diff options
Diffstat (limited to 'data')
626 files changed, 4909 insertions, 4664 deletions
diff --git a/data/battle/accuracy_multipliers.asm b/data/battle/accuracy_multipliers.asm index a5a309bbd..4b52a0909 100644 --- a/data/battle/accuracy_multipliers.asm +++ b/data/battle/accuracy_multipliers.asm @@ -1,5 +1,5 @@ ; Multiplier ratios for accuracy from modifier -6 to +6 -; (for other stats, see data/battle/stat_multipliers.asm) +; (for other stats, see data/battle/stat_multipliers.asm). AccuracyLevelMultipliers: db 33, 100 ; -6 = 33% diff --git a/data/battle/ai/constant_damage_effects.asm b/data/battle/ai/constant_damage_effects.asm new file mode 100644 index 000000000..0ce67c191 --- /dev/null +++ b/data/battle/ai/constant_damage_effects.asm @@ -0,0 +1,11 @@ +; AIDamageCalc uses BattleCommand_ConstantDamage +; to calculate damage for these instead of +; BattleCommand_DamageCalc and BattleCommand_Stab. + +ConstantDamageEffects: ; 39413 + db EFFECT_SUPER_FANG + db EFFECT_STATIC_DAMAGE + db EFFECT_LEVEL_DAMAGE + db EFFECT_PSYWAVE + db -1 ; end +; 39418 diff --git a/data/battle/ai/encore_moves.asm b/data/battle/ai/encore_moves.asm new file mode 100644 index 000000000..b18f2419d --- /dev/null +++ b/data/battle/ai/encore_moves.asm @@ -0,0 +1,35 @@ +; AI_SMART encourages these moves with Encore. + +EncoreMoves: ; 38c85 + db SWORDS_DANCE + db WHIRLWIND + db LEER + db ROAR + db DISABLE + db MIST + db LEECH_SEED + db GROWTH + db POISONPOWDER + db STRING_SHOT + db MEDITATE + db AGILITY + db TELEPORT + db SCREECH + db HAZE + db FOCUS_ENERGY + db DREAM_EATER + db POISON_GAS + db SPLASH + db SHARPEN + db CONVERSION + db SUPER_FANG + db SUBSTITUTE + db TRIPLE_KICK + db SPIDER_WEB + db MIND_READER + db FLAME_WHEEL + db AEROBLAST + db COTTON_SPORE + db POWDER_SNOW + db -1 ; end +; 38ca4 diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm new file mode 100644 index 000000000..05cf68670 --- /dev/null +++ b/data/battle/ai/rain_dance_moves.asm @@ -0,0 +1,16 @@ +; AI_SMART prefers these moves during rain. + +RainDanceMoves: ; 390e7 + db WATER_GUN + db HYDRO_PUMP + db SURF + db BUBBLEBEAM + db THUNDER + db WATERFALL + db CLAMP + db BUBBLE + db CRABHAMMER + db OCTAZOOKA + db WHIRLPOOL + db -1 ; end +; 390f3 diff --git a/data/battle/ai/reckless_moves.asm b/data/battle/ai/reckless_moves.asm new file mode 100644 index 000000000..40bc070d8 --- /dev/null +++ b/data/battle/ai/reckless_moves.asm @@ -0,0 +1,10 @@ +; AI_AGGRESSIVE does not discourage these moves +; even if a stronger one is available. + +RecklessMoves: ; 393e2 + db EFFECT_SELFDESTRUCT + db EFFECT_RAMPAGE + db EFFECT_MULTI_HIT + db EFFECT_DOUBLE_HIT + db -1 ; end +; 393e7 diff --git a/data/battle/ai/residual_moves.asm b/data/battle/ai/residual_moves.asm new file mode 100644 index 000000000..99407e238 --- /dev/null +++ b/data/battle/ai/residual_moves.asm @@ -0,0 +1,17 @@ +; AI_CAUTIOUS discourages these moves after the first turn. + +ResidualMoves: + db MIST + db LEECH_SEED + db POISONPOWDER + db STUN_SPORE + db THUNDER_WAVE + db FOCUS_ENERGY + db BIDE + db POISON_GAS + db TRANSFORM + db CONVERSION + db SUBSTITUTE + db SPIKES + db -1 ; end +; 39453 diff --git a/data/battle/ai/risky_effects.asm b/data/battle/ai/risky_effects.asm new file mode 100644 index 000000000..2ca0bc655 --- /dev/null +++ b/data/battle/ai/risky_effects.asm @@ -0,0 +1,8 @@ +; AI_RISKY will not use these effects at max HP +; even if they would KO the player. + +RiskyEffects: ; 394ff + db EFFECT_SELFDESTRUCT + db EFFECT_OHKO + db -1 ; end +; 39502 diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm new file mode 100644 index 000000000..5a017dadf --- /dev/null +++ b/data/battle/ai/stall_moves.asm @@ -0,0 +1,38 @@ +; AI_OPPORTUNIST discourages these moves +; when the player's HP is low. + +StallMoves: ; 39348 + db SWORDS_DANCE + db TAIL_WHIP + db LEER + db GROWL + db DISABLE + db MIST + db COUNTER + db LEECH_SEED + db GROWTH + db STRING_SHOT + db MEDITATE + db AGILITY + db RAGE + db MIMIC + db SCREECH + db HARDEN + db WITHDRAW + db DEFENSE_CURL + db BARRIER + db LIGHT_SCREEN + db HAZE + db REFLECT + db FOCUS_ENERGY + db BIDE + db AMNESIA + db TRANSFORM + db SPLASH + db ACID_ARMOR + db SHARPEN + db CONVERSION + db SUBSTITUTE + db FLAME_WHEEL + db -1 ; end +; 39369 diff --git a/data/battle/ai/status_only_effects.asm b/data/battle/ai/status_only_effects.asm new file mode 100644 index 000000000..daeadb46c --- /dev/null +++ b/data/battle/ai/status_only_effects.asm @@ -0,0 +1,10 @@ +; AI_BASIC discourages these effects if the player +; already has a status condition. + +StatusOnlyEffects: ; 385db + db EFFECT_SLEEP + db EFFECT_TOXIC + db EFFECT_POISON + db EFFECT_PARALYZE + db -1 ; end +; 385e0 diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm new file mode 100644 index 000000000..0ec59bc9e --- /dev/null +++ b/data/battle/ai/sunny_day_moves.asm @@ -0,0 +1,13 @@ +; AI_SMART prefers these moves during harsh sunlight. + +SunnyDayMoves: ; 39134 + db FIRE_PUNCH + db EMBER + db FLAMETHROWER + db FIRE_SPIN + db FIRE_BLAST + db SACRED_FIRE + db MORNING_SUN + db SYNTHESIS + db -1 ; end +; 3913d diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm new file mode 100644 index 000000000..3bab9e598 --- /dev/null +++ b/data/battle/ai/useful_moves.asm @@ -0,0 +1,24 @@ +; AI_SMART knows these moves are usable all-around. + +UsefulMoves: ; 39301 + db DOUBLE_EDGE + db SING + db FLAMETHROWER + db HYDRO_PUMP + db SURF + db ICE_BEAM + db BLIZZARD + db HYPER_BEAM + db SLEEP_POWDER + db THUNDERBOLT + db THUNDER + db EARTHQUAKE + db TOXIC + db PSYCHIC_M + db HYPNOSIS + db RECOVER + db FIRE_BLAST + db SOFTBOILED + db SUPER_FANG + db -1 ; end +; 39315 diff --git a/data/battle/held_consumables.asm b/data/battle/held_consumables.asm new file mode 100644 index 000000000..c1b28822c --- /dev/null +++ b/data/battle/held_consumables.asm @@ -0,0 +1,26 @@ +; Held item effects that are consumed on use + +ConsumableEffects: ; 271de + db HELD_BERRY + db HELD_2 + db HELD_5 + db HELD_HEAL_POISON + db HELD_HEAL_FREEZE + db HELD_HEAL_BURN + db HELD_HEAL_SLEEP + db HELD_HEAL_PARALYZE + db HELD_HEAL_STATUS + db HELD_30 + db HELD_ATTACK_UP + db HELD_DEFENSE_UP + db HELD_SPEED_UP + db HELD_SP_ATTACK_UP + db HELD_SP_DEFENSE_UP + db HELD_ACCURACY_UP + db HELD_EVASION_UP + db HELD_38 + db HELD_71 + db HELD_ESCAPE + db HELD_CRITICAL_UP + db -1 +; 271f4 diff --git a/data/battle/held_heal_status.asm b/data/battle/held_heal_status.asm new file mode 100644 index 000000000..b56335189 --- /dev/null +++ b/data/battle/held_heal_status.asm @@ -0,0 +1,11 @@ +; See also data/items/heal_status.asm + +HeldStatusHealingEffects: ; 3de44 + db HELD_HEAL_POISON, 1 << PSN + db HELD_HEAL_FREEZE, 1 << FRZ + db HELD_HEAL_BURN, 1 << BRN + db HELD_HEAL_SLEEP, SLP + db HELD_HEAL_PARALYZE, 1 << PAR + db HELD_HEAL_STATUS, ALL_STATUS + db -1 ; end +; 3de51 diff --git a/data/battle/held_stat_up.asm b/data/battle/held_stat_up.asm new file mode 100644 index 000000000..a08aa1844 --- /dev/null +++ b/data/battle/held_stat_up.asm @@ -0,0 +1,10 @@ +HeldStatUpItems: + dbw HELD_ATTACK_UP, BattleCommand_AttackUp + dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp + dbw HELD_SPEED_UP, BattleCommand_SpeedUp + dbw HELD_SP_ATTACK_UP, BattleCommand_SpecialAttackUp + dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp + dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp + dbw HELD_EVASION_UP, BattleCommand_EvasionUp + db -1 ; end +; 3df12 diff --git a/data/battle/metronome_exception_moves.asm b/data/battle/metronome_exception_moves.asm new file mode 100644 index 000000000..e9cd7f860 --- /dev/null +++ b/data/battle/metronome_exception_moves.asm @@ -0,0 +1,18 @@ +; Metronome cannot turn into these moves. + +MetronomeExcepts: ; 37454 + db NO_MOVE + db METRONOME + db STRUGGLE + db SKETCH + db MIMIC + db COUNTER + db MIRROR_COAT + db PROTECT + db DETECT + db ENDURE + db DESTINY_BOND + db SLEEP_TALK + db THIEF + db -1 +; 37462 diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm index e7cf8e472..1b9b08588 100644 --- a/data/battle/stat_multipliers.asm +++ b/data/battle/stat_multipliers.asm @@ -1,5 +1,8 @@ ; Multiplier ratios for all stats from modifier -6 to +6 -; (except accuracy, see data/battle/accuracy_multipliers.asm) +; (except accuracy, see data/battle/accuracy_multipliers.asm). + +; This table is identical to data/battle/stat_multipliers_2.asm. +; This one is used by CalcStats. StatLevelMultipliers: db 25, 100 ; -6 = 25% diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm new file mode 100644 index 000000000..3f3dc2348 --- /dev/null +++ b/data/battle/stat_multipliers_2.asm @@ -0,0 +1,20 @@ +; Multiplier ratios for all stats from modifier -6 to +6 +; (except accuracy, see data/battle/accuracy_multipliers.asm). + +; This table is identical to data/battle/stat_multipliers.asm. +; This one is used by ApplyStatLevelMultiplier. + +StatLevelMultipliers_Applied: + db 25, 100 ; -6 = 25% + db 28, 100 ; -5 = 28% + db 33, 100 ; -4 = 33% + db 40, 100 ; -3 = 40% + db 50, 100 ; -2 = 50% + db 66, 100 ; -1 = 66% + db 1, 1 ; 0 = 100% + db 15, 10 ; +1 = 150% + db 2, 1 ; +2 = 200% + db 25, 10 ; +3 = 250% + db 3, 1 ; +4 = 300% + db 35, 10 ; +5 = 350% + db 4, 1 ; +6 = 400% diff --git a/data/battle/weather_modifiers.asm b/data/battle/weather_modifiers.asm new file mode 100644 index 000000000..d0acdc25f --- /dev/null +++ b/data/battle/weather_modifiers.asm @@ -0,0 +1,10 @@ +WeatherTypeModifiers: + db WEATHER_RAIN, WATER, MORE_EFFECTIVE + db WEATHER_RAIN, FIRE, NOT_VERY_EFFECTIVE + db WEATHER_SUN, FIRE, MORE_EFFECTIVE + db WEATHER_SUN, WATER, NOT_VERY_EFFECTIVE + db -1 ; end + +WeatherMoveModifiers: + db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE + db -1 ; end diff --git a/data/battle/wobble_probabilities.asm b/data/battle/wobble_probabilities.asm new file mode 100644 index 000000000..38e9a12c6 --- /dev/null +++ b/data/battle/wobble_probabilities.asm @@ -0,0 +1,27 @@ +WobbleProbabilities: +; catch rate, chance of wobbling / 255 +; nLeft/255 = (nRight/255) ** 4 + db 1, 63 + db 2, 75 + db 3, 84 + db 4, 90 + db 5, 95 + db 7, 103 + db 10, 113 + db 15, 126 + db 20, 134 + db 30, 149 + db 40, 160 + db 50, 169 + db 60, 177 + db 80, 191 + db 100, 201 + db 120, 211 + db 140, 220 + db 160, 227 + db 180, 234 + db 200, 240 + db 220, 246 + db 240, 251 + db 254, 253 + db 255, 255 diff --git a/data/common_text/common_text.asm b/data/common_text/common_text.asm deleted file mode 100644 index 2f88b4e9d..000000000 --- a/data/common_text/common_text.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - - -SECTION "Text 1", ROMX - -INCLUDE "data/common_text/common_text_1.asm" - - -SECTION "Text 2", ROMX - -INCLUDE "data/common_text/common_text_2.asm" - - -SECTION "Text 3", ROMX - -INCLUDE "data/common_text/common_text_3.asm" diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm index 209662a6f..a60f441a6 100644 --- a/data/decorations/attributes.asm +++ b/data/decorations/attributes.asm @@ -7,36 +7,36 @@ ENDM DecorationAttributes: ; 26a4f ; entries correspond to deco constants - decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, $00, $0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08 decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20 decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21 decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23 decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24 decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64 decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY diff --git a/data/decorations/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm index bdd4694c6..94a5935de 100644 --- a/data/decorations/mystery_gift_decos.asm +++ b/data/decorations/mystery_gift_decos.asm @@ -36,5 +36,5 @@ MysteryGiftDecos: ; 2c74a db DECOFLAG_PIKACHU_BED db DECOFLAG_GRIMER_DOLL db DECOFLAG_UNOWN_DOLL -MysteryGiftDecosEnd +.End ; 2c76f diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 9c2dda5a6..261d38d7f 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -1,206 +1,201 @@ engine_flag: MACRO - dwb \1, 1 << \2 +; location, bit +; (all locations are in WRAM bank 1) + dwb \1 + (\2 / 8), 1 << (\2 % 8) ENDM EngineFlags: ; 80462 - ; location, bit - ; (all locations are in WRAM bank 1) +; entries correspond to ENGINE_* constants ; pokegear - engine_flag wPokegearFlags, 1 ; radio card ; $0 - engine_flag wPokegearFlags, 0 ; map card - engine_flag wPokegearFlags, 2 ; phone card - engine_flag wPokegearFlags, 3 ; expn card - engine_flag wPokegearFlags, 7 ; on/off + engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 + engine_flag wPokegearFlags, POKEGEAR_MAP_CARD_F + engine_flag wPokegearFlags, POKEGEAR_PHONE_CARD_F + engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F + engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F - ; wDayCareMan, 7 ; day-care 1 on - engine_flag wDayCareMan, 6 ; egg is ready - ; wDayCareMan, 5 ; monster 1 and 2 are compatible - engine_flag wDayCareMan, 0 ; monster 1 in day-care + ; day-care + engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F + engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F + engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - ; wDayCareLady, 7 = day-care 2 on - engine_flag wDayCareLady, 0 ; monster 2 in day-care - - engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 - engine_flag wMomSavingMoney, 7 ; dst + engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8 + engine_flag wMomSavingMoney, MOM_ACTIVE_F engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer - engine_flag wStatusFlags, 0 ; pokedex - engine_flag wStatusFlags, 1 ; unown dex - engine_flag wStatusFlags, 3 ; pokerus - engine_flag wStatusFlags, 4 ; rocket signal on ch20 - engine_flag wStatusFlags, 6 ; credits skip - engine_flag wStatusFlags, 7 ; bug contest on ; $10 - engine_flag wStatusFlags2, 2 ; bug contest timer - engine_flag wStatusFlags2, 1 ; safari zone? - engine_flag wStatusFlags2, 0 ; rockets in radio tower - engine_flag wStatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd) - engine_flag wStatusFlags2, 5 ; give pokerus - engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? - engine_flag wStatusFlags2, 7 ; rockets in mahogany - - engine_flag wBikeFlags, 0 ; strength active ; $18 - engine_flag wBikeFlags, 1 ; always on bike (cant surf) - engine_flag wBikeFlags, 2 ; downhill (cycling road) - - engine_flag wJohtoBadges, 0 ; zephyrbadge - engine_flag wJohtoBadges, 1 ; hivebadge - engine_flag wJohtoBadges, 2 ; plainbadge - engine_flag wJohtoBadges, 3 ; fogbadge - engine_flag wJohtoBadges, 4 ; mineralbadge - engine_flag wJohtoBadges, 5 ; stormbadge ; $20 - engine_flag wJohtoBadges, 6 ; glacierbadge - engine_flag wJohtoBadges, 7 ; risingbadge - - engine_flag wKantoBadges, 0 ; boulderbadge - engine_flag wKantoBadges, 1 ; cascadebadge - engine_flag wKantoBadges, 2 ; thunderbadge - engine_flag wKantoBadges, 3 ; rainbowbadge - engine_flag wKantoBadges, 4 ; soulbadge - engine_flag wKantoBadges, 5 ; marshbadge ; $28 - engine_flag wKantoBadges, 6 ; volcanobadge - engine_flag wKantoBadges, 7 ; earthbadge - - ; unown sets - engine_flag wUnlockedUnowns, 0 ; 1 - engine_flag wUnlockedUnowns, 1 ; 2 - engine_flag wUnlockedUnowns, 2 ; 3 - engine_flag wUnlockedUnowns, 3 ; 4 - engine_flag wUnlockedUnowns, 4 ; 5 - engine_flag wUnlockedUnowns, 5 ; 6 ; $30 - engine_flag wUnlockedUnowns, 6 ; 7 - engine_flag wUnlockedUnowns, 7 ; 8 + engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F + engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F + engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F + engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F + engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F + engine_flag wStatusFlags, STATUSFLAGS_BUG_CONTEST_ON_F + + engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F + engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F + engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F + engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_F + engine_flag wStatusFlags2, STATUSFLAGS2_CAN_USE_SWEET_SCENT_F + engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F + engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F + + engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18 + engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F + engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F + + engine_flag wJohtoBadges, ZEPHYRBADGE + engine_flag wJohtoBadges, HIVEBADGE + engine_flag wJohtoBadges, PLAINBADGE + engine_flag wJohtoBadges, FOGBADGE + engine_flag wJohtoBadges, MINERALBADGE + engine_flag wJohtoBadges, STORMBADGE ; $20 + engine_flag wJohtoBadges, GLACIERBADGE + engine_flag wJohtoBadges, RISINGBADGE + + engine_flag wKantoBadges, BOULDERBADGE + engine_flag wKantoBadges, CASCADEBADGE + engine_flag wKantoBadges, THUNDERBADGE + engine_flag wKantoBadges, RAINBOWBADGE + engine_flag wKantoBadges, SOULBADGE + engine_flag wKantoBadges, MARSHBADGE ; $28 + engine_flag wKantoBadges, VOLCANOBADGE + engine_flag wKantoBadges, EARTHBADGE + + ; unown sets (see data/wild/unlocked_unowns.asm) + engine_flag wUnlockedUnowns, 0 ; A-K + engine_flag wUnlockedUnowns, 1 ; L-R + engine_flag wUnlockedUnowns, 2 ; S-W + engine_flag wUnlockedUnowns, 3 ; X-Z + engine_flag wUnlockedUnowns, 4 ; unused + engine_flag wUnlockedUnowns, 5 ; unused ; $30 + engine_flag wUnlockedUnowns, 6 ; unused + engine_flag wUnlockedUnowns, 7 ; unused ; fly - engine_flag wVisitedSpawns, 0 ; your house - engine_flag wVisitedSpawns, 1 ; viridian pokecenter - engine_flag wVisitedSpawns, 2 ; pallet - engine_flag wVisitedSpawns, 3 ; viridian - engine_flag wVisitedSpawns, 4 ; pewter - engine_flag wVisitedSpawns, 5 ; cerulean ; $38 - engine_flag wVisitedSpawns, 6 ; rock tunnel - engine_flag wVisitedSpawns, 7 ; vermilion - engine_flag wVisitedSpawns + 1, 0 ; lavender - engine_flag wVisitedSpawns + 1, 1 ; saffron - engine_flag wVisitedSpawns + 1, 2 ; celadon - engine_flag wVisitedSpawns + 1, 3 ; fuchsia - engine_flag wVisitedSpawns + 1, 4 ; cinnabar - engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40 - engine_flag wVisitedSpawns + 1, 6 ; new bark - engine_flag wVisitedSpawns + 1, 7 ; cherrygrove - engine_flag wVisitedSpawns + 2, 0 ; violet - ; union cave - engine_flag wVisitedSpawns + 2, 2 ; azalea - engine_flag wVisitedSpawns + 2, 3 ; cianwood - engine_flag wVisitedSpawns + 2, 4 ; goldenrod - engine_flag wVisitedSpawns + 2, 5 ; olivine - engine_flag wVisitedSpawns + 2, 6 ; ecruteak ; $48 - engine_flag wVisitedSpawns + 2, 7 ; mahogany - engine_flag wVisitedSpawns + 3, 0 ; lake of rage - engine_flag wVisitedSpawns + 3, 1 ; blackthorn - engine_flag wVisitedSpawns + 3, 2 ; silver cave - ; fast ship - engine_flag wVisitedSpawns + 3, 4 ; unused - - engine_flag wLuckyNumberShowFlag, 0 ; lucky number show - engine_flag wStatusFlags2, 3 ; ???? - - engine_flag wDailyFlags, 0 ; kurt making balls ; $50 - engine_flag wDailyFlags, 1 ; ???? - engine_flag wDailyFlags, 2 ; special wilddata? - engine_flag wDailyFlags, 3 ; time capsule (24h wait) - engine_flag wDailyFlags, 4 ; all fruit trees - engine_flag wDailyFlags, 5 ; shuckle given - engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed - engine_flag wDailyFlags, 7 ; fought in trainer hall today - - engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 - engine_flag wWeeklyFlags, 1 ; union cave lapras - engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07 - engine_flag wWeeklyFlags, 4 ; tea in blues house - engine_flag wWeeklyFlags, 5 ; indigo plateau rival fight - engine_flag wWeeklyFlags, 6 ; move tutor - engine_flag wWeeklyFlags, 7 ; buenas password - - engine_flag wSwarmFlags, 0 ; buenas password 2 - engine_flag wSwarmFlags, 1 ; goldenrod dept store sale is on - - engine_flag wGameTimerPause, 7 ; $62 - - engine_flag wPlayerGender, 0 ; player is female - - engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it + engine_flag wVisitedSpawns, SPAWN_HOME + engine_flag wVisitedSpawns, SPAWN_DEBUG + engine_flag wVisitedSpawns, SPAWN_PALLET + engine_flag wVisitedSpawns, SPAWN_VIRIDIAN + engine_flag wVisitedSpawns, SPAWN_PEWTER + engine_flag wVisitedSpawns, SPAWN_CERULEAN ; $38 + engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL + engine_flag wVisitedSpawns, SPAWN_VERMILION + engine_flag wVisitedSpawns, SPAWN_LAVENDER + engine_flag wVisitedSpawns, SPAWN_SAFFRON + engine_flag wVisitedSpawns, SPAWN_CELADON + engine_flag wVisitedSpawns, SPAWN_FUCHSIA + engine_flag wVisitedSpawns, SPAWN_CINNABAR + engine_flag wVisitedSpawns, SPAWN_INDIGO ; $40 + engine_flag wVisitedSpawns, SPAWN_NEW_BARK + engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE + engine_flag wVisitedSpawns, SPAWN_VIOLET + engine_flag wVisitedSpawns, SPAWN_AZALEA + engine_flag wVisitedSpawns, SPAWN_CIANWOOD + engine_flag wVisitedSpawns, SPAWN_GOLDENROD + engine_flag wVisitedSpawns, SPAWN_OLIVINE + engine_flag wVisitedSpawns, SPAWN_ECRUTEAK ; $48 + engine_flag wVisitedSpawns, SPAWN_MAHOGANY + engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE + engine_flag wVisitedSpawns, SPAWN_BLACKTHORN + engine_flag wVisitedSpawns, SPAWN_MT_SILVER + engine_flag wVisitedSpawns, NUM_SPAWNS ; unused + + engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F + + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_F + + engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50 + engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F + engine_flag wDailyFlags, DAILYFLAGS_FISH_SWARM_F + engine_flag wDailyFlags, DAILYFLAGS_TIME_CAPSULE_F + engine_flag wDailyFlags, DAILYFLAGS_ALL_FRUIT_TREES_F + engine_flag wDailyFlags, DAILYFLAGS_GOT_SHUCKIE_TODAY_F + engine_flag wDailyFlags, DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F + engine_flag wDailyFlags, DAILYFLAGS_TRAINER_HOUSE_F + + engine_flag wWeeklyFlags, WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; $58 + engine_flag wWeeklyFlags, WEEKLYFLAGS_UNION_CAVE_LAPRAS_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_DAISYS_GROOMING_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F + + engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60 + engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F + + engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F + + engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F + + engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F ; rematches - engine_flag wDailyRematchFlags, 0 ; jack - engine_flag wDailyRematchFlags, 1 ; huey - engine_flag wDailyRematchFlags, 2 ; gaven - engine_flag wDailyRematchFlags, 3 ; beth ; $68 - engine_flag wDailyRematchFlags, 4 ; jose - engine_flag wDailyRematchFlags, 5 ; reena - engine_flag wDailyRematchFlags, 6 ; joey - engine_flag wDailyRematchFlags, 7 ; wade - engine_flag wDailyRematchFlags + 1, 0 ; ralph - engine_flag wDailyRematchFlags + 1, 1 ; liz - engine_flag wDailyRematchFlags + 1, 2 ; anthony - engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 - engine_flag wDailyRematchFlags + 1, 4 ; gina - engine_flag wDailyRematchFlags + 1, 5 ; arnie - engine_flag wDailyRematchFlags + 1, 6 ; alan - engine_flag wDailyRematchFlags + 1, 7 ; dana - engine_flag wDailyRematchFlags + 2, 0 ; chad - engine_flag wDailyRematchFlags + 2, 1 ; tully - engine_flag wDailyRematchFlags + 2, 2 ; brent - engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 - engine_flag wDailyRematchFlags + 2, 4 ; vance - engine_flag wDailyRematchFlags + 2, 5 ; wilton - engine_flag wDailyRematchFlags + 2, 6 ; parry - engine_flag wDailyRematchFlags + 2, 7 ; erin + engine_flag wDailyRematchFlags, 0 ; jack + engine_flag wDailyRematchFlags, 1 ; huey + engine_flag wDailyRematchFlags, 2 ; gaven + engine_flag wDailyRematchFlags, 3 ; beth ; $68 + engine_flag wDailyRematchFlags, 4 ; jose + engine_flag wDailyRematchFlags, 5 ; reena + engine_flag wDailyRematchFlags, 6 ; joey + engine_flag wDailyRematchFlags, 7 ; wade + engine_flag wDailyRematchFlags, 8 ; ralph + engine_flag wDailyRematchFlags, 9 ; liz + engine_flag wDailyRematchFlags, 10 ; anthony + engine_flag wDailyRematchFlags, 11 ; todd ; $70 + engine_flag wDailyRematchFlags, 12 ; gina + engine_flag wDailyRematchFlags, 13 ; arnie + engine_flag wDailyRematchFlags, 14 ; alan + engine_flag wDailyRematchFlags, 15 ; dana + engine_flag wDailyRematchFlags, 16 ; chad + engine_flag wDailyRematchFlags, 17 ; tully + engine_flag wDailyRematchFlags, 18 ; brent + engine_flag wDailyRematchFlags, 19 ; tiffany ; $78 + engine_flag wDailyRematchFlags, 20 ; vance + engine_flag wDailyRematchFlags, 21 ; wilton + engine_flag wDailyRematchFlags, 22 ; parry + engine_flag wDailyRematchFlags, 23 ; erin engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 + engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone - - engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow - engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) - - engine_flag wDailyPhoneTimeOfDayFlags, 0 - engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 - engine_flag wDailyPhoneTimeOfDayFlags, 2 - engine_flag wDailyPhoneTimeOfDayFlags, 3 - engine_flag wDailyPhoneTimeOfDayFlags, 4 - engine_flag wDailyPhoneTimeOfDayFlags, 5 - engine_flag wDailyPhoneTimeOfDayFlags, 6 - engine_flag wDailyPhoneTimeOfDayFlags, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 7 - - engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male - - engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 - engine_flag wSwarmFlags, 3 ; yanma swarm + engine_flag wDailyPhoneItemFlags, 8 ; tiffany has pink bow + engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) + + engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack + engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; $88 + engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven + engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth + engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose + engine_flag wDailyPhoneTimeOfDayFlags, 5 ; reena + engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey + engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade + engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph + engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz ; $90 + engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony + engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd + engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina + engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie + engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan + engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana + engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad + engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98 + engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent + engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany + engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance + engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton + engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry + engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin + + engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F + + engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0 + engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F ; 80648 diff --git a/data/bug_contest_flags.asm b/data/events/bug_contest_flags.asm index 04d748270..04d748270 100644 --- a/data/bug_contest_flags.asm +++ b/data/events/bug_contest_flags.asm diff --git a/data/bug_contest_winners.asm b/data/events/bug_contest_winners.asm index 7a465edf5..7a465edf5 100644 --- a/data/bug_contest_winners.asm +++ b/data/events/bug_contest_winners.asm diff --git a/data/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index 8156d039d..8156d039d 100644 --- a/data/collision_stdscripts.asm +++ b/data/events/collision_stdscripts.asm diff --git a/data/elevator_floors.asm b/data/events/elevator_floors.asm index abc793cf2..abc793cf2 100644 --- a/data/elevator_floors.asm +++ b/data/events/elevator_floors.asm diff --git a/data/field_move_blocks.asm b/data/events/field_move_blocks.asm index d97fdc995..d97fdc995 100644 --- a/data/field_move_blocks.asm +++ b/data/events/field_move_blocks.asm diff --git a/data/events/happiness_chances.asm b/data/events/happiness_chances.asm new file mode 100644 index 000000000..22a7395d9 --- /dev/null +++ b/data/events/happiness_chances.asm @@ -0,0 +1,12 @@ +HappinessData_YoungerHaircutBrother: ; 7459 + db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance + db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance + db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance + +HappinessData_OlderHaircutBrother: ; 7462 + db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance + db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance + +HappinessData_DaisysGrooming: ; 746b + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/happiness_changes.asm b/data/events/happiness_changes.asm index de60ea32d..de60ea32d 100644 --- a/data/happiness_changes.asm +++ b/data/events/happiness_changes.asm diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm new file mode 100644 index 000000000..a631ef719 --- /dev/null +++ b/data/events/magikarp_lengths.asm @@ -0,0 +1,21 @@ +MagikarpLengths: ; fbca8 +; [wMagikarpLength] = z * 100 + (bc - x) / y +; First argument is the bc threshold as well as x. +; Second argument is y. +; In reality, due to the bug at .BCLessThanDE, +; the threshold is determined by only register b. + dwb 110, 1 ; not used unless the bug is fixed + dwb 310, 2 + dwb 710, 4 + dwb 2710, 20 + dwb 7710, 50 + dwb 17710, 100 + dwb 32710, 150 + dwb 47710, 150 + dwb 57710, 100 + dwb 62710, 50 + dwb 64710, 20 + dwb 65210, 5 + dwb 65410, 2 + dwb 65510, 1 ; not used +; fbcd2 diff --git a/data/npc_trades.asm b/data/events/npc_trades.asm index d16670984..d16670984 100644 --- a/data/npc_trades.asm +++ b/data/events/npc_trades.asm diff --git a/data/odd_eggs.asm b/data/events/odd_eggs.asm index aa7e8176b..aa7e8176b 100644 --- a/data/odd_eggs.asm +++ b/data/events/odd_eggs.asm diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm new file mode 100644 index 000000000..be23c401f --- /dev/null +++ b/data/events/pokedex_ratings.asm @@ -0,0 +1,24 @@ +OakRatings: ; 0x2667f +; if you caught at most this many, play this sound, load this text +; (text is defined in engine/events/prof_oaks_pc.asm) + dbww 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 + dbww 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 + dbww 34, SFX_DEX_FANFARE_20_49, OakRating03 + dbww 49, SFX_DEX_FANFARE_20_49, OakRating04 + dbww 64, SFX_DEX_FANFARE_50_79, OakRating05 + dbww 79, SFX_DEX_FANFARE_50_79, OakRating06 + dbww 94, SFX_DEX_FANFARE_80_109, OakRating07 + dbww 109, SFX_DEX_FANFARE_80_109, OakRating08 + dbww 124, SFX_CAUGHT_MON, OakRating09 + dbww 139, SFX_CAUGHT_MON, OakRating10 + dbww 154, SFX_DEX_FANFARE_140_169, OakRating11 + dbww 169, SFX_DEX_FANFARE_140_169, OakRating12 + dbww 184, SFX_DEX_FANFARE_170_199, OakRating13 + dbww 199, SFX_DEX_FANFARE_170_199, OakRating14 + dbww 214, SFX_DEX_FANFARE_200_229, OakRating15 + dbww 229, SFX_DEX_FANFARE_200_229, OakRating16 + dbww 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 + dbww 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 + dbww 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 + ; 0x266de +
\ No newline at end of file diff --git a/data/unown_walls.asm b/data/events/unown_walls.asm index eae376730..c05d37004 100644 --- a/data/unown_walls.asm +++ b/data/events/unown_walls.asm @@ -38,7 +38,7 @@ UnownWalls: ; 8aebc unownwall "H", "O", "-", "O", "H" ; 8aed5 -MenuDataHeaders_UnownWalls: ; 0x8aed5 +MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_ESCAPE db MENU_BACKUP_TILES ; flags menu_coords 3, 4, 16, 9 diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm index d0a0e6b88..baac8a56d 100644 --- a/data/items/buena_prizes.asm +++ b/data/items/buena_prizes.asm @@ -9,5 +9,5 @@ BuenaPrizeItems: ; 8b15e db CARBOS, 5 db CALCIUM, 5 db HP_UP, 5 -BuenaPrizeItemsEnd: +.End ; 8b170 diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm index f0b0148bb..29bb872e1 100644 --- a/data/items/heal_status.asm +++ b/data/items/heal_status.asm @@ -1,3 +1,5 @@ +; See also data/battle/held_heal_status.asm + StatusHealingActions: ; f071 ; item, party menu action text, status db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN diff --git a/data/items/marts.asm b/data/items/marts.asm index fd156225d..a9fad3e69 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -34,7 +34,7 @@ Marts: ; 160a9 dw MartMtMoon dw MartIndigoPlateau dw MartUnderground -MartsEnd +.End ; 160ed diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm index 288a14acc..5a5087c0e 100644 --- a/data/items/mom_phone.asm +++ b/data/items/mom_phone.asm @@ -11,7 +11,7 @@ MomItems_1: ; fd136 momitem 0, 180, MOM_ITEM, POKE_BALL momitem 0, 450, MOM_ITEM, ESCAPE_ROPE momitem 0, 500, MOM_ITEM, GREAT_BALL -MomItems_1End: ; fd15e +.End ; fd15e MomItems_2: ; fd15e momitem 900, 600, MOM_ITEM, SUPER_POTION @@ -24,4 +24,4 @@ MomItems_2: ; fd15e momitem 40000, 900, MOM_ITEM, HYPER_POTION momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL -MomItems_2End: ; fd1ae +.End ; fd1ae diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm index b2379071e..7f7125ef7 100644 --- a/data/items/mystery_gift_items.asm +++ b/data/items/mystery_gift_items.asm @@ -36,5 +36,5 @@ MysteryGiftItems: ; 2c725 db RARE_CANDY db BLUESKY_MAIL db MIRAGE_MAIL -MysteryGiftItemsEnd: +.End ; 2c74a diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm new file mode 100644 index 000000000..880e08fe3 --- /dev/null +++ b/data/items/pocket_names.asm @@ -0,0 +1,11 @@ +ItemPocketNames: +; entries correspond to item type constants + dw .Item + dw .Key + dw .Ball + dw .TM + +.Item: db "ITEM POCKET@" +.Key: db "KEY POCKET@" +.Ball: db "BALL POCKET@" +.TM: db "TM POCKET@" diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm index b16724cdc..87165fa5a 100644 --- a/data/items/rooftop_sale.asm +++ b/data/items/rooftop_sale.asm @@ -1,4 +1,4 @@ -RooftopSaleData1: ; 15aee +RooftopSaleMart1: ; 15aee db 5 dbw POKE_BALL, 150 dbw GREAT_BALL, 500 @@ -7,7 +7,7 @@ RooftopSaleData1: ; 15aee dbw REVIVE, 1200 db -1 -RooftopSaleData2: ; 15aff +RooftopSaleMart2: ; 15aff db 5 dbw HYPER_POTION, 1000 dbw FULL_RESTORE, 2000 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 7f008b5b2..dbfa49b5a 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -165,20 +165,20 @@ CharcoalKiln_Blocks: LakeOfRageHiddenPowerHouse_Blocks: LakeOfRageMagikarpHouse_Blocks: GoldenrodHappinessRater_Blocks: -GoldenrodBillsHouse_Blocks: +BillsFamilysHouse_Blocks: GoldenrodPPSpeechHouse_Blocks: GoldenrodNameRater_Blocks: -VermilionHouseFishingSpeechHouse_Blocks: +VermilionFishingSpeechHouse_Blocks: VermilionMagnetTrainSpeechHouse_Blocks: -VermilionHouseDiglettsCaveSpeechHouse_Blocks: +VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: -FuchsiaBillSpeechHouse_Blocks: +BillsBrothersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: -Route28FamousSpeechHouse_Blocks: +Route28SteelWingHouse_Blocks: CeladonMansionRoofHouse_Blocks: Route16FuchsiaSpeechHouse_Blocks: ManiasHouse_Blocks: @@ -187,17 +187,17 @@ CianwoodPhotoStudio_Blocks: CianwoodLugiaSpeechHouse_Blocks: PokeSeersHouse_Blocks: ViridianNicknameSpeechHouse_Blocks: -Route2NuggetSpeechHouse_Blocks: -KrissNeighborsHouse_Blocks: -Route26HealSpeechHouse_Blocks: -Route26DayofWeekSiblingsHouse_Blocks: +Route2NuggetHouse_Blocks: +PlayersNeighborsHouse_Blocks: +Route26HealHouse_Blocks: +DayOfWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: MrPsychicsHouse_Blocks: -Route5CleanseTagSpeechHouse_Blocks: +Route5CleanseTagHouse_Blocks: CherrygroveGymSpeechHouse_Blocks: GuideGentsHouse_Blocks: CherrygroveEvolutionSpeechHouse_Blocks: -Route30BerrySpeechHouse_Blocks: +Route30BerryHouse_Blocks: INCBIN "maps/House1.blk" SafariZoneFuchsiaGateBeta_Blocks: @@ -265,8 +265,8 @@ Route43_Blocks: Route39_Blocks: INCBIN "maps/Route39.blk" -KrissHouse1F_Blocks: - INCBIN "maps/KrissHouse1F.blk" +PlayersHouse1F_Blocks: + INCBIN "maps/PlayersHouse1F.blk" Route38EcruteakGate_Blocks: Route42EcruteakGate_Blocks: @@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks: DanceTheatre_Blocks: INCBIN "maps/DanceTheatre.blk" -EcruteakHouse_Blocks: - INCBIN "maps/EcruteakHouse.blk" +EcruteakTinTowerEntrance_Blocks: + INCBIN "maps/EcruteakTinTowerEntrance.blk" GoldenrodGameCorner_Blocks: INCBIN "maps/GoldenrodGameCorner.blk" @@ -846,8 +846,8 @@ OlivineCafe_Blocks: SafariZoneMainOffice_Blocks: INCBIN "maps/OlivineCafe.blk" -KrissHouse2F_Blocks: - INCBIN "maps/KrissHouse2F.blk" +PlayersHouse2F_Blocks: + INCBIN "maps/PlayersHouse2F.blk" SaffronMagnetTrainStation_Blocks: INCBIN "maps/SaffronMagnetTrainStation.blk" @@ -1022,8 +1022,8 @@ BattleTower1F_Blocks: BattleTowerBattleRoom_Blocks: INCBIN "maps/BattleTowerBattleRoom.blk" -GoldenrodPokeComCenter2FMobile_Blocks: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" +PokecomCenterAdminRoomMobile_Blocks: + INCBIN "maps/PokecomCenterAdminRoomMobile.blk" MobileTradeRoomMobile_Blocks: INCBIN "maps/MobileTradeRoomMobile.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 0cdfb0826..2bd2fc553 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -3,365 +3,343 @@ map_data: MACRO ;\2: map id ;\3: border block ;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +CURRENT_MAP_WIDTH = \2_WIDTH +CURRENT_MAP_HEIGHT = \2_HEIGHT \1_MapData:: db \3 - db \2_HEIGHT, \2_WIDTH + db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH db BANK(\1_Blocks) dw \1_Blocks - db BANK(\1_MapScripts) + db BANK(\1_MapScripts) ; BANK(\1_MapEvents) dw \1_MapScripts dw \1_MapEvents db \4 ENDM connection: MACRO -if "\1" == "north" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: x -;\5: offset? +;\1: direction +;\2: map name +;\3: map id +;\4: x offset for east/west, y offset for north/south +;\5: distance offset? ;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5 +if "\1" == "north" + map \3 + dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5 dw OverworldMap + \4 + 3 db \6 - db \2_WIDTH - db \2_HEIGHT * 2 - 1 + db \3_WIDTH + db \3_HEIGHT * 2 - 1 db (\4 - \5) * -2 - dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 -endc - -if "\1" == "south" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + \5 - dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 + dw OverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1 +elif "\1" == "south" + map \3 + dw \2_Blocks + \5 + dw OverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 db \6 - db \2_WIDTH + db \3_WIDTH db 0 db (\4 - \5) * -2 - dw OverworldMap + \2_WIDTH + 7 -endc - -if "\1" == "west" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3 - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3) + dw OverworldMap + \3_WIDTH + 7 +elif "\1" == "west" + map \3 + dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3 + dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) db \6 - db \2_WIDTH + db \3_WIDTH db (\4 - \5) * -2 - db \2_WIDTH * 2 - 1 - dw OverworldMap + \2_WIDTH * 2 + 6 -endc - -if "\1" == "east" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + (\2_WIDTH * \5) - dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 + db \3_WIDTH * 2 - 1 + dw OverworldMap + \3_WIDTH * 2 + 6 +elif "\1" == "east" + map \3 + dw \2_Blocks + (\3_WIDTH * \5) + dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 db \6 - db \2_WIDTH + db \3_WIDTH db (\4 - \5) * -2 db 0 - dw OverworldMap + \2_WIDTH + 7 + dw OverworldMap + \3_WIDTH + 7 endc ENDM map_data NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST - connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN - connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN + connection west, Route29, ROUTE_29, 0, 0, 9 + connection east, Route27, ROUTE_27, 0, 0, 9 map_data CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST - connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY - connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY + connection north, Route30, ROUTE_30, 5, 0, 10 + connection east, Route29, ROUTE_29, 0, 0, 9 map_data VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST - connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY - connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY - connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY + connection south, Route32, ROUTE_32, 0, 0, 10 + connection west, Route36, ROUTE_36, 0, 0, 9 + connection east, Route31, ROUTE_31, 9, 0, 9 map_data AzaleaTown, AZALEA_TOWN, $05, WEST | EAST - connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN - connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN + connection west, Route34, ROUTE_34, -3, 15, 12 + connection east, Route33, ROUTE_33, 0, 0, 9 map_data CianwoodCity, CIANWOOD_CITY, $35, EAST - connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY + connection east, Route41, ROUTE_41, 0, 0, 27 map_data GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH - connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY - connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY + connection north, Route35, ROUTE_35, 5, 0, 10 + connection south, Route34, ROUTE_34, 5, 0, 10 map_data OlivineCity, OLIVINE_CITY, $35, NORTH | WEST - connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY - connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY + connection north, Route39, ROUTE_39, 5, 0, 10 + connection west, Route40, ROUTE_40, 9, 0, 12 map_data EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST - connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY - connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY - connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY + connection south, Route37, ROUTE_37, 5, 0, 10 + connection west, Route38, ROUTE_38, 5, 0, 9 + connection east, Route42, ROUTE_42, 9, 0, 9 map_data MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST - connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN - connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN - connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN + connection north, Route43, ROUTE_43, 0, 0, 10 + connection west, Route42, ROUTE_42, 0, 0, 9 + connection east, Route44, ROUTE_44, 0, 0, 9 map_data LakeOfRage, LAKE_OF_RAGE, $05, SOUTH - connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE + connection south, Route43, ROUTE_43, 5, 0, 10 map_data BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST - connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY - connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY + connection south, Route45, ROUTE_45, 0, 0, 10 + connection west, Route44, ROUTE_44, 9, 0, 9 map_data SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST - connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE + connection east, Route28, ROUTE_28, 9, 0, 9 map_data Route26, ROUTE_26, $05, WEST - connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26 + connection west, Route27, ROUTE_27, 45, 0, 9 map_data Route27, ROUTE_27, $35, WEST | EAST - connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27 - connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27 + connection west, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9 + connection east, Route26, ROUTE_26, -3, 42, 12 map_data Route28, ROUTE_28, $2c, WEST - connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28 + connection west, SilverCaveOutside, SILVER_CAVE_OUTSIDE, -3, 6, 12 map_data Route29, ROUTE_29, $05, NORTH | WEST | EAST - connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29 - connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29 - connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29 + connection north, Route46, ROUTE_46, 10, 0, 10 + connection west, CherrygroveCity, CHERRYGROVE_CITY, 0, 0, 9 + connection east, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9 map_data Route30, ROUTE_30, $05, NORTH | SOUTH - connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30 - connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30 + connection north, Route31, ROUTE_31, -3, 7, 13 + connection south, CherrygroveCity, CHERRYGROVE_CITY, -3, 2, 16 map_data Route31, ROUTE_31, $05, SOUTH | WEST - connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31 - connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31 + connection south, Route30, ROUTE_30, 10, 0, 10 + connection west, VioletCity, VIOLET_CITY, -3, 6, 12 map_data Route32, ROUTE_32, $05, NORTH | SOUTH - connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32 - connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32 + connection north, VioletCity, VIOLET_CITY, 0, 0, 13 + connection south, Route33, ROUTE_33, 0, 0, 10 map_data Route33, ROUTE_33, $05, NORTH | WEST - connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33 - connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33 + connection north, Route32, ROUTE_32, 0, 0, 10 + connection west, AzaleaTown, AZALEA_TOWN, 0, 0, 9 map_data Route34, ROUTE_34, $05, NORTH | EAST - connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34 - connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34 + connection north, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16 + connection east, AzaleaTown, AZALEA_TOWN, 18, 0, 9 map_data Route35, ROUTE_35, $05, NORTH | SOUTH - connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35 - connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35 + connection north, Route36, ROUTE_36, 0, 0, 13 + connection south, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16 map_data Route36, ROUTE_36, $05, NORTH | SOUTH | EAST - connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36 - connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36 - connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36 + connection north, Route37, ROUTE_37, 10, 0, 10 + connection south, Route35, ROUTE_35, 0, 0, 10 + connection east, VioletCity, VIOLET_CITY, 0, 0, 12 map_data Route37, ROUTE_37, $05, NORTH | SOUTH - connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37 - connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37 + connection north, EcruteakCity, ECRUTEAK_CITY, -3, 2, 16 + connection south, Route36, ROUTE_36, -3, 7, 16 map_data Route38, ROUTE_38, $05, WEST | EAST - connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38 - connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38 + connection west, Route39, ROUTE_39, 0, 0, 12 + connection east, EcruteakCity, ECRUTEAK_CITY, -3, 2, 15 map_data Route39, ROUTE_39, $05, SOUTH | EAST - connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39 - connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39 + connection south, OlivineCity, OLIVINE_CITY, -3, 2, 16 + connection east, Route38, ROUTE_38, 0, 0, 9 map_data Route40, ROUTE_40, $35, SOUTH | EAST - connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40 - connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40 + connection south, Route41, ROUTE_41, -3, 12, 13 + connection east, OlivineCity, OLIVINE_CITY, -3, 6, 12 map_data Route41, ROUTE_41, $35, NORTH | WEST - connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41 - connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41 + connection north, Route40, ROUTE_40, 15, 0, 10 + connection west, CianwoodCity, CIANWOOD_CITY, 0, 0, 27 map_data Route42, ROUTE_42, $05, WEST | EAST - connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42 - connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42 + connection west, EcruteakCity, ECRUTEAK_CITY, -3, 6, 12 + connection east, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9 map_data Route43, ROUTE_43, $05, NORTH | SOUTH - connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43 - connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43 + connection north, LakeOfRage, LAKE_OF_RAGE, -3, 2, 16 + connection south, MahoganyTown, MAHOGANY_TOWN, 0, 0, 10 map_data Route44, ROUTE_44, $71, WEST | EAST - connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44 - connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44 + connection west, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9 + connection east, BlackthornCity, BLACKTHORN_CITY, -3, 6, 12 map_data Route45, ROUTE_45, $71, NORTH | WEST - connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45 - connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45 + connection north, BlackthornCity, BLACKTHORN_CITY, 0, 0, 13 + connection west, Route46, ROUTE_46, 36, 0, 12 map_data Route46, ROUTE_46, $05, SOUTH | EAST - connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46 - connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46 + connection south, Route29, ROUTE_29, -3, 7, 16 + connection east, Route45, ROUTE_45, -3, 33, 12 map_data PewterCity, PEWTER_CITY, $0f, SOUTH | EAST - connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY - connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY + connection south, Route2, ROUTE_2, 5, 0, 10 + connection east, Route3, ROUTE_3, 5, 0, 9 map_data Route2, ROUTE_2, $0f, NORTH | SOUTH - connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2 - connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2 + connection north, PewterCity, PEWTER_CITY, -3, 2, 16 + connection south, ViridianCity, VIRIDIAN_CITY, -3, 2, 16 map_data ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST - connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY - connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY - connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY + connection north, Route2, ROUTE_2, 5, 0, 10 + connection south, Route1, ROUTE_1, 10, 0, 10 + connection west, Route22, ROUTE_22, 4, 0, 9 map_data Route22, ROUTE_22, $2c, EAST - connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22 + connection east, ViridianCity, VIRIDIAN_CITY, -3, 1, 15 map_data Route1, ROUTE_1, $0f, NORTH | SOUTH - connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1 - connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1 + connection north, ViridianCity, VIRIDIAN_CITY, -3, 7, 13 + connection south, PalletTown, PALLET_TOWN, 0, 0, 10 map_data PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH - connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN - connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN + connection north, Route1, ROUTE_1, 0, 0, 10 + connection south, Route21, ROUTE_21, 0, 0, 10 map_data Route21, ROUTE_21, $43, NORTH | SOUTH - connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21 - connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21 + connection north, PalletTown, PALLET_TOWN, 0, 0, 10 + connection south, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 10 map_data CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST - connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND - connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND + connection north, Route21, ROUTE_21, 0, 0, 10 + connection east, Route20, ROUTE_20, 0, 0, 9 map_data Route20, ROUTE_20, $43, WEST | EAST - connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20 - connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20 + connection west, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 9 + connection east, Route19, ROUTE_19, -3, 6, 12 map_data Route19, ROUTE_19, $43, NORTH | WEST - connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19 - connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19 + connection north, FuchsiaCity, FUCHSIA_CITY, 0, 0, 13 + connection west, Route20, ROUTE_20, 9, 0, 9 map_data FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST - connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY - connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY - connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY + connection south, Route19, ROUTE_19, 0, 0, 10 + connection west, Route18, ROUTE_18, 7, 0, 9 + connection east, Route15, ROUTE_15, 9, 0, 9 map_data Route18, ROUTE_18, $43, WEST | EAST - connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18 - connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18 + connection west, Route17, ROUTE_17, -3, 35, 10 + connection east, FuchsiaCity, FUCHSIA_CITY, -3, 4, 14 map_data Route17, ROUTE_17, $43, NORTH | EAST - connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17 - connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17 + connection north, Route16, ROUTE_16, 0, 0, 10 + connection east, Route18, ROUTE_18, 38, 0, 9 map_data Route16, ROUTE_16, $0f, SOUTH | EAST - connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16 - connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16 + connection south, Route17, ROUTE_17, 0, 0, 10 + connection east, CeladonCity, CELADON_CITY, -3, 6, 12 map_data CeladonCity, CELADON_CITY, $0f, WEST | EAST - connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY - connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY + connection west, Route16, ROUTE_16, 9, 0, 9 + connection east, Route7, ROUTE_7, 5, 0, 9 map_data Route7, ROUTE_7, $0f, WEST | EAST - connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7 - connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7 + connection west, CeladonCity, CELADON_CITY, -3, 2, 15 + connection east, SaffronCity, SAFFRON_CITY, -3, 6, 12 map_data Route15, ROUTE_15, $0f, WEST | EAST - connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15 - connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15 + connection west, FuchsiaCity, FUCHSIA_CITY, -3, 6, 12 + connection east, Route14, ROUTE_14, -3, 6, 12 map_data Route14, ROUTE_14, $43, NORTH | WEST - connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14 - connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14 + connection north, Route13, ROUTE_13, 0, 0, 13 + connection west, Route15, ROUTE_15, 9, 0, 9 map_data Route13, ROUTE_13, $43, NORTH | SOUTH - connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13 - connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13 + connection north, Route12, ROUTE_12, 20, 0, 10 + connection south, Route14, ROUTE_14, 0, 0, 10 map_data Route12, ROUTE_12, $43, NORTH | SOUTH | WEST - connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12 - connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12 - connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12 + connection north, LavenderTown, LAVENDER_TOWN, 0, 0, 10 + connection south, Route13, ROUTE_13, -3, 17, 13 + connection west, Route11, ROUTE_11, 9, 0, 9 map_data Route11, ROUTE_11, $0f, WEST | EAST - connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11 - connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11 + connection west, VermilionCity, VERMILION_CITY, 0, 0, 12 + connection east, Route12, ROUTE_12, -3, 6, 15 map_data LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST - connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN - connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN - connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN + connection north, Route10South, ROUTE_10_SOUTH, 0, 0, 10 + connection south, Route12, ROUTE_12, 0, 0, 10 + connection west, Route8, ROUTE_8, 0, 0, 9 map_data VermilionCity, VERMILION_CITY, $43, NORTH | EAST - connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY - connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY + connection north, Route6, ROUTE_6, 5, 0, 10 + connection east, Route11, ROUTE_11, 0, 0, 9 map_data Route6, ROUTE_6, $0f, NORTH | SOUTH - connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6 - connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6 + connection north, SaffronCity, SAFFRON_CITY, -3, 2, 16 + connection south, VermilionCity, VERMILION_CITY, -3, 2, 16 map_data SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY - connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY - connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY - connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY + connection north, Route5, ROUTE_5, 5, 0, 10 + connection south, Route6, ROUTE_6, 5, 0, 10 + connection west, Route7, ROUTE_7, 9, 0, 9 + connection east, Route8, ROUTE_8, 9, 0, 9 map_data Route5, ROUTE_5, $0f, NORTH | SOUTH - connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5 - connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5 + connection north, CeruleanCity, CERULEAN_CITY, -3, 2, 16 + connection south, SaffronCity, SAFFRON_CITY, -3, 2, 16 map_data CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY - connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY - connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY - connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY + connection north, Route24, ROUTE_24, 6, 0, 10 + connection south, Route5, ROUTE_5, 5, 0, 10 + connection west, Route4, ROUTE_4, 5, 0, 9 + connection east, Route9, ROUTE_9, 9, 0, 9 map_data Route9, ROUTE_9, $2c, SOUTH | WEST - connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9 - connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9 + connection south, Route10North, ROUTE_10_NORTH, 20, 0, 10 + connection west, CeruleanCity, CERULEAN_CITY, -3, 6, 12 map_data Route24, ROUTE_24, $2c, NORTH | SOUTH - connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24 - connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24 + connection north, Route25, ROUTE_25, 0, 0, 13 + connection south, CeruleanCity, CERULEAN_CITY, -3, 3, 16 map_data Route25, ROUTE_25, $2c, SOUTH - connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25 + connection south, Route24, ROUTE_24, 0, 0, 10 map_data Route3, ROUTE_3, $2c, WEST | EAST - connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3 - connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3 + connection west, PewterCity, PEWTER_CITY, -3, 2, 15 + connection east, Route4, ROUTE_4, 0, 0, 9 map_data Route4, ROUTE_4, $2c, WEST | EAST - connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4 - connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4 + connection west, Route3, ROUTE_3, 0, 0, 9 + connection east, CeruleanCity, CERULEAN_CITY, -3, 2, 15 map_data Route8, ROUTE_8, $2c, WEST | EAST - connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8 - connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8 + connection west, SaffronCity, SAFFRON_CITY, -3, 6, 12 + connection east, LavenderTown, LAVENDER_TOWN, 0, 0, 9 map_data Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH - connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH - connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH + connection north, Route9, ROUTE_9, -3, 17, 13 + connection south, Route10South, ROUTE_10_SOUTH, 0, 0, 10 map_data Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH - connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH - connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH + connection north, Route10North, ROUTE_10_NORTH, 0, 0, 10 + connection south, LavenderTown, LAVENDER_TOWN, 0, 0, 10 map_data Route23, ROUTE_23, $0f, 0 map_data SproutTower1F, SPROUT_TOWER_1F, $00, 0 @@ -470,7 +448,7 @@ ENDM map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 map_data VictoryRoad, VICTORY_ROAD, $1d, 0 - map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0 + map_data EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0 map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 @@ -524,7 +502,7 @@ ENDM map_data GoldenrodGym, GOLDENROD_GYM, $00, 0 map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0 map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0 - map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0 + map_data BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0 map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0 map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0 map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0 @@ -539,17 +517,17 @@ ENDM map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 - map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0 + map_data PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0 map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 map_data DayCare, DAY_CARE, $00, 0 - map_data VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $00, 0 + map_data VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0 map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0 map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0 map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0 map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0 map_data VermilionMart, VERMILION_MART, $00, 0 - map_data VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0 + map_data VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0 map_data VermilionGym, VERMILION_GYM, $00, 0 map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0 map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0 @@ -585,7 +563,7 @@ ENDM map_data FuchsiaMart, FUCHSIA_MART, $00, 0 map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 map_data FuchsiaGym, FUCHSIA_GYM, $00, 0 - map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0 + map_data BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0 map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 @@ -601,7 +579,7 @@ ENDM map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0 map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0 map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0 - map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0 + map_data Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0 map_data Pokecenter2F, POKECENTER_2F, $00, 0 map_data TradeCenter, TRADE_CENTER, $00, 0 map_data Colosseum, COLOSSEUM, $00, 0 @@ -650,16 +628,16 @@ ENDM map_data ViridianMart, VIRIDIAN_MART, $00, 0 map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0 map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0 - map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0 + map_data Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0 map_data Route2Gate, ROUTE_2_GATE, $00, 0 map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0 map_data ElmsLab, ELMS_LAB, $00, 0 - map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0 - map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0 - map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0 + map_data PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0 + map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0 + map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0 map_data ElmsHouse, ELMS_HOUSE, $00, 0 - map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0 - map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 + map_data Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0 + map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0 map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0 map_data FightingDojo, FIGHTING_DOJO, $00, 0 @@ -674,12 +652,12 @@ ENDM map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0 map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0 map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0 - map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0 + map_data Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0 map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0 map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0 map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0 map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0 map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0 - map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0 + map_data Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0 map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0 map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 44cb85ac6..6772ecc97 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -15,7 +15,7 @@ map_def: MACRO ENDM MapGroupPointers:: -; pointers to the first map header of each map group +; pointers to the first map_def of each map group dw MapGroup_Olivine ; 1 dw MapGroup_Mahogany ; 2 dw MapGroup_Dungeons ; 3 @@ -163,7 +163,7 @@ MapGroup_Dungeons: map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE MapGroup_Ecruteak: - map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -256,7 +256,7 @@ MapGroup_Goldenrod: map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -271,7 +271,7 @@ MapGroup_Goldenrod: map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -280,13 +280,13 @@ MapGroup_Vermilion: map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -342,7 +342,7 @@ MapGroup_Fuchsia: map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -368,7 +368,7 @@ MapGroup_Silver: map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE MapGroup_CableClub: map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE @@ -435,7 +435,7 @@ MapGroup_Viridian: map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -445,12 +445,12 @@ MapGroup_NewBark: map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -469,7 +469,7 @@ MapGroup_Saffron: map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Cherrygrove: map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND @@ -480,6 +480,6 @@ MapGroup_Cherrygrove: map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index b41db0ea1..c24cd8d89 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -7,32 +7,32 @@ Flypoints: ; 91c5e ; landmark, spawn point const_def ; Johto - flypoint NEW_BARK, NEW_BARK_TOWN - flypoint CHERRYGROVE, CHERRYGROVE_CITY - flypoint VIOLET, VIOLET_CITY - flypoint AZALEA, AZALEA_TOWN - flypoint GOLDENROD, GOLDENROD_CITY - flypoint ECRUTEAK, ECRUTEAK_CITY - flypoint OLIVINE, OLIVINE_CITY - flypoint CIANWOOD, CIANWOOD_CITY - flypoint MAHOGANY, MAHOGANY_TOWN - flypoint LAKE, LAKE_OF_RAGE - flypoint BLACKTHORN, BLACKTHORN_CITY - flypoint MT_SILVER, SILVER_CAVE + flypoint NEW_BARK, NEW_BARK_TOWN + flypoint CHERRYGROVE, CHERRYGROVE_CITY + flypoint VIOLET, VIOLET_CITY + flypoint AZALEA, AZALEA_TOWN + flypoint GOLDENROD, GOLDENROD_CITY + flypoint ECRUTEAK, ECRUTEAK_CITY + flypoint OLIVINE, OLIVINE_CITY + flypoint CIANWOOD, CIANWOOD_CITY + flypoint MAHOGANY, MAHOGANY_TOWN + flypoint LAKE_OF_RAGE, LAKE_OF_RAGE + flypoint BLACKTHORN, BLACKTHORN_CITY + flypoint MT_SILVER, SILVER_CAVE ; Kanto KANTO_FLYPOINT EQU const_value - flypoint PALLET, PALLET_TOWN - flypoint VIRIDIAN, VIRIDIAN_CITY - flypoint PEWTER, PEWTER_CITY - flypoint CERULEAN, CERULEAN_CITY - flypoint VERMILION, VERMILION_CITY - flypoint ROCK_TUNNEL, ROCK_TUNNEL - flypoint LAVENDER, LAVENDER_TOWN - flypoint CELADON, CELADON_CITY - flypoint SAFFRON, SAFFRON_CITY - flypoint FUCHSIA, FUCHSIA_CITY - flypoint CINNABAR, CINNABAR_ISLAND - flypoint INDIGO, INDIGO_PLATEAU + flypoint PALLET, PALLET_TOWN + flypoint VIRIDIAN, VIRIDIAN_CITY + flypoint PEWTER, PEWTER_CITY + flypoint CERULEAN, CERULEAN_CITY + flypoint VERMILION, VERMILION_CITY + flypoint ROCK_TUNNEL, ROCK_TUNNEL + flypoint LAVENDER, LAVENDER_TOWN + flypoint CELADON, CELADON_CITY + flypoint SAFFRON, SAFFRON_CITY + flypoint FUCHSIA, FUCHSIA_CITY + flypoint CINNABAR, CINNABAR_ISLAND + flypoint INDIGO, INDIGO_PLATEAU db -1 ; 91c8f diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index a835d4895..89ec3ad31 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -28,7 +28,7 @@ MapScenes:: ; 4d01e scene_def ROUTE_27, wRoute27SceneID scene_def NEW_BARK_TOWN, wNewBarkTownSceneID scene_def ELMS_LAB, wElmsLabSceneID - scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID + scene_def PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID scene_def ROUTE_29, wRoute29SceneID scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID @@ -43,7 +43,7 @@ MapScenes:: ; 4d01e scene_def OLIVINE_CITY, wOlivineCitySceneID scene_def ROUTE_34, wRoute34SceneID scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID - scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID + scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID scene_def ECRUTEAK_GYM, wEcruteakGymSceneID diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 51725fb4f..331418d6c 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -3,7 +3,7 @@ SECTION "Map Scripts 1", ROMX INCLUDE "maps/GoldenrodGym.asm" INCLUDE "maps/GoldenrodBikeShop.asm" INCLUDE "maps/GoldenrodHappinessRater.asm" -INCLUDE "maps/GoldenrodBillsHouse.asm" +INCLUDE "maps/BillsFamilysHouse.asm" INCLUDE "maps/GoldenrodMagnetTrainStation.asm" INCLUDE "maps/GoldenrodFlowerShop.asm" INCLUDE "maps/GoldenrodPPSpeechHouse.asm" @@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm" -INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" +INCLUDE "maps/PokecomCenterAdminRoomMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" @@ -151,12 +151,12 @@ SECTION "Map Scripts 9", ROMX INCLUDE "maps/Route34.asm" INCLUDE "maps/ElmsLab.asm" -INCLUDE "maps/KrissHouse1F.asm" -INCLUDE "maps/KrissHouse2F.asm" -INCLUDE "maps/KrissNeighborsHouse.asm" +INCLUDE "maps/PlayersHouse1F.asm" +INCLUDE "maps/PlayersHouse2F.asm" +INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" -INCLUDE "maps/Route26HealSpeechHouse.asm" -INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" +INCLUDE "maps/Route26HealHouse.asm" +INCLUDE "maps/DayOfWeekSiblingsHouse.asm" INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route29Route46Gate.asm" @@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm" SECTION "Map Scripts 11", ROMX -INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/EcruteakTinTowerEntrance.asm" INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" @@ -206,7 +206,7 @@ INCLUDE "maps/TrainerHouseB1F.asm" INCLUDE "maps/ViridianMart.asm" INCLUDE "maps/ViridianPokecenter1F.asm" INCLUDE "maps/ViridianPokecenter2FBeta.asm" -INCLUDE "maps/Route2NuggetSpeechHouse.asm" +INCLUDE "maps/Route2NuggetHouse.asm" INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" @@ -294,7 +294,7 @@ INCLUDE "maps/CopycatsHouse1F.asm" INCLUDE "maps/CopycatsHouse2F.asm" INCLUDE "maps/Route5UndergroundPathEntrance.asm" INCLUDE "maps/Route5SaffronGate.asm" -INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" +INCLUDE "maps/Route5CleanseTagHouse.asm" SECTION "Map Scripts 16", ROMX @@ -329,13 +329,13 @@ SECTION "Map Scripts 17", ROMX INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/Route32.asm" -INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" +INCLUDE "maps/VermilionFishingSpeechHouse.asm" INCLUDE "maps/VermilionPokecenter1F.asm" INCLUDE "maps/VermilionPokecenter2FBeta.asm" INCLUDE "maps/PokemonFanClub.asm" INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" INCLUDE "maps/VermilionMart.asm" -INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" +INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm" INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6UndergroundPathEntrance.asm" @@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/FuchsiaBillSpeechHouse.asm" +INCLUDE "maps/BillsBrothersHouse.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" @@ -371,7 +371,7 @@ INCLUDE "maps/CherrygrovePokecenter1F.asm" INCLUDE "maps/CherrygroveGymSpeechHouse.asm" INCLUDE "maps/GuideGentsHouse.asm" INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" -INCLUDE "maps/Route30BerrySpeechHouse.asm" +INCLUDE "maps/Route30BerryHouse.asm" INCLUDE "maps/MrPokemonsHouse.asm" INCLUDE "maps/Route31VioletGate.asm" @@ -477,7 +477,7 @@ INCLUDE "maps/Route4.asm" INCLUDE "maps/Route10South.asm" INCLUDE "maps/Route23.asm" INCLUDE "maps/SilverCavePokecenter1F.asm" -INCLUDE "maps/Route28FamousSpeechHouse.asm" +INCLUDE "maps/Route28SteelWingHouse.asm" SECTION "Map Scripts 25", ROMX diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index e0f913fab..51e32d855 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -7,7 +7,7 @@ ENDM SpawnPoints: ; 0x152ab ; entries correspond to SPAWN_* constants - spawn KRISS_HOUSE_2F, 3, 3 + spawn PLAYERS_HOUSE_2F, 3, 3 spawn VIRIDIAN_POKECENTER_1F, 5, 3 spawn PALLET_TOWN, 5, 6 diff --git a/data/mon_menu.asm b/data/mon_menu.asm new file mode 100644 index 000000000..e8a262059 --- /dev/null +++ b/data/mon_menu.asm @@ -0,0 +1,48 @@ +; MonMenuOptionStrings indexes +const_value set 1 + const MONMENUVALUE_STATS ; 1 + const MONMENUVALUE_SWITCH ; 2 + const MONMENUVALUE_ITEM ; 3 + const MONMENUVALUE_CANCEL ; 4 + const MONMENUVALUE_MOVE ; 5 + const MONMENUVALUE_MAIL ; 6 + const MONMENUVALUE_ERROR ; 7 + +MonMenuOptionStrings: ; 24caf +; entries correspond to MONMENUVALUE_* constants + db "STATS@" + db "SWITCH@" + db "ITEM@" + db "CANCEL@" + db "MOVE@" + db "MAIL@" + db "ERROR!@" +; 24cd9 + +MonMenuOptions: ; 24cd9 +; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm) +; moves + db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT + db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY + db MONMENU_FIELD_MOVE, MONMENUITEM_SURF, SURF + db MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH, STRENGTH + db MONMENU_FIELD_MOVE, MONMENUITEM_FLASH, FLASH + db MONMENU_FIELD_MOVE, MONMENUITEM_WATERFALL, WATERFALL + db MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL, WHIRLPOOL + db MONMENU_FIELD_MOVE, MONMENUITEM_DIG, DIG + db MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT, TELEPORT + db MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED + db MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT, HEADBUTT + db MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH, ROCK_SMASH + db MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK + db MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT +; options + db MONMENU_MENUOPTION, MONMENUITEM_STATS, MONMENUVALUE_STATS + db MONMENU_MENUOPTION, MONMENUITEM_SWITCH, MONMENUVALUE_SWITCH + db MONMENU_MENUOPTION, MONMENUITEM_ITEM, MONMENUVALUE_ITEM + db MONMENU_MENUOPTION, MONMENUITEM_CANCEL, MONMENUVALUE_CANCEL + db MONMENU_MENUOPTION, MONMENUITEM_MOVE, MONMENUVALUE_MOVE + db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL + db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR + db -1 +; 24d19 diff --git a/data/moves/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm new file mode 100644 index 000000000..fb915905e --- /dev/null +++ b/data/moves/flail_reversal_power.asm @@ -0,0 +1,8 @@ +FlailReversalPower: + ; hp bar pixels, power + db HP_BAR_LENGTH_PX / 48, 200 + db HP_BAR_LENGTH_PX / 12, 150 + db HP_BAR_LENGTH_PX / 5, 100 + db HP_BAR_LENGTH_PX / 3, 80 + db HP_BAR_LENGTH_PX * 2 / 3, 40 + db HP_BAR_LENGTH_PX, 20 diff --git a/data/moves/magnitude_power.asm b/data/moves/magnitude_power.asm new file mode 100644 index 000000000..7359bdb10 --- /dev/null +++ b/data/moves/magnitude_power.asm @@ -0,0 +1,9 @@ +MagnitudePower: + ; chance, power, magnitude # + db 13, 10, 4 + db 38, 30, 5 + db 89, 50, 6 + db 166, 70, 7 + db 217, 90, 8 + db 242, 110, 9 + db 255, 150, 10 diff --git a/data/moves/present_power.asm b/data/moves/present_power.asm new file mode 100644 index 000000000..885e9c692 --- /dev/null +++ b/data/moves/present_power.asm @@ -0,0 +1,6 @@ +PresentPower: + ; chance, power + db 40 percent, 40 ; 40% + db 70 percent + 1, 80 ; 30% + db 80 percent, 120 ; 10% + db -1 ; 20% chance to heal instead diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index fea29780c..fd610d5fa 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,4 +1,5 @@ TMHMMoves: ; 1167a +; entries correspond to *_TMNUM enums (see constants/item_constants.asm) ; TMs db DYNAMICPUNCH db HEADBUTT diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm new file mode 100644 index 000000000..184a93113 --- /dev/null +++ b/data/phone/non_trainer_names.asm @@ -0,0 +1,16 @@ +NonTrainerCallerNames: ; 903d6 +; entries correspond to PHONECONTACT_* constants + dw .none + dw .mom + dw .bikeshop + dw .bill + dw .elm + dw .buena + +.none: db "----------@" +.mom: db "MOM:@" +.bill: db "BILL:@" +.elm: db "PROF.ELM:@" +.bikeshop: db "BIKE SHOP:@" +.buena: db "BUENA:<LNBRK> DISC JOCKEY@" +; 90423 diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index bec40a12a..488a54f06 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -10,42 +10,42 @@ ENDM PhoneContacts: ; 9045f ; entries correspond to PHONE_* constants - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 - phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 - phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 + phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 + phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 + phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 - phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 - phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 - phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 - phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 - phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 - phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 - phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 - phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 - phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 - phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 - phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 - phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 - phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 - phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 - phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 - phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 - phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 - phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 - phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 - phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 - phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 - phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 - phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 + phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 + phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 + phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 + phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 + phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 + phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 + phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 + phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 + phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 + phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 + phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 + phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 + phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 + phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 + phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 + phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 + phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 + phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 + phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 + phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 + phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 + phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 + phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2 ; 90627 diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm index 03c27743a..5dba36fc9 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -7,12 +7,12 @@ ENDM SpecialPhoneCallList: ; 90627 ; entries correspond to SPECIALCALL_* constants - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_OAK, BikeShopPhoneScript - specialcall SpecialCallWhereverYouAre, PHONE_MOM, MomPhoneLectureScript - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneScript + specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 ; 90657 diff --git a/data/player_names.asm b/data/player_names.asm index 04eac7508..3c5a34c77 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,4 +1,4 @@ -ChrisNameMenuDataHeader: ; 882b5 +ChrisNameMenuHeader: ; 882b5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames @@ -17,7 +17,7 @@ MalePlayerNameArray: ; 882c9 db 2 ; displacement db " NAME @" ; title -KrisNameMenuDataHeader: ; 882e5 +KrisNameMenuHeader: ; 882e5 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index d7824f196..687c3a872 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -3,20 +3,19 @@ db 25, 20, 15, 90, 105, 55 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 200 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/abra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 26eac4ded..531c03803 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 130, 60, 75 ; hp atk def spd sat sdf - db ROCK, FLYING + db ROCK, FLYING ; type db 45 ; catch rate db 202 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aerodactyl/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index 0bd6954f4..9da59d7ac 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -3,20 +3,19 @@ db 55, 70, 55, 85, 40, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aipom/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 35ebdf9af..affcd565b 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -3,20 +3,19 @@ db 55, 50, 45, 120, 135, 85 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 50 ; catch rate db 186 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/alakazam/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index b391238d3..90086b7cd 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 55, 115, 90 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ampharos/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index 52341c37d..76302d5d5 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -3,20 +3,19 @@ db 60, 85, 69, 80, 65, 79 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 90 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arbok/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 299086c9d..406199c2d 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -3,20 +3,19 @@ db 90, 110, 80, 95, 100, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 213 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arcanine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 78697127c..431291ec3 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -3,20 +3,19 @@ db 70, 90, 70, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ariados/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index e637c47f4..bd8d1f59f 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -3,20 +3,19 @@ db 90, 85, 100, 85, 95, 125 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/articuno/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 1681d3be2..870fbc0f2 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -3,20 +3,19 @@ db 100, 50, 80, 50, 50, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/azumarill/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index 50ee3044c..ef5b38ab0 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -3,20 +3,19 @@ db 60, 62, 80, 60, 63, 80 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bayleef/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 3fa11d8eb..074dabd4b 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -3,20 +3,19 @@ db 65, 80, 40, 75, 45, 80 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 45 ; catch rate db 159 ; base exp - db NO_ITEM ; item 1 - db POISON_BARB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, POISON_BARB; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/beedrill/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 3f3f06870..6c2986ba8 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 90, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellossom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 5e75e6e89..3b40c1783 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -3,20 +3,19 @@ db 50, 75, 35, 40, 70, 30 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 84 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellsprout/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 7e2f1697e..86706bfdd 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -3,20 +3,19 @@ db 79, 83, 100, 78, 85, 105 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blastoise/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index 789649a40..ef7db52de 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -3,20 +3,19 @@ db 255, 10, 10, 55, 75, 135 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blissey/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 2795d8035..6afca0c97 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -3,20 +3,19 @@ db 45, 49, 49, 45, 65, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bulbasaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index 1feee4f58..f1037d971 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -3,20 +3,19 @@ db 60, 45, 50, 70, 80, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db SILVERPOWDER ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SILVERPOWDER; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/butterfree/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index a10790541..045123043 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -3,20 +3,19 @@ db 45, 30, 35, 45, 20, 20 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 255 ; catch rate db 53 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/caterpie/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index aabadba4f..757f7ec48 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, GRASS + db PSYCHIC, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/celebi/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index d51f67d4f..53cd2caed 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -3,20 +3,19 @@ db 250, 05, 05, 50, 35, 105 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chansey/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index d978c6ad5..cffacc93b 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charizard/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 2fa9b9526..667211ee5 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmander/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 5d86b975b..b3806de4c 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmeleon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 0476ba558..2876a776f 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -3,20 +3,19 @@ db 45, 49, 65, 45, 49, 65 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chikorita/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index a5b3ded3a..508c104be 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -3,20 +3,19 @@ db 75, 38, 38, 67, 56, 56 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chinchou/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 4da3c73df..7fcff1bb4 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -3,20 +3,19 @@ db 95, 70, 73, 60, 85, 90 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 129 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefable/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 5e4def0ca..59d265359 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -3,20 +3,19 @@ db 70, 45, 48, 35, 60, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 68 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefairy/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 89fa91a45..7a1a74402 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -3,20 +3,19 @@ db 50, 25, 28, 15, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 37 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cleffa/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 3f3c13b6a..59544abe2 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -3,20 +3,19 @@ db 50, 95, 180, 70, 85, 45 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 60 ; catch rate db 203 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cloyster/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 8f1e836ff..e06f509cc 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -3,20 +3,19 @@ db 55, 55, 85, 35, 65, 85 ; hp atk def spd sat sdf - db WATER, ROCK + db WATER, ROCK ; type db 60 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/corsola/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 34d7d10c5..0e7bad390 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -3,20 +3,19 @@ db 85, 90, 80, 130, 70, 80 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/crobat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 6c76b19b1..0afdd1a14 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -3,20 +3,19 @@ db 65, 80, 80, 58, 59, 63 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/croconaw/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 451f52133..174dcb5a1 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -3,20 +3,19 @@ db 50, 50, 95, 35, 40, 50 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 190 ; catch rate db 87 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cubone/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index a1b07cb91..dfd052d5f 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cyndaquil/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 0b38e8b97..3736e4e00 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -3,20 +3,19 @@ db 45, 55, 45, 75, 65, 45 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 45 ; catch rate db 183 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/delibird/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index ae6aa1941..332597ee8 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -3,20 +3,19 @@ db 90, 70, 80, 70, 70, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 75 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dewgong/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 1153cbcac..4079fe063 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -3,20 +3,19 @@ db 10, 55, 25, 95, 35, 45 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 81 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/diglett/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 89d92ab7a..cb449773d 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -3,20 +3,19 @@ db 48, 48, 48, 48, 48, 48 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 35 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ditto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn LADIES_MAN, LADIES_MAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index 9065dcbde..b26b4f631 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -3,20 +3,19 @@ db 60, 110, 70, 100, 60, 60 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 158 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dodrio/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index f844ccb07..6e649a9fe 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -3,20 +3,19 @@ db 35, 85, 45, 75, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 190 ; catch rate db 96 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/doduo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index a5995c3fb..8b68360bc 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -3,20 +3,19 @@ db 90, 120, 120, 50, 60, 60 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/donphan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 0478bd6a1..f2ca387c7 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -3,20 +3,19 @@ db 61, 84, 65, 70, 70, 70 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonair/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index d8ae9add9..a004b0d31 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -3,20 +3,19 @@ db 91, 134, 95, 80, 100, 100 ; hp atk def spd sat sdf - db DRAGON, FLYING + db DRAGON, FLYING ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonite/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 0d5ccd5fd..eb1fc4f61 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -3,20 +3,19 @@ db 41, 64, 45, 50, 50, 50 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dratini/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 7dd4855a3..d84a3cb41 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -3,20 +3,19 @@ db 60, 48, 45, 42, 43, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 190 ; catch rate db 102 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/drowzee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index 9430a6669..07c0f1c1e 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -3,20 +3,19 @@ db 35, 80, 50, 120, 50, 70 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 50 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dugtrio/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 8eef16241..407d81820 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -3,20 +3,19 @@ db 100, 70, 70, 45, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dunsparce/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 95f67cf2b..69d4b4525 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -3,20 +3,19 @@ db 55, 55, 50, 55, 45, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 92 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/eevee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index feed64b34..0dbb46384 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -3,20 +3,19 @@ db 35, 60, 44, 55, 40, 54 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 255 ; catch rate db 62 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ekans/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 472e4487c..1a5e52508 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -3,20 +3,19 @@ db 65, 83, 57, 105, 95, 85 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electabuzz/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 72bc666e9..48ae46276 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -3,20 +3,19 @@ db 60, 50, 70, 140, 80, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 60 ; catch rate db 150 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electrode/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index e53dcc23c..e60b486de 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -3,20 +3,19 @@ db 45, 63, 37, 95, 65, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/elekid/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 4e4b7b3f8..6e58a9daa 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -3,20 +3,19 @@ db 115, 115, 85, 100, 90, 75 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/entei/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 0bc50fb6d..4e6b93282 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 110, 130, 95 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/espeon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 0547333ad..f6b6c183f 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -3,20 +3,19 @@ db 60, 40, 80, 40, 60, 45 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 90 ; catch rate db 98 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggcute/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 409eb8a1d..6d406897b 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -3,20 +3,19 @@ db 95, 95, 85, 55, 125, 65 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 45 ; catch rate db 212 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggutor/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 35d76b0a9..bf5c05921 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -3,20 +3,19 @@ db 52, 65, 55, 60, 58, 62 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db STICK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, STICK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/farfetch_d/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 7ef9936d8..b337a282e 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -3,20 +3,19 @@ db 65, 90, 65, 100, 61, 61 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/fearow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index 41efb2edd..cee2f4cfb 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -3,20 +3,19 @@ db 85, 105, 100, 78, 79, 83 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/feraligatr/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index b20dc4774..737210352 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -3,20 +3,19 @@ db 70, 55, 55, 45, 80, 60 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flaaffy/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index f1d4c8a69..5b03e2ac9 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -3,20 +3,19 @@ db 65, 130, 60, 65, 95, 110 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 198 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flareon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 9c5a885aa..4f486b292 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -3,20 +3,19 @@ db 75, 90, 140, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 75 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/forretress/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index b26a82e2e..8fdc6df96 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -3,20 +3,19 @@ db 85, 76, 64, 90, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db BERRY ; item 1 - db GOLD_BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, GOLD_BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/furret/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index 7e46be055..97383ac89 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -3,20 +3,19 @@ db 30, 35, 30, 80, 100, 35 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 190 ; catch rate db 95 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gastly/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 4176aa330..98f3ebf1f 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -3,20 +3,19 @@ db 60, 65, 60, 110, 130, 75 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 45 ; catch rate db 190 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gengar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 35e5d22a7..9664d4318 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -3,20 +3,19 @@ db 40, 80, 100, 20, 30, 30 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 255 ; catch rate db 86 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/geodude/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 7e67b19a6..eb159919a 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -3,20 +3,19 @@ db 70, 80, 65, 85, 90, 65 ; hp atk def spd sat sdf - db NORMAL, PSYCHIC + db NORMAL, PSYCHIC ; type db 60 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/girafarig/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index e16bf7043..8bd607656 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -3,20 +3,19 @@ db 65, 75, 105, 85, 35, 65 ; hp atk def spd sat sdf - db GROUND, FLYING + db GROUND, FLYING ; type db 60 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gligar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 128b1fe81..30f4cbe9c 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -3,20 +3,19 @@ db 60, 65, 70, 40, 85, 75 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gloom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 2de7278ca..a73d5651f 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -3,20 +3,19 @@ db 75, 80, 70, 90, 65, 75 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golbat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index bc165c7a5..3651e0948 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -3,20 +3,19 @@ db 45, 67, 60, 63, 35, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 111 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/goldeen/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index e3e5ea1aa..ea89e9436 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -3,20 +3,19 @@ db 80, 82, 78, 85, 95, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 174 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golduck/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index bda102404..18c83b397 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -3,20 +3,19 @@ db 80, 110, 130, 45, 55, 65 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golem/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index 9c572cf7b..f49bf530c 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -3,20 +3,19 @@ db 90, 120, 75, 45, 60, 60 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 75 ; catch rate db 178 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/granbull/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index b6be8cb5c..0a19caf64 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -3,20 +3,19 @@ db 55, 95, 115, 35, 45, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 120 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/graveler/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index b1536bb3c..2aa87d4e2 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -3,20 +3,19 @@ db 80, 80, 50, 25, 40, 50 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/grimer/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index e3cfa7faa..f61260b55 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -3,20 +3,19 @@ db 55, 70, 45, 60, 70, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 91 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/growlithe/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index eb4f51f08..894982327 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -3,20 +3,19 @@ db 95, 125, 79, 81, 60, 100 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 45 ; catch rate db 214 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gyarados/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 5c31fd2a9..a5cf1e459 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -3,20 +3,19 @@ db 45, 50, 45, 95, 115, 55 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 90 ; catch rate db 126 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/haunter/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index f27efbe0d..762813ac4 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -3,20 +3,19 @@ db 80, 125, 75, 85, 40, 95 ; hp atk def spd sat sdf - db BUG, FIGHTING + db BUG, FIGHTING ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/heracross/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index b8e7da73b..e1d3c7c58 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -3,20 +3,19 @@ db 50, 105, 79, 76, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 140 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonchan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index a5759f92d..3296cbdd9 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -3,20 +3,19 @@ db 50, 120, 53, 87, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 139 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonlee/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index a36b7fc58..c45aa51e6 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -3,20 +3,19 @@ db 50, 95, 95, 70, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmontop/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index 910ea5a9f..20d96bafe 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -3,20 +3,19 @@ db 106, 130, 90, 90, 110, 154 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 220 ; base exp - db SACRED_ASH ; item 1 - db SACRED_ASH ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db SACRED_ASH, SACRED_ASH; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ho_oh/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index b52e929e9..50b2bdf9e 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -3,20 +3,19 @@ db 60, 30, 30, 50, 36, 56 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoothoot/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index c6e1a86dc..32c09f16c 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -3,20 +3,19 @@ db 35, 35, 40, 50, 35, 55 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 255 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoppip/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index c3d75a927..2321b4d66 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -3,20 +3,19 @@ db 30, 40, 70, 60, 70, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 83 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/horsea/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index 1f3b4f903..25d728edf 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -3,20 +3,19 @@ db 75, 90, 50, 95, 110, 80 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 45 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndoom/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index b064b3e0d..010b21928 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -3,20 +3,19 @@ db 45, 60, 30, 65, 80, 50 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 120 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndour/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 83aab91c8..af03aa777 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -3,20 +3,19 @@ db 85, 73, 70, 67, 73, 115 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 75 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hypno/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index 8745ecafb..b8a198d91 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -3,20 +3,19 @@ db 90, 30, 15, 15, 40, 20 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 39 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/igglybuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 8e7c7c9c4..f416b76e3 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -3,20 +3,19 @@ db 60, 62, 63, 60, 80, 80 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ivysaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index f785f0228..222c05820 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -3,20 +3,19 @@ db 115, 45, 20, 20, 45, 25 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 76 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jigglypuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index a6636ebba..311e07b9a 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 130, 110, 95 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jolteon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index c40d2c559..e20b59e3d 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -3,20 +3,19 @@ db 75, 55, 70, 110, 55, 85 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 45 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jumpluff/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 5696b83ee..ec8c47d9c 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -3,20 +3,19 @@ db 65, 50, 35, 95, 115, 95 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 137 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jynx/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 60022586f..984e66da7 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -3,20 +3,19 @@ db 30, 80, 90, 55, 55, 45 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 119 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabuto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index b56cb1db8..a7e2e521c 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -3,20 +3,19 @@ db 60, 115, 105, 80, 65, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 201 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabutops/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index e3ce05321..ece5f8a79 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 105, 120, 70 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 100 ; catch rate db 145 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kadabra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 4c8304dd2..a4f9dd363 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -3,20 +3,19 @@ db 45, 25, 50, 35, 25, 25 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 120 ; catch rate db 71 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kakuna/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 3724e29eb..b2a7d64b1 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -3,20 +3,19 @@ db 105, 95, 80, 90, 40, 80 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 175 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kangaskhan/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index d217fa612..65993ea25 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -3,20 +3,19 @@ db 75, 95, 95, 85, 95, 95 ; hp atk def spd sat sdf - db WATER, DRAGON + db WATER, DRAGON ; type db 45 ; catch rate db 207 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingdra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index 82549ca88..947526dd6 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -3,20 +3,19 @@ db 55, 130, 115, 75, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 206 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingler/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 8408f4ad8..1e55c5010 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -3,20 +3,19 @@ db 40, 65, 95, 35, 60, 45 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/koffing/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index f4d78962a..d386988a5 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -3,20 +3,19 @@ db 30, 105, 90, 50, 25, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 115 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/krabby/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index ea97a9722..28fd3aed2 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -3,20 +3,19 @@ db 125, 58, 58, 67, 76, 76 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 75 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lanturn/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 4ba001dfd..9a40f3447 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -3,20 +3,19 @@ db 130, 85, 80, 60, 85, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 45 ; catch rate db 219 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lapras/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index d9c18d1bc..acdfd290f 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -3,20 +3,19 @@ db 50, 64, 50, 41, 45, 50 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/larvitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index 1f0cb4fd9..27a002dcd 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -3,20 +3,19 @@ db 55, 35, 50, 85, 55, 110 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledian/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index e78d4efe4..e65614248 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -3,20 +3,19 @@ db 40, 20, 30, 55, 40, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledyba/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 43d60ec6c..3c7c96e40 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -3,20 +3,19 @@ db 90, 55, 75, 30, 60, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 127 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lickitung/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 7ad2f23a1..fe7391c04 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -3,20 +3,19 @@ db 106, 90, 130, 110, 90, 154 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lugia/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 41b168234..1e7a07e5f 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -3,20 +3,19 @@ db 90, 130, 80, 55, 65, 85 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 193 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machamp/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 8b98ea1de..87ceb4549 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -3,20 +3,19 @@ db 80, 100, 70, 45, 50, 60 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 90 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machoke/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index cb1b2f7c5..4969a8403 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -3,20 +3,19 @@ db 70, 80, 50, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 180 ; catch rate db 88 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machop/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index 132387f32..37075404b 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -3,20 +3,19 @@ db 45, 75, 37, 83, 70, 55 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 117 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magby/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index aa2008cd1..d91f72b27 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -3,20 +3,19 @@ db 50, 50, 120, 30, 80, 80 ; hp atk def spd sat sdf - db FIRE, ROCK + db FIRE, ROCK ; type db 75 ; catch rate db 154 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magcargo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index e5524543f..220f5ddd9 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -3,20 +3,19 @@ db 20, 10, 55, 80, 15, 20 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 20 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magikarp/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FISH, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 595df7ab7..8a11e538d 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -3,20 +3,19 @@ db 65, 95, 57, 93, 100, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 167 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magmar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 42bdc18a7..0a5620487 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -3,20 +3,19 @@ db 25, 35, 70, 45, 95, 55 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 190 ; catch rate db 89 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magnemite/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 5cac867be..b5faa573a 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -3,20 +3,19 @@ db 50, 60, 95, 70, 120, 70 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 60 ; catch rate db 161 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magneton/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 41aaac8a9..82c9456ff 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -3,20 +3,19 @@ db 40, 80, 35, 70, 35, 45 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mankey/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index bec060cb6..80f5dde6b 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -3,20 +3,19 @@ db 65, 40, 70, 70, 80, 140 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mantine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 8388d7f8c..8a68d5cf2 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -3,20 +3,19 @@ db 55, 40, 40, 35, 65, 45 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mareep/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index b6fcc62e5..e190e0d0c 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -3,20 +3,19 @@ db 70, 20, 50, 40, 20, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMPHIBIAN, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index cc03dc697..453bb9932 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -3,20 +3,19 @@ db 60, 80, 110, 45, 50, 80 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 75 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marowak/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index eaca626d4..3e02ced99 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -3,20 +3,19 @@ db 80, 82, 100, 80, 83, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meganium/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 114f76899..feb97df30 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 90, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 69 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meowth/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index f2b33f831..8a4d27220 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -3,20 +3,19 @@ db 50, 20, 55, 30, 25, 25 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 120 ; catch rate db 72 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/metapod/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 4d70413d0..f09d291a9 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mew/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 0e9636223..98ee9e43a 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -3,20 +3,19 @@ db 106, 110, 90, 130, 154, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db BERSERK_GENE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, BERSERK_GENE; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mewtwo/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index c751a2f9c..35642718b 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -3,20 +3,19 @@ db 95, 80, 105, 100, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 200 ; base exp - db MOOMOO_MILK ; item 1 - db MOOMOO_MILK ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db MOOMOO_MILK, MOOMOO_MILK; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/miltank/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index d1824eaa2..ebb2a8160 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -3,20 +3,19 @@ db 60, 60, 60, 85, 85, 85 ; hp atk def spd sat sdf - db GHOST, GHOST + db GHOST, GHOST ; type db 45 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db SPELL_TAG ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SPELL_TAG; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/misdreavus/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 22157c073..2b02ad1b9 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -3,20 +3,19 @@ db 90, 100, 90, 90, 125, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/moltres/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 1abc9995f..cf3707f0f 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -3,20 +3,19 @@ db 40, 45, 65, 90, 100, 120 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db MYSTERYBERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, MYSTERYBERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mr__mime/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn HUMANSHAPE, HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index a25d85605..32e326cbe 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -3,20 +3,19 @@ db 105, 105, 75, 50, 65, 100 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 75 ; catch rate db 157 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/muk/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 2fada2697..404a8d8ac 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -3,20 +3,19 @@ db 60, 85, 42, 91, 85, 42 ; hp atk def spd sat sdf - db DARK, FLYING + db DARK, FLYING ; type db 30 ; catch rate db 107 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/murkrow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY ; end diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index b9bde658a..ae5c9839e 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -3,20 +3,19 @@ db 40, 50, 45, 70, 70, 45 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 190 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/natu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 3d7205af5..796d87a93 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -3,20 +3,19 @@ db 81, 92, 77, 85, 85, 75 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 195 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 4c5ca110e..4637b486f 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -3,20 +3,19 @@ db 90, 82, 87, 76, 75, 85 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoqueen/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 77925f1df..0fa3ea2ed 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -3,20 +3,19 @@ db 55, 47, 52, 41, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_f/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 0f25712dd..f23405a78 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -3,20 +3,19 @@ db 46, 57, 40, 50, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_m/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 2385f82ec..65dfd558e 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -3,20 +3,19 @@ db 70, 62, 67, 56, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorina/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 9c94ea824..7ba686eff 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -3,20 +3,19 @@ db 61, 72, 57, 65, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorino/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index f23d2e384..892874071 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -3,20 +3,19 @@ db 73, 76, 75, 100, 81, 100 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 178 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ninetales/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 030dec08e..6adcdc976 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -3,20 +3,19 @@ db 100, 50, 50, 70, 76, 96 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/noctowl/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index 6bc2f7d46..247b996ca 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -3,20 +3,19 @@ db 75, 105, 75, 45, 105, 75 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/octillery/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 98f8c96f9..a4cba7085 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -3,20 +3,19 @@ db 45, 50, 55, 30, 75, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/oddish/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 70b88df38..a7d9d346d 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -3,20 +3,19 @@ db 35, 40, 100, 35, 90, 55 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 120 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omanyte/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 659ecc825..a2d60abf3 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -3,20 +3,19 @@ db 70, 60, 125, 55, 115, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 199 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omastar/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index befd53abf..a28fe72d9 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -3,20 +3,19 @@ db 35, 45, 160, 70, 30, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/onix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 46687f928..8f99631ce 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -3,20 +3,19 @@ db 35, 70, 55, 25, 45, 55 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 190 ; catch rate db 70 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/paras/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index d40dd4fd9..32b823b83 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -3,20 +3,19 @@ db 60, 95, 80, 30, 60, 80 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 75 ; catch rate db 128 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/parasect/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index bbfd9beec..eace03a07 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -3,20 +3,19 @@ db 65, 70, 60, 115, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 148 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/persian/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 27794e0b5..58d3a810d 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -3,20 +3,19 @@ db 90, 60, 60, 40, 40, 40 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/phanpy/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index 35d6a105a..08346c338 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -3,20 +3,19 @@ db 20, 40, 15, 60, 35, 35 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 42 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pichu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 2d117b955..b8270e0b2 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -3,20 +3,19 @@ db 83, 80, 75, 91, 70, 70 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 172 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeot/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 8e263c4b3..1951abc75 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -3,20 +3,19 @@ db 63, 60, 55, 71, 50, 50 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 120 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeotto/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 123b95d7d..cd547de53 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -3,20 +3,19 @@ db 40, 45, 40, 56, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 55 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgey/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 78204ff78..2ac75e086 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -3,20 +3,19 @@ db 35, 55, 30, 90, 50, 40 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 82 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pikachu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index 3e48aa4c9..ee013c2e4 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -3,20 +3,19 @@ db 100, 100, 80, 50, 60, 60 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 75 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/piloswine/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 5754c49a2..09eae2319 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -3,20 +3,19 @@ db 50, 65, 90, 15, 35, 35 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 190 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pineco/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 55927c918..37c3dfced 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -3,20 +3,19 @@ db 65, 125, 100, 85, 55, 70 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pinsir/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 6ad959406..ba152e9e2 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 70, 90, 100 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/politoed/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 3a4d8c051..a8cddbdeb 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -3,20 +3,19 @@ db 40, 50, 40, 90, 40, 40 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 77 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwag/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index d28964ebd..e76dd5b4b 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -3,20 +3,19 @@ db 65, 65, 65, 90, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 120 ; catch rate db 131 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwhirl/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 3b142e061..95c8406e9 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -3,20 +3,19 @@ db 90, 85, 95, 70, 70, 90 ; hp atk def spd sat sdf - db WATER, FIGHTING + db WATER, FIGHTING ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwrath/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn AMPHIBIAN, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 2c3c3f9cf..4a32f9010 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -3,20 +3,19 @@ db 50, 85, 55, 90, 65, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 152 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ponyta/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index c034acdfb..b9c6f7df7 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -3,20 +3,19 @@ db 65, 60, 70, 40, 85, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 130 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 1e9625509..50022cae8 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -3,20 +3,19 @@ db 85, 80, 90, 60, 105, 95 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 180 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon2/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index a7d1ee74a..276f8e39a 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -3,20 +3,19 @@ db 65, 105, 60, 95, 60, 70 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/primeape/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index d2901750b..98bd99337 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -3,20 +3,19 @@ db 50, 52, 48, 55, 65, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 80 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/psyduck/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 7ff381195..80ba55692 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -3,20 +3,19 @@ db 70, 84, 70, 51, 65, 70 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pupitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index 75a1d24be..3972a0763 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -3,20 +3,19 @@ db 95, 85, 85, 35, 65, 65 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 90 ; catch rate db 137 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quagsire/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 4cb388301..13789d3a6 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quilava/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 0cfe4e2d8..5dfc6f982 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -3,20 +3,19 @@ db 65, 95, 75, 85, 55, 55 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 45 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/qwilfish/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index b6723ac0f..a691fecd3 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -3,20 +3,19 @@ db 60, 90, 55, 100, 90, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 75 ; catch rate db 122 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raichu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 47f4f9da3..d8b2a98ed 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -3,20 +3,19 @@ db 90, 85, 75, 115, 115, 100 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raikou/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 291b129f2..8da61a515 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -3,20 +3,19 @@ db 65, 100, 70, 105, 80, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 60 ; catch rate db 192 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rapidash/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 1424f3ffb..31440b27a 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -3,20 +3,19 @@ db 55, 81, 60, 97, 50, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raticate/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 71498aeac..761e6400b 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -3,20 +3,19 @@ db 30, 56, 35, 72, 25, 35 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rattata/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index 8dabbb0a4..c201544ea 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -3,20 +3,19 @@ db 35, 65, 35, 65, 65, 35 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/remoraid/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index e885edd75..cd4498a8a 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -3,20 +3,19 @@ db 105, 130, 120, 40, 45, 45 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 60 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhydon/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index f15f73719..f9b0fb693 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -3,20 +3,19 @@ db 80, 85, 95, 25, 30, 30 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 120 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhyhorn/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 7b172a120..daa6574a3 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -3,20 +3,19 @@ db 50, 75, 85, 40, 20, 30 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 93 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandshrew/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index d850c9697..8296cc27d 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -3,20 +3,19 @@ db 75, 100, 110, 65, 45, 55 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 90 ; catch rate db 163 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandslash/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index c841c6301..ced06ee44 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -3,20 +3,19 @@ db 70, 130, 100, 65, 55, 80 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 25 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scizor/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index ea7c7cd33..fa1beee7f 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -3,20 +3,19 @@ db 70, 110, 80, 105, 55, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 187 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scyther/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 3ba5687ce..2f1e38c01 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -3,20 +3,19 @@ db 55, 65, 95, 85, 95, 45 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 155 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seadra/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, REPTILE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 70bee646a..4f32ed710 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -3,20 +3,19 @@ db 80, 92, 65, 68, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 170 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seaking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FISH, FISH ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index 13edf89bc..b3528b8eb 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -3,20 +3,19 @@ db 65, 45, 55, 45, 45, 70 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index c3802fa63..15cf518ce 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -3,20 +3,19 @@ db 35, 46, 34, 20, 35, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sentret/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index 9ca88a03d..19e4d9e45 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -3,20 +3,19 @@ db 30, 65, 100, 40, 45, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 97 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shellder/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index ec3a3b410..51d02d70c 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -3,20 +3,19 @@ db 20, 10, 230, 05, 10, 230 ; hp atk def spd sat sdf - db BUG, ROCK + db BUG, ROCK ; type db 190 ; catch rate db 80 ; base exp - db BERRY ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, BERRY; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shuckle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index 4d0b5f3de..aaeddade7 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -3,20 +3,19 @@ db 65, 80, 140, 70, 40, 70 ; hp atk def spd sat sdf - db STEEL, FLYING + db STEEL, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skarmory/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index 29a7be748..c37c5da1f 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -3,20 +3,19 @@ db 55, 45, 50, 80, 45, 65 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 120 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skiploom/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FAIRY, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index a9fc61e3a..5696c8c1e 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -3,20 +3,19 @@ db 95, 75, 110, 30, 100, 80 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowbro/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index 59d6c83e4..d40beb2f9 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -3,20 +3,19 @@ db 95, 75, 80, 30, 100, 110 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 70 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowking/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index cb9bc813b..95ab73a95 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -3,20 +3,19 @@ db 90, 65, 65, 15, 40, 40 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 190 ; catch rate db 99 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowpoke/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 234e844b9..77bb71573 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -3,20 +3,19 @@ db 40, 40, 40, 20, 70, 40 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slugma/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index 2373cb0f0..6d7ebe8a7 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -3,20 +3,19 @@ db 55, 20, 35, 75, 20, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smeargle/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index f8f5e22f6..4739e5269 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -3,20 +3,19 @@ db 45, 30, 15, 65, 85, 65 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 87 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smoochum/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index 4e24a8ada..a5fbeff57 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -3,20 +3,19 @@ db 55, 95, 55, 115, 35, 75 ; hp atk def spd sat sdf - db DARK, ICE + db DARK, ICE ; type db 60 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db QUICK_CLAW ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, QUICK_CLAW; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9a9e426e9..a5bf72f69 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -3,20 +3,19 @@ db 160, 110, 65, 30, 65, 110 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 154 ; base exp - db LEFTOVERS ; item 1 - db LEFTOVERS ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db LEFTOVERS, LEFTOVERS; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snorlax/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 6dbca375e..11d121ec2 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 30, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 63 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snubbull/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FIELD, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index a55e8a17c..66e929f65 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -3,20 +3,19 @@ db 40, 60, 30, 70, 31, 31 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spearow/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index fb2fbb7f3..9c73af7c0 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -3,20 +3,19 @@ db 40, 60, 40, 30, 40, 40 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 6582f88a8..6f6712431 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -3,20 +3,19 @@ db 44, 48, 65, 43, 50, 64 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/squirtle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index a8537a1e0..1a14001a2 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -3,20 +3,19 @@ db 73, 95, 62, 85, 85, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/stantler/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 55c5fcc99..bb6f66218 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -3,20 +3,19 @@ db 60, 75, 85, 115, 100, 85 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 60 ; catch rate db 207 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/starmie/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index d702faaf2..1b2fd1dc7 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -3,20 +3,19 @@ db 30, 45, 55, 85, 70, 55 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 106 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/staryu/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 6931418c8..d337a2d52 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -3,20 +3,19 @@ db 75, 85, 200, 30, 55, 65 ; hp atk def spd sat sdf - db STEEL, GROUND + db STEEL, GROUND ; type db 25 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/steelix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index 40726999d..ecd0b4be4 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -3,20 +3,19 @@ db 70, 100, 115, 30, 30, 65 ; hp atk def spd sat sdf - db ROCK, ROCK + db ROCK, ROCK ; type db 65 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sudowoodo/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index b199eddd7..68feb6003 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -3,20 +3,19 @@ db 100, 75, 115, 85, 90, 115 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/suicune/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index ec39d0932..04c0ed1d8 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -3,20 +3,19 @@ db 75, 75, 55, 30, 105, 85 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 120 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunflora/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index 7e502900c..2a5581ab2 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -3,20 +3,19 @@ db 30, 30, 30, 30, 30, 30 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 235 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunkern/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index ee6bd783a..800b32f49 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -3,20 +3,19 @@ db 50, 50, 40, 50, 30, 30 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 225 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/swinub/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index a2b5b06a0..9a41a16ab 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -3,20 +3,19 @@ db 65, 55, 115, 60, 100, 40 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 166 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tangela/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 936d60a4d..8d6d0ca93 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -3,20 +3,19 @@ db 75, 100, 95, 110, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 211 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tauros/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 18c4ede7a..2283850ab 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 40, 50, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/teddiursa/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index 94dcb42b0..d036f1401 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -3,20 +3,19 @@ db 40, 40, 35, 70, 50, 100 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 190 ; catch rate db 105 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacool/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index e922c5938..2e47041ff 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -3,20 +3,19 @@ db 80, 70, 65, 100, 80, 120 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 60 ; catch rate db 205 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacruel/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn INVERTEBRATE, INVERTEBRATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index 0f22863e5..14c5cb58b 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -3,20 +3,19 @@ db 35, 20, 65, 20, 40, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togepi/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index ef2f94305..2c4461836 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -3,20 +3,19 @@ db 55, 40, 85, 40, 80, 105 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 75 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togetic/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn AVIAN, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 49c7603f6..4a81090a1 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -3,20 +3,19 @@ db 50, 65, 64, 43, 44, 48 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/totodile/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index ed6fcf198..d52c06ddf 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/typhlosion/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index b6ed98dd7..e11e39a2a 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -3,20 +3,19 @@ db 100, 134, 110, 61, 95, 100 ; hp atk def spd sat sdf - db ROCK, DARK + db ROCK, DARK ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyranitar/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn MONSTER, MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 026aab404..38f5dc913 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -3,20 +3,19 @@ db 35, 35, 35, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 91 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyrogue/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 0382e69e2..962cb7a84 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -3,20 +3,19 @@ db 95, 65, 110, 65, 60, 130 ; hp atk def spd sat sdf - db DARK, DARK + db DARK, DARK ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/umbreon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index ef67b1ce1..992d51971 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -3,20 +3,19 @@ db 48, 72, 48, 48, 72, 48 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 225 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 8f2031c77..aed338f70 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -3,20 +3,19 @@ db 90, 130, 75, 55, 75, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ursaring/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 083a67499..245179e51 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -3,20 +3,19 @@ db 130, 65, 60, 65, 110, 95 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vaporeon/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c92c7fbff..76bcf584b 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -3,20 +3,19 @@ db 70, 65, 60, 90, 90, 75 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 75 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venomoth/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 40a9639b8..b55518730 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -3,20 +3,19 @@ db 60, 55, 50, 45, 40, 55 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venonat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 465b3d0fc..7fd7895a1 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -3,20 +3,19 @@ db 80, 82, 83, 80, 100, 100 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venusaur/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index e4e1a24e5..3969e5f25 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 70, 100, 60 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 191 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/victreebel/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 3f0d0b996..8cbce585a 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 100, 90 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vileplume/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 2767568fa..34f4f6d90 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -3,20 +3,19 @@ db 40, 30, 50, 100, 55, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 103 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/voltorb/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INANIMATE, INANIMATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index e012402a0..50f5406d1 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -3,20 +3,19 @@ db 38, 41, 40, 65, 50, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 63 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vulpix/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn FIELD, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index 7df729f3f..a032a60a6 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -3,20 +3,19 @@ db 59, 63, 80, 58, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wartortle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn MONSTER, AMPHIBIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index 520109245..5c8475b8f 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 50, 20, 20 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weedle/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 3dbd2595e..4c597e7d7 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -3,20 +3,19 @@ db 65, 90, 50, 55, 85, 45 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 151 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weepinbell/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_SLOW ; growth rate dn PLANT, PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 41c1d4f5d..25e0e45e9 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -3,20 +3,19 @@ db 65, 90, 120, 60, 85, 70 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 60 ; catch rate db 173 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weezing/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index e2d3bd7e6..38f0f815d 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -3,20 +3,19 @@ db 140, 70, 45, 45, 75, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 50 ; catch rate db 109 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wigglytuff/front.dimensions" db 0, 0, 0, 0 ; padding db FAST ; growth rate dn FAIRY, FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index 393655150..a94280a8c 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -3,20 +3,19 @@ db 190, 33, 58, 33, 33, 58 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wobbuffet/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMORPHOUS, AMORPHOUS ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index db3f7f90a..0d45b3c34 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -3,20 +3,19 @@ db 55, 45, 45, 15, 25, 25 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wooper/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AMPHIBIAN, FIELD ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index a5941421e..cf3688b6f 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -3,20 +3,19 @@ db 65, 75, 70, 95, 95, 70 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 75 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/xatu/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 0bff5157a..78f412844 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -3,20 +3,19 @@ db 65, 65, 45, 95, 75, 45 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 75 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/yanma/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn INSECT, INSECT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 35b557404..e56172d77 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -3,20 +3,19 @@ db 90, 90, 85, 100, 125, 90 ; hp atk def spd sat sdf - db ELECTRIC, FLYING + db ELECTRIC, FLYING ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDERLESS ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zapdos/front.dimensions" db 0, 0, 0, 0 ; padding db SLOW ; growth rate dn NO_EGGS, NO_EGGS ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 5da4ceeba..84673fef7 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 55, 30, 40 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zubat/front.dimensions" db 0, 0, 0, 0 ; padding db MEDIUM_FAST ; growth rate dn AVIAN, AVIAN ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/dex_entries/abra.asm b/data/pokemon/dex_entries/abra.asm index be3b263cd..91f55c23f 100644 --- a/data/pokemon/dex_entries/abra.asm +++ b/data/pokemon/dex_entries/abra.asm @@ -1,10 +1,10 @@ -; AbraPokedexEntry: ; 0x1830d5 db "PSI@" ; species name dw 211, 430 ; height, weight db "It hypnotizes" next "itself so that it" next "can teleport away" + page "when it senses" next "danger, even" next "if it is asleep.@" diff --git a/data/pokemon/dex_entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm index d6189500b..48f943c99 100644 --- a/data/pokemon/dex_entries/aerodactyl.asm +++ b/data/pokemon/dex_entries/aerodactyl.asm @@ -1,10 +1,10 @@ -; AerodactylPokedexEntry: ; 0x1cc576 db "FOSSIL@" ; species name dw 511, 1300 ; height, weight db "In prehistoric" next "times, this" next "#MON flew" + page "freely and" next "fearlessly through" next "the skies.@" diff --git a/data/pokemon/dex_entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm index 3fadb9169..4cb0f86ce 100644 --- a/data/pokemon/dex_entries/aipom.asm +++ b/data/pokemon/dex_entries/aipom.asm @@ -1,10 +1,10 @@ -; AipomPokedexEntry: ; 0x1cda11 db "LONG TAIL@" ; species name dw 207, 250 ; height, weight db "It uses its tail" next "to hang on to tree" next "branches. It uses" + page "its momentum to" next "swing from one" next "branch to another.@" diff --git a/data/pokemon/dex_entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm index 1d34fa1f7..e13ef835f 100644 --- a/data/pokemon/dex_entries/alakazam.asm +++ b/data/pokemon/dex_entries/alakazam.asm @@ -1,10 +1,10 @@ -; AlakazamPokedexEntry: ; 0x1b8000 db "PSI@" ; species name dw 411, 1060 ; height, weight db "It has an IQ of" next "5000. It calcu-" next "lates many things" + page "in order to gain" next "the edge in every" next "battle.@" diff --git a/data/pokemon/dex_entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm index 1f48fe322..dd5c18620 100644 --- a/data/pokemon/dex_entries/ampharos.asm +++ b/data/pokemon/dex_entries/ampharos.asm @@ -1,10 +1,10 @@ -; AmpharosPokedexEntry: ; 0x1cd626 db "LIGHT@" ; species name dw 407, 1360 ; height, weight db "When it gets dark," next "the light from its" next "bright, shiny tail" + page "can be seen from" next "far away on the" next "ocean's surface.@" diff --git a/data/pokemon/dex_entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm index c5d5b7704..0ecab500c 100644 --- a/data/pokemon/dex_entries/arbok.asm +++ b/data/pokemon/dex_entries/arbok.asm @@ -1,10 +1,10 @@ -; ArbokPokedexEntry: ; 0x18203d db "COBRA@" ; species name dw 1106, 1430 ; height, weight db "To intimidate" next "foes, it spreads" next "its chest wide and" + page "makes eerie sounds" next "by expelling air" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm index e319bcb6a..2443a1be8 100644 --- a/data/pokemon/dex_entries/arcanine.asm +++ b/data/pokemon/dex_entries/arcanine.asm @@ -1,10 +1,10 @@ -; ArcaninePokedexEntry: ; 0x182f1c db "LEGENDARY@" ; species name dw 603, 3420 ; height, weight db "An ancient picture" next "scroll shows that" next "people were" + page "attracted to its" next "movement as it ran" next "through prairies.@" diff --git a/data/pokemon/dex_entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm index a27d13fef..bdc335f2c 100644 --- a/data/pokemon/dex_entries/ariados.asm +++ b/data/pokemon/dex_entries/ariados.asm @@ -1,10 +1,10 @@ -; AriadosPokedexEntry: ; 0x1cd083 db "LONG LEG@" ; species name dw 307, 740 ; height, weight db "Rather than mak-" next "ing a nest in one" next "specific spot, it" + page "wanders in search" next "of food after" next "darkness falls.@" diff --git a/data/pokemon/dex_entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm index 92b297d28..50439c59b 100644 --- a/data/pokemon/dex_entries/articuno.asm +++ b/data/pokemon/dex_entries/articuno.asm @@ -1,10 +1,10 @@ -; ArticunoPokedexEntry: ; 0x1cc632 db "FREEZE@" ; species name dw 507, 1220 ; height, weight db "Legendary bird" next "#MON. As it" next "flies through the" + page "sky, it cools the" next "air, causing snow" next "to fall.@" diff --git a/data/pokemon/dex_entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm index bdbc83d1d..892ac77e3 100644 --- a/data/pokemon/dex_entries/azumarill.asm +++ b/data/pokemon/dex_entries/azumarill.asm @@ -1,10 +1,10 @@ -; AzumarillPokedexEntry: ; 0x1cd771 db "AQUARABBIT@" ; species name dw 207, 630 ; height, weight db "The bubble-like" next "pattern on its" next "stomach helps it" + page "camouflage itself" next "when it's in the" next "water.@" diff --git a/data/pokemon/dex_entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm index ac66dccd5..534c4c972 100644 --- a/data/pokemon/dex_entries/bayleef.asm +++ b/data/pokemon/dex_entries/bayleef.asm @@ -1,10 +1,10 @@ -; BayleefPokedexEntry: ; 0x1cc9e9 db "LEAF@" ; species name dw 311, 350 ; height, weight db "The scent that" next "wafts from the" next "leaves on its neck" + page "causes anyone who" next "smells it to" next "become energetic.@" diff --git a/data/pokemon/dex_entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm index 505396ca1..7dc8f6262 100644 --- a/data/pokemon/dex_entries/beedrill.asm +++ b/data/pokemon/dex_entries/beedrill.asm @@ -1,10 +1,10 @@ -; BeedrillPokedexEntry: ; 0x181c8a db "POISON BEE@" ; species name dw 303, 650 ; height, weight db "It uses sharp," next "poisonous stings" next "to defeat prey," + page "then takes the" next "victim back to its" next "nest for food.@" diff --git a/data/pokemon/dex_entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm index 0d13ed65d..1e90f4b35 100644 --- a/data/pokemon/dex_entries/bellossom.asm +++ b/data/pokemon/dex_entries/bellossom.asm @@ -1,10 +1,10 @@ -; BellossomPokedexEntry: ; 0x1cd69a db "FLOWER@" ; species name dw 104, 130 ; height, weight db "When these dance" next "together, their" next "petals rub against" + page "each other," next "making pretty," next "relaxing sounds.@" diff --git a/data/pokemon/dex_entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm index fcd42c125..f279bbefb 100644 --- a/data/pokemon/dex_entries/bellsprout.asm +++ b/data/pokemon/dex_entries/bellsprout.asm @@ -1,10 +1,10 @@ -; BellsproutPokedexEntry: ; 0x1b81a1 db "FLOWER@" ; species name dw 204, 90 ; height, weight db "If it notices" next "anything that" next "moves, it" + page "immediately flings" next "its vine at the" next "object.@" diff --git a/data/pokemon/dex_entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm index ea2a18d05..eeb7cf202 100644 --- a/data/pokemon/dex_entries/blastoise.asm +++ b/data/pokemon/dex_entries/blastoise.asm @@ -1,10 +1,10 @@ -; BlastoisePokedexEntry: ; 0x1819f9 db "SHELLFISH@" ; species name dw 503, 1890 ; height, weight db "It firmly plants" next "its feet on the" next "ground before" + page "shooting water" next "from the jets on" next "its back.@" diff --git a/data/pokemon/dex_entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm index 10151a398..2496478b5 100644 --- a/data/pokemon/dex_entries/blissey.asm +++ b/data/pokemon/dex_entries/blissey.asm @@ -1,10 +1,10 @@ -; BlisseyPokedexEntry: ; 0x1d14f7 db "HAPPINESS@" ; species name dw 411, 1030 ; height, weight db "Biting into one" next "of the delicious" next "eggs that BLISSEY" + page "provides will make" next "everyone around" next "smile with joy.@" diff --git a/data/pokemon/dex_entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm index fdfe39c8c..88fca15ec 100644 --- a/data/pokemon/dex_entries/bulbasaur.asm +++ b/data/pokemon/dex_entries/bulbasaur.asm @@ -1,10 +1,10 @@ -; BulbasaurPokedexEntry: ; 0x181695 db "SEED@" ; species name dw 204, 150 ; height, weight db "While it is young," next "it uses the" next "nutrients that are" + page "stored in the" next "seeds on its back" next "in order to grow.@" diff --git a/data/pokemon/dex_entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm index edf9e2599..9661cce68 100644 --- a/data/pokemon/dex_entries/butterfree.asm +++ b/data/pokemon/dex_entries/butterfree.asm @@ -1,10 +1,10 @@ -; ButterfreePokedexEntry: ; 0x181b45 db "BUTTERFLY@" ; species name dw 307, 710 ; height, weight db "It flits from" next "flower to flower," next "collecting honey." + page "It can even" next "identify distant" next "flowers in bloom.@" diff --git a/data/pokemon/dex_entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm index 940aa014f..2c5d74c8d 100644 --- a/data/pokemon/dex_entries/caterpie.asm +++ b/data/pokemon/dex_entries/caterpie.asm @@ -1,10 +1,10 @@ -; CaterpiePokedexEntry: ; 0x181a60 db "WORM@" ; species name dw 100, 60 ; height, weight db "It crawls into" next "foliage where it" next "camouflages itself" + page "among leaves that" next "are the same color" next "as its body.@" diff --git a/data/pokemon/dex_entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm index 3922d1749..ae0bc0fc0 100644 --- a/data/pokemon/dex_entries/celebi.asm +++ b/data/pokemon/dex_entries/celebi.asm @@ -1,10 +1,10 @@ -; CelebiPokedexEntry: ; 0x1d18cc db "TIMETRAVEL@" ; species name dw 200, 110 ; height, weight db "Revered as a" next "guardian of the" next "forest, CELEBI" + page "appears wherever" next "beautiful forests" next "exist.@" diff --git a/data/pokemon/dex_entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm index fd45cf121..2cc0b278b 100644 --- a/data/pokemon/dex_entries/chansey.asm +++ b/data/pokemon/dex_entries/chansey.asm @@ -1,10 +1,10 @@ -; ChanseyPokedexEntry: ; 0x1b942e db "EGG@" ; species name dw 307, 760 ; height, weight db "People try to" next "catch it for its" next "extremely" + page "nutritious eggs," next "but it rarely can" next "be found.@" diff --git a/data/pokemon/dex_entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm index 53a542fb5..2bd55febe 100644 --- a/data/pokemon/dex_entries/charizard.asm +++ b/data/pokemon/dex_entries/charizard.asm @@ -1,10 +1,10 @@ -; CharizardPokedexEntry: ; 0x1818b3 db "FLAME@" ; species name dw 507, 2000 ; height, weight db "It uses its wings" next "to fly high. The" next "temperature of its" + page "fire increases as" next "it gains exper-" next "ience in battle.@" diff --git a/data/pokemon/dex_entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm index a89b138f8..19ed15cbc 100644 --- a/data/pokemon/dex_entries/charmander.asm +++ b/data/pokemon/dex_entries/charmander.asm @@ -1,10 +1,10 @@ -; CharmanderPokedexEntry: ; 0x1817db db "LIZARD@" ; species name dw 200, 190 ; height, weight db "If it's healthy," next "the flame on the" next "tip of its tail" + page "will burn vigor-" next "ously, even if it" next "gets a bit wet.@" diff --git a/data/pokemon/dex_entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm index 2891764c3..17868516d 100644 --- a/data/pokemon/dex_entries/charmeleon.asm +++ b/data/pokemon/dex_entries/charmeleon.asm @@ -1,10 +1,10 @@ -; CharmeleonPokedexEntry: ; 0x18184a db "FLAME@" ; species name dw 307, 420 ; height, weight db "If it becomes" next "agitated during" next "battle, it spouts" + page "intense flames," next "incinerating its" next "surroundings.@" diff --git a/data/pokemon/dex_entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm index 3ba17e1f8..ecf5f8520 100644 --- a/data/pokemon/dex_entries/chikorita.asm +++ b/data/pokemon/dex_entries/chikorita.asm @@ -1,10 +1,10 @@ -; ChikoritaPokedexEntry: ; 0x1cc988 db "LEAF@" ; species name dw 211, 140 ; height, weight db "It loves to bask" next "in the sunlight." next "It uses the leaf" + page "on its head to" next "seek out warm" next "places.@" diff --git a/data/pokemon/dex_entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm index 22d887859..6074d4995 100644 --- a/data/pokemon/dex_entries/chinchou.asm +++ b/data/pokemon/dex_entries/chinchou.asm @@ -1,10 +1,10 @@ -; ChinchouPokedexEntry: ; 0x1cd165 db "ANGLER@" ; species name dw 108, 260 ; height, weight db "Its antennae, whi-" next "ch evolved from a" next "fin, have both po-" + page "sitive and neg-" next "ative charges flo-" next "wing through them.@" diff --git a/data/pokemon/dex_entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm index 240d70eb5..3ea166487 100644 --- a/data/pokemon/dex_entries/clefable.asm +++ b/data/pokemon/dex_entries/clefable.asm @@ -1,10 +1,10 @@ -; ClefablePokedexEntry: ; 0x182530 db "FAIRY@" ; species name dw 403, 880 ; height, weight db "Said to live in" next "quiet, remote" next "mountains, this" + page "type of fairy has" next "a strong aversion" next "to being seen.@" diff --git a/data/pokemon/dex_entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm index b5973b21a..ff26e3e4a 100644 --- a/data/pokemon/dex_entries/clefairy.asm +++ b/data/pokemon/dex_entries/clefairy.asm @@ -1,10 +1,10 @@ -; ClefairyPokedexEntry: ; 0x1824c8 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "Though rarely" next "seen, it becomes" next "easier to spot," + page "for some reason," next "on the night of a " next "full moon.@" diff --git a/data/pokemon/dex_entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm index 897bb2501..9095f990f 100644 --- a/data/pokemon/dex_entries/cleffa.asm +++ b/data/pokemon/dex_entries/cleffa.asm @@ -1,10 +1,10 @@ -; CleffaPokedexEntry: ; 0x1cd2bc db "STARSHAPE@" ; species name dw 100, 70 ; height, weight db "If the impact site" next "of a meteorite is" next "found, this" + page "#MON is certain" next "to be within the" next "immediate area.@" diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm index b1eaf80b9..7a887838d 100644 --- a/data/pokemon/dex_entries/cloyster.asm +++ b/data/pokemon/dex_entries/cloyster.asm @@ -1,10 +1,10 @@ -; CloysterPokedexEntry: ; 0x1b8ad9 db "BIVALVE@" ; species name dw 411, 2920 ; height, weight db "Even a missile" next "can't break the" next "spikes it uses to" + page "stab opponents." next "They're even hard-" next "er than its shell.@" diff --git a/data/pokemon/dex_entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm index 52fbd0c44..fa073f0d0 100644 --- a/data/pokemon/dex_entries/corsola.asm +++ b/data/pokemon/dex_entries/corsola.asm @@ -1,10 +1,10 @@ -; CorsolaPokedexEntry: ; 0x1d0c68 db "CORAL@" ; species name dw 200, 110 ; height, weight db "The points on its" next "head absorb" next "nutrients from" + page "clean water. They" next "cannot survive in" next "polluted water.@" diff --git a/data/pokemon/dex_entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm index 107683110..2b7e28f76 100644 --- a/data/pokemon/dex_entries/crobat.asm +++ b/data/pokemon/dex_entries/crobat.asm @@ -1,10 +1,10 @@ -; CrobatPokedexEntry: ; 0x1cd0f5 db "BAT@" ; species name dw 511, 1650 ; height, weight db "As a result of its" next "pursuit of faster," next "yet more silent" + page "flight, a new set" next "of wings grew on" next "its hind legs.@" diff --git a/data/pokemon/dex_entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm index 0edcf80cc..0cde70653 100644 --- a/data/pokemon/dex_entries/croconaw.asm +++ b/data/pokemon/dex_entries/croconaw.asm @@ -1,10 +1,10 @@ -; CroconawPokedexEntry: ; 0x1ccc84 db "BIG JAW@" ; species name dw 307, 550 ; height, weight db "The tips of its" next "fangs are slanted" next "backward. Once" + page "those fangs clamp" next "down, the prey has" next "no hope of escape.@" diff --git a/data/pokemon/dex_entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm index 911377864..6c8bed214 100644 --- a/data/pokemon/dex_entries/cubone.asm +++ b/data/pokemon/dex_entries/cubone.asm @@ -1,10 +1,10 @@ -; CubonePokedexEntry: ; 0x1b9068 db "LONELY@" ; species name dw 104, 140 ; height, weight db "It lost its mother" next "after its birth." next "It wears its" + page "mother's skull," next "never revealing" next "its true face.@" diff --git a/data/pokemon/dex_entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm index 47329d37f..2604f4879 100644 --- a/data/pokemon/dex_entries/cyndaquil.asm +++ b/data/pokemon/dex_entries/cyndaquil.asm @@ -1,10 +1,10 @@ -; CyndaquilPokedexEntry: ; 0x1ccabd db "FIRE MOUSE@" ; species name dw 108, 170 ; height, weight db "The fire that" next "spouts from its" next "back burns hottest" + page "when it is angry." next "The flaring flames" next "intimidate foes.@" diff --git a/data/pokemon/dex_entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm index 2c998d8be..47f8e2c90 100644 --- a/data/pokemon/dex_entries/delibird.asm +++ b/data/pokemon/dex_entries/delibird.asm @@ -1,10 +1,10 @@ -; DelibirdPokedexEntry: ; 0x1d0db1 db "DELIVERY@" ; species name dw 211, 350 ; height, weight db "It always carries" next "its food with it," next "wherever it goes." + page "If attacked, it" next "throws its food at" next "the opponent.@" diff --git a/data/pokemon/dex_entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm index a3ff9b6f5..a7a0bf13e 100644 --- a/data/pokemon/dex_entries/dewgong.asm +++ b/data/pokemon/dex_entries/dewgong.asm @@ -1,10 +1,10 @@ -; DewgongPokedexEntry: ; 0x1b8934 db "SEA LION@" ; species name dw 507, 2650 ; height, weight db "It sleeps under" next "shallow ocean" next "waters during the" + page "day, then looks" next "for food at night" next "when it's cold.@" diff --git a/data/pokemon/dex_entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm index 469d9311d..c2b6c4671 100644 --- a/data/pokemon/dex_entries/diglett.asm +++ b/data/pokemon/dex_entries/diglett.asm @@ -1,10 +1,10 @@ -; DiglettPokedexEntry: ; 0x182b30 db "MOLE@" ; species name dw 8, 20 ; height, weight db "It digs under-" next "ground and chews" next "on tree roots," + page "sticking its head" next "out only when the" next "sun isn't bright.@" diff --git a/data/pokemon/dex_entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm index 5a838b5b8..ffe394a1b 100644 --- a/data/pokemon/dex_entries/ditto.asm +++ b/data/pokemon/dex_entries/ditto.asm @@ -1,10 +1,10 @@ -; DittoPokedexEntry: ; 0x1cc13c db "TRANSFORM@" ; species name dw 100, 90 ; height, weight db "When it encount-" next "ers another DITTO," next "it will move" + page "faster than normal" next "to duplicate that" next "opponent exactly.@" diff --git a/data/pokemon/dex_entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm index ef495b99b..767fd9abe 100644 --- a/data/pokemon/dex_entries/dodrio.asm +++ b/data/pokemon/dex_entries/dodrio.asm @@ -1,10 +1,10 @@ -; DodrioPokedexEntry: ; 0x1b884a db "TRIPLEBIRD@" ; species name dw 511, 1880 ; height, weight db "An enemy that" next "takes its eyes off" next "any of the three" + page "heads--even for a" next "second--will get" next "pecked severely.@" diff --git a/data/pokemon/dex_entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm index 124469457..eba65000d 100644 --- a/data/pokemon/dex_entries/doduo.asm +++ b/data/pokemon/dex_entries/doduo.asm @@ -1,10 +1,10 @@ -; DoduoPokedexEntry: ; 0x1b87d7 db "TWIN BIRD@" ; species name dw 407, 860 ; height, weight db "It lives on a" next "grassy plain where" next "it can see a long" + page "way. If it sees an" next "enemy, it runs" next "away at 60 mph.@" diff --git a/data/pokemon/dex_entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm index 4dc489938..eac9c5467 100644 --- a/data/pokemon/dex_entries/donphan.asm +++ b/data/pokemon/dex_entries/donphan.asm @@ -1,10 +1,10 @@ -; DonphanPokedexEntry: ; 0x1d10ac db "ARMOR@" ; species name dw 307, 2650 ; height, weight db "Because this" next "#MON's skin is" next "so tough, a normal" + page "attack won't even" next "leave a scratch on" next "it.@" diff --git a/data/pokemon/dex_entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm index cef4f8f29..915db2c21 100644 --- a/data/pokemon/dex_entries/dragonair.asm +++ b/data/pokemon/dex_entries/dragonair.asm @@ -1,10 +1,10 @@ -; DragonairPokedexEntry: ; 0x1cc7dc db "DRAGON@" ; species name dw 1301, 360 ; height, weight db "It is called the" next "divine #MON." next "When its entire" + page "body brightens" next "slightly, the" next "weather changes.@" diff --git a/data/pokemon/dex_entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm index bbbc6cff0..9db1bf54b 100644 --- a/data/pokemon/dex_entries/dragonite.asm +++ b/data/pokemon/dex_entries/dragonite.asm @@ -1,10 +1,10 @@ -; DragonitePokedexEntry: ; 0x1cc843 db "DRAGON@" ; species name dw 703, 4630 ; height, weight db "It is said that" next "somewhere in the" next "ocean lies an" + page "island where these" next "gather. Only they" next "live there.@" diff --git a/data/pokemon/dex_entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm index ef16aa20c..baa12940e 100644 --- a/data/pokemon/dex_entries/dratini.asm +++ b/data/pokemon/dex_entries/dratini.asm @@ -1,10 +1,10 @@ -; DratiniPokedexEntry: ; 0x1cc761 db "DRAGON@" ; species name dw 511, 70 ; height, weight db "It sheds many lay-" next "ers of skin as it" next "grows larger. Dur-" + page "ing this process," next "it is protected by" next "a rapid waterfall.@" diff --git a/data/pokemon/dex_entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm index 34ae54435..fe6f14ba7 100644 --- a/data/pokemon/dex_entries/drowzee.asm +++ b/data/pokemon/dex_entries/drowzee.asm @@ -1,10 +1,10 @@ -; DrowzeePokedexEntry: ; 0x1b8d0a db "HYPNOSIS@" ; species name dw 303, 710 ; height, weight db "When it twitches" next "its nose, it can" next "tell where someone" + page "is sleeping and" next "what that person" next "is dreaming about.@" diff --git a/data/pokemon/dex_entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm index 829e2aa09..a12c2984d 100644 --- a/data/pokemon/dex_entries/dugtrio.asm +++ b/data/pokemon/dex_entries/dugtrio.asm @@ -1,10 +1,10 @@ -; DugtrioPokedexEntry: ; 0x182b9d db "MOLE@" ; species name dw 204, 730 ; height, weight db "These DIGLETT" next "triplets dig over" next "60 miles below sea" + page "level. No one" next "knows what it's" next "like underground.@" diff --git a/data/pokemon/dex_entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm index 7a9d812f3..5391438c1 100644 --- a/data/pokemon/dex_entries/dunsparce.asm +++ b/data/pokemon/dex_entries/dunsparce.asm @@ -1,10 +1,10 @@ -; DunsparcePokedexEntry: ; 0x1d0593 db "LAND SNAKE@" ; species name dw 411, 310 ; height, weight db "It hides deep" next "inside caves where" next "no light ever" + page "reaches it and" next "remains virtually" next "motionless there.@" diff --git a/data/pokemon/dex_entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm index 3081a5829..91a3d70bc 100644 --- a/data/pokemon/dex_entries/eevee.asm +++ b/data/pokemon/dex_entries/eevee.asm @@ -1,10 +1,10 @@ -; EeveePokedexEntry: ; 0x1cc1b2 db "EVOLUTION@" ; species name dw 100, 140 ; height, weight db "Its ability to" next "evolve into many" next "forms allows it to" + page "adapt smoothly" next "and perfectly to" next "any environment.@" diff --git a/data/pokemon/dex_entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm index 23faa4854..bb2fe9594 100644 --- a/data/pokemon/dex_entries/ekans.asm +++ b/data/pokemon/dex_entries/ekans.asm @@ -1,10 +1,10 @@ -; EkansPokedexEntry: ; 0x181fd4 db "SNAKE@" ; species name dw 607, 150 ; height, weight db "It flutters the" next "tip of its tongue" next "to seek out the" + page "scent of prey," next "then swallows the" next "prey whole.@" diff --git a/data/pokemon/dex_entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm index e6bf15587..0eddf3416 100644 --- a/data/pokemon/dex_entries/electabuzz.asm +++ b/data/pokemon/dex_entries/electabuzz.asm @@ -1,10 +1,10 @@ -; ElectabuzzPokedexEntry: ; 0x1b992a db "ELECTRIC@" ; species name dw 307, 660 ; height, weight db "When two" next "ELECTABUZZ touch," next "they control the" + page "electric currents" next "to communicate" next "their feelings.@" diff --git a/data/pokemon/dex_entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm index 48d523c69..2e6378d41 100644 --- a/data/pokemon/dex_entries/electrode.asm +++ b/data/pokemon/dex_entries/electrode.asm @@ -1,10 +1,10 @@ -; ElectrodePokedexEntry: ; 0x1b8f19 db "BALL@" ; species name dw 311, 1470 ; height, weight db "The more energy it" next "charges up, the" next "faster it gets." + page "But this also" next "makes it more" next "likely to explode.@" diff --git a/data/pokemon/dex_entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm index 6a046bda4..a84d24dc0 100644 --- a/data/pokemon/dex_entries/elekid.asm +++ b/data/pokemon/dex_entries/elekid.asm @@ -1,10 +1,10 @@ -; ElekidPokedexEntry: ; 0x1d1398 db "ELECTRIC@" ; species name dw 200, 520 ; height, weight db "It loves violent" next "thunder. The space" next "between its horns" + page "flickers bluish-" next "white when it is" next "charging energy.@" diff --git a/data/pokemon/dex_entries/entei.asm b/data/pokemon/dex_entries/entei.asm index 3784a898c..355bd4ae6 100644 --- a/data/pokemon/dex_entries/entei.asm +++ b/data/pokemon/dex_entries/entei.asm @@ -1,10 +1,10 @@ -; EnteiPokedexEntry: ; 0x1d15dd db "VOLCANO@" ; species name dw 607, 4370 ; height, weight db "This brawny" next "#MON courses" next "around the earth," + page "spouting flames" next "hotter than a" next "volcano's magma.@" diff --git a/data/pokemon/dex_entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm index 059b01fbe..93bde0d8c 100644 --- a/data/pokemon/dex_entries/espeon.asm +++ b/data/pokemon/dex_entries/espeon.asm @@ -1,10 +1,10 @@ -; EspeonPokedexEntry: ; 0x1d0155 db "SUN@" ; species name dw 211, 580 ; height, weight db "The tip of its" next "forked tail" next "quivers when it is" + page "predicting its" next "opponent's next" next "move.@" diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm index 01453955e..27360dc05 100644 --- a/data/pokemon/dex_entries/exeggcute.asm +++ b/data/pokemon/dex_entries/exeggcute.asm @@ -1,10 +1,10 @@ -; ExeggcutePokedexEntry: ; 0x1b8f84 db "EGG@" ; species name dw 104, 60 ; height, weight db "If even one is" next "separated from the" next "group, the energy" + page "bond between the" next "six will make them" next "rejoin instantly.@" diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm index abefffd69..31ba01ae4 100644 --- a/data/pokemon/dex_entries/exeggutor.asm +++ b/data/pokemon/dex_entries/exeggutor.asm @@ -1,10 +1,10 @@ -; ExeggutorPokedexEntry: ; 0x1b8ff6 db "COCONUT@" ; species name dw 607, 2650 ; height, weight db "Living in a good" next "environment makes" next "it grow lots of" + page "heads. A head that" next "drops off becomes" next "an EXEGGCUTE.@" diff --git a/data/pokemon/dex_entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm index c9e756a6a..b5bd3bc98 100644 --- a/data/pokemon/dex_entries/farfetch_d.asm +++ b/data/pokemon/dex_entries/farfetch_d.asm @@ -1,10 +1,10 @@ -; FarfetchDPokedexEntry: ; 0x1b876c db "WILD DUCK@" ; species name dw 207, 330 ; height, weight db "In order to pre-" next "vent their" next "extinction, more" + page "people have made" next "an effort to breed" next "these #MON.@" diff --git a/data/pokemon/dex_entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm index 90de6a612..b91c66ed1 100644 --- a/data/pokemon/dex_entries/fearow.asm +++ b/data/pokemon/dex_entries/fearow.asm @@ -1,10 +1,10 @@ -; FearowPokedexEntry: ; 0x181f64 db "BEAK@" ; species name dw 311, 840 ; height, weight db "It uses its long" next "beak to attack. It" next "has a surprisingly" + page "long reach, so it" next "must be treated" next "with caution.@" diff --git a/data/pokemon/dex_entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm index cb3672c92..3c411fe48 100644 --- a/data/pokemon/dex_entries/feraligatr.asm +++ b/data/pokemon/dex_entries/feraligatr.asm @@ -1,10 +1,10 @@ -; FeraligatrPokedexEntry: ; 0x1cccf9 db "BIG JAW@" ; species name dw 707, 1960 ; height, weight db "Although it has a" next "massive body, its" next "powerful hind legs" + page "enable it to move" next "quickly, even on" next "the ground.@" diff --git a/data/pokemon/dex_entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm index 04bcc0668..d408a4706 100644 --- a/data/pokemon/dex_entries/flaaffy.asm +++ b/data/pokemon/dex_entries/flaaffy.asm @@ -1,10 +1,10 @@ -; FlaaffyPokedexEntry: ; 0x1cd5b8 db "WOOL@" ; species name dw 207, 290 ; height, weight db "Because of its" next "rubbery, electric-" next "ity-resistant" + page "skin, it can store" next "lots of electric-" next "ity in its fur.@" diff --git a/data/pokemon/dex_entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm index ba3e0399d..fbab999c4 100644 --- a/data/pokemon/dex_entries/flareon.asm +++ b/data/pokemon/dex_entries/flareon.asm @@ -1,10 +1,10 @@ -; FlareonPokedexEntry: ; 0x1cc2ec db "FLAME@" ; species name dw 211, 550 ; height, weight db "Once it has stored" next "up enough heat," next "this #MON's" + page "body temperature" next "can reach up to" next "1700 degrees.@" diff --git a/data/pokemon/dex_entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm index 8644b4b39..6815f6d31 100644 --- a/data/pokemon/dex_entries/forretress.asm +++ b/data/pokemon/dex_entries/forretress.asm @@ -1,10 +1,10 @@ -; ForretressPokedexEntry: ; 0x1d0524 db "BAGWORM@" ; species name dw 311, 2770 ; height, weight db "Usually found" next "hanging on to a" next "fat tree trunk. It" + page "shoots out bits of" next "its shell when it" next "sees action.@" diff --git a/data/pokemon/dex_entries/furret.asm b/data/pokemon/dex_entries/furret.asm index 653a3dead..b9ec74d2d 100644 --- a/data/pokemon/dex_entries/furret.asm +++ b/data/pokemon/dex_entries/furret.asm @@ -1,10 +1,10 @@ -; FurretPokedexEntry: ; 0x1ccddd db "LONG BODY@" ; species name dw 511, 720 ; height, weight db "It lives in narrow" next "burrows that fit" next "its slim body. The" + page "deeper the nests" next "go, the more maze-" next "like they become.@" diff --git a/data/pokemon/dex_entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm index db7f6d57d..5f5420e02 100644 --- a/data/pokemon/dex_entries/gastly.asm +++ b/data/pokemon/dex_entries/gastly.asm @@ -1,10 +1,10 @@ -; GastlyPokedexEntry: ; 0x1b8b4a db "GAS@" ; species name dw 403, 2 ; height, weight db "It wraps its op-" next "ponent in its gas-" next "like body, slowly" + page "weakening its prey" next "by poisoning it" next "through the skin.@" diff --git a/data/pokemon/dex_entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm index e9650fb39..ac85e88f4 100644 --- a/data/pokemon/dex_entries/gengar.asm +++ b/data/pokemon/dex_entries/gengar.asm @@ -1,10 +1,10 @@ -; GengarPokedexEntry: ; 0x1b8c25 db "SHADOW@" ; species name dw 411, 890 ; height, weight db "Hiding in people's" next "shadows at night," next "it absorbs their" + page "heat. The chill it" next "causes makes the" next "victims shake.@" diff --git a/data/pokemon/dex_entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm index 389ce042a..ea3c8b79e 100644 --- a/data/pokemon/dex_entries/geodude.asm +++ b/data/pokemon/dex_entries/geodude.asm @@ -1,10 +1,10 @@ -; GeodudePokedexEntry: ; 0x1b83a1 db "ROCK@" ; species name dw 104, 440 ; height, weight db "Proud of their" next "sturdy bodies," next "they bash against" + page "each other in a" next "contest to prove" next "whose is harder.@" diff --git a/data/pokemon/dex_entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm index 527aa9807..caeb13dd7 100644 --- a/data/pokemon/dex_entries/girafarig.asm +++ b/data/pokemon/dex_entries/girafarig.asm @@ -1,10 +1,10 @@ -; GirafarigPokedexEntry: ; 0x1d0446 db "LONG NECK@" ; species name dw 411, 910 ; height, weight db "When it is in" next "danger, its tail" next "uses some sort of" + page "mysterious powers" next "to drive away the" next "enemy.@" diff --git a/data/pokemon/dex_entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm index 43c4c95ce..32ac0a5f5 100644 --- a/data/pokemon/dex_entries/gligar.asm +++ b/data/pokemon/dex_entries/gligar.asm @@ -1,10 +1,10 @@ -; GligarPokedexEntry: ; 0x1d0604 db "FLYSCORPIO@" ; species name dw 307, 1430 ; height, weight db "It builds its nest" next "on a steep cliff." next "When it is done" + page "gliding, it hops" next "along the ground" next "back to its nest.@" diff --git a/data/pokemon/dex_entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm index 0552a8d0c..6b2e4e534 100644 --- a/data/pokemon/dex_entries/gloom.asm +++ b/data/pokemon/dex_entries/gloom.asm @@ -1,10 +1,10 @@ -; GloomPokedexEntry: ; 0x1828a6 db "WEED@" ; species name dw 207, 190 ; height, weight db "The smell from its" next "drool-like syrup" next "and the pollen on" + page "its petals is so" next "bad, it may make" next "opponents faint.@" diff --git a/data/pokemon/dex_entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm index 434108bf4..d59b9408c 100644 --- a/data/pokemon/dex_entries/golbat.asm +++ b/data/pokemon/dex_entries/golbat.asm @@ -1,10 +1,10 @@ -; GolbatPokedexEntry: ; 0x1827c4 db "BAT@" ; species name dw 503, 1210 ; height, weight db "When it plunges" next "its fangs into its" next "prey, it instantly" + page "draws and gulps" next "down more than ten" next "ounces of blood.@" diff --git a/data/pokemon/dex_entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm index 101edf434..075a9b5a2 100644 --- a/data/pokemon/dex_entries/goldeen.asm +++ b/data/pokemon/dex_entries/goldeen.asm @@ -1,10 +1,10 @@ -; GoldeenPokedexEntry: ; 0x1b9626 db "GOLDFISH@" ; species name dw 200, 330 ; height, weight db "During spawning" next "season, they swim" next "gracefully in the" + page "water, searching" next "for their perfect" next "mate.@" diff --git a/data/pokemon/dex_entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm index b38cfd2dc..921e4ddb0 100644 --- a/data/pokemon/dex_entries/golduck.asm +++ b/data/pokemon/dex_entries/golduck.asm @@ -1,10 +1,10 @@ -; GolduckPokedexEntry: ; 0x182d55 db "DUCK@" ; species name dw 507, 1690 ; height, weight db "It swims grace-" next "fully along on the" next "quiet, slow-moving" + page "rivers and lakes" next "of which it is so" next "fond.@" diff --git a/data/pokemon/dex_entries/golem.asm b/data/pokemon/dex_entries/golem.asm index dbb5a8e3d..7d5e9af49 100644 --- a/data/pokemon/dex_entries/golem.asm +++ b/data/pokemon/dex_entries/golem.asm @@ -1,10 +1,10 @@ -; GolemPokedexEntry: ; 0x1b8481 db "MEGATON@" ; species name dw 407, 6620 ; height, weight db "Its rock-like body" next "is so durable," next "even high-powered" + page "dynamite blasts" next "fail to scratch" next "its rugged hide.@" diff --git a/data/pokemon/dex_entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm index 15f3e194c..de6460d8d 100644 --- a/data/pokemon/dex_entries/granbull.asm +++ b/data/pokemon/dex_entries/granbull.asm @@ -1,10 +1,10 @@ -; GranbullPokedexEntry: ; 0x1d074a db "FAIRY@" ; species name dw 407, 1070 ; height, weight db "It can make most" next "any #MON run" next "away simply by" + page "opening its mouth" next "wide to reveal its" next "big fangs.@" diff --git a/data/pokemon/dex_entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm index 3bf04148c..26b9db795 100644 --- a/data/pokemon/dex_entries/graveler.asm +++ b/data/pokemon/dex_entries/graveler.asm @@ -1,10 +1,10 @@ -; GravelerPokedexEntry: ; 0x1b840c db "ROCK@" ; species name dw 303, 2320 ; height, weight db "It travels by rol-" next "ling on mountain" next "paths. If it gains" + page "too much speed, it" next "stops by running" next "into huge rocks.@" diff --git a/data/pokemon/dex_entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm index bda09cf94..ed76b6249 100644 --- a/data/pokemon/dex_entries/grimer.asm +++ b/data/pokemon/dex_entries/grimer.asm @@ -1,10 +1,10 @@ -; GrimerPokedexEntry: ; 0x1b89a2 db "SLUDGE@" ; species name dw 211, 660 ; height, weight db "When two of these" next "#MON's bodies" next "are combined" + page "together, new" next "poisons are" next "created.@" diff --git a/data/pokemon/dex_entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm index cd261d886..af5610cda 100644 --- a/data/pokemon/dex_entries/growlithe.asm +++ b/data/pokemon/dex_entries/growlithe.asm @@ -1,10 +1,10 @@ -; GrowlithePokedexEntry: ; 0x182eaa db "PUPPY@" ; species name dw 204, 420 ; height, weight db "It controls a big" next "territory. If it" next "detects an unknown" + page "smell, it roars" next "loudly to force" next "out the intruder.@" diff --git a/data/pokemon/dex_entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm index 767380680..3f3235679 100644 --- a/data/pokemon/dex_entries/gyarados.asm +++ b/data/pokemon/dex_entries/gyarados.asm @@ -1,10 +1,10 @@ -; GyaradosPokedexEntry: ; 0x1cc065 db "ATROCIOUS@" ; species name dw 2104, 5180 ; height, weight db "It appears when-" next "ever there is" next "world conflict," + page "burning down any" next "place it travels" next "through.@" diff --git a/data/pokemon/dex_entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm index 6efe4b15c..b03c0996f 100644 --- a/data/pokemon/dex_entries/haunter.asm +++ b/data/pokemon/dex_entries/haunter.asm @@ -1,10 +1,10 @@ -; HaunterPokedexEntry: ; 0x1b8bbd db "GAS@" ; species name dw 503, 2 ; height, weight db "It hides in the" next "dark, planning to" next "take the life of" + page "the next living" next "thing that wanders" next "close by.@" diff --git a/data/pokemon/dex_entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm index ed709b526..25d1e28a6 100644 --- a/data/pokemon/dex_entries/heracross.asm +++ b/data/pokemon/dex_entries/heracross.asm @@ -1,10 +1,10 @@ -; HeracrossPokedexEntry: ; 0x1d0907 db "SINGLEHORN@" ; species name dw 411, 1190 ; height, weight db "With its Herculean" next "powers, it can" next "easily throw arou-" + page "nd an object that" next "is 100 times its" next "own weight.@" diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm index e5686b1a5..8b2f97823 100644 --- a/data/pokemon/dex_entries/hitmonchan.asm +++ b/data/pokemon/dex_entries/hitmonchan.asm @@ -1,10 +1,10 @@ -; HitmonchanPokedexEntry: ; 0x1b91a4 db "PUNCHING@" ; species name dw 407, 1110 ; height, weight db "To increase the" next "strength of all" next "its punch moves," + page "it spins its arms" next "just before making" next "contact.@" diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm index 0215d3bdc..0df1bf2a9 100644 --- a/data/pokemon/dex_entries/hitmonlee.asm +++ b/data/pokemon/dex_entries/hitmonlee.asm @@ -1,10 +1,10 @@ -; HitmonleePokedexEntry: ; 0x1b913f db "KICKING@" ; species name dw 411, 1100 ; height, weight db "It is also called" next "the Kick Master." next "It uses its" + page "elastic legs to" next "execute every" next "known kick.@" diff --git a/data/pokemon/dex_entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm index 14175ec8a..609ccb48a 100644 --- a/data/pokemon/dex_entries/hitmontop.asm +++ b/data/pokemon/dex_entries/hitmontop.asm @@ -1,10 +1,10 @@ -; HitmontopPokedexEntry: ; 0x1d12c0 db "HANDSTAND@" ; species name dw 407, 1060 ; height, weight db "After doing a" next "handstand to" next "throw off the" + page "opponent's timing," next "it presents its" next "fancy kick moves.@" diff --git a/data/pokemon/dex_entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm index 1d74cd058..2bc0abcf0 100644 --- a/data/pokemon/dex_entries/ho_oh.asm +++ b/data/pokemon/dex_entries/ho_oh.asm @@ -1,10 +1,10 @@ -; HoOhPokedexEntry: ; 0x1d185d db "RAINBOW@" ; species name dw 1206, 4390 ; height, weight db "It will reveal" next "itself before a" next "pure-hearted" + page "trainer by shining" next "its bright rain-" next "bow-colored wings.@" diff --git a/data/pokemon/dex_entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm index 88039eea8..1df540fe6 100644 --- a/data/pokemon/dex_entries/hoothoot.asm +++ b/data/pokemon/dex_entries/hoothoot.asm @@ -1,10 +1,10 @@ -; HoothootPokedexEntry: ; 0x1cce58 db "OWL@" ; species name dw 204, 470 ; height, weight db "It begins to hoot" next "at the same time" next "every day. Some" + page "trainers use them" next "in place of" next "clocks.@" diff --git a/data/pokemon/dex_entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm index 734ddc766..3e97be0e2 100644 --- a/data/pokemon/dex_entries/hoppip.asm +++ b/data/pokemon/dex_entries/hoppip.asm @@ -1,10 +1,10 @@ -; HoppipPokedexEntry: ; 0x1cd8b5 db "COTTONWEED@" ; species name dw 104, 10 ; height, weight db "It can be carried" next "away on even the" next "gentlest breeze." + page "It may even float" next "all the way to the" next "next town.@" diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm index dd50057e7..53f6ec71d 100644 --- a/data/pokemon/dex_entries/horsea.asm +++ b/data/pokemon/dex_entries/horsea.asm @@ -1,10 +1,10 @@ -; HorseaPokedexEntry: ; 0x1b9553 db "DRAGON@" ; species name dw 104, 180 ; height, weight db "When they're in a" next "safe location," next "they can be seen" + page "playfully tangling" next "their tails" next "together.@" diff --git a/data/pokemon/dex_entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm index 6a21602f3..a3b8f9cb8 100644 --- a/data/pokemon/dex_entries/houndoom.asm +++ b/data/pokemon/dex_entries/houndoom.asm @@ -1,10 +1,10 @@ -; HoundoomPokedexEntry: ; 0x1d0f66 db "DARK@" ; species name dw 407, 770 ; height, weight db "The pungent-" next "smelling flame" next "that shoots from" + page "its mouth results" next "from toxins burn-" next "ing in its body.@" diff --git a/data/pokemon/dex_entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm index 5fa89fe85..ba89b90d2 100644 --- a/data/pokemon/dex_entries/houndour.asm +++ b/data/pokemon/dex_entries/houndour.asm @@ -1,10 +1,10 @@ -; HoundourPokedexEntry: ; 0x1d0eff db "DARK@" ; species name dw 200, 240 ; height, weight db "Around dawn, its" next "ominous howl" next "echoes through the" + page "area to announce" next "that this is its" next "territory.@" diff --git a/data/pokemon/dex_entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm index 2309a6bfa..cfdd29896 100644 --- a/data/pokemon/dex_entries/hypno.asm +++ b/data/pokemon/dex_entries/hypno.asm @@ -1,10 +1,10 @@ -; HypnoPokedexEntry: ; 0x1b8d80 db "HYPNOSIS@" ; species name dw 503, 1670 ; height, weight db "The longer it" next "swings its" next "pendulum, the" + page "longer the effects" next "of its hypnosis" next "last.@" diff --git a/data/pokemon/dex_entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm index aa1c1cabf..27d5a8040 100644 --- a/data/pokemon/dex_entries/igglybuff.asm +++ b/data/pokemon/dex_entries/igglybuff.asm @@ -1,10 +1,10 @@ -; IgglybuffPokedexEntry: ; 0x1cd32c db "BALLOON@" ; species name dw 100, 20 ; height, weight db "Instead of walking" next "with its short" next "legs, it moves" + page "around by bouncing" next "on its soft," next "tender body.@" diff --git a/data/pokemon/dex_entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm index 66d16d323..91a672c9e 100644 --- a/data/pokemon/dex_entries/ivysaur.asm +++ b/data/pokemon/dex_entries/ivysaur.asm @@ -1,10 +1,10 @@ -; IvysaurPokedexEntry: ; 0x181702 db "SEED@" ; species name dw 303, 290 ; height, weight db "The bulb on its" next "back grows as it" next "absorbs nutrients." + page "The bulb gives off" next "a pleasant aroma" next "when it blooms.@" diff --git a/data/pokemon/dex_entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm index 01a3b4480..b90ba7316 100644 --- a/data/pokemon/dex_entries/jigglypuff.asm +++ b/data/pokemon/dex_entries/jigglypuff.asm @@ -1,10 +1,10 @@ -; JigglypuffPokedexEntry: ; 0x182673 db "BALLOON@" ; species name dw 108, 120 ; height, weight db "It rolls its cute" next "eyes as it sings a" next "soothing lullaby." + page "Its gentle song" next "puts anyone who" next "hears it to sleep.@" diff --git a/data/pokemon/dex_entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm index 9b9149d9a..4d6be5d57 100644 --- a/data/pokemon/dex_entries/jolteon.asm +++ b/data/pokemon/dex_entries/jolteon.asm @@ -1,10 +1,10 @@ -; JolteonPokedexEntry: ; 0x1cc28b db "LIGHTNING@" ; species name dw 207, 540 ; height, weight db "The negatively" next "charged ions" next "generated in its" + page "fur create a" next "constant sparking" next "noise.@" diff --git a/data/pokemon/dex_entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm index 0aade0b75..8dacd4dff 100644 --- a/data/pokemon/dex_entries/jumpluff.asm +++ b/data/pokemon/dex_entries/jumpluff.asm @@ -1,10 +1,10 @@ -; JumpluffPokedexEntry: ; 0x1cd998 db "COTTONWEED@" ; species name dw 207, 70 ; height, weight db "Even in the fierc-" next "est wind, it can" next "control its fluff" + page "to make its way to" next "any place in the" next "world it wants.@" diff --git a/data/pokemon/dex_entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm index b4b9eac8c..6f6486776 100644 --- a/data/pokemon/dex_entries/jynx.asm +++ b/data/pokemon/dex_entries/jynx.asm @@ -1,10 +1,10 @@ -; JynxPokedexEntry: ; 0x1b98c5 db "HUMANSHAPE@" ; species name dw 407, 900 ; height, weight db "It has several" next "different cry pat-" next "terns, each of" + page "which seems to" next "have its own" next "meaning.@" diff --git a/data/pokemon/dex_entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm index 9231fb9be..8a65e4cb6 100644 --- a/data/pokemon/dex_entries/kabuto.asm +++ b/data/pokemon/dex_entries/kabuto.asm @@ -1,10 +1,10 @@ -; KabutoPokedexEntry: ; 0x1cc497 db "SHELLFISH@" ; species name dw 108, 250 ; height, weight db "Three hundred" next "million years ago," next "it hid on the sea" + page "floor. It also has" next "eyes on its back" next "that glow.@" diff --git a/data/pokemon/dex_entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm index 8f5e1348b..bca687d39 100644 --- a/data/pokemon/dex_entries/kabutops.asm +++ b/data/pokemon/dex_entries/kabutops.asm @@ -1,10 +1,10 @@ -; KabutopsPokedexEntry: ; 0x1cc507 db "SHELLFISH@" ; species name dw 403, 890 ; height, weight db "It was able to" next "swim quickly thro-" next "ugh the water by" + page "compactly folding" next "up its razor-sharp" next "sickles.@" diff --git a/data/pokemon/dex_entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm index 26226724f..01fd96098 100644 --- a/data/pokemon/dex_entries/kadabra.asm +++ b/data/pokemon/dex_entries/kadabra.asm @@ -1,10 +1,10 @@ -; KadabraPokedexEntry: ; 0x18313c db "PSI@" ; species name dw 403, 1250 ; height, weight db "When it closes its" next "eyes, twice as" next "many alpha parti-" + page "cles come out of" next "the surface of its" next "body.@" diff --git a/data/pokemon/dex_entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm index 469e14bf6..3f4a1326d 100644 --- a/data/pokemon/dex_entries/kakuna.asm +++ b/data/pokemon/dex_entries/kakuna.asm @@ -1,10 +1,10 @@ -; KakunaPokedexEntry: ; 0x181c23 db "COCOON@" ; species name dw 200, 220 ; height, weight db "Nearly incapable" next "of movement, it" next "leans against" + page "stout trees while" next "waiting for its" next "evolution.@" diff --git a/data/pokemon/dex_entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm index ec2050845..c1c9d8db5 100644 --- a/data/pokemon/dex_entries/kangaskhan.asm +++ b/data/pokemon/dex_entries/kangaskhan.asm @@ -1,10 +1,10 @@ -; KangaskhanPokedexEntry: ; 0x1b94f6 db "PARENT@" ; species name dw 703, 1760 ; height, weight db "To avoid" next "crushing the" next "baby it carries in" + page "its pouch, it" next "always sleeps" next "standing up.@" diff --git a/data/pokemon/dex_entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm index 555601b51..05e79a86a 100644 --- a/data/pokemon/dex_entries/kingdra.asm +++ b/data/pokemon/dex_entries/kingdra.asm @@ -1,10 +1,10 @@ -; KingdraPokedexEntry: ; 0x1d0fd1 db "DRAGON@" ; species name dw 511, 3350 ; height, weight db "It stores energy" next "by sleeping at" next "underwater depths" + page "at which no other" next "life forms can" next "survive.@" diff --git a/data/pokemon/dex_entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm index 25685d517..2c4b17a15 100644 --- a/data/pokemon/dex_entries/kingler.asm +++ b/data/pokemon/dex_entries/kingler.asm @@ -1,10 +1,10 @@ -; KinglerPokedexEntry: ; 0x1b8e45 db "PINCER@" ; species name dw 403, 1320 ; height, weight db "Its oversized claw" next "is very powerful," next "but when it's not" + page "in battle, the" next "claw just gets in" next "the way.@" diff --git a/data/pokemon/dex_entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm index 20bde8671..a3fc0da9f 100644 --- a/data/pokemon/dex_entries/koffing.asm +++ b/data/pokemon/dex_entries/koffing.asm @@ -1,10 +1,10 @@ -; KoffingPokedexEntry: ; 0x1b9276 db "POISON GAS@" ; species name dw 200, 20 ; height, weight db "If one gets close" next "enough to it when" next "it expels poison-" + page "ous gas, the gas" next "swirling inside it" next "can be seen.@" diff --git a/data/pokemon/dex_entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm index 2435cd64d..0e0081ae6 100644 --- a/data/pokemon/dex_entries/krabby.asm +++ b/data/pokemon/dex_entries/krabby.asm @@ -1,10 +1,10 @@ -; KrabbyPokedexEntry: ; 0x1b8ddd db "RIVER CRAB@" ; species name dw 104, 140 ; height, weight db "If it is unable" next "to find food, it" next "will absorb" + page "nutrients by" next "swallowing a" next "mouthful of sand.@" diff --git a/data/pokemon/dex_entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm index 3aa2b5523..46ea41e89 100644 --- a/data/pokemon/dex_entries/lanturn.asm +++ b/data/pokemon/dex_entries/lanturn.asm @@ -1,10 +1,10 @@ -; LanturnPokedexEntry: ; 0x1cd1de db "LIGHT@" ; species name dw 311, 500 ; height, weight db "This #MON uses" next "the bright part of" next "its body, which" + page "changed from a" next "dorsal fin, to" next "lure prey.@" diff --git a/data/pokemon/dex_entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm index 550d6e12c..e074cfe02 100644 --- a/data/pokemon/dex_entries/lapras.asm +++ b/data/pokemon/dex_entries/lapras.asm @@ -1,10 +1,10 @@ -; LaprasPokedexEntry: ; 0x1cc0cd db "TRANSPORT@" ; species name dw 802, 4850 ; height, weight db "This gentle" next "#MON loves to" next "give people rides" + page "and provides a ve-" next "ry comfortable way" next "to get around.@" diff --git a/data/pokemon/dex_entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm index 14ec08c7b..fa8145626 100644 --- a/data/pokemon/dex_entries/larvitar.asm +++ b/data/pokemon/dex_entries/larvitar.asm @@ -1,10 +1,10 @@ -; LarvitarPokedexEntry: ; 0x1d169c db "ROCK SKIN@" ; species name dw 200, 1590 ; height, weight db "Born deep under-" next "ground, this" next "#MON becomes a" + page "pupa after eating" next "enough dirt to" next "make a mountain.@" diff --git a/data/pokemon/dex_entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm index a112aa722..90a21d427 100644 --- a/data/pokemon/dex_entries/ledian.asm +++ b/data/pokemon/dex_entries/ledian.asm @@ -1,10 +1,10 @@ -; LedianPokedexEntry: ; 0x1ccfa0 db "FIVE STAR@" ; species name dw 407, 780 ; height, weight db "In the daytime" next "when it gets warm," next "it curls up inside" + page "a big leaf and" next "drifts off into" next "a deep slumber.@" diff --git a/data/pokemon/dex_entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm index 1e62ab4b1..71ed42a8d 100644 --- a/data/pokemon/dex_entries/ledyba.asm +++ b/data/pokemon/dex_entries/ledyba.asm @@ -1,10 +1,10 @@ -; LedybaPokedexEntry: ; 0x1ccf2c db "FIVE STAR@" ; species name dw 303, 240 ; height, weight db "It is timid and" next "clusters together" next "with others. The" + page "fluid secreted by" next "its feet indicates" next "its location.@" diff --git a/data/pokemon/dex_entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm index 0003f14dc..b5aa73af5 100644 --- a/data/pokemon/dex_entries/lickitung.asm +++ b/data/pokemon/dex_entries/lickitung.asm @@ -1,10 +1,10 @@ -; LickitungPokedexEntry: ; 0x1b9210 db "LICKING@" ; species name dw 311, 1440 ; height, weight db "It has a tongue" next "that is over 6'6''" next "long. It uses this" + page "long tongue to" next "lick its body" next "clean.@" diff --git a/data/pokemon/dex_entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm index c15345300..8fa0dcf1f 100644 --- a/data/pokemon/dex_entries/lugia.asm +++ b/data/pokemon/dex_entries/lugia.asm @@ -1,10 +1,10 @@ -; LugiaPokedexEntry: ; 0x1d17e9 db "DIVING@" ; species name dw 1701, 4760 ; height, weight db "It has an incred-" next "ible ability to" next "calm raging sto-" + page "rms. It is said" next "that LUGIA appears" next "when storms start.@" diff --git a/data/pokemon/dex_entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm index 0ff42bf5f..2a84a6815 100644 --- a/data/pokemon/dex_entries/machamp.asm +++ b/data/pokemon/dex_entries/machamp.asm @@ -1,10 +1,10 @@ -; MachampPokedexEntry: ; 0x1b8133 db "SUPERPOWER@" ; species name dw 503, 2870 ; height, weight db "With four arms" next "that react more" next "quickly than it" + page "can think, it can" next "execute many" next "punches at once.@" diff --git a/data/pokemon/dex_entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm index 53523a832..fa7642ee7 100644 --- a/data/pokemon/dex_entries/machoke.asm +++ b/data/pokemon/dex_entries/machoke.asm @@ -1,10 +1,10 @@ -; MachokePokedexEntry: ; 0x1b80cb db "SUPERPOWER@" ; species name dw 411, 1550 ; height, weight db "This tough #MON" next "always stays in" next "the zone. Its" + page "muscles become" next "thicker after" next "every battle.@" diff --git a/data/pokemon/dex_entries/machop.asm b/data/pokemon/dex_entries/machop.asm index aba71bc04..d50eb0aa7 100644 --- a/data/pokemon/dex_entries/machop.asm +++ b/data/pokemon/dex_entries/machop.asm @@ -1,10 +1,10 @@ -; MachopPokedexEntry: ; 0x1b8065 db "SUPERPOWER@" ; species name dw 207, 430 ; height, weight db "It trains by" next "lifting rocks in" next "the mountains. It" + page "can even pick up a" next "GRAVELER with" next "ease.@" diff --git a/data/pokemon/dex_entries/magby.asm b/data/pokemon/dex_entries/magby.asm index 53f9e1129..013d96670 100644 --- a/data/pokemon/dex_entries/magby.asm +++ b/data/pokemon/dex_entries/magby.asm @@ -1,10 +1,10 @@ -; MagbyPokedexEntry: ; 0x1d140e db "LIVE COAL@" ; species name dw 204, 470 ; height, weight db "It naturally spits" next "an 1100-degree" next "flame. It is said" + page "when many appear," next "it heralds a" next "volcanic eruption.@" diff --git a/data/pokemon/dex_entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm index 5f1122906..8bbb84593 100644 --- a/data/pokemon/dex_entries/magcargo.asm +++ b/data/pokemon/dex_entries/magcargo.asm @@ -1,10 +1,10 @@ -; MagcargoPokedexEntry: ; 0x1d0b21 db "LAVA@" ; species name dw 207, 1210 ; height, weight db "Its body is as hot" next "as lava and is" next "always billowing." + page "Flames will" next "occasionally burst" next "from its shell.@" diff --git a/data/pokemon/dex_entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm index 765840899..2be156fcc 100644 --- a/data/pokemon/dex_entries/magikarp.asm +++ b/data/pokemon/dex_entries/magikarp.asm @@ -1,10 +1,10 @@ -; MagikarpPokedexEntry: ; 0x1cc000 db "FISH@" ; species name dw 211, 220 ; height, weight db "This weak and" next "pathetic #MON" next "gets easily pushed" + page "along rivers when" next "there are strong" next "currents.@" diff --git a/data/pokemon/dex_entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm index 1bfa961f9..f62544b50 100644 --- a/data/pokemon/dex_entries/magmar.asm +++ b/data/pokemon/dex_entries/magmar.asm @@ -1,10 +1,10 @@ -; MagmarPokedexEntry: ; 0x1b9994 db "SPITFIRE@" ; species name dw 403, 980 ; height, weight db "It moves more" next "frequently in hot" next "areas. It can heal" + page "itself by dipping" next "its wound into" next "lava.@" diff --git a/data/pokemon/dex_entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm index e7703e050..646bd80f4 100644 --- a/data/pokemon/dex_entries/magnemite.asm +++ b/data/pokemon/dex_entries/magnemite.asm @@ -1,10 +1,10 @@ -; MagnemitePokedexEntry: ; 0x1b869d db "MAGNET@" ; species name dw 100, 130 ; height, weight db "The electricity" next "emitted by the" next "units on each side" + page "of its body cause" next "it to become a" next "strong magnet.@" diff --git a/data/pokemon/dex_entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm index 115506ad6..fff66dec7 100644 --- a/data/pokemon/dex_entries/magneton.asm +++ b/data/pokemon/dex_entries/magneton.asm @@ -1,10 +1,10 @@ -; MagnetonPokedexEntry: ; 0x1b870a db "MAGNET@" ; species name dw 303, 1320 ; height, weight db "When many" next "MAGNETON gather" next "together, the" + page "resulting magnetic" next "storm disrupts" next "radio waves.@" diff --git a/data/pokemon/dex_entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm index 59dfc4919..344e6ca0f 100644 --- a/data/pokemon/dex_entries/mankey.asm +++ b/data/pokemon/dex_entries/mankey.asm @@ -1,10 +1,10 @@ -; MankeyPokedexEntry: ; 0x182dbd db "PIG MONKEY@" ; species name dw 108, 620 ; height, weight db "It lives in groups" next "in the treetops." next "If it loses sight" + page "of its group, it" next "becomes infuriated" next "by its loneliness.@" diff --git a/data/pokemon/dex_entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm index 880c4f179..02d4c445a 100644 --- a/data/pokemon/dex_entries/mantine.asm +++ b/data/pokemon/dex_entries/mantine.asm @@ -1,10 +1,10 @@ -; MantinePokedexEntry: ; 0x1d0e25 db "KITE@" ; species name dw 611, 4850 ; height, weight db "It swims along" next "freely, eating" next "things that swim" + page "into its mouth." next "Its whole body is" next "very coarse.@" diff --git a/data/pokemon/dex_entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm index 94f78ee31..3f0492ade 100644 --- a/data/pokemon/dex_entries/mareep.asm +++ b/data/pokemon/dex_entries/mareep.asm @@ -1,10 +1,10 @@ -; MareepPokedexEntry: ; 0x1cd551 db "WOOL@" ; species name dw 200, 170 ; height, weight db "It stores lots of" next "air in its soft" next "fur, allowing it" + page "to stay cool in" next "summer and warm" next "in winter.@" diff --git a/data/pokemon/dex_entries/marill.asm b/data/pokemon/dex_entries/marill.asm index 6afbc2902..1b87ba23c 100644 --- a/data/pokemon/dex_entries/marill.asm +++ b/data/pokemon/dex_entries/marill.asm @@ -1,10 +1,10 @@ -; MarillPokedexEntry: ; 0x1cd705 db "AQUAMOUSE@" ; species name dw 104, 190 ; height, weight db "The fur on its" next "body naturally" next "repels water. It" + page "can stay dry, even" next "when it plays in" next "the water.@" diff --git a/data/pokemon/dex_entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm index 01baf04e3..18b3f2e5d 100644 --- a/data/pokemon/dex_entries/marowak.asm +++ b/data/pokemon/dex_entries/marowak.asm @@ -1,10 +1,10 @@ -; MarowakPokedexEntry: ; 0x1b90d2 db "BONEKEEPER@" ; species name dw 303, 990 ; height, weight db "Somewhere in the" next "world is a ceme-" next "tery just for" + page "MAROWAK. It gets" next "its bones from" next "those graves.@" diff --git a/data/pokemon/dex_entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm index dead64ff5..711c12b57 100644 --- a/data/pokemon/dex_entries/meganium.asm +++ b/data/pokemon/dex_entries/meganium.asm @@ -1,10 +1,10 @@ -; MeganiumPokedexEntry: ; 0x1cca54 db "HERB@" ; species name dw 511, 2220 ; height, weight db "Anyone who stands" next "beside it becomes" next "refreshed, just as" + page "if they were" next "relaxing in a" next "sunny forest.@" diff --git a/data/pokemon/dex_entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm index 9fe66977b..9897a3b60 100644 --- a/data/pokemon/dex_entries/meowth.asm +++ b/data/pokemon/dex_entries/meowth.asm @@ -1,10 +1,10 @@ -; MeowthPokedexEntry: ; 0x182c08 db "SCRATCHCAT@" ; species name dw 104, 90 ; height, weight db "It loves things" next "that sparkle. When" next "it sees a shiny" + page "object, the gold" next "coin on its head" next "shines too.@" diff --git a/data/pokemon/dex_entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm index b2c6b78b7..9ee9b8a71 100644 --- a/data/pokemon/dex_entries/metapod.asm +++ b/data/pokemon/dex_entries/metapod.asm @@ -1,10 +1,10 @@ -; MetapodPokedexEntry: ; 0x181ace db "COCOON@" ; species name dw 204, 220 ; height, weight db "This is its pre-" next "evolved form. At" next "this stage, it can" + page "only harden, so it" next "remains motionless" next "to avoid attack.@" diff --git a/data/pokemon/dex_entries/mew.asm b/data/pokemon/dex_entries/mew.asm index 9da7f6a17..66682b14c 100644 --- a/data/pokemon/dex_entries/mew.asm +++ b/data/pokemon/dex_entries/mew.asm @@ -1,10 +1,10 @@ -; MewPokedexEntry: ; 0x1cc915 db "NEW SPECIE@" ; species name dw 104, 90 ; height, weight db "Because it can" next "learn any move," next "some people began" + page "research to see if" next "it is the ancestor" next "of all #MON.@" diff --git a/data/pokemon/dex_entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm index eb41ebb90..c49e553d5 100644 --- a/data/pokemon/dex_entries/mewtwo.asm +++ b/data/pokemon/dex_entries/mewtwo.asm @@ -1,10 +1,10 @@ -; MewtwoPokedexEntry: ; 0x1cc8ae db "GENETIC@" ; species name dw 607, 2690 ; height, weight db "Said to rest qui-" next "etly in an" next "undiscovered cave," + page "this #MON was" next "created solely for" next "battling.@" diff --git a/data/pokemon/dex_entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm index 1f85ef668..660f652bc 100644 --- a/data/pokemon/dex_entries/miltank.asm +++ b/data/pokemon/dex_entries/miltank.asm @@ -1,10 +1,10 @@ -; MiltankPokedexEntry: ; 0x1d1482 db "MILK COW@" ; species name dw 311, 1660 ; height, weight db "In order to milk a" next "MILTANK, one must" next "have a knack for" + page "rhythmically pull-" next "ing up and down" next "on its udders.@" diff --git a/data/pokemon/dex_entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm index c3f1b002a..6e7e510a7 100644 --- a/data/pokemon/dex_entries/misdreavus.asm +++ b/data/pokemon/dex_entries/misdreavus.asm @@ -1,10 +1,10 @@ -; MisdreavusPokedexEntry: ; 0x1d0301 db "SCREECH@" ; species name dw 204, 20 ; height, weight db "It loves to watch" next "people it's scar-" next "ed. It frightens" + page "them by screaming" next "loudly or appear-" next "ing suddenly.@" diff --git a/data/pokemon/dex_entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm index f459d622e..d4ec793d5 100644 --- a/data/pokemon/dex_entries/moltres.asm +++ b/data/pokemon/dex_entries/moltres.asm @@ -1,10 +1,10 @@ -; MoltresPokedexEntry: ; 0x1cc706 db "FLAME@" ; species name dw 607, 1320 ; height, weight db "Legendary bird" next "#MON. It is" next "said to migrate" + page "from the south" next "along with the" next "spring.@" diff --git a/data/pokemon/dex_entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm index dce25be67..d96b9b37b 100644 --- a/data/pokemon/dex_entries/mr__mime.asm +++ b/data/pokemon/dex_entries/mr__mime.asm @@ -1,10 +1,10 @@ -; MrMimePokedexEntry: ; 0x1b97ea db "BARRIER@" ; species name dw 403, 1200 ; height, weight db "It uses the" next "mysterious" next "power it has in" + page "its fingers to" next "solidify air into" next "an invisible wall.@" diff --git a/data/pokemon/dex_entries/muk.asm b/data/pokemon/dex_entries/muk.asm index 49512c99f..6db1f1867 100644 --- a/data/pokemon/dex_entries/muk.asm +++ b/data/pokemon/dex_entries/muk.asm @@ -1,10 +1,10 @@ -; MukPokedexEntry: ; 0x1b89fc db "SLUDGE@" ; species name dw 311, 660 ; height, weight db "As it moves, a" next "very strong poison" next "leaks from it," + page "making the ground" next "there barren for" next "three years.@" diff --git a/data/pokemon/dex_entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm index 6a0f42145..90d90bfbf 100644 --- a/data/pokemon/dex_entries/murkrow.asm +++ b/data/pokemon/dex_entries/murkrow.asm @@ -1,10 +1,10 @@ -; MurkrowPokedexEntry: ; 0x1d021e db "DARKNESS@" ; species name dw 108, 50 ; height, weight db "It hides any shiny" next "object it finds in" next "a secret location." + page "MURKROW and" next "MEOWTH loot one" next "another's stashes.@" diff --git a/data/pokemon/dex_entries/natu.asm b/data/pokemon/dex_entries/natu.asm index 20958dbff..04c47970c 100644 --- a/data/pokemon/dex_entries/natu.asm +++ b/data/pokemon/dex_entries/natu.asm @@ -1,10 +1,10 @@ -; NatuPokedexEntry: ; 0x1cd47d db "LITTLE BIRD@" ; species name dw 8, 40 ; height, weight db "It is extremely" next "good at climbing" next "tree trunks and" + page "likes to eat the" next "new sprouts on" next "the trees.@" diff --git a/data/pokemon/dex_entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm index 97c203064..a260ceadb 100644 --- a/data/pokemon/dex_entries/nidoking.asm +++ b/data/pokemon/dex_entries/nidoking.asm @@ -1,10 +1,10 @@ -; NidokingPokedexEntry: ; 0x182463 db "DRILL@" ; species name dw 407, 1370 ; height, weight db "It uses its thick" next "arms, legs and" next "tail to attack" + page "forcefully. Melee" next "combat is its" next "specialty.@" diff --git a/data/pokemon/dex_entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm index c0f711eb4..534546721 100644 --- a/data/pokemon/dex_entries/nidoqueen.asm +++ b/data/pokemon/dex_entries/nidoqueen.asm @@ -1,10 +1,10 @@ -; NidoqueenPokedexEntry: ; 0x18232e db "DRILL@" ; species name dw 403, 1320 ; height, weight db "The hard scales" next "that cover its" next "strong body serve" + page "as excellent" next "protection from" next "any attack.@" diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm index 4e7299b0d..9181edc20 100644 --- a/data/pokemon/dex_entries/nidoran_f.asm +++ b/data/pokemon/dex_entries/nidoran_f.asm @@ -1,10 +1,10 @@ -; NidoranFPokedexEntry: ; 0x18224b db "POISON PIN@" ; species name dw 104, 150 ; height, weight db "Small and very" next "docile, it pro-" next "tects itself with" + page "its small, poison-" next "ous horn when" next "attacked.@" diff --git a/data/pokemon/dex_entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm index 8970afc36..51ec0a530 100644 --- a/data/pokemon/dex_entries/nidoran_m.asm +++ b/data/pokemon/dex_entries/nidoran_m.asm @@ -1,10 +1,10 @@ -; NidoranMPokedexEntry: ; 0x182392 db "POISON PIN@" ; species name dw 108, 200 ; height, weight db "It constantly" next "moves its large" next "ears in many" + page "directions in" next "order to detect" next "danger right away.@" diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm index 93c1e164d..e1670a187 100644 --- a/data/pokemon/dex_entries/nidorina.asm +++ b/data/pokemon/dex_entries/nidorina.asm @@ -1,10 +1,10 @@ -; NidorinaPokedexEntry: ; 0x1822b6 db "POISON PIN@" ; species name dw 207, 440 ; height, weight db "It has a docile" next "nature. If it is" next "threatened with" + page "attack, it raises" next "the barbs that are" next "all over its body.@" diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm index 6b1403ad2..3f00ac0a5 100644 --- a/data/pokemon/dex_entries/nidorino.asm +++ b/data/pokemon/dex_entries/nidorino.asm @@ -1,10 +1,10 @@ -; NidorinoPokedexEntry: ; 0x1823fd db "POISON PIN@" ; species name dw 211, 430 ; height, weight db "It is easily" next "agitated and uses" next "its horn for" + page "offense as soon as" next "it notices an" next "attacker.@" diff --git a/data/pokemon/dex_entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm index fd3a66ffb..c0295e0f7 100644 --- a/data/pokemon/dex_entries/ninetales.asm +++ b/data/pokemon/dex_entries/ninetales.asm @@ -1,10 +1,10 @@ -; NinetalesPokedexEntry: ; 0x18260c db "FOX@" ; species name dw 307, 440 ; height, weight db "It is said to live" next "a thousand years," next "and each of its" + page "tails is loaded" next "with supernatural" next "powers.@" diff --git a/data/pokemon/dex_entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm index b939cfe05..ed04cb200 100644 --- a/data/pokemon/dex_entries/noctowl.asm +++ b/data/pokemon/dex_entries/noctowl.asm @@ -1,10 +1,10 @@ -; NoctowlPokedexEntry: ; 0x1cceb9 db "OWL@" ; species name dw 503, 900 ; height, weight db "Its extremely soft" next "feathers make no" next "sound in flight." + page "It silently sneaks" next "up on prey without" next "being detected.@" diff --git a/data/pokemon/dex_entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm index 902c1bf9a..66c539155 100644 --- a/data/pokemon/dex_entries/octillery.asm +++ b/data/pokemon/dex_entries/octillery.asm @@ -1,10 +1,10 @@ -; OctilleryPokedexEntry: ; 0x1d0d42 db "JET@" ; species name dw 211, 630 ; height, weight db "Its instinct is to" next "bury itself in" next "holes. It often" + page "steals the nesting" next "holes of others to" next "sleep in them.@" diff --git a/data/pokemon/dex_entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm index 84560c113..e8a63d81f 100644 --- a/data/pokemon/dex_entries/oddish.asm +++ b/data/pokemon/dex_entries/oddish.asm @@ -1,10 +1,10 @@ -; OddishPokedexEntry: ; 0x182836 db "WEED@" ; species name dw 108, 120 ; height, weight db "During the day, it" next "stays in the cold" next "underground to" + page "avoid the sun." next "It grows by bath-" next "ing in moonlight.@" diff --git a/data/pokemon/dex_entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm index 9f7948fe0..70c556910 100644 --- a/data/pokemon/dex_entries/omanyte.asm +++ b/data/pokemon/dex_entries/omanyte.asm @@ -1,10 +1,10 @@ -; OmanytePokedexEntry: ; 0x1cc3c1 db "SPIRAL@" ; species name dw 104, 170 ; height, weight db "In prehistoric" next "times, it swam on" next "the sea floor," + page "eating plankton." next "Its fossils are" next "sometimes found.@" diff --git a/data/pokemon/dex_entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm index 65ba92356..f2cc0caba 100644 --- a/data/pokemon/dex_entries/omastar.asm +++ b/data/pokemon/dex_entries/omastar.asm @@ -1,10 +1,10 @@ -; OmastarPokedexEntry: ; 0x1cc42e db "SPIRAL@" ; species name dw 303, 770 ; height, weight db "Its heavy shell" next "allowed it to" next "reach only nearby" + page "food. This could" next "be the reason it" next "is extinct.@" diff --git a/data/pokemon/dex_entries/onix.asm b/data/pokemon/dex_entries/onix.asm index f0f88fcff..12164c5fb 100644 --- a/data/pokemon/dex_entries/onix.asm +++ b/data/pokemon/dex_entries/onix.asm @@ -1,10 +1,10 @@ -; OnixPokedexEntry: ; 0x1b8c98 db "ROCK SNAKE@" ; species name dw 2810, 4630 ; height, weight db "As it digs through" next "the ground, it" next "absorbs many hard" + page "objects. This is" next "what makes its" next "body so solid.@" diff --git a/data/pokemon/dex_entries/paras.asm b/data/pokemon/dex_entries/paras.asm index 152e1fcc0..62d473c53 100644 --- a/data/pokemon/dex_entries/paras.asm +++ b/data/pokemon/dex_entries/paras.asm @@ -1,10 +1,10 @@ -; ParasPokedexEntry: ; 0x18297f db "MUSHROOM@" ; species name dw 100, 120 ; height, weight db "The tochukaso" next "growing on this" next "#MON's back" + page "orders it to" next "extract juice from" next "tree trunks.@" diff --git a/data/pokemon/dex_entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm index bd912212e..6fbf4f7f9 100644 --- a/data/pokemon/dex_entries/parasect.asm +++ b/data/pokemon/dex_entries/parasect.asm @@ -1,10 +1,10 @@ -; ParasectPokedexEntry: ; 0x1829e2 db "MUSHROOM@" ; species name dw 303, 650 ; height, weight db "When nothing's" next "left to extract" next "from the bug, the" + page "mushrooms on its" next "back leave spores" next "on the bug's egg.@" diff --git a/data/pokemon/dex_entries/persian.asm b/data/pokemon/dex_entries/persian.asm index 7ce74f6f8..9264eeca2 100644 --- a/data/pokemon/dex_entries/persian.asm +++ b/data/pokemon/dex_entries/persian.asm @@ -1,10 +1,10 @@ -; PersianPokedexEntry: ; 0x182c78 db "CLASSY CAT@" ; species name dw 303, 710 ; height, weight db "Behind its lithe," next "elegant appearance" next "lies a barbaric" + page "side. It will tear" next "apart its prey on" next "a mere whim.@" diff --git a/data/pokemon/dex_entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm index a7393e546..c32a6889e 100644 --- a/data/pokemon/dex_entries/phanpy.asm +++ b/data/pokemon/dex_entries/phanpy.asm @@ -1,10 +1,10 @@ -; PhanpyPokedexEntry: ; 0x1d1038 db "LONG NOSE@" ; species name dw 108, 740 ; height, weight db "During the desert-" next "ed morning hours," next "it comes ashore" + page "where it deftly" next "uses its trunk to" next "take a shower.@" diff --git a/data/pokemon/dex_entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm index b31976aaf..2d82c6fb1 100644 --- a/data/pokemon/dex_entries/pichu.asm +++ b/data/pokemon/dex_entries/pichu.asm @@ -1,10 +1,10 @@ -; PichuPokedexEntry: ; 0x1cd243 db "TINY MOUSE@" ; species name dw 100, 40 ; height, weight db "It is unskilled at" next "storing electric" next "power. Any kind of" + page "shock causes it to" next "discharge energy" next "spontaneously.@" diff --git a/data/pokemon/dex_entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm index 16a877427..07df086f2 100644 --- a/data/pokemon/dex_entries/pidgeot.asm +++ b/data/pokemon/dex_entries/pidgeot.asm @@ -1,10 +1,10 @@ -; PidgeotPokedexEntry: ; 0x181dd7 db "BIRD@" ; species name dw 411, 870 ; height, weight db "Its outstanding" next "vision allows it" next "to spot splashing" + page "MAGIKARP, even" next "while flying at" next "3300 feet.@" diff --git a/data/pokemon/dex_entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm index 1ab6fde5c..30a1ccebd 100644 --- a/data/pokemon/dex_entries/pidgeotto.asm +++ b/data/pokemon/dex_entries/pidgeotto.asm @@ -1,10 +1,10 @@ -; PidgeottoPokedexEntry: ; 0x181d75 db "BIRD@" ; species name dw 307, 660 ; height, weight db "It slowly flies in" next "a circular pat-" next "tern, all the" + page "while keeping a" next "sharp lookout for" next "prey.@" diff --git a/data/pokemon/dex_entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm index 491dfb9b9..cde05eb61 100644 --- a/data/pokemon/dex_entries/pidgey.asm +++ b/data/pokemon/dex_entries/pidgey.asm @@ -1,10 +1,10 @@ -; PidgeyPokedexEntry: ; 0x181cfa db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "It rapidly flaps" next "its wings in the" next "grass, stirring up" + page "a dust cloud that" next "drives insect prey" next "out into the open.@" diff --git a/data/pokemon/dex_entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm index 680e24673..699900f18 100644 --- a/data/pokemon/dex_entries/pikachu.asm +++ b/data/pokemon/dex_entries/pikachu.asm @@ -1,10 +1,10 @@ -; PikachuPokedexEntry: ; 0x1820ad db "MOUSE@" ; species name dw 104, 130 ; height, weight db "When it is anger-" next "ed, it immediately" next "discharges the" + page "energy stored in" next "the pouches in its" next "cheeks.@" diff --git a/data/pokemon/dex_entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm index 326ea4503..1c5aa36c0 100644 --- a/data/pokemon/dex_entries/piloswine.asm +++ b/data/pokemon/dex_entries/piloswine.asm @@ -1,10 +1,10 @@ -; PiloswinePokedexEntry: ; 0x1d0c01 db "SWINE@" ; species name dw 307, 1230 ; height, weight db "Although its legs" next "are short, its" next "rugged hooves" + page "prevent it from" next "slipping, even on" next "icy ground.@" diff --git a/data/pokemon/dex_entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm index 9781b094e..7d8d990b9 100644 --- a/data/pokemon/dex_entries/pineco.asm +++ b/data/pokemon/dex_entries/pineco.asm @@ -1,10 +1,10 @@ -; PinecoPokedexEntry: ; 0x1d04b0 db "BAGWORM@" ; species name dw 200, 160 ; height, weight db "It spits out a" next "fluid that it uses" next "to glue tree bark" + page "to its body. The" next "fluid hardens when" next "it touches air.@" diff --git a/data/pokemon/dex_entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm index c236b3594..331a8d4f5 100644 --- a/data/pokemon/dex_entries/pinsir.asm +++ b/data/pokemon/dex_entries/pinsir.asm @@ -1,10 +1,10 @@ -; PinsirPokedexEntry: ; 0x1b99fb db "STAGBEETLE@" ; species name dw 411, 1210 ; height, weight db "When the tempera-" next "ture drops at" next "night, it sleeps" + page "on treetops or" next "among roots where" next "it is well hidden.@" diff --git a/data/pokemon/dex_entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm index 0dea3d572..a085ad58a 100644 --- a/data/pokemon/dex_entries/politoed.asm +++ b/data/pokemon/dex_entries/politoed.asm @@ -1,10 +1,10 @@ -; PolitoedPokedexEntry: ; 0x1cd84b db "FROG@" ; species name dw 307, 750 ; height, weight db "When it expands" next "its throat to" next "croak out a tune," + page "nearby POLIWAG and" next "POLIWHIRL gather" next "immediately.@" diff --git a/data/pokemon/dex_entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm index d21677cc4..9183a15da 100644 --- a/data/pokemon/dex_entries/poliwag.asm +++ b/data/pokemon/dex_entries/poliwag.asm @@ -1,10 +1,10 @@ -; PoliwagPokedexEntry: ; 0x182f91 db "TADPOLE@" ; species name dw 200, 270 ; height, weight db "The swirl on its" next "belly is its" next "insides showing" + page "through the skin." next "It looks clearer" next "after it eats.@" diff --git a/data/pokemon/dex_entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm index 69a6ee206..df4e0e6fd 100644 --- a/data/pokemon/dex_entries/poliwhirl.asm +++ b/data/pokemon/dex_entries/poliwhirl.asm @@ -1,10 +1,10 @@ -; PoliwhirlPokedexEntry: ; 0x182ffd db "TADPOLE@" ; species name dw 303, 440 ; height, weight db "Though it is" next "skilled at walk-" next "ing, it prefers to" + page "live underwater" next "where there is" next "less danger.@" diff --git a/data/pokemon/dex_entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm index bb3e7dda5..4b4f23389 100644 --- a/data/pokemon/dex_entries/poliwrath.asm +++ b/data/pokemon/dex_entries/poliwrath.asm @@ -1,10 +1,10 @@ -; PoliwrathPokedexEntry: ; 0x183066 db "TADPOLE@" ; species name dw 403, 1190 ; height, weight db "It can use its" next "well-developed" next "arms and legs to" + page "run on the surface" next "of the water for a" next "split second.@" diff --git a/data/pokemon/dex_entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm index fa123cde1..0d82b7702 100644 --- a/data/pokemon/dex_entries/ponyta.asm +++ b/data/pokemon/dex_entries/ponyta.asm @@ -1,10 +1,10 @@ -; PonytaPokedexEntry: ; 0x1b84f2 db "FIRE HORSE@" ; species name dw 303, 660 ; height, weight db "Training by" next "jumping over grass" next "that grows longer" + page "every day has made" next "it a world-class" next "jumper.@" diff --git a/data/pokemon/dex_entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm index 9a73c9623..098a96d25 100644 --- a/data/pokemon/dex_entries/porygon.asm +++ b/data/pokemon/dex_entries/porygon.asm @@ -1,10 +1,10 @@ -; PorygonPokedexEntry: ; 0x1cc353 db "VIRTUAL@" ; species name dw 207, 800 ; height, weight db "An artificial" next "#MON created" next "due to extensive" + page "research, it can" next "perform only what" next "is in its program.@" diff --git a/data/pokemon/dex_entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm index 8591e0039..e4f5a2358 100644 --- a/data/pokemon/dex_entries/porygon2.asm +++ b/data/pokemon/dex_entries/porygon2.asm @@ -1,10 +1,10 @@ -; Porygon2PokedexEntry: ; 0x1d110c db "VIRTUAL@" ; species name dw 200, 720 ; height, weight db "This manmade" next "#MON evolved" next "from the latest" + page "technology. It" next "may have unprog-" next "rammed reactions.@" diff --git a/data/pokemon/dex_entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm index 7d7f211cc..3a96c936c 100644 --- a/data/pokemon/dex_entries/primeape.asm +++ b/data/pokemon/dex_entries/primeape.asm @@ -1,10 +1,10 @@ -; PrimeapePokedexEntry: ; 0x182e39 db "PIG MONKEY@" ; species name dw 303, 710 ; height, weight db "It will beat up" next "anyone who makes" next "it mad, even if it" + page "has to chase them" next "until the end of" next "the world.@" diff --git a/data/pokemon/dex_entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm index 088b4ff76..6a58bc9f8 100644 --- a/data/pokemon/dex_entries/psyduck.asm +++ b/data/pokemon/dex_entries/psyduck.asm @@ -1,10 +1,10 @@ -; PsyduckPokedexEntry: ; 0x182cee db "DUCK@" ; species name dw 207, 430 ; height, weight db "The only time it" next "can use its psy-" next "chic power is when" + page "its sleeping brain" next "cells happen to" next "wake.@" diff --git a/data/pokemon/dex_entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm index d35e457ad..ae8b5b3a4 100644 --- a/data/pokemon/dex_entries/pupitar.asm +++ b/data/pokemon/dex_entries/pupitar.asm @@ -1,10 +1,10 @@ -; PupitarPokedexEntry: ; 0x1d1709 db "HARD SHELL@" ; species name dw 311, 3350 ; height, weight db "It will not stay" next "still, even while" next "it's a pupa. It" + page "already has arms" next "and legs under its" next "solid shell.@" diff --git a/data/pokemon/dex_entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm index 053058d54..25bb2ab66 100644 --- a/data/pokemon/dex_entries/quagsire.asm +++ b/data/pokemon/dex_entries/quagsire.asm @@ -1,10 +1,10 @@ -; QuagsirePokedexEntry: ; 0x1d00dd db "WATER FISH@" ; species name dw 407, 1650 ; height, weight db "Its body is always" next "slimy. It often" next "bangs its head on" + page "the river bottom" next "as it swims but" next "seems not to care.@" diff --git a/data/pokemon/dex_entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm index aaf8069af..97363c158 100644 --- a/data/pokemon/dex_entries/quilava.asm +++ b/data/pokemon/dex_entries/quilava.asm @@ -1,10 +1,10 @@ -; QuilavaPokedexEntry: ; 0x1ccb33 db "VOLCANO@" ; species name dw 211, 420 ; height, weight db "Before battle, it" next "turns its back on" next "its opponent to" + page "demonstrate how" next "ferociously its" next "fire blazes.@" diff --git a/data/pokemon/dex_entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm index d9529146f..c7405b980 100644 --- a/data/pokemon/dex_entries/qwilfish.asm +++ b/data/pokemon/dex_entries/qwilfish.asm @@ -1,10 +1,10 @@ -; QwilfishPokedexEntry: ; 0x1d07b1 db "BALLOON@" ; species name dw 108, 90 ; height, weight db "When faced with a" next "larger opponent," next "it swallows as" + page "much water as it" next "can to match the" next "opponent's size.@" diff --git a/data/pokemon/dex_entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm index 886aef283..a17a5e9c2 100644 --- a/data/pokemon/dex_entries/raichu.asm +++ b/data/pokemon/dex_entries/raichu.asm @@ -1,10 +1,10 @@ -; RaichuPokedexEntry: ; 0x182117 db "MOUSE@" ; species name dw 207, 660 ; height, weight db "If its electric" next "pouches run empty," next "it raises its tail" + page "to gather electri-" next "city from the" next "atmosphere.@" diff --git a/data/pokemon/dex_entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm index 315eb84ae..4f300635f 100644 --- a/data/pokemon/dex_entries/raikou.asm +++ b/data/pokemon/dex_entries/raikou.asm @@ -1,10 +1,10 @@ -; RaikouPokedexEntry: ; 0x1d156b db "THUNDER@" ; species name dw 603, 3920 ; height, weight db "This rough #MON" next "stores energy" next "inside its body," + page "then sweeps across" next "the land, shooting" next "off electricity.@" diff --git a/data/pokemon/dex_entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm index ae98e2cb8..051e557ef 100644 --- a/data/pokemon/dex_entries/rapidash.asm +++ b/data/pokemon/dex_entries/rapidash.asm @@ -1,10 +1,10 @@ -; RapidashPokedexEntry: ; 0x1b855e db "FIRE HORSE@" ; species name dw 507, 2090 ; height, weight db "It just loves to" next "gallop. The faster" next "it goes, the long-" + page "er the swaying" next "flames of its mane" next "will become.@" diff --git a/data/pokemon/dex_entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm index f009c29aa..50898dda3 100644 --- a/data/pokemon/dex_entries/raticate.asm +++ b/data/pokemon/dex_entries/raticate.asm @@ -1,10 +1,10 @@ -; RaticatePokedexEntry: ; 0x181ea3 db "RAT@" ; species name dw 204, 410 ; height, weight db "The webs on its" next "hind legs enable" next "it to cross" + page "rivers. It search-" next "es wide areas for" next "food.@" diff --git a/data/pokemon/dex_entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm index 0a066eb74..f9e801b52 100644 --- a/data/pokemon/dex_entries/rattata.asm +++ b/data/pokemon/dex_entries/rattata.asm @@ -1,10 +1,10 @@ -; RattataPokedexEntry: ; 0x181e3d db "RAT@" ; species name dw 100, 80 ; height, weight db "This #MON's" next "impressive vital-" next "ity allows it to" + page "live anywhere. It" next "also multiplies" next "very quickly.@" diff --git a/data/pokemon/dex_entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm index aaa6f1a49..1b9b0e562 100644 --- a/data/pokemon/dex_entries/remoraid.asm +++ b/data/pokemon/dex_entries/remoraid.asm @@ -1,10 +1,10 @@ -; RemoraidPokedexEntry: ; 0x1d0cd3 db "JET@" ; species name dw 200, 260 ; height, weight db "To escape from an" next "attacker, it may" next "shoot water out of" + page "its mouth, then" next "use that force to" next "swim backward.@" diff --git a/data/pokemon/dex_entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm index c820666b3..c81141343 100644 --- a/data/pokemon/dex_entries/rhydon.asm +++ b/data/pokemon/dex_entries/rhydon.asm @@ -1,10 +1,10 @@ -; RhydonPokedexEntry: ; 0x1b93c5 db "DRILL@" ; species name dw 603, 2650 ; height, weight db "By lightly spin-" next "ning its drill-" next "like horn, it can" + page "easily shatter" next "even a diamond in" next "the rough.@" diff --git a/data/pokemon/dex_entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm index b2f26e204..d7dd8d7e1 100644 --- a/data/pokemon/dex_entries/rhyhorn.asm +++ b/data/pokemon/dex_entries/rhyhorn.asm @@ -1,10 +1,10 @@ -; RhyhornPokedexEntry: ; 0x1b935d db "SPIKES@" ; species name dw 303, 2540 ; height, weight db "It can remember" next "only one thing at" next "a time. Once it" + page "starts rushing, it" next "forgets why it" next "started.@" diff --git a/data/pokemon/dex_entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm index 2ef83f9c3..570907b31 100644 --- a/data/pokemon/dex_entries/sandshrew.asm +++ b/data/pokemon/dex_entries/sandshrew.asm @@ -1,10 +1,10 @@ -; SandshrewPokedexEntry: ; 0x182184 db "MOUSE@" ; species name dw 200, 260 ; height, weight db "It prefers dry," next "sandy places" next "because it uses" + page "the sand to" next "protect itself" next "when threatened.@" diff --git a/data/pokemon/dex_entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm index fd2492f91..9e7fc454b 100644 --- a/data/pokemon/dex_entries/sandslash.asm +++ b/data/pokemon/dex_entries/sandslash.asm @@ -1,10 +1,10 @@ -; SandslashPokedexEntry: ; 0x1821e7 db "MOUSE@" ; species name dw 303, 650 ; height, weight db "Adept at climbing" next "trees, it rolls" next "into a spiny ball," + page "then attacks its" next "enemies from" next "above.@" diff --git a/data/pokemon/dex_entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm index a000a6586..fa184c6ca 100644 --- a/data/pokemon/dex_entries/scizor.asm +++ b/data/pokemon/dex_entries/scizor.asm @@ -1,10 +1,10 @@ -; ScizorPokedexEntry: ; 0x1d0821 db "SCISSORS@" ; species name dw 511, 2600 ; height, weight db "This #MON's" next "pincers, which" next "contain steel, can" + page "crush any hard" next "object it gets a" next "hold of into bits.@" diff --git a/data/pokemon/dex_entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm index ca47c46b6..f2231dd6d 100644 --- a/data/pokemon/dex_entries/scyther.asm +++ b/data/pokemon/dex_entries/scyther.asm @@ -1,10 +1,10 @@ -; ScytherPokedexEntry: ; 0x1b9851 db "MANTIS@" ; species name dw 411, 1230 ; height, weight db "It's very proud of" next "its speed. It" next "moves so fast that" + page "its opponent does" next "not even know what" next "knocked it down.@" diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm index 91731c64a..482302ad6 100644 --- a/data/pokemon/dex_entries/seadra.asm +++ b/data/pokemon/dex_entries/seadra.asm @@ -1,10 +1,10 @@ -; SeadraPokedexEntry: ; 0x1b95b8 db "DRAGON@" ; species name dw 311, 550 ; height, weight db "The male raises" next "the young. If it" next "is approached, it" + page "uses its toxic" next "spikes to fend off" next "the intruder.@" diff --git a/data/pokemon/dex_entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm index 0d7d1fe48..1225d0bf8 100644 --- a/data/pokemon/dex_entries/seaking.asm +++ b/data/pokemon/dex_entries/seaking.asm @@ -1,10 +1,10 @@ -; SeakingPokedexEntry: ; 0x1b9690 db "GOLDFISH@" ; species name dw 403, 860 ; height, weight db "When autumn comes," next "the males patrol" next "the area around" + page "their nests in" next "order to protect" next "their offspring.@" diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm index 53d179097..ac5bdbc8a 100644 --- a/data/pokemon/dex_entries/seel.asm +++ b/data/pokemon/dex_entries/seel.asm @@ -1,10 +1,10 @@ -; SeelPokedexEntry: ; 0x1b88bf db "SEA LION@" ; species name dw 307, 1980 ; height, weight db "The light blue fur" next "that covers it" next "keeps it protected" + page "against the cold." next "It loves iceberg-" next "filled oceans.@" diff --git a/data/pokemon/dex_entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm index 9e70418c8..70f1af39e 100644 --- a/data/pokemon/dex_entries/sentret.asm +++ b/data/pokemon/dex_entries/sentret.asm @@ -1,10 +1,10 @@ -; SentretPokedexEntry: ; 0x1ccd6b db "SCOUT@" ; species name dw 207, 130 ; height, weight db "When acting as a" next "lookout, it warns" next "others of danger" + page "by screeching and" next "hitting the ground" next "with its tail.@" diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm index 0c7553c43..43d3c05a8 100644 --- a/data/pokemon/dex_entries/shellder.asm +++ b/data/pokemon/dex_entries/shellder.asm @@ -1,10 +1,10 @@ -; ShellderPokedexEntry: ; 0x1b8a68 db "BIVALVE@" ; species name dw 100, 90 ; height, weight db "Clamping on to an" next "opponent reveals" next "its vulnerable" + page "parts, so it uses" next "this move only as" next "a last resort.@" diff --git a/data/pokemon/dex_entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm index 3795942e3..4eaa349eb 100644 --- a/data/pokemon/dex_entries/shuckle.asm +++ b/data/pokemon/dex_entries/shuckle.asm @@ -1,10 +1,10 @@ -; ShucklePokedexEntry: ; 0x1d088e db "MOLD@" ; species name dw 200, 450 ; height, weight db "The fluid secreted" next "by its toes carves" next "holes in rocks for" + page "nesting and can be" next "mixed with BERRIES" next "to make a drink.@" diff --git a/data/pokemon/dex_entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm index 2558065af..46f0a12fc 100644 --- a/data/pokemon/dex_entries/skarmory.asm +++ b/data/pokemon/dex_entries/skarmory.asm @@ -1,10 +1,10 @@ -; SkarmoryPokedexEntry: ; 0x1d0e8c db "ARMOR BIRD@" ; species name dw 507, 1110 ; height, weight db "The feathers that" next "it sheds are very" next "sharp. It is said" + page "that people once" next "used the feathers" next "as swords.@" diff --git a/data/pokemon/dex_entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm index f6e62266c..2980679e8 100644 --- a/data/pokemon/dex_entries/skiploom.asm +++ b/data/pokemon/dex_entries/skiploom.asm @@ -1,10 +1,10 @@ -; SkiploomPokedexEntry: ; 0x1cd928 db "COTTONWEED@" ; species name dw 200, 20 ; height, weight db "As soon as it" next "rains, it closes" next "its flower and" + page "hides in the shade" next "of a tree to avoid" next "getting wet.@" diff --git a/data/pokemon/dex_entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm index fdfb36e98..f48be6761 100644 --- a/data/pokemon/dex_entries/slowbro.asm +++ b/data/pokemon/dex_entries/slowbro.asm @@ -1,10 +1,10 @@ -; SlowbroPokedexEntry: ; 0x1b8635 db "HERMITCRAB@" ; species name dw 503, 1730 ; height, weight db "An attached" next "SHELLDER won't let" next "go because of the" + page "tasty flavor that" next "oozes out of its" next "tail.@" diff --git a/data/pokemon/dex_entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm index f52bdb1b7..07a5c4a15 100644 --- a/data/pokemon/dex_entries/slowking.asm +++ b/data/pokemon/dex_entries/slowking.asm @@ -1,10 +1,10 @@ -; SlowkingPokedexEntry: ; 0x1d0292 db "ROYAL@" ; species name dw 607, 1750 ; height, weight db "Every time it ya-" next "wns, SHELLDER" next "injects more poi-" + page "son into it. The" next "poison makes it" next "more intelligent.@" diff --git a/data/pokemon/dex_entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm index 2341758f8..0c35e438f 100644 --- a/data/pokemon/dex_entries/slowpoke.asm +++ b/data/pokemon/dex_entries/slowpoke.asm @@ -1,10 +1,10 @@ -; SlowpokePokedexEntry: ; 0x1b85d3 db "DOPEY@" ; species name dw 311, 790 ; height, weight db "It is always so" next "absent-minded that" next "it won't react," + page "even if its" next "flavorful tail is" next "bitten.@" diff --git a/data/pokemon/dex_entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm index ea1fc01f2..d56958540 100644 --- a/data/pokemon/dex_entries/slugma.asm +++ b/data/pokemon/dex_entries/slugma.asm @@ -1,10 +1,10 @@ -; SlugmaPokedexEntry: ; 0x1d0ab8 db "LAVA@" ; species name dw 204, 770 ; height, weight db "These group to-" next "gether in areas" next "that are hotter" + page "than normal. If it" next "cools off, its" next "skin hardens.@" diff --git a/data/pokemon/dex_entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm index 8b265c1ea..98b9f69f3 100644 --- a/data/pokemon/dex_entries/smeargle.asm +++ b/data/pokemon/dex_entries/smeargle.asm @@ -1,10 +1,10 @@ -; SmearglePokedexEntry: ; 0x1d11e0 db "PAINTER@" ; species name dw 311, 1280 ; height, weight db "The color of the" next "mysterious fluid" next "secreted from its" + page "tail is predeter-" next "mined for each" next "SMEARGLE.@" diff --git a/data/pokemon/dex_entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm index b619b1720..74dbc77b8 100644 --- a/data/pokemon/dex_entries/smoochum.asm +++ b/data/pokemon/dex_entries/smoochum.asm @@ -1,10 +1,10 @@ -; SmoochumPokedexEntry: ; 0x1d132b db "KISS@" ; species name dw 104, 130 ; height, weight db "The sensitivity of" next "its lips develops" next "most quickly." + page "It uses them to" next "try to identify" next "unknown objects.@" diff --git a/data/pokemon/dex_entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm index 5c1e70f09..b2cba47fa 100644 --- a/data/pokemon/dex_entries/sneasel.asm +++ b/data/pokemon/dex_entries/sneasel.asm @@ -1,10 +1,10 @@ -; SneaselPokedexEntry: ; 0x1d097a db "SHARP CLAW@" ; species name dw 211, 620 ; height, weight db "This cunning" next "#MON hides" next "under the cover" + page "of darkness," next "waiting to attack" next "its prey.@" diff --git a/data/pokemon/dex_entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm index e56651fb8..b006777dd 100644 --- a/data/pokemon/dex_entries/snorlax.asm +++ b/data/pokemon/dex_entries/snorlax.asm @@ -1,10 +1,10 @@ -; SnorlaxPokedexEntry: ; 0x1cc5cf db "SLEEPING@" ; species name dw 611, 10140 ; height, weight db "This #MON's" next "stomach is so" next "strong, even" + page "eating moldy or" next "rotten food will" next "not affect it.@" diff --git a/data/pokemon/dex_entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm index 97b27ed8f..ca8b9bb2d 100644 --- a/data/pokemon/dex_entries/snubbull.asm +++ b/data/pokemon/dex_entries/snubbull.asm @@ -1,10 +1,10 @@ -; SnubbullPokedexEntry: ; 0x1d06e0 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "In truth, it is a" next "cowardly #MON." next "It growls eagerly" + page "in order to hide" next "its fear from its" next "opponent.@" diff --git a/data/pokemon/dex_entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm index 16b89d22f..290e721b1 100644 --- a/data/pokemon/dex_entries/spearow.asm +++ b/data/pokemon/dex_entries/spearow.asm @@ -1,10 +1,10 @@ -; SpearowPokedexEntry: ; 0x181f03 db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "To protect its" next "territory, it" next "flies around" + page "ceaselessly," next "making high-" next "pitched cries.@" diff --git a/data/pokemon/dex_entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm index e6e4c7203..8adbd74ef 100644 --- a/data/pokemon/dex_entries/spinarak.asm +++ b/data/pokemon/dex_entries/spinarak.asm @@ -1,10 +1,10 @@ -; SpinarakPokedexEntry: ; 0x1cd012 db "STRINGSPIT@" ; species name dw 108, 190 ; height, weight db "If prey becomes" next "ensnared in its" next "nest of spun" + page "string, it waits" next "motionlessly until" next "it becomes dark.@" diff --git a/data/pokemon/dex_entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm index 6fd442a13..e82e6bd6b 100644 --- a/data/pokemon/dex_entries/squirtle.asm +++ b/data/pokemon/dex_entries/squirtle.asm @@ -1,10 +1,10 @@ -; SquirtlePokedexEntry: ; 0x181926 db "TINYTURTLE@" ; species name dw 108, 200 ; height, weight db "When it feels" next "threatened, it" next "draws its legs" + page "inside its shell" next "and sprays water" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm index 0fce8f2b5..cabe544ff 100644 --- a/data/pokemon/dex_entries/stantler.asm +++ b/data/pokemon/dex_entries/stantler.asm @@ -1,10 +1,10 @@ -; StantlerPokedexEntry: ; 0x1d1174 db "BIG HORN@" ; species name dw 407, 1570 ; height, weight db "The round balls" next "found on the" next "fallen antlers can" + page "be ground into a" next "powder that aids" next "in sleeping.@" diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm index 83393b9c2..c7aa7838a 100644 --- a/data/pokemon/dex_entries/starmie.asm +++ b/data/pokemon/dex_entries/starmie.asm @@ -1,10 +1,10 @@ -; StarmiePokedexEntry: ; 0x1b9776 db "MYSTERIOUS@" ; species name dw 307, 1760 ; height, weight db "It is said that it" next "uses the seven-" next "colored core of" + page "its body to send" next "electric waves" next "into outer space.@" diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm index 9f1fadc9c..f18678d98 100644 --- a/data/pokemon/dex_entries/staryu.asm +++ b/data/pokemon/dex_entries/staryu.asm @@ -1,10 +1,10 @@ -; StaryuPokedexEntry: ; 0x1b9702 db "STARSHAPE@" ; species name dw 207, 760 ; height, weight db "When the stars" next "twinkle at night," next "it floats up from" + page "the sea floor, and" next "its body's center" next "core flickers.@" diff --git a/data/pokemon/dex_entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm index 6bbfe6c28..7d9fcc219 100644 --- a/data/pokemon/dex_entries/steelix.asm +++ b/data/pokemon/dex_entries/steelix.asm @@ -1,10 +1,10 @@ -; SteelixPokedexEntry: ; 0x1d067c db "IRON SNAKE@" ; species name dw 3002, 8820 ; height, weight db "The many small" next "metal particles" next "that cover this" + page "#MON's body" next "reflect bright" next "light well.@" diff --git a/data/pokemon/dex_entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm index 060db1d8d..f8250f5f0 100644 --- a/data/pokemon/dex_entries/sudowoodo.asm +++ b/data/pokemon/dex_entries/sudowoodo.asm @@ -1,10 +1,10 @@ -; SudowoodoPokedexEntry: ; 0x1cd7d9 db "IMITATION@" ; species name dw 311, 840 ; height, weight db "If a tree branch" next "shakes when there" next "is no wind, it's a" + page "SUDOWOODO, not a" next "tree. It hides" next "from the rain.@" diff --git a/data/pokemon/dex_entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm index c60c002f7..5b4aa9e27 100644 --- a/data/pokemon/dex_entries/suicune.asm +++ b/data/pokemon/dex_entries/suicune.asm @@ -1,10 +1,10 @@ -; SuicunePokedexEntry: ; 0x1d1642 db "AURORA@" ; species name dw 607, 4120 ; height, weight db "This divine" next "#MON blows" next "around the world," + page "always in search" next "of a pure" next "reservoir.@" diff --git a/data/pokemon/dex_entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm index 2d0e78111..2b162a526 100644 --- a/data/pokemon/dex_entries/sunflora.asm +++ b/data/pokemon/dex_entries/sunflora.asm @@ -1,10 +1,10 @@ -; SunfloraPokedexEntry: ; 0x1cdaef db "SUN@" ; species name dw 207, 190 ; height, weight db "As the hot season" next "approaches, the" next "petals on this" + page "#MON's face" next "become more vivid" next "and lively.@" diff --git a/data/pokemon/dex_entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm index 680e1799e..8264891e4 100644 --- a/data/pokemon/dex_entries/sunkern.asm +++ b/data/pokemon/dex_entries/sunkern.asm @@ -1,10 +1,10 @@ -; SunkernPokedexEntry: ; 0x1cda87 db "SEED@" ; species name dw 100, 40 ; height, weight db "It is very weak." next "Its only means of" next "defense is to" + page "shake its leaves" next "desperately at its" next "attacker.@" diff --git a/data/pokemon/dex_entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm index 3e6d61dc8..44f78aaaa 100644 --- a/data/pokemon/dex_entries/swinub.asm +++ b/data/pokemon/dex_entries/swinub.asm @@ -1,10 +1,10 @@ -; SwinubPokedexEntry: ; 0x1d0b8d db "PIG@" ; species name dw 104, 140 ; height, weight db "It uses the tip of" next "its nose to dig" next "for food. Its nose" + page "is so tough that" next "even frozen ground" next "poses no problem.@" diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm index 4e011b082..6c84cbfd1 100644 --- a/data/pokemon/dex_entries/tangela.asm +++ b/data/pokemon/dex_entries/tangela.asm @@ -1,10 +1,10 @@ -; TangelaPokedexEntry: ; 0x1b948c db "VINE@" ; species name dw 303, 770 ; height, weight db "During battle, it" next "constantly moves" next "the vines that" + page "cover its body in" next "order to annoy its" next "opponent.@" diff --git a/data/pokemon/dex_entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm index bd7851165..04a4b5ce1 100644 --- a/data/pokemon/dex_entries/tauros.asm +++ b/data/pokemon/dex_entries/tauros.asm @@ -1,10 +1,10 @@ -; TaurosPokedexEntry: ; 0x1b9a6f db "WILD BULL@" ; species name dw 407, 1950 ; height, weight db "These violent" next "#MON fight" next "with other mem-" + page "bers of their herd" next "in order to prove" next "their strength.@" diff --git a/data/pokemon/dex_entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm index 35b32c322..1d75c8299 100644 --- a/data/pokemon/dex_entries/teddiursa.asm +++ b/data/pokemon/dex_entries/teddiursa.asm @@ -1,10 +1,10 @@ -; TeddiursaPokedexEntry: ; 0x1d09da db "LITTLE BEAR@" ; species name dw 200, 190 ; height, weight db "It always licks" next "honey. Its palm" next "tastes sweet" + page "because of all the" next "honey it has" next "absorbed.@" diff --git a/data/pokemon/dex_entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm index 5ed4b4fa0..f16523c9d 100644 --- a/data/pokemon/dex_entries/tentacool.asm +++ b/data/pokemon/dex_entries/tentacool.asm @@ -1,10 +1,10 @@ -; TentacoolPokedexEntry: ; 0x1b82d1 db "JELLYFISH@" ; species name dw 211, 1000 ; height, weight db "As it floats along" next "on the waves, it" next "uses its toxic" + page "feelers to stab" next "anything it" next "touches.@" diff --git a/data/pokemon/dex_entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm index 27dad758f..c09f892e4 100644 --- a/data/pokemon/dex_entries/tentacruel.asm +++ b/data/pokemon/dex_entries/tentacruel.asm @@ -1,10 +1,10 @@ -; TentacruelPokedexEntry: ; 0x1b8337 db "JELLYFISH@" ; species name dw 503, 1210 ; height, weight db "When its 80 feel-" next "ers absorb water," next "it stretches to" + page "become like a net" next "to entangle its" next "prey.@" diff --git a/data/pokemon/dex_entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm index eb185b1f1..a295acf54 100644 --- a/data/pokemon/dex_entries/togepi.asm +++ b/data/pokemon/dex_entries/togepi.asm @@ -1,10 +1,10 @@ -; TogepiPokedexEntry: ; 0x1cd396 db "SPIKE BALL@" ; species name dw 100, 30 ; height, weight db "It is considered" next "to be a symbol of" next "good luck. Its" + page "shell is said to" next "be filled with" next "happiness.@" diff --git a/data/pokemon/dex_entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm index 7d1519d73..b638aceb3 100644 --- a/data/pokemon/dex_entries/togetic.asm +++ b/data/pokemon/dex_entries/togetic.asm @@ -1,10 +1,10 @@ -; TogeticPokedexEntry: ; 0x1cd402 db "HAPPINESS@" ; species name dw 200, 70 ; height, weight db "Although it does" next "not flap its wings" next "very much, it can" + page "stay up in the air" next "as it tags along" next "after its trainer.@" diff --git a/data/pokemon/dex_entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm index 78a1b761e..8be3ad28c 100644 --- a/data/pokemon/dex_entries/totodile.asm +++ b/data/pokemon/dex_entries/totodile.asm @@ -1,10 +1,10 @@ -; TotodilePokedexEntry: ; 0x1ccc14 db "BIG JAW@" ; species name dw 200, 210 ; height, weight db "This rough critter" next "chomps at any" next "moving object it" + page "sees. Turning your" next "back on it is not" next "recommended.@" diff --git a/data/pokemon/dex_entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm index e11823cf5..52961be46 100644 --- a/data/pokemon/dex_entries/typhlosion.asm +++ b/data/pokemon/dex_entries/typhlosion.asm @@ -1,10 +1,10 @@ -; TyphlosionPokedexEntry: ; 0x1ccba0 db "VOLCANO@" ; species name dw 507, 1750 ; height, weight db "When heat from its" next "body causes the" next "air around it to" + page "shimmer, this is a" next "sign that it is" next "ready to battle.@" diff --git a/data/pokemon/dex_entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm index 9786a6430..4d5a16672 100644 --- a/data/pokemon/dex_entries/tyranitar.asm +++ b/data/pokemon/dex_entries/tyranitar.asm @@ -1,10 +1,10 @@ -; TyranitarPokedexEntry: ; 0x1d177b db "ARMOR@" ; species name dw 607, 4450 ; height, weight db "In just one of its" next "mighty hands, it" next "has the power to" + page "make the ground" next "shake and moun-" next "tains crumble.@" diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm index d8900c160..6571e9f62 100644 --- a/data/pokemon/dex_entries/tyrogue.asm +++ b/data/pokemon/dex_entries/tyrogue.asm @@ -1,10 +1,10 @@ -; TyroguePokedexEntry: ; 0x1d124b db "SCUFFLE@" ; species name dw 204, 460 ; height, weight db "To brush up on its" next "fighting skills," next "it will challenge" + page "anyone. It has a" next "very strong com-" next "petitive spirit.@" diff --git a/data/pokemon/dex_entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm index 483322f18..206ea4070 100644 --- a/data/pokemon/dex_entries/umbreon.asm +++ b/data/pokemon/dex_entries/umbreon.asm @@ -1,10 +1,10 @@ -; UmbreonPokedexEntry: ; 0x1d01af db "MOONLIGHT@" ; species name dw 303, 600 ; height, weight db "On the night of a" next "full moon, or when" next "it gets excited," + page "the ring patterns" next "on its body glow" next "yellow.@" diff --git a/data/pokemon/dex_entries/unown.asm b/data/pokemon/dex_entries/unown.asm index 5be078b8a..60ee3b3de 100644 --- a/data/pokemon/dex_entries/unown.asm +++ b/data/pokemon/dex_entries/unown.asm @@ -1,10 +1,10 @@ -; UnownPokedexEntry: ; 0x1d0373 db "SYMBOL@" ; species name dw 108, 110 ; height, weight db "Because different" next "types of UNOWN" next "exist, it is said" + page "that they must" next "have a variety of" next "abilities.@" diff --git a/data/pokemon/dex_entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm index acf7626f9..c2f070603 100644 --- a/data/pokemon/dex_entries/ursaring.asm +++ b/data/pokemon/dex_entries/ursaring.asm @@ -1,10 +1,10 @@ -; UrsaringPokedexEntry: ; 0x1d0a41 db "HIBERNANT@" ; species name dw 511, 2770 ; height, weight db "Although it has a" next "large body, it is" next "quite skilled at" + page "climbing trees. It" next "eats and sleeps in" next "the treetops.@" diff --git a/data/pokemon/dex_entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm index 36617899f..dbbce1177 100644 --- a/data/pokemon/dex_entries/vaporeon.asm +++ b/data/pokemon/dex_entries/vaporeon.asm @@ -1,10 +1,10 @@ -; VaporeonPokedexEntry: ; 0x1cc224 db "BUBBLE JET@" ; species name dw 303, 640 ; height, weight db "As it uses the" next "fins on the tip" next "of its tail to" + page "swim, it blends" next "with the water" next "perfectly.@" diff --git a/data/pokemon/dex_entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm index 4ff583940..338f0ed8e 100644 --- a/data/pokemon/dex_entries/venomoth.asm +++ b/data/pokemon/dex_entries/venomoth.asm @@ -1,10 +1,10 @@ -; VenomothPokedexEntry: ; 0x182abf db "POISONMOTH@" ; species name dw 411, 280 ; height, weight db "The scales it" next "scatters will" next "paralyze anyone" + page "who touches them," next "making that person" next "unable to stand.@" diff --git a/data/pokemon/dex_entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm index 8e52b4c82..01e4df353 100644 --- a/data/pokemon/dex_entries/venonat.asm +++ b/data/pokemon/dex_entries/venonat.asm @@ -1,10 +1,10 @@ -; VenonatPokedexEntry: ; 0x182a53 db "INSECT@" ; species name dw 303, 660 ; height, weight db "The small bugs it" next "eats appear only" next "at night, so it" + page "sleeps in a hole" next "in a tree until" next "night falls.@" diff --git a/data/pokemon/dex_entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm index 1b9cc6e43..b5c843c15 100644 --- a/data/pokemon/dex_entries/venusaur.asm +++ b/data/pokemon/dex_entries/venusaur.asm @@ -1,10 +1,10 @@ -; VenusaurPokedexEntry: ; 0x181773 db "SEED@" ; species name dw 607, 2210 ; height, weight db "As it warms it-" next "self and absorbs" next "the sunlight, its" + page "flower petals" next "release a pleasant" next "fragrance.@" diff --git a/data/pokemon/dex_entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm index 552051572..b960cf81c 100644 --- a/data/pokemon/dex_entries/victreebel.asm +++ b/data/pokemon/dex_entries/victreebel.asm @@ -1,10 +1,10 @@ -; VictreebelPokedexEntry: ; 0x1b826e db "FLYCATCHER@" ; species name dw 507, 340 ; height, weight db "Once ingested into" next "this #MON's" next "body, even the" + page "hardest object" next "will melt into" next "nothing.@" diff --git a/data/pokemon/dex_entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm index cf2ea191d..541fd4da5 100644 --- a/data/pokemon/dex_entries/vileplume.asm +++ b/data/pokemon/dex_entries/vileplume.asm @@ -1,10 +1,10 @@ -; VileplumePokedexEntry: ; 0x182918 db "FLOWER@" ; species name dw 311, 410 ; height, weight db "By shaking its big" next "petals, it scat-" next "ters toxic pollen" + page "into the air," next "turning the air" next "yellow.@" diff --git a/data/pokemon/dex_entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm index 5a532e2d0..ddc0ffa29 100644 --- a/data/pokemon/dex_entries/voltorb.asm +++ b/data/pokemon/dex_entries/voltorb.asm @@ -1,10 +1,10 @@ -; VoltorbPokedexEntry: ; 0x1b8eb0 db "BALL@" ; species name dw 108, 230 ; height, weight db "During the study" next "of this #MON," next "it was discovered" + page "that its compo-" next "nents are not" next "found in nature.@" diff --git a/data/pokemon/dex_entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm index f5bbd03a1..0409bb91e 100644 --- a/data/pokemon/dex_entries/vulpix.asm +++ b/data/pokemon/dex_entries/vulpix.asm @@ -1,10 +1,10 @@ -; VulpixPokedexEntry: ; 0x18259b db "FOX@" ; species name dw 200, 220 ; height, weight db "As its body grows" next "larger, its six" next "warm tails become" + page "more beautiful," next "with a more luxur-" next "ious coat of fur.@" diff --git a/data/pokemon/dex_entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm index 927af5fd2..f96c6e40d 100644 --- a/data/pokemon/dex_entries/wartortle.asm +++ b/data/pokemon/dex_entries/wartortle.asm @@ -1,10 +1,10 @@ -; WartortlePokedexEntry: ; 0x181993 db "TURTLE@" ; species name dw 303, 500 ; height, weight db "Its long, furry" next "tail is a symbol" next "of longevity," + page "making it quite" next "popular among" next "older people.@" diff --git a/data/pokemon/dex_entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm index 9b81fa11d..c7e9deb00 100644 --- a/data/pokemon/dex_entries/weedle.asm +++ b/data/pokemon/dex_entries/weedle.asm @@ -1,10 +1,10 @@ -; WeedlePokedexEntry: ; 0x181bb4 db "HAIRY BUG@" ; species name dw 100, 70 ; height, weight db "The barb on top of" next "its head secretes" next "a strong poison." + page "It uses this toxic" next "barb to protect" next "itself.@" diff --git a/data/pokemon/dex_entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm index 81eb7c215..d53be6604 100644 --- a/data/pokemon/dex_entries/weepinbell.asm +++ b/data/pokemon/dex_entries/weepinbell.asm @@ -1,10 +1,10 @@ -; WeepinbellPokedexEntry: ; 0x1b81fd db "FLYCATCHER@" ; species name dw 303, 140 ; height, weight db "When it's hungry," next "it swings its" next "razor-sharp" + page "leaves, slicing up" next "any unlucky object" next "nearby for food.@" diff --git a/data/pokemon/dex_entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm index 1a7b268fd..8e02970d0 100644 --- a/data/pokemon/dex_entries/weezing.asm +++ b/data/pokemon/dex_entries/weezing.asm @@ -1,10 +1,10 @@ -; WeezingPokedexEntry: ; 0x1b92ec db "POISON GAS@" ; species name dw 311, 210 ; height, weight db "When it inhales" next "poisonous gases" next "from garbage, its" + page "body expands, and" next "its insides smell" next "much worse.@" diff --git a/data/pokemon/dex_entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm index 8ba563cce..65e9f49bb 100644 --- a/data/pokemon/dex_entries/wigglytuff.asm +++ b/data/pokemon/dex_entries/wigglytuff.asm @@ -1,10 +1,10 @@ -; WigglytuffPokedexEntry: ; 0x1826e9 db "BALLOON@" ; species name dw 303, 260 ; height, weight db "The rich, fluffy" next "fur that covers" next "its body feels so" + page "good that anyone" next "who feels it can't" next "stop touching it.@" diff --git a/data/pokemon/dex_entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm index 95aae69ab..6dcde2df9 100644 --- a/data/pokemon/dex_entries/wobbuffet.asm +++ b/data/pokemon/dex_entries/wobbuffet.asm @@ -1,10 +1,10 @@ -; WobbuffetPokedexEntry: ; 0x1d03dd db "PATIENT@" ; species name dw 403, 630 ; height, weight db "In order to con-" next "ceal its black" next "tail, it lives in" + page "a dark cave and" next "only moves about" next "at night.@" diff --git a/data/pokemon/dex_entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm index d612f2070..00f97d0d7 100644 --- a/data/pokemon/dex_entries/wooper.asm +++ b/data/pokemon/dex_entries/wooper.asm @@ -1,10 +1,10 @@ -; WooperPokedexEntry: ; 0x1d0078 db "WATER FISH@" ; species name dw 104, 190 ; height, weight db "A mucous" next "membrane covers" next "its body. Touching" + page "it barehanded will" next "cause a shooting" next "pain.@" diff --git a/data/pokemon/dex_entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm index 21a53d8fc..c285b8cb3 100644 --- a/data/pokemon/dex_entries/xatu.asm +++ b/data/pokemon/dex_entries/xatu.asm @@ -1,10 +1,10 @@ -; XatuPokedexEntry: ; 0x1cd4e9 db "MYSTIC@" ; species name dw 411, 330 ; height, weight db "Once it begins to" next "meditate at sun-" next "rise, the entire" + page "day will pass" next "before it will" next "move again.@" diff --git a/data/pokemon/dex_entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm index 9843ad289..4acf0e290 100644 --- a/data/pokemon/dex_entries/yanma.asm +++ b/data/pokemon/dex_entries/yanma.asm @@ -1,10 +1,10 @@ -; YanmaPokedexEntry: ; 0x1d0000 db "CLEAR WING@" ; species name dw 311, 840 ; height, weight db "It can see in all" next "directions without" next "moving its big" + page "eyes, helping it" next "spot attackers and" next "food right away.@" diff --git a/data/pokemon/dex_entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm index ea61198a0..3dfa33530 100644 --- a/data/pokemon/dex_entries/zapdos.asm +++ b/data/pokemon/dex_entries/zapdos.asm @@ -1,10 +1,10 @@ -; ZapdosPokedexEntry: ; 0x1cc697 db "ELECTRIC@" ; species name dw 503, 1160 ; height, weight db "Legendary bird" next "#MON. They say" next "lightning caused" + page "by the flapping of" next "its wings causes" next "summer storms.@" diff --git a/data/pokemon/dex_entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm index 8232f8bd6..0f54d51b1 100644 --- a/data/pokemon/dex_entries/zubat.asm +++ b/data/pokemon/dex_entries/zubat.asm @@ -1,10 +1,10 @@ -; ZubatPokedexEntry: ; 0x18275d db "BAT@" ; species name dw 207, 170 ; height, weight db "During the day, it" next "gathers with" next "others and hangs" + page "from the ceilings" next "of old buildings" next "and caves.@" diff --git a/data/pokemon/rby_base_special.asm b/data/pokemon/gen1_base_special.asm index 9998692ab..9998692ab 100644 --- a/data/pokemon/rby_base_special.asm +++ b/data/pokemon/gen1_base_special.asm diff --git a/data/pokemon/rby_order.asm b/data/pokemon/gen1_order.asm index e40ba0273..e40ba0273 100644 --- a/data/pokemon/rby_order.asm +++ b/data/pokemon/gen1_order.asm diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm new file mode 100644 index 000000000..4283d3708 --- /dev/null +++ b/data/pokemon/unown_words.asm @@ -0,0 +1,67 @@ +unownword: MACRO +x = 1 + rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 + endr + db -1 +ENDM + +UnownWords: ; fba5a +; entries correspond to UNOWN_* form constants + dw UnownWordA + dw UnownWordA + dw UnownWordB + dw UnownWordC + dw UnownWordD + dw UnownWordE + dw UnownWordF + dw UnownWordG + dw UnownWordH + dw UnownWordI + dw UnownWordJ + dw UnownWordK + dw UnownWordL + dw UnownWordM + dw UnownWordN + dw UnownWordO + dw UnownWordP + dw UnownWordQ + dw UnownWordR + dw UnownWordS + dw UnownWordT + dw UnownWordU + dw UnownWordV + dw UnownWordW + dw UnownWordX + dw UnownWordY + dw UnownWordZ +; fba90 + +UnownWordA: unownword "ANGRY" +UnownWordB: unownword "BEAR" +UnownWordC: unownword "CHASE" +UnownWordD: unownword "DIRECT" +UnownWordE: unownword "ENGAGE" +UnownWordF: unownword "FIND" +UnownWordG: unownword "GIVE" +UnownWordH: unownword "HELP" +UnownWordI: unownword "INCREASE" +UnownWordJ: unownword "JOIN" +UnownWordK: unownword "KEEP" +UnownWordL: unownword "LAUGH" +UnownWordM: unownword "MAKE" +UnownWordN: unownword "NUZZLE" +UnownWordO: unownword "OBSERVE" +UnownWordP: unownword "PERFORM" +UnownWordQ: unownword "QUICKEN" +UnownWordR: unownword "REASSURE" +UnownWordS: unownword "SEARCH" +UnownWordT: unownword "TELL" +UnownWordU: unownword "UNDO" +UnownWordV: unownword "VANISH" +UnownWordW: unownword "WANT" +UnownWordX: unownword "XXXXX" +UnownWordY: unownword "YIELD" +UnownWordZ: unownword "ZOOM" +; fbb32 diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index ad7b6529d..419c4ec79 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -16,4 +16,4 @@ OaksPkmnTalkRoutes: map ROUTE_45 map ROUTE_36 map ROUTE_31 -OaksPkmnTalkRoutesEnd +.End diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm index 4cf1987d3..3314976f5 100644 --- a/data/radio/pnp_hidden_places.asm +++ b/data/radio/pnp_hidden_places.asm @@ -10,4 +10,4 @@ PnP_HiddenPlaces: map ROUTE_16 map ROUTE_14 map CINNABAR_POKECENTER_2F_BETA -PnP_HiddenPlacesEnd +.End diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 6320838fc..f16dcdf30 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -7,179 +7,179 @@ add_special: MACRO ENDM SpecialsPointers:: ; c029 - add_special Special_WarpToSpawnPoint + add_special WarpToSpawnPoint ; $0 ; Communications - add_special Special_SetBitsForLinkTradeRequest - add_special Special_WaitForLinkedFriend - add_special Special_CheckLinkTimeout - add_special Special_TryQuickSave - add_special Special_CheckBothSelectedSameRoom - add_special Special_FailedLinkToPast - add_special Special_CloseLink - add_special Special_WaitForOtherPlayerToExit - add_special Special_SetBitsForBattleRequest - add_special Special_SetBitsForTimeCapsuleRequest - add_special Special_CheckTimeCapsuleCompatibility - add_special Special_EnterTimeCapsule - add_special Special_TradeCenter - add_special Special_Colosseum - add_special Special_TimeCapsule - add_special Special_CableClubCheckWhichChris - add_special Special_CheckMysteryGift - add_special Special_GetMysteryGiftItem - add_special Special_UnlockMysteryGift + add_special SetBitsForLinkTradeRequest + add_special WaitForLinkedFriend + add_special CheckLinkTimeout + add_special TryQuickSave + add_special CheckBothSelectedSameRoom + add_special FailedLinkToPast + add_special CloseLink + add_special WaitForOtherPlayerToExit ; $8 + add_special SetBitsForBattleRequest + add_special SetBitsForTimeCapsuleRequest + add_special CheckTimeCapsuleCompatibility + add_special EnterTimeCapsule + add_special TradeCenter + add_special Colosseum + add_special TimeCapsule + add_special CableClubCheckWhichChris ; $10 + add_special CheckMysteryGift + add_special GetMysteryGiftItem + add_special UnlockMysteryGift -; Map Events - add_special Special_BugContestJudging - add_special Special_CheckPartyFullAfterContest - add_special Special_ContestDropOffMons - add_special Special_ContestReturnMons - add_special Special_GiveParkBalls - add_special Special_CheckMagikarpLength - add_special Special_MagikarpHouseSign +; Map events + add_special BugContestJudging + add_special CheckPartyFullAfterContest + add_special ContestDropOffMons + add_special ContestReturnMons + add_special GiveParkBalls ; $18 + add_special CheckMagikarpLength + add_special MagikarpHouseSign add_special HealParty ; this is both a special and a predef - add_special Special_PokemonCenterPC - add_special Special_KrissHousePC - add_special Special_DayCareMan - add_special Special_DayCareLady - add_special Special_DayCareManOutside - add_special Special_MoveDeletion - add_special Special_BankOfMom - add_special Special_MagnetTrain - add_special Special_NameRival - add_special Special_SetDayOfWeek - add_special Special_TownMap - add_special Special_UnownPrinter - add_special Special_MapRadio - add_special Special_UnownPuzzle - add_special Special_SlotMachine - add_special Special_CardFlip - add_special Special_DummyNonfunctionalGameCornerGame - add_special Special_ClearBGPalettesBufferScreen - add_special Special_FadeOutPalettes - add_special Special_BattleTowerFade - add_special Special_FadeBlackQuickly - add_special Special_FadeInPalettes - add_special Special_FadeInQuickly + add_special PokemonCenterPC + add_special PlayersHousePC + add_special DayCareMan + add_special DayCareLady + add_special DayCareManOutside ; $20 + add_special MoveDeletion + add_special BankOfMom + add_special MagnetTrain + add_special NameRival + add_special SetDayOfWeek + add_special OverworldTownMap + add_special UnownPrinter + add_special MapRadio ; $28 + add_special UnownPuzzle + add_special SlotMachine + add_special CardFlip + add_special DummyNonfunctionalGameCornerGame + add_special ClearBGPalettesBufferScreen + add_special FadeOutPalettes + add_special BattleTowerFade + add_special FadeBlackQuickly ; $30 + add_special FadeInPalettes + add_special FadeInQuickly add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 add_special ClearTileMap ; bank 0 add_special UpdateSprites ; bank 0 - add_special ReplaceKrisSprite ; bank 0 - add_special Special_GameCornerPrizeMonCheckDex - add_special UnusedSpecial_SeenMon + add_special ReplaceKrisSprite ; $38 ; bank 0 + add_special GameCornerPrizeMonCheckDex + add_special UnusedSetSeenMon add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 - add_special Special_HealMachineAnim - add_special Special_SurfStartStep - add_special Special_FindGreaterThanThatLevel - add_special Special_FindAtLeastThatHappy - add_special Special_FindThatSpecies - add_special Special_FindThatSpeciesYourTrainerID - add_special UnusedSpecial_CheckUnusedTwoDayTimer - add_special Special_DayCareMon1 - add_special Special_DayCareMon2 - add_special Special_SelectRandomBugContestContestants - add_special Special_ActivateFishingSwarm - add_special Special_ToggleMaptileDecorations - add_special Special_ToggleDecorationsVisibility - add_special Special_GiveShuckle - add_special Special_ReturnShuckle - add_special Special_BillsGrandfather - add_special Special_CheckPokerus - add_special Special_DisplayCoinCaseBalance - add_special Special_DisplayMoneyAndCoinBalance - add_special Special_PlaceMoneyTopRight - add_special Special_CheckForLuckyNumberWinners - add_special Special_CheckLuckyNumberShowFlag - add_special Special_ResetLuckyNumberShowFlag - add_special Special_PrintTodaysLuckyNumber - add_special Special_SelectApricornForKurt - add_special Special_NameRater - add_special Special_DisplayLinkRecord - add_special Special_GetFirstPokemonHappiness - add_special Special_CheckFirstMonIsEgg - add_special Special_RandomUnseenWildMon - add_special Special_RandomPhoneWildMon - add_special Special_RandomPhoneMon - add_special Special_LoadUsedSpritesGFX - add_special Special_PlaySlowCry - add_special Special_SnorlaxAwake - add_special Special_YoungerHaircutBrother - add_special Special_OlderHaircutBrother - add_special Special_DaisyMassage - add_special Special_PlayCurMonCry - add_special Special_ProfOaksPCBoot - add_special Special_GameboyCheck - add_special Special_TrainerHouse - add_special Special_PhotoStudio - add_special Special_InitRoamMons - add_special Special_FadeOutMusic - add_special Special_Diploma - add_special Special_PrintDiploma + add_special HealMachineAnim + add_special SurfStartStep + add_special FindPartyMonGreaterThanThatLevel ; $40 + add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonThatSpecies + add_special FindPartyMonThatSpeciesYourTrainerID + add_special UnusedCheckUnusedTwoDayTimer + add_special DayCareMon1 + add_special DayCareMon2 + add_special SelectRandomBugContestContestants + add_special ActivateFishingSwarm ; $48 + add_special ToggleMaptileDecorations + add_special ToggleDecorationsVisibility + add_special GiveShuckle + add_special ReturnShuckle + add_special BillsGrandfather + add_special CheckPokerus + add_special DisplayCoinCaseBalance + add_special DisplayMoneyAndCoinBalance ; $50 + add_special PlaceMoneyTopRight + add_special CheckForLuckyNumberWinners + add_special CheckLuckyNumberShowFlag + add_special ResetLuckyNumberShowFlag + add_special PrintTodaysLuckyNumber + add_special SelectApricornForKurt + add_special NameRater + add_special DisplayLinkRecord ; $58 + add_special GetFirstPokemonHappiness + add_special CheckFirstMonIsEgg + add_special RandomUnseenWildMon + add_special RandomPhoneWildMon + add_special RandomPhoneMon + add_special LoadUsedSpritesGFX + add_special PlaySlowCry + add_special SnorlaxAwake ; $60 + add_special YoungerHaircutBrother + add_special OlderHaircutBrother + add_special DaisysGrooming + add_special PlayCurMonCry + add_special ProfOaksPCBoot + add_special GameboyCheck + add_special TrainerHouse + add_special PhotoStudio ; $68 + add_special InitRoamMons + add_special FadeOutMusic + add_special Diploma + add_special PrintDiploma - ; Crystal - add_special Special_Function11ac3e - add_special Special_Function11b444 - add_special Special_Function11b5e8 - add_special Special_Function11b7e5 - add_special Special_Function11b879 - add_special Special_Function11b920 - add_special Special_Function11b93b - add_special Special_BattleTowerRoomMenu - add_special Special_Function1700ba - add_special Special_Function170114 - add_special Special_BattleTowerBattle - add_special UnusedSpecial_Function1704e1 +; Crystal only + add_special Function11ac3e + add_special Function11b444 + add_special Function11b5e8 + add_special Function11b7e5 ; $70 + add_special Function11b879 + add_special Function11b920 + add_special Function11b93b + add_special BattleTowerRoomMenu + add_special Function1700ba + add_special Function170114 + add_special BattleTowerBattle + add_special Function1704e1 ; $78 add_special DummySpecial_17021d - add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite - add_special Special_Function11ba38 - add_special Special_CheckForBattleTowerRules - add_special Special_GiveOddEgg + add_special LoadOpponentTrainerAndPokemonWithOTSprite + add_special Function11ba38 + add_special CheckForBattleTowerRules + add_special GiveOddEgg add_special Reset ; bank 0 - add_special Special_Function1011f1 - add_special Special_Function101220 - add_special Special_Function101225 - add_special Special_Function101231 - add_special Special_MoveTutor - add_special Special_OmanyteChamber - add_special Special_Function11c1ab - add_special Special_BattleTowerAction - add_special Special_DisplayUnownWords - add_special Special_Menu_ChallengeExplanationCancel - add_special Special_Function17d2b6 - add_special Special_Function17d2ce - add_special Special_BattleTowerMobileError - add_special Special_AskMobileOrCable - add_special Special_HoOhChamber - add_special Special_Function102142 - add_special Special_CelebiShrineEvent - add_special Special_CheckCaughtCelebi - add_special Special_PokeSeer - add_special Special_BuenasPassword - add_special Special_BuenaPrize - add_special Special_Dratini - add_special Special_SampleKenjiBreakCountdown - add_special Special_BeastsCheck - add_special Special_MonCheck - add_special Special_SetPlayerPalette + add_special Function1011f1 + add_special Function101220 ; $80 + add_special Function101225 + add_special Function101231 + add_special MoveTutor + add_special OmanyteChamber + add_special Function11c1ab + add_special BattleTowerAction + add_special DisplayUnownWords + add_special Menu_ChallengeExplanationCancel ; $88 + add_special Function17d2b6 + add_special Function17d2ce + add_special BattleTowerMobileError + add_special AskMobileOrCable + add_special HoOhChamber + add_special Function102142 + add_special CelebiShrineEvent + add_special CheckCaughtCelebi ; $90 + add_special PokeSeer + add_special BuenasPassword + add_special BuenaPrize + add_special GiveDratini + add_special SampleKenjiBreakCountdown + add_special BeastsCheck + add_special MonCheck + add_special SetPlayerPalette ; $98 add_special DummySpecial_170bd2 - add_special Special_Mobile_SelectThreeMons - add_special Special_Function1037eb - add_special Special_Function10383c - add_special Special_StubbedTrainerRankings_Healings - add_special Special_RefreshSprites - add_special Special_Function1037c2 - add_special Special_Mobile_DummyReturnFalse - add_special Special_Function103780 - add_special Special_Function10387b - add_special Special_AskRememberPassword - add_special Special_LoadMapPalettes - add_special UnusedSpecial_FindItemInPCOrBag - add_special Special_InitialSetDSTFlag - add_special Special_InitialClearDSTFlag - add_special DummySpecial_c224 + add_special Mobile_SelectThreeMons + add_special Function1037eb + add_special Function10383c + add_special StubbedTrainerRankings_Healings + add_special RefreshSprites + add_special Function1037c2 + add_special Mobile_DummyReturnFalse ; $a0 + add_special Function103780 + add_special Function10387b + add_special AskRememberPassword + add_special LoadMapPalettes + add_special UnusedFindItemInPCOrBag + add_special InitialSetDSTFlag + add_special InitialClearDSTFlag + add_special DummySpecial_c224 ; $a8 ; c224 diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index 4d2a55364..166455707 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -32,10 +32,10 @@ Facings: ; 4049 dw FacingBoulderDust2 dw FacingGrass1 dw FacingGrass2 -FacingsEnd: +.End dw 0 -NUM_FACINGS EQU (FacingsEnd - Facings) / 2 +NUM_FACINGS EQU (Facings.End - Facings) / 2 ; Tables used as a reference to transform OAM data. diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm new file mode 100644 index 000000000..89eb6e831 --- /dev/null +++ b/data/sprites/player_sprites.asm @@ -0,0 +1,13 @@ +ChrisStateSprites: + db PLAYER_NORMAL, SPRITE_CHRIS + db PLAYER_BIKE, SPRITE_CHRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end + +KrisStateSprites: + db PLAYER_NORMAL, SPRITE_KRIS + db PLAYER_BIKE, SPRITE_KRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end diff --git a/data/battle/battle_text.asm b/data/text/battle.asm index eaff02017..eaff02017 100644 --- a/data/battle/battle_text.asm +++ b/data/text/battle.asm diff --git a/data/text/common.asm b/data/text/common.asm new file mode 100644 index 000000000..d1fbb8b1a --- /dev/null +++ b/data/text/common.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/common_1.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "data/text/common_2.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "data/text/common_3.asm" diff --git a/data/common_text/common_text_1.asm b/data/text/common_1.asm index 38007bc43..38007bc43 100644 --- a/data/common_text/common_text_1.asm +++ b/data/text/common_1.asm diff --git a/data/common_text/common_text_2.asm b/data/text/common_2.asm index bddd0d470..aaf14cc48 100644 --- a/data/common_text/common_text_2.asm +++ b/data/text/common_2.asm @@ -1071,12 +1071,12 @@ UnknownText_0x1c1368:: line "to do?" done -_KrissPCHowManyWithdrawText:: +_PlayersPCHowManyWithdrawText:: text "How many do you" line "want to withdraw?" done -_KrissPCWithdrewItemsText:: +_PlayersPCWithdrewItemsText:: text "Withdrew @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1085,7 +1085,7 @@ _KrissPCWithdrewItemsText:: text "(S)." prompt -_KrissPCNoRoomWithdrawText:: +_PlayersPCNoRoomWithdrawText:: text "There's no room" line "for more items." prompt @@ -1094,12 +1094,12 @@ UnknownText_0x1c13df:: text "No items here!" prompt -_KrissPCHowManyDepositText:: +_PlayersPCHowManyDepositText:: text "How many do you" line "want to deposit?" done -_KrissPCDepositItemsText:: +_PlayersPCDepositItemsText:: text "Deposited @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1108,7 +1108,7 @@ _KrissPCDepositItemsText:: text "(S)." prompt -_KrissPCNoRoomDepositText:: +_PlayersPCNoRoomDepositText:: text "There's no room to" line "store items." prompt diff --git a/data/common_text/common_text_3.asm b/data/text/common_3.asm index a04432637..a04432637 100644 --- a/data/common_text/common_text_3.asm +++ b/data/text/common_3.asm diff --git a/data/mail_input_chars.asm b/data/text/mail_input_chars.asm index ca3833529..ca3833529 100644 --- a/data/mail_input_chars.asm +++ b/data/text/mail_input_chars.asm diff --git a/data/name_input_chars.asm b/data/text/name_input_chars.asm index d89289142..d89289142 100644 --- a/data/name_input_chars.asm +++ b/data/text/name_input_chars.asm diff --git a/data/std_text.asm b/data/text/std_text.asm index 4b027abac..4b027abac 100644 --- a/data/std_text.asm +++ b/data/text/std_text.asm diff --git a/data/unused/dakutens.asm b/data/text/unused_dakutens.asm index 756018d79..756018d79 100644 --- a/data/unused/dakutens.asm +++ b/data/text/unused_dakutens.asm diff --git a/data/unused/gen_1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm index a802a5048..a802a5048 100644 --- a/data/unused/gen_1_trainer_names.asm +++ b/data/text/unused_gen1_trainer_names.asm diff --git a/data/unused/sweet_honey_text.asm b/data/text/unused_sweet_honey.asm index 9bfa4f6b1..9bfa4f6b1 100644 --- a/data/unused/sweet_honey_text.asm +++ b/data/text/unused_sweet_honey.asm diff --git a/data/tilesets/aerodactyl_word_room_collision.asm b/data/tilesets/aerodactyl_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/aerodactyl_word_room_collision.asm +++ b/data/tilesets/aerodactyl_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_collision.asm index 908fee326..97e09bf5d 100644 --- a/data/tilesets/battle_tower_collision.asm +++ b/data/tilesets/battle_tower_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, WALL ; 15 tilecoll FLOOR, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll FLOOR, WALL, FLOOR, WALL ; 1a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b - tilecoll WALL, WALL, FLOOR, FLOOR ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, FLOOR ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, WALL, FLOOR, WALL ; 20 - tilecoll WALL, WALL, WALL, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WALL, WALL ; 25 - tilecoll WALL, FLOOR, FLOOR, DOOR ; 26 + tilecoll WALL, WALL, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WALL, WALL ; 24 + tilecoll WALL, FLOOR, FLOOR, DOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, FLOOR, FLOOR ; 28 - tilecoll WALL, PC, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d - tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e + tilecoll WALL, PC, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2c + tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, FLOOR ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll WALL, WALL, WALL, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, FLOOR, WALL ; 3c tilecoll WALL, WALL, FLOOR, WALL ; 3d - tilecoll WALL, WALL, FLOOR, WALL ; 3e - tilecoll WALL, WALL, WALL, FLOOR ; 3f - tilecoll WALL, WALL, FLOOR, WALL ; 40 + tilecoll WALL, WALL, WALL, FLOOR ; 3e + tilecoll WALL, WALL, FLOOR, WALL ; 3f diff --git a/data/tilesets/battle_tower_outside_collision.asm b/data/tilesets/battle_tower_outside_collision.asm index 3aaa60113..03dec85bf 100644 --- a/data/tilesets/battle_tower_outside_collision.asm +++ b/data/tilesets/battle_tower_outside_collision.asm @@ -1,37 +1,38 @@ - tilecoll 01, 01, 01, 01 ; 01 + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, WALL ; 12 - tilecoll WALL, WALL, DOOR, DOOR ; 13 - tilecoll WALL, WALL, WALL, FLOOR ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, WALL ; 11 + tilecoll WALL, WALL, DOOR, DOOR ; 12 + tilecoll WALL, WALL, WALL, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, DOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e - tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20 - tilecoll FLOOR, FLOOR, WALL, WALL ; 21 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 @@ -42,18 +43,18 @@ tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, FLOOR, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, FLOOR, WALL, WALL ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33 - tilecoll WALL, WALL, WALL, WALL ; 34 - tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35 - tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36 - tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37 - tilecoll 5B, 01, FLOOR, FLOOR ; 38 + tilecoll WALL, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, FLOOR, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 34 + tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 35 + tilecoll 5B, FLOOR, FLOOR, FLOOR ; 36 + tilecoll 5B, 01, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b @@ -65,11 +66,11 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 44 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47 - tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b @@ -125,4 +126,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 diff --git a/data/tilesets/beta_word_room_collision.asm b/data/tilesets/beta_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/beta_word_room_collision.asm +++ b/data/tilesets/beta_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm index 3d5e0ae05..18f9b805a 100644 --- a/data/tilesets/cave_collision.asm +++ b/data/tilesets/cave_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WATER, WATER, WATER, WATER ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 - tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 tilecoll WATER, WATER, WATER, WATER ; 26 tilecoll WATER, WATER, WATER, WATER ; 27 - tilecoll WATER, WATER, WATER, WATER ; 28 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 tilecoll WATER, WATER, WATER, WATER ; 33 - tilecoll WATER, WATER, WATER, WATER ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, CAVE ; 38 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e - tilecoll WATER, WATER, WATER, WATER ; 3f - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f diff --git a/data/tilesets/champions_room_collision.asm b/data/tilesets/champions_room_collision.asm index 351f76f61..bb3201d0d 100644 --- a/data/tilesets/champions_room_collision.asm +++ b/data/tilesets/champions_room_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, FLOOR, WALL ; 02 - tilecoll WALL, WALL, WALL, FLOOR ; 03 - tilecoll FLOOR, FLOOR, WALL, WALL ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll WALL, WALL, COUNTER, FLOOR ; 06 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 - tilecoll WALL, FLOOR, FLOOR, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WALL, WALL, LADDER, LADDER ; 0c - tilecoll WALL, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, WALL ; 14 - tilecoll WALL, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll FLOOR, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e - tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 - tilecoll WALL, FLOOR, WALL, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, FLOOR, WALL ; 01 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll FLOOR, FLOOR, WALL, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, COUNTER, FLOOR ; 05 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 06 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 + tilecoll WALL, FLOOR, FLOOR, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WALL, WALL, LADDER, LADDER ; 0b + tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 13 + tilecoll WALL, FLOOR, WALL, WALL ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, UP_WALL, WALL, FLOOR ; 1c + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1d + tilecoll UP_WALL, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 23 + tilecoll WALL, FLOOR, WALL, FLOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll FLOOR, WALL, FLOOR, WALL ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2f + tilecoll FLOOR, WALL, FLOOR, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll FLOOR, WALL, WALL, WALL ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll FLOOR, WALL, WALL, WALL ; 37 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll FLOOR, WALL, FLOOR, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e - tilecoll WALL, FLOOR, WALL, WALL ; 3f - tilecoll FLOOR, WALL, WALL, WALL ; 40 + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/dark_cave_collision.asm b/data/tilesets/dark_cave_collision.asm index 3d5e0ae05..18f9b805a 100644 --- a/data/tilesets/dark_cave_collision.asm +++ b/data/tilesets/dark_cave_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WATER, WATER, WATER, WATER ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 - tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 tilecoll WATER, WATER, WATER, WATER ; 26 tilecoll WATER, WATER, WATER, WATER ; 27 - tilecoll WATER, WATER, WATER, WATER ; 28 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 tilecoll WATER, WATER, WATER, WATER ; 33 - tilecoll WATER, WATER, WATER, WATER ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, CAVE ; 38 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e - tilecoll WATER, WATER, WATER, WATER ; 3f - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f diff --git a/data/tilesets/elite_four_room_collision.asm b/data/tilesets/elite_four_room_collision.asm index cc0b705f3..59b5d223e 100644 --- a/data/tilesets/elite_four_room_collision.asm +++ b/data/tilesets/elite_four_room_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, WALL ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, FLOOR, WALL, FLOOR ; 11 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, FLOOR, WALL, FLOOR ; 10 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll LADDER, LADDER, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, FLOOR, WALL, WALL ; 18 tilecoll FLOOR, FLOOR, WALL, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, WALL ; 1c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, WALL ; 1b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll WALL, WALL, FLOOR, FLOOR ; 21 tilecoll WALL, WALL, FLOOR, FLOOR ; 22 tilecoll WALL, WALL, FLOOR, FLOOR ; 23 - tilecoll WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, WALL, FLOOR, WALL ; 26 - tilecoll WALL, FLOOR, WALL, FLOOR ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, WALL, FLOOR, WALL ; 25 + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 28 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll ICE, ICE, ICE, FLOOR ; 2f - tilecoll ICE, ICE, FLOOR, ICE ; 30 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 - tilecoll FLOOR, ICE, ICE, ICE ; 32 - tilecoll ICE, FLOOR, ICE, ICE ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll ICE, ICE, ICE, FLOOR ; 2e + tilecoll ICE, ICE, FLOOR, ICE ; 2f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, ICE, ICE, ICE ; 31 + tilecoll ICE, FLOOR, ICE, ICE ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, FLOOR, FLOOR ; 35 - tilecoll ICE, WALL, ICE, WALL ; 36 - tilecoll WALL, ICE, WALL, ICE ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll ICE, ICE, ICE, ICE ; 3a - tilecoll WALL, FLOOR, FLOOR, WALL ; 3b - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c - tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, FLOOR ; 3e + tilecoll ICE, WALL, ICE, WALL ; 35 + tilecoll WALL, ICE, WALL, ICE ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll ICE, ICE, ICE, ICE ; 39 + tilecoll WALL, FLOOR, FLOOR, WALL ; 3a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/facility_collision.asm b/data/tilesets/facility_collision.asm index eb5cd8f33..781618c25 100644 --- a/data/tilesets/facility_collision.asm +++ b/data/tilesets/facility_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, WALL, WALL ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll WALL, FLOOR, WALL, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 - tilecoll FLOOR, FLOOR, WALL, WALL ; 12 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll WALL, FLOOR, WALL, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, FLOOR ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, COUNTER ; 1f - tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, FLOOR ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 - tilecoll WALL, FLOOR, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, FLOOR ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, COUNTER ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll WALL, FLOOR, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, FLOOR, WALL, FLOOR ; 2c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 2e tilecoll WALL, FLOOR, WALL, FLOOR ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32 - tilecoll WALL, WALL, FLOOR, FLOOR ; 33 - tilecoll FLOOR, WALL, FLOOR, WALL ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll FLOOR, WALL, FLOOR, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, WALL, FLOOR, WALL ; 39 - tilecoll WALL, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, WALL, FLOOR ; 3d - tilecoll WALL, WALL, FLOOR, WALL ; 3e - tilecoll WALL, FLOOR, WALL, WALL ; 3f - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, FLOOR ; 3c + tilecoll WALL, WALL, FLOOR, WALL ; 3d + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f diff --git a/data/tilesets/forest_collision.asm b/data/tilesets/forest_collision.asm index 70cc72ff1..0b9aa78bb 100644 --- a/data/tilesets/forest_collision.asm +++ b/data/tilesets/forest_collision.asm @@ -1,43 +1,44 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WATER, WATER, WATER, WATER ; 02 tilecoll WATER, WATER, WATER, WATER ; 03 - tilecoll WATER, WATER, WATER, WATER ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07 - tilecoll WATER, WATER, WATER, WATER ; 08 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06 + tilecoll WATER, WATER, WATER, WATER ; 07 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a tilecoll WATER, WATER, WATER, WATER ; 0b - tilecoll WATER, WATER, WATER, WATER ; 0c - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d - tilecoll WATER, WATER, WATER, WATER ; 0e - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f - tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12 - tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c + tilecoll WATER, WATER, WATER, WATER ; 0d + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, DOOR ; 25 + tilecoll WALL, WALL, WALL, DOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, FLOOR, WALL, FLOOR ; 28 tilecoll WALL, FLOOR, WALL, FLOOR ; 29 tilecoll WALL, FLOOR, WALL, FLOOR ; 2a tilecoll WALL, FLOOR, WALL, FLOOR ; 2b @@ -61,4 +62,3 @@ tilecoll WALL, FLOOR, WALL, FLOOR ; 3d tilecoll WALL, FLOOR, WALL, FLOOR ; 3e tilecoll WALL, FLOOR, WALL, FLOOR ; 3f - tilecoll WALL, FLOOR, WALL, FLOOR ; 40 diff --git a/data/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm index 65b99cf54..9bcc3feb4 100644 --- a/data/tilesets/game_corner_collision.asm +++ b/data/tilesets/game_corner_collision.asm @@ -1,52 +1,53 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08 + tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 07 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 08 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, COUNTER, COUNTER ; 10 tilecoll WALL, WALL, COUNTER, COUNTER ; 11 - tilecoll WALL, WALL, COUNTER, COUNTER ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, COUNTER, FLOOR ; 14 - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17 - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, COUNTER, FLOOR ; 13 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 16 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 17 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c - tilecoll WALL, WALL, FLOOR, COUNTER ; 1d - tilecoll FLOOR, WALL, FLOOR, WALL ; 1e - tilecoll WALL, FLOOR, WALL, FLOOR ; 1f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20 + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1b + tilecoll WALL, WALL, FLOOR, COUNTER ; 1c + tilecoll FLOOR, WALL, FLOOR, WALL ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, WALL, WALL, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/gate_collision.asm b/data/tilesets/gate_collision.asm index 54cd95d34..1a7501f4c 100644 --- a/data/tilesets/gate_collision.asm +++ b/data/tilesets/gate_collision.asm @@ -1,64 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09 - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e - tilecoll WALL, WALL, COUNTER, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, COUNTER ; 10 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 08 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d + tilecoll WALL, WALL, COUNTER, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, COUNTER ; 0f + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 10 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 11 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, COUNTER ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, COUNTER ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a - tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c - tilecoll WALL, WALL, FLOOR, PC ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33 - tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 23 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 29 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2b + tilecoll WALL, WALL, FLOOR, PC ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 30 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 31 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 32 + tilecoll COUNTER, FLOOR, FLOOR, WALL ; 33 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d - tilecoll WALL, WALL, FLOOR, FLOOR ; 3e - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3b + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3c + tilecoll WALL, WALL, FLOOR, FLOOR ; 3d + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3e + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f diff --git a/data/tilesets/ho_oh_word_room_collision.asm b/data/tilesets/ho_oh_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/ho_oh_word_room_collision.asm +++ b/data/tilesets/ho_oh_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm index ae5580782..7c7f3fca5 100644 --- a/data/tilesets/house_collision.asm +++ b/data/tilesets/house_collision.asm @@ -1,54 +1,55 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 - tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06 - tilecoll WALL, FLOOR, WALL, FLOOR ; 07 - tilecoll FLOOR, WALL, FLOOR, WALL ; 08 - tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, WALL, PC, WALL ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, WALL, FLOOR ; 06 + tilecoll FLOOR, WALL, FLOOR, WALL ; 07 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, PC, WALL ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b - tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, PC ; 1d - tilecoll WALL, WALL, FLOOR, RADIO ; 1e - tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a + tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, PC ; 1c + tilecoll WALL, WALL, FLOOR, RADIO ; 1d + tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll FLOOR, WALL, FLOOR, WALL ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, WALL, FLOOR, WALL ; 24 - tilecoll WALL, FLOOR, WALL, FLOOR ; 25 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26 - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27 - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll WALL, FLOOR, WALL, FLOOR ; 24 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll FLOOR, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WINDOW, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WINDOW, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/ice_path_collision.asm b/data/tilesets/ice_path_collision.asm index 4fd9376ad..362126969 100644 --- a/data/tilesets/ice_path_collision.asm +++ b/data/tilesets/ice_path_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1c - tilecoll WALL, FLOOR, WALL, WALL ; 1d - tilecoll FLOOR, FLOOR, WALL, WALL ; 1e - tilecoll FLOOR, WALL, WALL, WALL ; 1f - tilecoll ICE, ICE, ICE, ICE ; 20 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 25 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 26 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 27 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 28 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 29 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, ICE, ICE, ICE ; 2d - tilecoll ICE, ICE, WALL, ICE ; 2e - tilecoll ICE, WALL, ICE, ICE ; 2f - tilecoll ICE, ICE, ICE, WALL ; 30 - tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll FLOOR, WALL, WALL, WALL ; 1e + tilecoll ICE, ICE, ICE, ICE ; 1f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 23 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 24 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 25 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 26 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 27 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 28 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, ICE, ICE, ICE ; 2c + tilecoll ICE, ICE, WALL, ICE ; 2d + tilecoll ICE, WALL, ICE, ICE ; 2e + tilecoll ICE, ICE, ICE, WALL ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, WALL, WALL, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 37 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 38 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3e - tilecoll FLOOR, FLOOR, WALL, WALL ; 3f - tilecoll ICE, ICE, ICE, LADDER ; 40 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3d + tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll ICE, ICE, ICE, LADDER ; 3f diff --git a/data/tilesets/johto_collision.asm b/data/tilesets/johto_collision.asm index 4d6d2c072..8da65db43 100644 --- a/data/tilesets/johto_collision.asm +++ b/data/tilesets/johto_collision.asm @@ -1,33 +1,34 @@ - tilecoll 01, 01, 01, 01 ; 01 + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll LADDER, LADDER, LADDER, LADDER ; 07 - tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll LADDER, LADDER, LADDER, LADDER ; 06 + tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 @@ -36,93 +37,92 @@ tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, DOOR, WALL ; 28 - tilecoll WALL, WALL, WALL, DOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, DOOR ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll BUOY, BUOY, BUOY, WATER ; 31 - tilecoll BUOY, BUOY, WATER, WATER ; 32 - tilecoll BUOY, BUOY, WATER, BUOY ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll BUOY, WATER, BUOY, WATER ; 35 - tilecoll WATER, WATER, WATER, WATER ; 36 - tilecoll WATER, BUOY, WATER, BUOY ; 37 - tilecoll WALL, WALL, WALL, DOOR ; 38 - tilecoll BUOY, WATER, BUOY, BUOY ; 39 - tilecoll WATER, WATER, BUOY, BUOY ; 3a - tilecoll WATER, BUOY, BUOY, BUOY ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll WALL, WALL, WALL, DOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 tilecoll WATER, WATER, WATER, WATER ; 55 - tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 58 tilecoll WATER, WATER, WATER, WATER ; 59 - tilecoll WATER, WATER, WATER, WATER ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62 - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63 - tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66 - tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67 - tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, CAVE, WALL ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER, WATER, WATER, WATER ; 77 - tilecoll WALL, WALL, DOOR, WALL ; 78 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66 + tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll WALL, WALL, DOOR, WALL ; 77 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 tilecoll WATER, WATER, WATER, WATER ; 7a - tilecoll WATER, WATER, WATER, WATER ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/tilesets/johto_modern_collision.asm b/data/tilesets/johto_modern_collision.asm index 40255d744..67ba03575 100644 --- a/data/tilesets/johto_modern_collision.asm +++ b/data/tilesets/johto_modern_collision.asm @@ -1,40 +1,41 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 - tilecoll WALL, WALL, DOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, DOOR, WALL ; 25 + tilecoll WALL, WALL, DOOR, WALL ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 @@ -42,87 +43,86 @@ tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, DOOR ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30 - tilecoll BUOY, BUOY, BUOY, WATER ; 31 - tilecoll BUOY, BUOY, WATER, WATER ; 32 - tilecoll BUOY, BUOY, WATER, BUOY ; 33 - tilecoll WALL, WALL, WALL, WALL ; 34 - tilecoll BUOY, WATER, BUOY, WATER ; 35 - tilecoll WATER, WATER, WATER, WATER ; 36 - tilecoll WATER, BUOY, WATER, BUOY ; 37 - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38 - tilecoll BUOY, WATER, BUOY, BUOY ; 39 - tilecoll WATER, WATER, BUOY, BUOY ; 3a - tilecoll WATER, BUOY, BUOY, BUOY ; 3b - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 tilecoll WATER, WATER, WATER, WATER ; 55 - tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 58 tilecoll WATER, WATER, WATER, WATER ; 59 - tilecoll WATER, WATER, WATER, WATER ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll WALL, WALL, WALL, CAVE ; 5c - tilecoll WALL, FLOOR, WALL, FLOOR ; 5d + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, WALL, WALL, CAVE ; 5b + tilecoll WALL, FLOOR, WALL, FLOOR ; 5c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5d tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f - tilecoll WALL, WALL, WALL, WALL ; 60 + tilecoll WALL, WALL, WALL, WALL ; 5f + tilecoll WATER, WATER, WALL, WALL ; 60 tilecoll WATER, WATER, WALL, WALL ; 61 tilecoll WATER, WATER, WALL, WALL ; 62 - tilecoll WATER, WATER, WALL, WALL ; 63 - tilecoll WATER, WATER, WATER, WATER ; 64 - tilecoll FLOOR, WALL, FLOOR, WALL ; 65 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66 - tilecoll WALL, FLOOR, WALL, FLOOR ; 67 - tilecoll WALL, WALL, WALL, WALL ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER, WATER, WATER, WATER ; 77 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78 - tilecoll FLOOR, FLOOR, WALL, WALL ; 79 + tilecoll WATER, WATER, WATER, WATER ; 63 + tilecoll FLOOR, WALL, FLOOR, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 65 + tilecoll WALL, FLOOR, WALL, FLOOR ; 66 + tilecoll WALL, WALL, WALL, WALL ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 77 + tilecoll FLOOR, FLOOR, WALL, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 tilecoll WATER, WATER, WATER, WATER ; 7a - tilecoll WATER, WATER, WATER, WATER ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e - tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f diff --git a/data/tilesets/kabuto_word_room_collision.asm b/data/tilesets/kabuto_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/kabuto_word_room_collision.asm +++ b/data/tilesets/kabuto_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm index 9b0f0c275..275c2b0b1 100644 --- a/data/tilesets/kanto_collision.asm +++ b/data/tilesets/kanto_collision.asm @@ -1,128 +1,128 @@ - tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, WALL, DOOR ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05 - tilecoll LADDER, LADDER, LADDER, LADDER ; 06 - tilecoll FLOOR, FLOOR, CAVE, WALL ; 07 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c + tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, DOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 + tilecoll LADDER, LADDER, LADDER, LADDER ; 05 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 06 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, WALL, WALL ; 12 - tilecoll WALL, WALL, DOOR, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WATER, WALL, WALL ; 15 - tilecoll WATER, WALL, WALL, WALL ; 16 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18 - tilecoll WALL, WATER, WALL, WATER ; 19 - tilecoll WATER, WALL, WATER, WALL ; 1a - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll WALL, WALL, DOOR, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WATER, WALL, WALL ; 14 + tilecoll WATER, WALL, WALL, WALL ; 15 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 16 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 17 + tilecoll WALL, WATER, WALL, WATER ; 18 + tilecoll WATER, WALL, WATER, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, FLOOR, WALL, WALL ; 1c + tilecoll WATER, WATER, WATER, WATER ; 1d tilecoll WATER, WATER, WATER, WATER ; 1e tilecoll WATER, WATER, WATER, WATER ; 1f - tilecoll WATER, WATER, WATER, WATER ; 20 + tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll WALL, FLOOR, WALL, WALL ; 25 - tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, WALL, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, FLOOR, WALL, FLOOR ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll WATER, WATER, WATER, WATER ; 2d tilecoll WATER, WATER, WATER, WATER ; 2e - tilecoll WATER, WATER, WATER, WATER ; 2f - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34 - tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35 - tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, CUT_TREE, WALL, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, CUT_TREE ; 33 + tilecoll CUT_TREE, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll FLOOR, FLOOR, WALL, WALL ; 38 tilecoll FLOOR, FLOOR, WALL, WALL ; 39 - tilecoll FLOOR, FLOOR, WALL, WALL ; 3a - tilecoll WALL, WALL, DOOR, WALL ; 3b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, WALL, DOOR ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42 - tilecoll HOP_DOWN, WALL, WALL, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 + tilecoll WALL, WALL, DOOR, WALL ; 3a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, DOOR ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, UP_WALL, WALL, FLOOR ; 3e + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 3f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 41 + tilecoll HOP_DOWN, WALL, WALL, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 46 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 47 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d - tilecoll FLOOR, WALL, FLOOR, WALL ; 4e - tilecoll WALL, FLOOR, WALL, FLOOR ; 4f - tilecoll FLOOR, WALL, WALL, WALL ; 50 - tilecoll WALL, FLOOR, WALL, WALL ; 51 - tilecoll WALL, WALL, FLOOR, FLOOR ; 52 - tilecoll FLOOR, FLOOR, WALL, WALL ; 53 - tilecoll WALL, WALL, WALL, DOOR ; 54 - tilecoll WALL, WALL, WALL, WALL ; 55 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c + tilecoll FLOOR, WALL, FLOOR, WALL ; 4d + tilecoll WALL, FLOOR, WALL, FLOOR ; 4e + tilecoll FLOOR, WALL, WALL, WALL ; 4f + tilecoll WALL, FLOOR, WALL, WALL ; 50 + tilecoll WALL, WALL, FLOOR, FLOOR ; 51 + tilecoll FLOOR, FLOOR, WALL, WALL ; 52 + tilecoll WALL, WALL, WALL, DOOR ; 53 + tilecoll WALL, WALL, WALL, WALL ; 54 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55 + tilecoll FLOOR, FLOOR, WALL, WALL ; 56 tilecoll FLOOR, FLOOR, WALL, WALL ; 57 - tilecoll FLOOR, FLOOR, WALL, WALL ; 58 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c - tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 58 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 59 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5b + tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f - tilecoll FLOOR, WALL, FLOOR, WALL ; 60 - tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61 - tilecoll FLOOR, FLOOR, WALL, WALL ; 62 - tilecoll WALL, WALL, WALL, FLOOR ; 63 - tilecoll WALL, WALL, FLOOR, WALL ; 64 + tilecoll FLOOR, WALL, FLOOR, WALL ; 5f + tilecoll FLOOR, WALL, CUT_TREE, WALL ; 60 + tilecoll FLOOR, FLOOR, WALL, WALL ; 61 + tilecoll WALL, WALL, WALL, FLOOR ; 62 + tilecoll WALL, WALL, FLOOR, WALL ; 63 + tilecoll WATER, WATER, WATER, WATER ; 64 tilecoll WATER, WATER, WATER, WATER ; 65 - tilecoll WATER, WATER, WATER, WATER ; 66 - tilecoll WALL, WALL, WALL, WALL ; 67 - tilecoll WALL, WATER, WALL, WATER ; 68 + tilecoll WALL, WALL, WALL, WALL ; 66 + tilecoll WALL, WATER, WALL, WATER ; 67 + tilecoll WALL, WALL, WALL, WALL ; 68 tilecoll WALL, WALL, WALL, WALL ; 69 - tilecoll WALL, WALL, WALL, WALL ; 6a - tilecoll WATER, WALL, WATER, WALL ; 6b - tilecoll WATER, WATER, WALL, WALL ; 6c - tilecoll WALL, WALL, FLOOR, FLOOR ; 6d - tilecoll WALL, FLOOR, WALL, FLOOR ; 6e - tilecoll FLOOR, WALL, FLOOR, WALL ; 6f - tilecoll FLOOR, FLOOR, WALL, WALL ; 70 - tilecoll FLOOR, WALL, CAVE, WALL ; 71 + tilecoll WATER, WALL, WATER, WALL ; 6a + tilecoll WATER, WATER, WALL, WALL ; 6b + tilecoll WALL, WALL, FLOOR, FLOOR ; 6c + tilecoll WALL, FLOOR, WALL, FLOOR ; 6d + tilecoll FLOOR, WALL, FLOOR, WALL ; 6e + tilecoll FLOOR, FLOOR, WALL, WALL ; 6f + tilecoll FLOOR, WALL, CAVE, WALL ; 70 + tilecoll WALL, WALL, WALL, WALL ; 71 tilecoll WALL, WALL, WALL, WALL ; 72 tilecoll WALL, WALL, WALL, WALL ; 73 - tilecoll WALL, WALL, WALL, WALL ; 74 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, WALL, WALL ; 75 tilecoll WALL, WALL, WALL, WALL ; 76 - tilecoll WALL, WALL, WALL, WALL ; 77 - tilecoll FLOOR, FLOOR, WALL, WALL ; 78 - tilecoll WATER, WATER, WATER, WATER ; 79 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a - tilecoll WALL, WALL, WALL, WALL ; 7b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c - tilecoll WALL, WALL, WALL, DOOR ; 7d + tilecoll FLOOR, FLOOR, WALL, WALL ; 77 + tilecoll WATER, WATER, WATER, WATER ; 78 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll WALL, WALL, WALL, WALL ; 7a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b + tilecoll WALL, WALL, WALL, DOOR ; 7c + tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/tilesets/lab_collision.asm b/data/tilesets/lab_collision.asm index 436c8e0a7..b3aa6ef1b 100644 --- a/data/tilesets/lab_collision.asm +++ b/data/tilesets/lab_collision.asm @@ -1,50 +1,51 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 tilecoll FLOOR, FLOOR, WALL, WALL ; 07 - tilecoll FLOOR, FLOOR, WALL, WALL ; 08 - tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 tilecoll WALL, WALL, FLOOR, FLOOR ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, WALL, WALL ; 20 - tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 1f + tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/lighthouse_collision.asm b/data/tilesets/lighthouse_collision.asm index 05b6cd614..81781fafa 100644 --- a/data/tilesets/lighthouse_collision.asm +++ b/data/tilesets/lighthouse_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 tilecoll WALL, WALL, WALL, WALL ; 02 tilecoll WALL, WALL, WALL, WALL ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll FLOOR, FLOOR, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, FLOOR ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll 9C, FLOOR, COUNTER, FLOOR ; 11 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll WALL, WALL, WALL, STAIRCASE ; 1a - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, STAIRCASE ; 19 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 - tilecoll FLOOR, WALL, FLOOR, WALL ; 22 - tilecoll WALL, FLOOR, WALL, WALL ; 23 - tilecoll FLOOR, WALL, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll FLOOR, FLOOR, PIT, PIT ; 29 - tilecoll WALL, WALL, WINDOW, WINDOW ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, FLOOR, FLOOR ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f - tilecoll WALL, WALL, WALL, BOOKSHELF ; 30 - tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, FLOOR, WALL, FLOOR ; 34 - tilecoll WALL, WALL, PC, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, FLOOR, WALL, WALL ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, PIT, PIT ; 28 + tilecoll WALL, WALL, WINDOW, WINDOW ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll WALL, WALL, WALL, BOOKSHELF ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, FLOOR, WALL, FLOOR ; 33 + tilecoll WALL, WALL, PC, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WINDOW, WALL ; 3e + tilecoll WALL, WALL, WINDOW, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/mansion_collision.asm b/data/tilesets/mansion_collision.asm index 5db409be7..2c8edd747 100644 --- a/data/tilesets/mansion_collision.asm +++ b/data/tilesets/mansion_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 tilecoll WALL, WALL, FLOOR, FLOOR ; 08 tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, WALL, FLOOR, WALL ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, FLOOR, WALL ; 0e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f - tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, BOOKSHELF, WALL ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e + tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15 tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16 - tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, BOOKSHELF, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, DOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d tilecoll FLOOR, FLOOR, WALL, WALL ; 1e tilecoll FLOOR, FLOOR, WALL, WALL ; 1f - tilecoll FLOOR, FLOOR, WALL, WALL ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 - tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24 - tilecoll WALL, WALL, WALL, STAIRCASE ; 25 - tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26 - tilecoll FLOOR, WALL, FLOOR, WALL ; 27 - tilecoll WALL, WALL, DOOR, WALL ; 28 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29 + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 23 + tilecoll WALL, WALL, WALL, STAIRCASE ; 24 + tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 25 + tilecoll FLOOR, WALL, FLOOR, WALL ; 26 + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 28 + tilecoll FLOOR, FLOOR, WALL, WALL ; 29 tilecoll FLOOR, FLOOR, WALL, WALL ; 2a - tilecoll FLOOR, FLOOR, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll FLOOR, WALL, WALL, WALL ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, FLOOR, WALL, WALL ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, FLOOR, WALL, WALL ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, WALL ; 3e - tilecoll FLOOR, WALL, WALL, WALL ; 3f - tilecoll FLOOR, FLOOR, WALL, WALL ; 40 + tilecoll WALL, FLOOR, WALL, WALL ; 3d + tilecoll FLOOR, WALL, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, WALL, WALL ; 3f diff --git a/data/tilesets/mart_collision.asm b/data/tilesets/mart_collision.asm index 80076ac3f..ee4f1e4c1 100644 --- a/data/tilesets/mart_collision.asm +++ b/data/tilesets/mart_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 - tilecoll WALL, FLOOR, WALL, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, COUNTER ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, COUNTER, FLOOR ; 0b - tilecoll WALL, FLOOR, WALL, FLOOR ; 0c - tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e - tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, WALL, WALL, WALL ; 10 - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, COUNTER ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, COUNTER, FLOOR ; 0a + tilecoll WALL, FLOOR, WALL, FLOOR ; 0b + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0c + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0d + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 10 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 12 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 13 tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14 tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15 - tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, FLOOR, COUNTER ; 18 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, COUNTER ; 17 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 19 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1a + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d - tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, FLOOR, WALL, WALL ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 - tilecoll FLOOR, WALL, WALL, WALL ; 36 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1e + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, COUNTER, MART_SHELF ; 27 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2c + tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2d + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2e + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, FLOOR, WALL, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, WALL, WALL, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/omanyte_word_room_collision.asm b/data/tilesets/omanyte_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/omanyte_word_room_collision.asm +++ b/data/tilesets/omanyte_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm index c5965e0c9..d24de1ec1 100644 --- a/data/tilesets/park_collision.asm +++ b/data/tilesets/park_collision.asm @@ -1,55 +1,56 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, WALL, WALL ; 07 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll WALL, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, WALL, WALL, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 - tilecoll WALL, WALL, FLOOR, WALL ; 13 - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 - tilecoll WALL, FLOOR, WALL, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, WALL, WALL, WALL ; 1b - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c - tilecoll WALL, WALL, WALL, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll WALL, FLOOR, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll FLOOR, WALL, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, WALL, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, WALL ; 12 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, WALL, WALL, WALL ; 1a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, WALL, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 tilecoll WALL, WALL, WALL, WALL ; 35 tilecoll WALL, WALL, WALL, WALL ; 36 tilecoll WALL, WALL, WALL, WALL ; 37 @@ -60,5 +61,4 @@ tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f diff --git a/data/tilesets/players_house_collision.asm b/data/tilesets/players_house_collision.asm index ed6b70a29..34c8c237b 100644 --- a/data/tilesets/players_house_collision.asm +++ b/data/tilesets/players_house_collision.asm @@ -1,43 +1,44 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, TV ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, TV ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 09 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0a tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, PC, FLOOR ; 11 - tilecoll WALL, WALL, TV, WALL ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, TV, FLOOR, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, WALL ; 15 - tilecoll WALL, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, RADIO, PC ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, RADIO, FLOOR ; 1b - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f - tilecoll WALL, WALL, PC, RADIO ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, TV, BOOKSHELF ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, PC, FLOOR ; 10 + tilecoll WALL, WALL, TV, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, TV, FLOOR, WALL ; 13 + tilecoll FLOOR, WALL, FLOOR, WALL ; 14 + tilecoll WALL, WALL, FLOOR, WALL ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, RADIO, PC ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, RADIO, FLOOR ; 1a + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1e + tilecoll WALL, WALL, PC, RADIO ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, TV, BOOKSHELF ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 23 tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/players_room_collision.asm b/data/tilesets/players_room_collision.asm index 464d80b83..713f06c9c 100644 --- a/data/tilesets/players_room_collision.asm +++ b/data/tilesets/players_room_collision.asm @@ -1,41 +1,42 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, TV, BOOKSHELF ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, TV, BOOKSHELF ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, WALL, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b tilecoll WALL, FLOOR, WALL, FLOOR ; 1c tilecoll WALL, FLOOR, WALL, FLOOR ; 1d tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll WALL, FLOOR, WALL, FLOOR ; 1f - tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20 + tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20 tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26 + tilecoll FF, FF, FF, FF ; 26 tilecoll FF, FF, FF, FF ; 27 tilecoll FF, FF, FF, FF ; 28 tilecoll FF, FF, FF, FF ; 29 @@ -61,4 +62,3 @@ tilecoll FF, FF, FF, FF ; 3d tilecoll FF, FF, FF, FF ; 3e tilecoll FF, FF, FF, FF ; 3f - tilecoll FF, FF, FF, FF ; 40 diff --git a/data/tilesets/pokecenter_collision.asm b/data/tilesets/pokecenter_collision.asm index 5b776330e..d76860917 100644 --- a/data/tilesets/pokecenter_collision.asm +++ b/data/tilesets/pokecenter_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll WALL, WALL, WALL, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, WALL ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06 - tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07 - tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, PC ; 09 - tilecoll WALL, WALL, FLOOR, WALL ; 0a - tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, WALL, FLOOR, WALL ; 0e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, WALL ; 10 - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 05 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 06 + tilecoll COUNTER, WALL, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, PC ; 08 + tilecoll WALL, WALL, FLOOR, WALL ; 09 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, WALL, FLOOR, WALL ; 0d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d tilecoll WALL, WALL, FLOOR, FLOOR ; 1e tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, FLOOR, PC ; 22 - tilecoll WALL, WALL, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, WALL ; 29 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, FLOOR ; 2b - tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll PC, WALL, FLOOR, WALL ; 33 - tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 35 - tilecoll DOOR, WALL, FLOOR, WALL ; 36 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 37 - tilecoll DOOR, WALL, FLOOR, WALL ; 38 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39 - tilecoll WALL, WALL, FLOOR, WALL ; 3a - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, FLOOR, PC ; 21 + tilecoll WALL, WALL, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, WALL ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, DOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2f + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll PC, WALL, FLOOR, WALL ; 32 + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 33 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 34 + tilecoll DOOR, WALL, FLOOR, WALL ; 35 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 36 + tilecoll DOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3c tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e - tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f - tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40 + tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3e + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3f diff --git a/data/tilesets/pokecom_center_collision.asm b/data/tilesets/pokecom_center_collision.asm index 1ecef84de..2272acfd4 100644 --- a/data/tilesets/pokecom_center_collision.asm +++ b/data/tilesets/pokecom_center_collision.asm @@ -1,38 +1,39 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll WALL, WALL, WALL, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, PC ; 08 - tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, PC ; 07 + tilecoll WALL, WALL, WALL, FLOOR ; 08 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 09 tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a - tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, WALL, FLOOR, WALL ; 0c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, WALL ; 10 - tilecoll WALL, WALL, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 0f + tilecoll WALL, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 @@ -40,25 +41,24 @@ tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e - tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 tilecoll WALL, WALL, WALL, WALL ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, WALL, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/port_collision.asm b/data/tilesets/port_collision.asm index fb37ee11e..8abc712c9 100644 --- a/data/tilesets/port_collision.asm +++ b/data/tilesets/port_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll BUOY, WATER, BUOY, WATER ; 03 - tilecoll WATER, BUOY, WATER, BUOY ; 04 - tilecoll LADDER, LADDER, LADDER, LADDER ; 05 - tilecoll WALL, WALL, WALL, WATER ; 06 - tilecoll WALL, WALL, WATER, WATER ; 07 - tilecoll WALL, WALL, WATER, WALL ; 08 - tilecoll WATER, WATER, WATER, WATER ; 09 - tilecoll WALL, WATER, WALL, WATER ; 0a - tilecoll WATER, WATER, WATER, WATER ; 0b - tilecoll WATER, WALL, WATER, WALL ; 0c - tilecoll WATER, WATER, FLOOR, FLOOR ; 0d - tilecoll WALL, WATER, WALL, WALL ; 0e - tilecoll WATER, WATER, WALL, WALL ; 0f - tilecoll WATER, WALL, WALL, WALL ; 10 - tilecoll WATER, WATER, WATER, WATER ; 11 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 - tilecoll WATER, WATER, WATER, WATER ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll BUOY, WATER, BUOY, WATER ; 02 + tilecoll WATER, BUOY, WATER, BUOY ; 03 + tilecoll LADDER, LADDER, LADDER, LADDER ; 04 + tilecoll WALL, WALL, WALL, WATER ; 05 + tilecoll WALL, WALL, WATER, WATER ; 06 + tilecoll WALL, WALL, WATER, WALL ; 07 + tilecoll WATER, WATER, WATER, WATER ; 08 + tilecoll WALL, WATER, WALL, WATER ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a + tilecoll WATER, WALL, WATER, WALL ; 0b + tilecoll WATER, WATER, FLOOR, FLOOR ; 0c + tilecoll WALL, WATER, WALL, WALL ; 0d + tilecoll WATER, WATER, WALL, WALL ; 0e + tilecoll WATER, WALL, WALL, WALL ; 0f + tilecoll WATER, WATER, WATER, WATER ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WATER, WATER, WATER, WATER ; 12 + tilecoll WATER, FLOOR, WATER, FLOOR ; 13 tilecoll WATER, FLOOR, WATER, FLOOR ; 14 - tilecoll WATER, FLOOR, WATER, FLOOR ; 15 + tilecoll WATER, WATER, WATER, WATER ; 15 tilecoll WATER, WATER, WATER, WATER ; 16 - tilecoll WATER, WATER, WATER, WATER ; 17 - tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18 - tilecoll WATER, WATER, WALL, WALL ; 19 - tilecoll WATER, FLOOR, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WATER, WALL, WALL ; 1c + tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 17 + tilecoll WATER, WATER, WALL, WALL ; 18 + tilecoll WATER, FLOOR, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WATER, WALL, WALL ; 1b + tilecoll WATER_21, WATER_21, WALL, WALL ; 1c tilecoll WATER_21, WATER_21, WALL, WALL ; 1d tilecoll WATER_21, WATER_21, WALL, WALL ; 1e - tilecoll WATER_21, WATER_21, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WATER ; 20 - tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll BUOY, BUOY, BUOY, WATER ; 23 - tilecoll BUOY, BUOY, WATER, BUOY ; 24 + tilecoll WALL, WALL, WALL, WATER ; 1f + tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll BUOY, BUOY, BUOY, WATER ; 22 + tilecoll BUOY, BUOY, WATER, BUOY ; 23 + tilecoll BUOY, BUOY, WATER, WATER ; 24 tilecoll BUOY, BUOY, WATER, WATER ; 25 - tilecoll BUOY, BUOY, WATER, WATER ; 26 - tilecoll LADDER, LADDER, LADDER, LADDER ; 27 - tilecoll FLOOR, FLOOR, WATER, WATER ; 28 - tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29 - tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c - tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d - tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, WATER, FLOOR, WATER ; 2f - tilecoll WATER, FLOOR, WATER, FLOOR ; 30 - tilecoll FLOOR, FLOOR, WATER, WATER ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, FLOOR, WALL, FLOOR ; 33 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 - tilecoll FLOOR, WATER, FLOOR, WATER ; 35 - tilecoll WALL, WALL, FLOOR, LADDER ; 36 - tilecoll WATER, WATER, WATER, WATER ; 37 - tilecoll FLOOR, WATER, FLOOR, WATER ; 38 - tilecoll WATER, FLOOR, WATER, FLOOR ; 39 - tilecoll WATER, WATER, FLOOR, FLOOR ; 3a + tilecoll LADDER, LADDER, LADDER, LADDER ; 26 + tilecoll FLOOR, FLOOR, WATER, WATER ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WATER ; 28 + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2c + tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, WATER, FLOOR, WATER ; 2e + tilecoll WATER, FLOOR, WATER, FLOOR ; 2f + tilecoll FLOOR, FLOOR, WATER, WATER ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 32 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 33 + tilecoll FLOOR, WATER, FLOOR, WATER ; 34 + tilecoll WALL, WALL, FLOOR, LADDER ; 35 + tilecoll WATER, WATER, WATER, WATER ; 36 + tilecoll FLOOR, WATER, FLOOR, WATER ; 37 + tilecoll WATER, FLOOR, WATER, FLOOR ; 38 + tilecoll WATER, WATER, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3a tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 diff --git a/data/tilesets/radio_tower_collision.asm b/data/tilesets/radio_tower_collision.asm index 1713eb438..2c2813047 100644 --- a/data/tilesets/radio_tower_collision.asm +++ b/data/tilesets/radio_tower_collision.asm @@ -1,64 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10 - tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 - tilecoll WALL, WALL, PC, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, WALL, COUNTER ; 05 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 09 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0e + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 0f + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, PC, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, FLOOR, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, COUNTER ; 1a - tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b - tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, WALL ; 1d - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, FLOOR, WALL, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, WALL ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, FLOOR ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, WALL, FLOOR ; 3d - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e - tilecoll FLOOR, WALL, FLOOR, WALL ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, COUNTER ; 19 + tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1a + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, FLOOR, WALL, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 21 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 24 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 25 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, WALL ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2d + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 38 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d + tilecoll FLOOR, WALL, FLOOR, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f diff --git a/data/tilesets/ruins_of_alph_collision.asm b/data/tilesets/ruins_of_alph_collision.asm index 8c65340ab..fd7447583 100644 --- a/data/tilesets/ruins_of_alph_collision.asm +++ b/data/tilesets/ruins_of_alph_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, WALL, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, WALL ; 09 - tilecoll WALL, FLOOR, WALL, WALL ; 0a + tilecoll WALL, WALL, FLOOR, WALL ; 08 + tilecoll WALL, FLOOR, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, WALL, WALL ; 0a tilecoll FLOOR, FLOOR, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, WALL, WALL ; 0c - tilecoll FLOOR, WALL, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, FLOOR, WALL, FLOOR ; 0f - tilecoll FLOOR, WALL, FLOOR, WALL ; 10 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll WALL, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, PIT ; 19 - tilecoll WALL, WALL, PIT, WALL ; 1a - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, WALL ; 1d - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 - tilecoll WALL, FLOOR, WALL, FLOOR ; 22 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24 + tilecoll FLOOR, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, FLOOR, WALL, FLOOR ; 0e + tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll WALL, FLOOR, WALL, WALL ; 14 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, PIT ; 18 + tilecoll WALL, WALL, PIT, WALL ; 19 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, WALL, FLOOR, FLOOR ; 2f - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30 - tilecoll CAVE, WALL, FLOOR, FLOOR ; 31 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, WALL, PIT ; 35 - tilecoll WALL, WALL, PIT, WALL ; 36 + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 2f + tilecoll CAVE, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, WALL, WALL, PIT ; 34 + tilecoll WALL, WALL, PIT, WALL ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39 - tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a - tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b - tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c - tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d - tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e - tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f - tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 38 + tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 39 + tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3a + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3b + tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3c + tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3d + tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3e + tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 3f diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm index 9d02e9640..30e74a56f 100644 --- a/data/tilesets/tower_collision.asm +++ b/data/tilesets/tower_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 02 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, WALL ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, WALL, FLOOR, WALL ; 11 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, WALL, FLOOR, WALL ; 10 + tilecoll WALL, FLOOR, WALL, FLOOR ; 11 tilecoll WALL, FLOOR, WALL, FLOOR ; 12 - tilecoll WALL, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, WALL, FLOOR, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 - tilecoll WALL, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, FLOOR, WALL, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 13 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1e + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1f tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21 - tilecoll WALL, WALL, WALL, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25 - tilecoll WALL, WALL, PIT, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27 - tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 24 + tilecoll WALL, WALL, PIT, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26 + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c - tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, WALL, WALL, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll FLOOR, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WALL, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, FLOOR, WALL ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll PIT, PIT, FLOOR, FLOOR ; 38 - tilecoll FLOOR, PIT, FLOOR, PIT ; 39 - tilecoll PIT, FLOOR, PIT, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d - tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e - tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b + tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, WALL, WALL, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, FLOOR, WALL ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll PIT, PIT, FLOOR, FLOOR ; 37 + tilecoll FLOOR, PIT, FLOOR, PIT ; 38 + tilecoll PIT, FLOOR, PIT, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 3b + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3c + tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d + tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/traditional_house_collision.asm b/data/tilesets/traditional_house_collision.asm index 95cb1c21d..72db9bd42 100644 --- a/data/tilesets/traditional_house_collision.asm +++ b/data/tilesets/traditional_house_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, RADIO, FLOOR ; 02 - tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, RADIO, FLOOR ; 01 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, FLOOR, WALL, FLOOR ; 0c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, FLOOR, WALL, FLOOR ; 0b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13 - tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 12 + tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23 - tilecoll WALL, WALL, RADIO, FLOOR ; 24 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WALL, WALL ; 27 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 21 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 22 + tilecoll WALL, WALL, RADIO, FLOOR ; 23 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24 + tilecoll WALL, WALL, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 33 tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, WALL, FLOOR ; 35 - tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a - tilecoll 04, 03, 03, 03 ; 3b - tilecoll 03, 03, 03, 03 ; 3c - tilecoll 03, 03, 04, 04 ; 3d - tilecoll 04, 04, 04, 04 ; 3e - tilecoll 03, 03, 03, 03 ; 3f - tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 38 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 39 + tilecoll 04, 03, 03, 03 ; 3a + tilecoll 03, 03, 03, 03 ; 3b + tilecoll 03, 03, 04, 04 ; 3c + tilecoll 04, 04, 04, 04 ; 3d + tilecoll 03, 03, 03, 03 ; 3e + tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 3f diff --git a/data/tilesets/train_station_collision.asm b/data/tilesets/train_station_collision.asm index 55b147237..a6a4b1ace 100644 --- a/data/tilesets/train_station_collision.asm +++ b/data/tilesets/train_station_collision.asm @@ -1,64 +1,64 @@ - tilecoll FF, FF, FF, FF ; 01 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02 - tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03 + tilecoll FF, FF, FF, FF ; 00 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 01 + tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WALL, WALL ; 07 - tilecoll WALL, FLOOR, WALL, FLOOR ; 08 - tilecoll WALL, FLOOR, WALL, WALL ; 09 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll WALL, FLOOR, WALL, FLOOR ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, FLOOR, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, DOOR, WALL ; 12 - tilecoll WALL, WALL, WALL, DOOR ; 13 + tilecoll WALL, WALL, DOOR, WALL ; 11 + tilecoll WALL, WALL, WALL, DOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, WALL ; 14 tilecoll WALL, WALL, WALL, WALL ; 15 tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, FLOOR, FLOOR ; 23 tilecoll WALL, WALL, FLOOR, FLOOR ; 24 tilecoll WALL, WALL, FLOOR, FLOOR ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll WALL, FLOOR, WALL, FLOOR ; 27 - tilecoll FLOOR, WALL, FLOOR, WALL ; 28 - tilecoll WALL, WALL, WALL, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, WALL, FLOOR, WALL ; 2b tilecoll FLOOR, WALL, FLOOR, WALL ; 2c tilecoll FLOOR, WALL, FLOOR, WALL ; 2d - tilecoll FLOOR, WALL, FLOOR, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f tilecoll WALL, WALL, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, FLOOR, FLOOR ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll FLOOR, WALL, FLOOR, WALL ; 33 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 - tilecoll WALL, FLOOR, WALL, FLOOR ; 35 - tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll WALL, WALL, WALL, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, FLOOR ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, FLOOR, WALL, WALL ; 3a - tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll FLOOR, WALL, WALL, WALL ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, WALL ; 32 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, FLOOR, WALL, FLOOR ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 + tilecoll WALL, WALL, WALL, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll FLOOR, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm index 0c3120451..e4cee7495 100644 --- a/data/tilesets/underground_collision.asm +++ b/data/tilesets/underground_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 02 tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll WALL, FLOOR, WALL, FLOOR ; 07 - tilecoll FLOOR, FLOOR, PIT, PIT ; 08 - tilecoll WALL, WALL, WALL, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f - tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10 - tilecoll WALL, FLOOR, WALL, WALL ; 11 - tilecoll FLOOR, FLOOR, WALL, WALL ; 12 - tilecoll FLOOR, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, WALL, FLOOR ; 06 + tilecoll FLOOR, FLOOR, PIT, PIT ; 07 + tilecoll WALL, WALL, WALL, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 0f + tilecoll WALL, FLOOR, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, WALL ; 11 + tilecoll FLOOR, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, WALL, WALL ; 14 tilecoll FLOOR, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, WALL ; 16 - tilecoll WALL, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll WALL, FLOOR, WALL, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll WALL, WALL, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 - tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26 - tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 25 + tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 27 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f + tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 tilecoll WALL, WALL, WALL, WALL ; 33 tilecoll WALL, WALL, WALL, WALL ; 34 tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll WALL, WALL, WALL, WALL ; 36 - tilecoll WALL, FLOOR, WALL, FLOOR ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 tilecoll WALL, WALL, WALL, WALL ; 39 tilecoll WALL, WALL, WALL, WALL ; 3a tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_dark_cave_collision.asm index 0022d3881..8bbc11f2a 100644 --- a/data/tilesets/unused_dark_cave_collision.asm +++ b/data/tilesets/unused_dark_cave_collision.asm @@ -1,33 +1,34 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 - tilecoll WALL, WALL, TOWN_MAP, WALL ; 18 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, TOWN_MAP, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b - tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 @@ -37,92 +38,91 @@ tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll WALL, WALL, WALL, DOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, DOOR ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, DOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c tilecoll FLOOR, FLOOR, WALL, WALL ; 2d - tilecoll FLOOR, FLOOR, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, DOOR ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31 - tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32 - tilecoll BUOY, BUOY, WATER_21, BUOY ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36 - tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll BUOY, WATER_21, BUOY, BUOY ; 39 - tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a - tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30 + tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31 + tilecoll BUOY, BUOY, WATER_21, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35 + tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll BUOY, WATER_21, BUOY, BUOY ; 38 + tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39 + tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c - tilecoll WALL, WALL, WALL, FLOOR ; 5d - tilecoll WALL, WALL, FLOOR, FLOOR ; 5e - tilecoll WALL, WALL, FLOOR, WALL ; 5f - tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60 - tilecoll WALL, FLOOR, WALL, FLOOR ; 61 - tilecoll WALL, WALL, WALL, WALL ; 62 - tilecoll FLOOR, WALL, FLOOR, WALL ; 63 - tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64 - tilecoll WALL, FLOOR, WALL, WALL ; 65 - tilecoll FLOOR, FLOOR, WALL, WALL ; 66 - tilecoll FLOOR, WALL, WALL, WALL ; 67 - tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, DOOR, WALL ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll WALL, WALL, WALL, FLOOR ; 5c + tilecoll WALL, WALL, FLOOR, FLOOR ; 5d + tilecoll WALL, WALL, FLOOR, WALL ; 5e + tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f + tilecoll WALL, FLOOR, WALL, FLOOR ; 60 + tilecoll WALL, WALL, WALL, WALL ; 61 + tilecoll FLOOR, WALL, FLOOR, WALL ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63 + tilecoll WALL, FLOOR, WALL, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, WALL ; 65 + tilecoll FLOOR, WALL, WALL, WALL ; 66 + tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, DOOR, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76 + tilecoll WALL, WALL, WALL, WALL ; 77 tilecoll WALL, WALL, WALL, WALL ; 78 - tilecoll WALL, WALL, WALL, WALL ; 79 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm index 758e3f0a4..90df4c5f8 100644 --- a/data/trainers/gendered_trainers.asm +++ b/data/trainers/gendered_trainers.asm @@ -26,7 +26,7 @@ MaleTrainers: ; 4e95d db SAGE db BIKER db SCIENTIST -MaleTrainersEnd +.End FemaleTrainers: ; 4e976 db MEDIUM @@ -39,4 +39,4 @@ FemaleTrainers: ; 4e976 db KIMONO_GIRL db POKEFANF db COOLTRAINERF -FemaleTrainersEnd +.End diff --git a/data/types/badge_type_boosts.asm b/data/types/badge_type_boosts.asm new file mode 100644 index 000000000..b212ef22e --- /dev/null +++ b/data/types/badge_type_boosts.asm @@ -0,0 +1,21 @@ +BadgeTypeBoosts: +; entries correspond to wJohtoBadges constants + db FLYING ; ZEPHYRBADGE + db BUG ; HIVEBADGE + db NORMAL ; PLAINBADGE + db GHOST ; FOGBADGE + db STEEL ; MINERALBADGE + db FIGHTING ; STORMBADGE + db ICE ; GLACIERBADGE + db DRAGON ; RISINGBADGE + ; fallthrough +; entries correspond to wKantoBadges constants + db ROCK ; BOULDERBADGE + db WATER ; CASCADEBADGE + db ELECTRIC ; THUNDERBADGE + db GRASS ; RAINBOWBADGE + db POISON ; SOULBADGE + db PSYCHIC ; MARSHBADGE + db FIRE ; VOLCANOBADGE + db GROUND ; EARTHBADGE + db -1 ; end diff --git a/data/battle/type_boost_items.asm b/data/types/type_boost_items.asm index 3b7231a59..3b7231a59 100644 --- a/data/battle/type_boost_items.asm +++ b/data/types/type_boost_items.asm diff --git a/data/battle/type_matchups.asm b/data/types/type_matchups.asm index 90e38ae2c..90e38ae2c 100644 --- a/data/battle/type_matchups.asm +++ b/data/types/type_matchups.asm diff --git a/data/unown_words.asm b/data/unown_words.asm deleted file mode 100644 index ea8c4b2a8..000000000 --- a/data/unown_words.asm +++ /dev/null @@ -1,67 +0,0 @@ -unownword: MACRO -x = 1 - rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 -x = x + 1 - endr - db -1 -ENDM - -UnownWords: ; fba5a -; entries correspond to Unown forms - dw UnownWord1 - dw UnownWord1 - dw UnownWord2 - dw UnownWord3 - dw UnownWord4 - dw UnownWord5 - dw UnownWord6 - dw UnownWord7 - dw UnownWord8 - dw UnownWord9 - dw UnownWord10 - dw UnownWord11 - dw UnownWord12 - dw UnownWord13 - dw UnownWord14 - dw UnownWord15 - dw UnownWord16 - dw UnownWord17 - dw UnownWord18 - dw UnownWord19 - dw UnownWord20 - dw UnownWord21 - dw UnownWord22 - dw UnownWord23 - dw UnownWord24 - dw UnownWord25 - dw UnownWord26 -; fba90 - -UnownWord1: unownword "ANGRY" -UnownWord2: unownword "BEAR" -UnownWord3: unownword "CHASE" -UnownWord4: unownword "DIRECT" -UnownWord5: unownword "ENGAGE" -UnownWord6: unownword "FIND" -UnownWord7: unownword "GIVE" -UnownWord8: unownword "HELP" -UnownWord9: unownword "INCREASE" -UnownWord10: unownword "JOIN" -UnownWord11: unownword "KEEP" -UnownWord12: unownword "LAUGH" -UnownWord13: unownword "MAKE" -UnownWord14: unownword "NUZZLE" -UnownWord15: unownword "OBSERVE" -UnownWord16: unownword "PERFORM" -UnownWord17: unownword "QUICKEN" -UnownWord18: unownword "REASSURE" -UnownWord19: unownword "SEARCH" -UnownWord20: unownword "TELL" -UnownWord21: unownword "UNDO" -UnownWord22: unownword "VANISH" -UnownWord23: unownword "WANT" -UnownWord24: unownword "XXXXX" -UnownWord25: unownword "YIELD" -UnownWord26: unownword "ZOOM" -; fbb32 diff --git a/data/unused/unknown_53d84.asm b/data/unused_53d84.asm index 026ec5275..026ec5275 100755 --- a/data/unused/unknown_53d84.asm +++ b/data/unused_53d84.asm diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm index 07bb7a9d9..c94ebfce0 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -2,11 +2,10 @@ ; Notably missing are Route 40 and Route 41, which are water routes. roam_map: MACRO -; map, # of other maps, other maps map \1 - db \2 -rept \2 - map \3 + db _NARG - 1 +rept _NARG +- 1 + map \2 shift endr db 0 @@ -14,21 +13,22 @@ ENDM RoamMaps: ; 2a40f ; there are NUM_ROAMMON_MAPS entries - roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 - roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31 - roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36 - roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33 - roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34 - roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35 - roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36 - roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 - roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42 - roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42 - roam_map ROUTE_39, 1, ROUTE_38 - roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 - roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44 - roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45 - roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46 - roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29 + ; start map, ...other maps + roam_map ROUTE_29, ROUTE_30, ROUTE_46 + roam_map ROUTE_30, ROUTE_29, ROUTE_31 + roam_map ROUTE_31, ROUTE_30, ROUTE_32, ROUTE_36 + roam_map ROUTE_32, ROUTE_36, ROUTE_31, ROUTE_33 + roam_map ROUTE_33, ROUTE_32, ROUTE_34 + roam_map ROUTE_34, ROUTE_33, ROUTE_35 + roam_map ROUTE_35, ROUTE_34, ROUTE_36 + roam_map ROUTE_36, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 + roam_map ROUTE_37, ROUTE_36, ROUTE_38, ROUTE_42 + roam_map ROUTE_38, ROUTE_37, ROUTE_39, ROUTE_42 + roam_map ROUTE_39, ROUTE_38 + roam_map ROUTE_42, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 + roam_map ROUTE_43, ROUTE_42, ROUTE_44 + roam_map ROUTE_44, ROUTE_42, ROUTE_43, ROUTE_45 + roam_map ROUTE_45, ROUTE_44, ROUTE_46 + roam_map ROUTE_46, ROUTE_45, ROUTE_29 db -1 ; end ; 2a4a0 diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 7860110ca..4e30a51a5 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -11,7 +11,7 @@ TreeMonMaps: ; b825e treemon_map ROUTE_30, TREEMON_SET_ROUTE treemon_map ROUTE_31, TREEMON_SET_ROUTE treemon_map ROUTE_32, TREEMON_SET_KANTO - treemon_map ROUTE_33, TREEMON_SET_AZALEA + treemon_map ROUTE_33, TREEMON_SET_TOWN treemon_map ROUTE_34, TREEMON_SET_ROUTE treemon_map ROUTE_35, TREEMON_SET_ROUTE treemon_map ROUTE_36, TREEMON_SET_ROUTE @@ -20,7 +20,7 @@ TreeMonMaps: ; b825e treemon_map ROUTE_39, TREEMON_SET_ROUTE treemon_map ROUTE_40, TREEMON_SET_CITY treemon_map ROUTE_41, TREEMON_SET_CITY - treemon_map ROUTE_42, TREEMON_SET_AZALEA + treemon_map ROUTE_42, TREEMON_SET_TOWN treemon_map ROUTE_43, TREEMON_SET_LAKE treemon_map ROUTE_44, TREEMON_SET_CANYON treemon_map ROUTE_45, TREEMON_SET_CANYON @@ -28,7 +28,7 @@ TreeMonMaps: ; b825e treemon_map NEW_BARK_TOWN, TREEMON_SET_CITY treemon_map CHERRYGROVE_CITY, TREEMON_SET_CITY treemon_map VIOLET_CITY, TREEMON_SET_CITY - treemon_map AZALEA_TOWN, TREEMON_SET_AZALEA + treemon_map AZALEA_TOWN, TREEMON_SET_TOWN treemon_map CIANWOOD_CITY, TREEMON_SET_CITY treemon_map GOLDENROD_CITY, TREEMON_SET_CITY treemon_map OLIVINE_CITY, TREEMON_SET_CITY diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm index 21cef29ec..5a29d675c 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -2,7 +2,7 @@ TreeMons: ; b82e8 ; entries correspond to TREEMON_SET_* constants dw TreeMonSet_City dw TreeMonSet_Canyon - dw TreeMonSet_Azalea + dw TreeMonSet_Town dw TreeMonSet_Route dw TreeMonSet_Kanto dw TreeMonSet_Lake @@ -33,7 +33,7 @@ TreeMonSet_Canyon: ; b82fa db 5, AIPOM, 10 db -1 -TreeMonSet_Azalea: ; b8320 +TreeMonSet_Town: ; b8320 ; common db 50, SPEAROW, 10 db 15, EKANS, 10 diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm new file mode 100644 index 000000000..d09064c4b --- /dev/null +++ b/data/wild/unlocked_unowns.asm @@ -0,0 +1,24 @@ +unown_set: MACRO +rept _NARG + db UNOWN_\1 + shift +endr + db -1 +ENDM + +UnlockedUnownLetterSets: +; entries correspond to wUnlockedUnowns bits + dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K + dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R + dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W + dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z +.End + +.Set_A_K: + unown_set A, B, C, D, E, F, G, H, I, J, K +.Set_L_R: + unown_set L, M, N, O, P, Q, R +.Set_S_W: + unown_set S, T, U, V, W +.Set_X_Z: + unown_set X, Y, Z |