diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle/stat_multipliers.asm | 20 | ||||
| -rw-r--r-- | data/battle/stat_names.asm | 10 | ||||
| -rw-r--r-- | data/moves/magnitude_power.asm | 9 | ||||
| -rw-r--r-- | data/moves/metronome_exception_moves.asm | 17 | ||||
| -rw-r--r-- | data/moves/present_power.asm | 6 | ||||
| -rwxr-xr-x | data/text/battle.asm | 6 | ||||
| -rw-r--r-- | data/text/common_2.asm | 26 |
7 files changed, 78 insertions, 16 deletions
diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm new file mode 100644 index 00000000..bbb1cadd --- /dev/null +++ b/data/battle/stat_multipliers.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_2.asm. +; This one is used by CalcBattleStats. + +StatLevelMultipliers: + 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/stat_names.asm b/data/battle/stat_names.asm new file mode 100644 index 00000000..a144a225 --- /dev/null +++ b/data/battle/stat_names.asm @@ -0,0 +1,10 @@ +StatNames: +; entries correspond to stat ids + db "ATTACK@" + db "DEFENSE@" + db "SPEED@" + db "SPCL.ATK@" + db "SPCL.DEF@" + db "ACCURACY@" + db "EVASION@" + db "ABILITY@" ; used for BattleCommand_Curse diff --git a/data/moves/magnitude_power.asm b/data/moves/magnitude_power.asm new file mode 100644 index 00000000..7359bdb1 --- /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/metronome_exception_moves.asm b/data/moves/metronome_exception_moves.asm new file mode 100644 index 00000000..a5aa4413 --- /dev/null +++ b/data/moves/metronome_exception_moves.asm @@ -0,0 +1,17 @@ +; Metronome cannot turn into these moves. + +MetronomeExcepts: + 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 diff --git a/data/moves/present_power.asm b/data/moves/present_power.asm new file mode 100644 index 00000000..885e9c69 --- /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/text/battle.asm b/data/text/battle.asm index a222cac5..cccc9421 100755 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -442,7 +442,7 @@ UsedBindText: cont "<TARGET>!" prompt -WhirlpoolTrapText: +WasTrappedText: text "<TARGET>" line "was trapped!" prompt @@ -806,7 +806,7 @@ SubFadedText: line "SUBSTITUTE faded!" prompt -LearnedMoveText: +MimicLearnedMoveText: text "<USER>" line "learned" cont "@" @@ -1072,7 +1072,7 @@ BeatUpAttackText: line "attack!" done -CanReceiveGiftText: +CantReceiveGiftText: text "<TARGET> can't" line "receive the gift!" prompt diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 355c88bb..d82fdccd 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -372,65 +372,65 @@ _EndUsedMove5Text:: text "!" done -UnknownText_0x1c0cc6:: +Text_BattleEffectActivate:: text "<USER>'s" line "@" text_ram wStringBuffer2 db "@@" -UnknownText_0x1c0cd0:: +_BattleStatWentWayUpText:: text_pause text "<SCROLL>went way up!" prompt -UnknownText_0x1c0ce0:: +_BattleStatWentUpText:: text " went up!" prompt -UnknownText_0x1c0ceb:: +Text_BattleFoeEffectActivate:: text "<TARGET>'s" line "@" text_ram wStringBuffer2 db "@@" -UnknownText_0x1c0cf5:: +_BattleStatSharplyFellText:: text_pause text "<SCROLL>sharply fell!" prompt -UnknownText_0x1c0d06:: +_BattleStatFellText:: text " fell!" prompt -UnknownText_0x1c0d0e:: +Text_BattleUser:: text "<USER>@@" -UnknownText_0x1c0d12:: +_BattleMadeWhirlwindText:: text_start line "made a whirlwind!" prompt -UnknownText_0x1c0d26:: +_BattleTookSunlightText:: text_start line "took in sunlight!" prompt -UnknownText_0x1c0d3a:: +_BattleLoweredHeadText:: text_start line "lowered its head!" prompt -UnknownText_0x1c0d4e:: +_BattleGlowingText:: text_start line "is glowing!" prompt -UnknownText_0x1c0d5c:: +_BattleFlewText:: text_start line "flew up high!" prompt -UnknownText_0x1c0d6c:: +_BattleDugText:: text_start line "dug a hole!" prompt |