diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-12 13:10:01 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-12 13:31:27 -0400 |
| commit | 3e40a1ecd0dc81d1d5be5f1adda1fbbe14b67d83 (patch) | |
| tree | f16febfeb0c404b6fd1c0e630d26da14eaf07a71 /data/moves | |
| parent | dac57cee381b68350ef50317619334892c140945 (diff) | |
Simple cleanups in constants/data/macros and banks 1-4.
Diffstat (limited to 'data/moves')
| -rw-r--r-- | data/moves/magnitude_power.asm | 14 | ||||
| -rw-r--r-- | data/moves/present_power.asm | 6 | ||||
| -rw-r--r-- | data/moves/tmhm_moves.asm | 66 |
3 files changed, 76 insertions, 10 deletions
diff --git a/data/moves/magnitude_power.asm b/data/moves/magnitude_power.asm index 7359bdb1..632a0c03 100644 --- a/data/moves/magnitude_power.asm +++ b/data/moves/magnitude_power.asm @@ -1,9 +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 + db 5 percent + 1, 10, 4 ; 5% + db 15 percent, 30, 5 ; 10% + db 35 percent, 50, 6 ; 20% + db 65 percent + 1, 70, 7 ; 30% + db 85 percent + 1, 90, 8 ; 20% + db 95 percent, 110, 9 ; 10% + db 100 percent, 150, 10 ; 5% diff --git a/data/moves/present_power.asm b/data/moves/present_power.asm index 885e9c69..9f85b8a6 100644 --- a/data/moves/present_power.asm +++ b/data/moves/present_power.asm @@ -1,6 +1,6 @@ PresentPower: ; chance, power - db 40 percent, 40 ; 40% - db 70 percent + 1, 80 ; 30% - db 80 percent, 120 ; 10% + db 40 percent, 40 ; 40% chance + db 70 percent + 1, 80 ; 30% chance + db 80 percent, 120 ; 10% chance db -1 ; 20% chance to heal instead diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm new file mode 100644 index 00000000..81c7d0ba --- /dev/null +++ b/data/moves/tmhm_moves.asm @@ -0,0 +1,66 @@ +TMHMMoves: +; entries correspond to *_TMNUM enums (see constants/item_constants.asm) +; TMs + db DYNAMICPUNCH + db HEADBUTT + db CURSE + db ROLLOUT + db ROAR + db TOXIC + db ZAP_CANNON + db ROCK_SMASH + db PSYCH_UP + db HIDDEN_POWER + db SUNNY_DAY + db SWEET_SCENT + db SNORE + db BLIZZARD + db HYPER_BEAM + db ICY_WIND + db PROTECT + db RAIN_DANCE + db GIGA_DRAIN + db ENDURE + db FRUSTRATION + db SOLARBEAM + db IRON_TAIL + db DRAGONBREATH + db THUNDER + db EARTHQUAKE + db RETURN + db DIG + db PSYCHIC_M + db SHADOW_BALL + db MUD_SLAP + db DOUBLE_TEAM + db ICE_PUNCH + db SWAGGER + db SLEEP_TALK + db SLUDGE_BOMB + db SANDSTORM + db FIRE_BLAST + db SWIFT + db DEFENSE_CURL + db THUNDERPUNCH + db DREAM_EATER + db DETECT + db REST + db ATTRACT + db THIEF + db STEEL_WING + db FIRE_PUNCH + db FURY_CUTTER + db NIGHTMARE +; HMs + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db WHIRLPOOL + db WATERFALL +; Move tutor (Crystal-only) + db 0 + db 0 + db 0 + db 0 ; end |