summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-20 14:34:00 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-20 15:00:59 -0400
commit2883bfb9b1d3db35d9f1cb61ee0d9c015df4de30 (patch)
tree817f03eeaa85858b351b586109f71f3bb67efa1c /data
parent0def3b67fa0a64bc2e2778c99c53e1a77cbf302c (diff)
Finish disassembling battle core.
Diffstat (limited to 'data')
-rw-r--r--data/battle/effect_command_pointers.asm181
-rw-r--r--data/battle/stat_multipliers_2.asm20
-rwxr-xr-xdata/text/common_1.asm16
-rw-r--r--data/wild/unlocked_unowns.asm24
4 files changed, 234 insertions, 7 deletions
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm
new file mode 100644
index 00000000..d5c044d7
--- /dev/null
+++ b/data/battle/effect_command_pointers.asm
@@ -0,0 +1,181 @@
+; battle commands are defined in engine/battle/effect_commands.asm
+
+ dw 0 ; padding
+
+BattleCommandPointers:
+; entries correspond to macros/scripts/battle_commands.asm
+ dw BattleCommand_CheckTurn
+ dw BattleCommand_CheckObedience
+ dw BattleCommand_UsedMoveText
+ dw BattleCommand_DoTurn
+ dw BattleCommand_Critical
+ dw BattleCommand_DamageStats
+ dw BattleCommand_Stab
+ dw BattleCommand_DamageVariation
+ dw BattleCommand_CheckHit
+ dw BattleCommand_LowerSub
+ dw BattleCommand_MoveAnimNoSub
+ dw BattleCommand_RaiseSub
+ dw BattleCommand_FailureText
+ dw BattleCommand_ApplyDamage
+ dw BattleCommand_CriticalText
+ dw BattleCommand_SuperEffectiveText
+ dw BattleCommand_CheckFaint
+ dw BattleCommand_BuildOpponentRage
+ dw BattleCommand_PoisonTarget
+ dw BattleCommand_SleepTarget
+ dw BattleCommand_DrainTarget
+ dw BattleCommand_EatDream
+ dw BattleCommand_BurnTarget
+ dw BattleCommand_FreezeTarget
+ dw BattleCommand_ParalyzeTarget
+ dw BattleCommand_Selfdestruct
+ dw BattleCommand_MirrorMove
+ dw BattleCommand_StatUp
+ dw BattleCommand_StatDown
+ dw BattleCommand_PayDay
+ dw BattleCommand_Conversion
+ dw BattleCommand_ResetStats
+ dw BattleCommand_StoreEnergy
+ dw BattleCommand_UnleashEnergy
+ dw BattleCommand_ForceSwitch
+ dw BattleCommand_EndLoop
+ dw BattleCommand_FlinchTarget
+ dw BattleCommand_OHKO
+ dw BattleCommand_Recoil
+ dw BattleCommand_Mist
+ dw BattleCommand_FocusEnergy
+ dw BattleCommand_Confuse
+ dw BattleCommand_ConfuseTarget
+ dw BattleCommand_Heal
+ dw BattleCommand_Transform
+ dw BattleCommand_Screen
+ dw BattleCommand_Poison
+ dw BattleCommand_Paralyze
+ dw BattleCommand_Substitute
+ dw BattleCommand_RechargeNextTurn
+ dw BattleCommand_Mimic
+ dw BattleCommand_Metronome
+ dw BattleCommand_LeechSeed
+ dw BattleCommand_Splash
+ dw BattleCommand_Disable
+ dw BattleCommand_ClearText
+ dw BattleCommand_Charge
+ dw BattleCommand_CheckCharge
+ dw BattleCommand_TrapTarget
+ dw BattleCommand3c
+ dw BattleCommand_Rampage
+ dw BattleCommand_CheckRampage
+ dw BattleCommand_ConstantDamage
+ dw BattleCommand_Counter
+ dw BattleCommand_Encore
+ dw BattleCommand_PainSplit
+ dw BattleCommand_Snore
+ dw BattleCommand_Conversion2
+ dw BattleCommand_LockOn
+ dw BattleCommand_Sketch
+ dw BattleCommand_DefrostOpponent
+ dw BattleCommand_SleepTalk
+ dw BattleCommand_DestinyBond
+ dw BattleCommand_Spite
+ dw BattleCommand_FalseSwipe
+ dw BattleCommand_HealBell
+ dw BattleCommand_HeldFlinch
+ dw BattleCommand_TripleKick
+ dw BattleCommand_KickCounter
+ dw BattleCommand_Thief
+ dw BattleCommand_ArenaTrap
+ dw BattleCommand_Nightmare
+ dw BattleCommand_Defrost
+ dw BattleCommand_Curse
+ dw BattleCommand_Protect
+ dw BattleCommand_Spikes
+ dw BattleCommand_Foresight
+ dw BattleCommand_PerishSong
+ dw BattleCommand_StartSandstorm
+ dw BattleCommand_Endure
+ dw BattleCommand_CheckCurl
+ dw BattleCommand_RolloutPower
+ dw BattleCommand5d
+ dw BattleCommand_FuryCutter
+ dw BattleCommand_Attract
+ dw BattleCommand_HappinessPower
+ dw BattleCommand_Present
+ dw BattleCommand_DamageCalc
+ dw BattleCommand_FrustrationPower
+ dw BattleCommand_Safeguard
+ dw BattleCommand_CheckSafeguard
+ dw BattleCommand_GetMagnitude
+ dw BattleCommand_BatonPass
+ dw BattleCommand_Pursuit
+ dw BattleCommand_ClearHazards
+ dw BattleCommand_HealMorn
+ dw BattleCommand_HealDay
+ dw BattleCommand_HealNite
+ dw BattleCommand_HiddenPower
+ dw BattleCommand_StartRain
+ dw BattleCommand_StartSun
+ dw BattleCommand_AttackUp
+ dw BattleCommand_DefenseUp
+ dw BattleCommand_SpeedUp
+ dw BattleCommand_SpecialAttackUp
+ dw BattleCommand_SpecialDefenseUp
+ dw BattleCommand_AccuracyUp
+ dw BattleCommand_EvasionUp
+ dw BattleCommand_AttackUp2
+ dw BattleCommand_DefenseUp2
+ dw BattleCommand_SpeedUp2
+ dw BattleCommand_SpecialAttackUp2
+ dw BattleCommand_SpecialDefenseUp2
+ dw BattleCommand_AccuracyUp2
+ dw BattleCommand_EvasionUp2
+ dw BattleCommand_AttackDown
+ dw BattleCommand_DefenseDown
+ dw BattleCommand_SpeedDown
+ dw BattleCommand_SpecialAttackDown
+ dw BattleCommand_SpecialDefenseDown
+ dw BattleCommand_AccuracyDown
+ dw BattleCommand_EvasionDown
+ dw BattleCommand_AttackDown2
+ dw BattleCommand_DefenseDown2
+ dw BattleCommand_SpeedDown2
+ dw BattleCommand_SpecialAttackDown2
+ dw BattleCommand_SpecialDefenseDown2
+ dw BattleCommand_AccuracyDown2
+ dw BattleCommand_EvasionDown2
+ dw BattleCommand_StatUpMessage
+ dw BattleCommand_StatDownMessage
+ dw BattleCommand_StatUpFailText
+ dw BattleCommand_StatDownFailText
+ dw BattleCommand_EffectChance
+ dw BattleCommand_StatDownAnim
+ dw BattleCommand_StatUpAnim
+ dw BattleCommand_SwitchTurn
+ dw BattleCommand_FakeOut
+ dw BattleCommand_BellyDrum
+ dw BattleCommand_PsychUp
+ dw BattleCommand_Rage
+ dw BattleCommand_DoubleFlyingDamage
+ dw BattleCommand_DoubleUndergroundDamage
+ dw BattleCommand_MirrorCoat
+ dw BattleCommand_CheckFutureSight
+ dw BattleCommand_FutureSight
+ dw BattleCommand_DoubleMinimizeDamage
+ dw BattleCommand_SkipSunCharge
+ dw BattleCommand_ThunderAccuracy
+ dw BattleCommand_Teleport
+ dw BattleCommand_BeatUp
+ dw BattleCommand_RageDamage
+ dw BattleCommand_ResetTypeMatchup
+ dw BattleCommand_AllStatsUp
+ dw BattleCommand_BideFailText
+ dw BattleCommand_RaiseSubNoAnim
+ dw BattleCommand_LowerSubNoAnim
+ dw BattleCommand_BeatUpFailText
+ dw BattleCommand_ClearMissDamage
+ dw BattleCommand_MoveDelay
+ dw BattleCommand_MoveAnim
+ dw BattleCommand_TriStatusChance
+ dw BattleCommand_SuperEffectiveLoopText
+ dw BattleCommand_StartLoop
+ dw BattleCommand_Curl
diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm
new file mode 100644
index 00000000..3f3dc234
--- /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/text/common_1.asm b/data/text/common_1.asm
index 69e3c49e..ca1a8e9a 100755
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -1633,7 +1633,7 @@ Text_Gained::
text_ram wStringBuffer1
text " gained@@"
-Text_ABoostedStringBuffer2ExpPoints::
+_BoostedExpPointsText::
text_start
line "a boosted"
cont "@"
@@ -1641,7 +1641,7 @@ Text_ABoostedStringBuffer2ExpPoints::
text " EXP. Points!"
prompt
-Text_StringBuffer2ExpPoints::
+_ExpPointsText::
text_start
line "@"
text_decimal wStringBuffer2, 2, 4
@@ -1674,29 +1674,31 @@ Text_YourFoesWeakGetmMon::
text "!"
done
-Text_ThatsEnoughComeBack::
+Text_BattleMonNickComma::
text_ram wBattleMonNick
text ",@@"
+
+_ThatsEnoughComeBackText::
text " that's"
line "enough! Come back!"
done
-Text_OKComeBack::
+_OKComeBackText::
text " OK!"
line "Come back!"
done
-Text_GoodComeBack::
+_GoodComeBackText::
text " good!"
line "Come back!"
done
-Text_ComeBack::
+_ComeBackText::
text " come"
line "back!"
done
-BattleText_PlayerPickedUpPayDayMoney:
+_PlayerPickedUpPayDayMoney::
text "<PLAYER> picked up"
line "¥@"
text_decimal wPayDayMoney, 3, 6
diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm
new file mode 100644
index 00000000..d09064c4
--- /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