summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-06-21 20:47:58 +0200
committerGitHub <noreply@github.com>2017-06-21 20:47:58 +0200
commitc84bb67156d6ab822b6ff1b508e9fae73f054675 (patch)
tree5973f1e72156bb75cb6561a11dd7f333b90fcb3f /data
parent11ad653b57d811dbe8df831d4987128da39bdcb5 (diff)
parent42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff)
Merge pull request #2 from pret/master
be up to date with master2
Diffstat (limited to 'data')
-rw-r--r--data/battle_811DA74.s20
-rw-r--r--data/battle_anim_81258BC.s8
-rw-r--r--data/battle_anim_8137220.s2
-rw-r--r--data/battle_scripts_1.s330
-rw-r--r--data/battle_scripts_2.s16
-rw-r--r--data/data2.s216
-rw-r--r--data/pokeball.s137
-rw-r--r--data/sine_degree_table.inc183
-rw-r--r--data/sine_table.inc323
-rw-r--r--data/text/battle_strings.inc20
-rw-r--r--data/trig.s10
11 files changed, 306 insertions, 959 deletions
diff --git a/data/battle_811DA74.s b/data/battle_811DA74.s
index a17937823..873c76eb9 100644
--- a/data/battle_811DA74.s
+++ b/data/battle_811DA74.s
@@ -4,10 +4,10 @@
.section .rodata
.align 2
-gUnknown_083FE4F4:: @ 83FE4F4
- .4byte dp01t_00_3_getattr
+gLinkPartnerBufferCommands:: @ 83FE4F4
+ .4byte LinkPartnerHandleGetAttributes
.4byte sub_811EC04
- .4byte sub_811EC10
+ .4byte LinkPartnerHandleSetAttributes
.4byte sub_811F664
.4byte sub_811F6D8
.4byte sub_811F7F4
@@ -29,10 +29,10 @@ gUnknown_083FE4F4:: @ 83FE4F4
.4byte sub_8120128
.4byte sub_8120134
.4byte sub_8120140
- .4byte sub_812014C
- .4byte sub_812023C
- .4byte sub_8120248
- .4byte sub_81202BC
+ .4byte LinkPartnerHandleHealthBarUpdate
+ .4byte LinkPartnerHandleExpBarUpdate
+ .4byte LinkPartnerHandleStatusIconUpdate
+ .4byte LinkPartnerHandleStatusAnimation
.4byte sub_8120324
.4byte sub_8120330
.4byte sub_812033C
@@ -46,11 +46,11 @@ gUnknown_083FE4F4:: @ 83FE4F4
.4byte sub_81203AC
.4byte sub_81203E4
.4byte sub_81203FC
- .4byte dp01t_29_3_blink
+ .4byte LinkPartnerHandleHitAnimation
.4byte sub_8120494
- .4byte sub_81204A0
+ .4byte LinkPartnerHandleEffectivenessSound
.4byte sub_81204E4
- .4byte sub_8120514
+ .4byte LinkPartnerHandleFaintingCry
.4byte dp01t_2E_3_battle_intro
.4byte sub_8120588
.4byte dp01t_30_3_80EB11C
diff --git a/data/battle_anim_81258BC.s b/data/battle_anim_81258BC.s
index b4f88fc67..993adbc2e 100644
--- a/data/battle_anim_81258BC.s
+++ b/data/battle_anim_81258BC.s
@@ -4,8 +4,8 @@
.section .rodata
.align 2
-gUnknown_08402080:: @ 8402080
- .4byte sub_812B864
+gSafariBufferCommands:: @ 8402080
+ .4byte SafariHandleGetAttributes
.4byte sub_812B870
.4byte sub_812B87C
.4byte sub_812B888
@@ -21,8 +21,8 @@ gUnknown_08402080:: @ 8402080
.4byte sub_812BA14
.4byte sub_812BA70
.4byte sub_812BA7C
- .4byte dp01t_10_6_message
- .4byte dp01t_11_6_message_for_player_only
+ .4byte SafariHandlePrintString
+ .4byte SafariHandlePrintStringPlayerOnly
.4byte sub_812BB10
.4byte sub_812BBFC
.4byte sub_812BC08
diff --git a/data/battle_anim_8137220.s b/data/battle_anim_8137220.s
index a2f7c1d74..c1673af9a 100644
--- a/data/battle_anim_8137220.s
+++ b/data/battle_anim_8137220.s
@@ -4,7 +4,7 @@
.section .rodata
.align 2
-gUnknown_084061A4:: @ 84061A4
+gWallyBufferCommands:: @ 84061A4
.4byte dp01t_00_5_getattr
.4byte sub_8138230
.4byte sub_813823C
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 32d8e6da5..fbb0826fc 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -280,7 +280,7 @@ BattleScript_1D6F48: @ 81D6F48
seteffectwithchancetarget
faintpokemon TARGET, 0, 0x0
-BattleScript_1D6F62:: @ 81D6F62
+BattleScript_EndTurn:: @ 81D6F62
setbyte 0x201600c, 0
atk49 0, 0
end
@@ -299,7 +299,7 @@ BattleScript_1D6F77: @ 81D6F77
missmessage
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Sleep: @ 81D6F81
attackcanceler
@@ -315,25 +315,25 @@ MoveEffect_Sleep: @ 81D6F81
waitanimation
setbyte 0x2024d21, 1
seteffecttarget
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D6FC4: @ 81D6FC4
pause 32
printstring BATTLE_TEXT_DefendingAsleep
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D6FD2: @ 81D6FD2
pause 32
printstring BATTLE_TEXT_WasntAffected
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D6FE0: @ 81D6FE0
pause 32
printfromtable BattleTextList_40156A
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_PoisonHit: @ 81D6FF0
MoveEffect_PoisonTail: @ 81D6FF0
@@ -380,7 +380,7 @@ BattleScript_1D703F: @ 81D703F
BattleScript_1D7056: @ 81D7056
faintpokemon USER, 0, 0x0
faintpokemon TARGET, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_BlazeKick: @ 81D7069
MoveEffect_BurnHit: @ 81D7069
@@ -490,7 +490,7 @@ BattleScript_1D7129: @ 81D7129
BattleScript_1D7167: @ 81D7167
faintpokemon TARGET, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_MirrorMove: @ 81D7173
attackcanceler
@@ -501,7 +501,7 @@ MoveEffect_MirrorMove: @ 81D7173
orbyte 0x2024c68, 32
printstring BATTLE_TEXT_MirrorFail
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_AttackUp: @ 81D718B
setbyte 0x201601e, 17
@@ -542,9 +542,9 @@ BattleScript_1D71D8: @ 81D71D8
waitmessage 64
BattleScript_1D71E0: @ 81D71E0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
-gUnknown_081D71E5:: @ 81D71E5
+BattleScript_StatUp:: @ 81D71E5
playanimation 2, 1, 0x20160a4
printfromtable BattleTextList_401570
waitmessage 64
@@ -592,9 +592,9 @@ BattleScript_1D7269: @ 81D7269
waitmessage 64
BattleScript_1D7271: @ 81D7271
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
-gUnknown_081D7276:: @ 81D7276
+BattleScript_StatDown:: @ 81D7276
playanimation 2, 1, 0x20160a4
printfromtable BattleTextList_40157C
waitmessage 64
@@ -609,7 +609,7 @@ MoveEffect_Haze: @ 81D7286
normalisebuffs
printstring BATTLE_TEXT_StatElim
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Bide: @ 81D7297
attackcanceler
@@ -619,7 +619,7 @@ MoveEffect_Bide: @ 81D7297
waitanimation
orword 0x2024c6c, 0x8000000
setbide
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Rampage: @ 81D72AB
attackcanceler
@@ -690,7 +690,7 @@ BattleScript_1D7377: @ 81D7377
resultmessage
waitmessage 64
jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396
- copyarray gUnknown_030041C0, 0x20160e0, 6
+ copyarray gBattleTextBuff1, 0x20160e0, 6
printstring BATTLE_TEXT_HitMulti
waitmessage 64
@@ -712,7 +712,7 @@ MoveEffect_Conversion: @ 81D73B1
waitanimation
printstring BATTLE_TEXT_TypeTransform
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_FlinchHit: @ 81D73C6
setbyte 0x2024d21, 8
@@ -730,7 +730,7 @@ MoveEffect_RestoreHp: @ 81D73D1
datahpupdate USER
printstring BATTLE_TEXT_RegainedHealth
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Toxic: @ 81D73F4
attackcanceler
@@ -751,19 +751,19 @@ MoveEffect_Toxic: @ 81D73F4
seteffecttarget
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D7455: @ 81D7455
pause 64
printstring BATTLE_TEXT_AlreadyPoisoned
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D7463: @ 81D7463
copyarray 0x2024c0a, 0x2024c08, 1
setbyte 0x2024d23, 0
- callatk BattleScript_1D98BD
- jump BattleScript_1D6F62
+ callatk BattleScript_PSNPrevention
+ jump BattleScript_EndTurn
MoveEffect_PayDay: @ 81D747D
setbyte 0x2024d21, 11
@@ -798,13 +798,13 @@ BattleScript_1D74C6: @ 81D74C6
pause 64
printfromtable BattleTextList_40156A
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D74D6: @ 81D74D6
pause 32
printstring BATTLE_TEXT_AttackingAsleep
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Ohko: @ 81D74E4
attackcanceler
@@ -821,14 +821,14 @@ BattleScript_1D7505: @ 81D7505
pause 64
printfromtable BattleTextList_4015C8
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_RazorWind: @ 81D7515
jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D
jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
setbyte 0x2016055, 0
callatk BattleScript_1D756C
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D753D: @ 81D753D
attackcanceler
@@ -909,7 +909,7 @@ BattleScript_1D7632: @ 81D7632
pause 64
resultmessage
waitmessage 64
- jumpifbyte 4, 0x2024c68, 8, BattleScript_1D6F62
+ jumpifbyte 4, 0x2024c68, 8, BattleScript_EndTurn
printstring BATTLE_TEXT_KeptGoingCrash
waitmessage 64
atk5
@@ -922,7 +922,7 @@ BattleScript_1D7632: @ 81D7632
datahpupdate USER
faintpokemon USER, 0, 0x0
orbyte 0x2024c68, 1
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Mist: @ 81D7676
attackcanceler
@@ -933,7 +933,7 @@ MoveEffect_Mist: @ 81D7676
waitanimation
printfromtable BattleTextList_4015A0
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_FocusEnergy: @ 81D7689
attackcanceler
@@ -945,7 +945,7 @@ MoveEffect_FocusEnergy: @ 81D7689
waitanimation
printfromtable BattleTextList_4015A4
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Recoil: @ 81D76A6
setbyte 0x2024d21, 206
@@ -968,13 +968,13 @@ MoveEffect_Confuse: @ 81D76BF
seteffecttarget
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D76FE: @ 81D76FE
pause 32
printstring BATTLE_TEXT_AlreadyConfused
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_AttackUp2: @ 81D770C
setbyte 0x201601e, 33
@@ -1005,7 +1005,7 @@ MoveEffect_Transform: @ 81D7743
waitanimation
printfromtable BattleTextList_4015A8
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_AttackDown2: @ 81D7756
setbyte 0x201601e, 161
@@ -1034,7 +1034,7 @@ BattleScript_1D7786: @ 81D7786
waitanimation
printfromtable BattleTextList_401540
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Poison: @ 81D7795
attackcanceler
@@ -1055,7 +1055,7 @@ MoveEffect_Poison: @ 81D7795
seteffecttarget
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Paralyze: @ 81D77F6
attackcanceler
@@ -1075,19 +1075,19 @@ MoveEffect_Paralyze: @ 81D77F6
seteffecttarget
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D784B: @ 81D784B
pause 32
printstring BATTLE_TEXT_AlreadyParalyzed
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D7859: @ 81D7859
copyarray 0x2024c0a, 0x2024c08, 1
setbyte 0x2024d23, 0
- callatk BattleScript_1D98B1
- jump BattleScript_1D6F62
+ callatk BattleScript_PRLZPrevention
+ jump BattleScript_EndTurn
MoveEffect_AttackDownHit: @ 81D7873
setbyte 0x2024d21, 22
@@ -1118,7 +1118,7 @@ MoveEffect_SkyAttack: @ 81D78B5
jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
setbyte 0x2016055, 3
callatk BattleScript_1D756C
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_ConfuseHit: @ 81D78DD
setbyte 0x2024d21, 7
@@ -1154,13 +1154,13 @@ BattleScript_1D7922: @ 81D7922
BattleScript_1D7928: @ 81D7928
printfromtable BattleTextList_4015AC
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D7935: @ 81D7935
pause 32
printstring BATTLE_TEXT_SubAlready
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Recharge: @ 81D7943
attackcanceler
@@ -1171,7 +1171,7 @@ MoveEffect_Recharge: @ 81D7943
gUnknown_081D7956:: @ 81D7956
printstring BATTLE_TEXT_MustRecharge
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Rage: @ 81D7961
attackcanceler
@@ -1197,7 +1197,7 @@ MoveEffect_Mimic: @ 81D7988
waitanimation
printstring BATTLE_TEXT_LearnedMove2
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Metronome: @ 81D79AE
attackcanceler
@@ -1223,7 +1223,7 @@ BattleScript_1D79D9: @ 81D79D9
waitanimation
printfromtable BattleTextList_40154C
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Splash: @ 81D79E9
attackcanceler
@@ -1234,7 +1234,7 @@ MoveEffect_Splash: @ 81D79E9
atk60 26
printstring BATTLE_TEXT_Nothing
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Disable: @ 81D79FB
attackcanceler
@@ -1246,7 +1246,7 @@ MoveEffect_Disable: @ 81D79FB
waitanimation
printstring BATTLE_TEXT_MoveWasDisabled
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_LevelDamage: @ 81D7A17
attackcanceler
@@ -1290,7 +1290,7 @@ MoveEffect_Encore: @ 81D7A5D
waitanimation
printstring BATTLE_TEXT_EncoreGot
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_PainSplit: @ 81D7A79
attackcanceler
@@ -1308,7 +1308,7 @@ MoveEffect_PainSplit: @ 81D7A79
datahpupdate TARGET
printstring BATTLE_TEXT_PainSplit
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Snore: @ 81D7AB0
attackcanceler
@@ -1339,7 +1339,7 @@ MoveEffect_Conversion2: @ 81D7AEA
waitanimation
printstring BATTLE_TEXT_TypeTransform
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_LockOn: @ 81D7AFF
attackcanceler
@@ -1352,7 +1352,7 @@ MoveEffect_LockOn: @ 81D7AFF
waitanimation
printstring BATTLE_TEXT_TookAim
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Sketch: @ 81D7B21
attackcanceler
@@ -1364,7 +1364,7 @@ MoveEffect_Sketch: @ 81D7B21
waitanimation
printstring BATTLE_TEXT_SketchedMove
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_SleepTalk: @ 81D7B40
attackcanceler
@@ -1400,7 +1400,7 @@ MoveEffect_DestinyBond: @ 81D7B82
waitanimation
printstring BATTLE_TEXT_DestinyBondTake
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Flail: @ 81D7B93
remaininghptopower
@@ -1416,7 +1416,7 @@ MoveEffect_Spite: @ 81D7B99
waitanimation
printstring BATTLE_TEXT_ReducedBy
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_HealBell: @ 81D7BB5
attackcanceler
@@ -1441,7 +1441,7 @@ BattleScript_1D7BE1: @ 81D7BE1
BattleScript_1D7BF2: @ 81D7BF2
atk98 4
waitstateatk
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_TripleKick: @ 81D7BFA
attackcanceler
@@ -1493,7 +1493,7 @@ BattleScript_1D7C90: @ 81D7C90
resultmessage
waitmessage 64
jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF
- copyarray gUnknown_030041C0, 0x20160e0, 6
+ copyarray gBattleTextBuff1, 0x20160e0, 6
printstring BATTLE_TEXT_HitMulti
waitmessage 64
@@ -1520,7 +1520,7 @@ MoveEffect_MeanLook: @ 81D7CCC
seteffecttarget
printstring BATTLE_TEXT_CantEscapeNow
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Nightmare: @ 81D7CF4
attackcanceler
@@ -1538,7 +1538,7 @@ BattleScript_1D7D1A: @ 81D7D1A
seteffecttarget
printstring BATTLE_TEXT_NightmareStart
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Minimize: @ 81D7D2E
attackcanceler
@@ -1578,7 +1578,7 @@ BattleScript_1D7D9A: @ 81D7D9A
waitmessage 64
BattleScript_1D7DAE: @ 81D7DAE
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D7DB3: @ 81D7DB3
jumpifarraynotequal 0x2024c07, 0x2024c08, 1, BattleScript_1D7DC4
@@ -1599,7 +1599,7 @@ BattleScript_1D7DC4: @ 81D7DC4
printstring BATTLE_TEXT_CurseLay
waitmessage 64
faintpokemon USER, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Endure: @ 81D7DFD
MoveEffect_Protect: @ 81D7DFD
@@ -1611,7 +1611,7 @@ MoveEffect_Protect: @ 81D7DFD
waitanimation
printfromtable BattleTextList_40153A
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Spikes: @ 81D7E10
attackcanceler
@@ -1622,7 +1622,7 @@ MoveEffect_Spikes: @ 81D7E10
waitanimation
printstring BATTLE_TEXT_SpikesScattered
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Foresight: @ 81D7E25
attackcanceler
@@ -1634,7 +1634,7 @@ MoveEffect_Foresight: @ 81D7E25
waitanimation
printstring BATTLE_TEXT_IdentifiedPoke
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_PerishSong: @ 81D7E3D
attackcanceler
@@ -1653,7 +1653,7 @@ BattleScript_1D7E53: @ 81D7E53
BattleScript_1D7E5A: @ 81D7E5A
addbyte 0x2016003, 1
jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D7E53
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D7E73: @ 81D7E73
printstring BATTLE_TEXT_BlocksOther2
@@ -1703,7 +1703,7 @@ BattleScript_1D7EE5: @ 81D7EE5
jumpifhalverset TARGET, 32, BattleScript_1D9037
setbyte 0x2024d21, 7
seteffecttarget
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_FuryCutter: @ 81D7F00
attackcanceler
@@ -1730,7 +1730,7 @@ MoveEffect_Attract: @ 81D7F1F
waitanimation
printstring BATTLE_TEXT_FellLove
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Frustration: @ 81D7F3B
MoveEffect_Return: @ 81D7F3B
@@ -1788,7 +1788,7 @@ MoveEffect_BatonPass: @ 81D7F7C
switch3 USER, 1
waitstateatk
atk52 USER
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_RapidSpin: @ 81D7FA9
setbyte 0x2024d21, 163
@@ -1833,7 +1833,7 @@ BattleScript_1D7FFA: @ 81D7FFA
printfromtable BattleTextList_40151C
waitmessage 64
callatk BattleScript_1D9761
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_SunnyDay: @ 81D800E
attackcanceler
@@ -1866,7 +1866,7 @@ MoveEffect_BellyDrum: @ 81D8038
datahpupdate USER
printstring BATTLE_TEXT_CutHPMaxATK
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_PsychUp: @ 81D805A
attackcanceler
@@ -1877,7 +1877,7 @@ MoveEffect_PsychUp: @ 81D805A
waitanimation
printstring BATTLE_TEXT_CopyStatChanges
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_MirrorCoat: @ 81D806F
attackcanceler
@@ -1903,7 +1903,7 @@ MoveEffect_SkullBash: @ 81D8085
waitmessage 64
BattleScript_1D80CF: @ 81D80CF
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Twister: @ 81D80D4
jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE
@@ -1976,7 +1976,7 @@ MoveEffect_FutureSight: @ 81D817D
waitanimation
printfromtable BattleTextList_4015E2
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Gust: @ 81D8194
jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14
@@ -1999,7 +1999,7 @@ BattleScript_1D81E1: @ 81D81E1
jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
setbyte 0x2016055, 1
callatk BattleScript_1D756C
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D8209: @ 81D8209
orword 0x2024c6c, 0x8000000
@@ -2026,7 +2026,7 @@ MoveEffect_Teleport: @ 81D8233
printstring BATTLE_TEXT_FledBattle
waitmessage 64
setbyte 0x2024d26, 5
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_BeatUp: @ 81D826E
attackcanceler
@@ -2088,7 +2088,7 @@ BattleScript_1D8322: @ 81D8322
BattleScript_1D8328: @ 81D8328
callatk BattleScript_1D756C
hidepreattack
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D8333: @ 81D8333
attackcanceler
@@ -2136,13 +2136,13 @@ BattleScript_1D839B:: @ 81D839B
datahpupdate TARGET
printstring BATTLE_TEXT_RegainedHealth
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D83B5:: @ 81D83B5
pause 32
printstring BATTLE_TEXT_HPFull
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_FakeOut: @ 81D83C3
attackcanceler
@@ -2161,14 +2161,14 @@ BattleScript_1D83D6:: @ 81D83D6
orbyte 0x2024c68, 32
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D83E8: @ 81D83E8
pause 32
orbyte 0x2024c68, 8
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Uproar: @ 81D83FA
attackcanceler
@@ -2191,7 +2191,7 @@ MoveEffect_Stockpile: @ 81D841A
waitanimation
printfromtable BattleTextList_40155E
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_SpitUp: @ 81D842D
attackcanceler
@@ -2208,7 +2208,7 @@ BattleScript_1D844E: @ 81D844E
pause 32
printstring BATTLE_TEXT_SpitUpFail
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D845C: @ 81D845C
attackstring
@@ -2217,7 +2217,7 @@ BattleScript_1D845C: @ 81D845C
stockpiletobasedamage BattleScript_1D844E
resultmessage
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Swallow: @ 81D846F
attackcanceler
@@ -2230,7 +2230,7 @@ BattleScript_1D847C: @ 81D847C
pause 32
printfromtable BattleTextList_401566
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Hail: @ 81D848C
attackcanceler
@@ -2249,7 +2249,7 @@ MoveEffect_Torment: @ 81D8495
waitanimation
printstring BATTLE_TEXT_TormentSubject
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Flatter: @ 81D84B1
attackcanceler
@@ -2273,7 +2273,7 @@ BattleScript_1D84F4: @ 81D84F4
jumpifhalverset TARGET, 32, BattleScript_1D9037
setbyte 0x2024d21, 7
seteffecttarget
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_WillOWisp: @ 81D850F
attackcanceler
@@ -2290,19 +2290,19 @@ MoveEffect_WillOWisp: @ 81D850F
waitanimation
setbyte 0x2024d21, 3
seteffecttarget
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D855B: @ 81D855B
copyarray 0x2024c0a, 0x2024c08, 1
setbyte 0x2024d23, 0
- callatk BattleScript_1D98A5
- jump BattleScript_1D6F62
+ callatk BattleScript_BRNPrevention
+ jump BattleScript_EndTurn
BattleScript_1D8575: @ 81D8575
pause 32
printstring BATTLE_TEXT_AlreadyBurned
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Memento: @ 81D8583
attackcanceler
@@ -2333,7 +2333,7 @@ BattleScript_1D85D0: @ 81D85D0
BattleScript_1D85F3: @ 81D85F3
faintpokemon USER, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D85FF: @ 81D85FF
printstring BATTLE_TEXT_NoEffect
@@ -2352,7 +2352,7 @@ BattleScript_1D8611: @ 81D8611
resultmessage
waitmessage 64
faintpokemon USER, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Facade: @ 81D8626
jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635
@@ -2368,7 +2368,7 @@ MoveEffect_FocusPunch: @ 81D8640
ppreduce
printstring BATTLE_TEXT_LostFocus
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Smellingsalt: @ 81D8652
jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14
@@ -2389,7 +2389,7 @@ MoveEffect_FollowMe: @ 81D867C
waitanimation
printstring BATTLE_TEXT_CenterAttention
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_NaturePower: @ 81D868D
attackcanceler
@@ -2409,7 +2409,7 @@ MoveEffect_Charge: @ 81D869A
waitanimation
printstring BATTLE_TEXT_ChargingPower
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Taunt: @ 81D86AB
attackcanceler
@@ -2421,7 +2421,7 @@ MoveEffect_Taunt: @ 81D86AB
waitanimation
printstring BATTLE_TEXT_TauntFell
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_HelpingHand: @ 81D86C7
attackcanceler
@@ -2432,7 +2432,7 @@ MoveEffect_HelpingHand: @ 81D86C7
waitanimation
printstring BATTLE_TEXT_ReadyToHelp
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Trick: @ 81D86DC
attackcanceler
@@ -2447,7 +2447,7 @@ MoveEffect_Trick: @ 81D86DC
waitmessage 64
printfromtable BattleTextList_401642
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_RolePlay: @ 81D870A
attackcanceler
@@ -2459,7 +2459,7 @@ MoveEffect_RolePlay: @ 81D870A
waitanimation
printstring BATTLE_TEXT_CopiedObject
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Wish: @ 81D8726
attackcanceler
@@ -2468,7 +2468,7 @@ MoveEffect_Wish: @ 81D8726
atkd4 0, BattleScript_1D83D6
attackanimation
waitanimation
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Assist: @ 81D8736
attackcanceler
@@ -2489,7 +2489,7 @@ MoveEffect_Ingrain: @ 81D874D
waitanimation
printstring BATTLE_TEXT_PlantedRoots
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Superpower: @ 81D8762
setbyte 0x2024d21, 229
@@ -2504,7 +2504,7 @@ MoveEffect_MagicCoat: @ 81D876D
waitanimation
printstring BATTLE_TEXT_ShroudedItself
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Recycle: @ 81D8782
attackcanceler
@@ -2515,7 +2515,7 @@ MoveEffect_Recycle: @ 81D8782
waitanimation
printstring BATTLE_TEXT_FoundOne
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Revenge: @ 81D8797
doubledamagedealtifdamaged
@@ -2554,7 +2554,7 @@ BattleScript_1D87D0: @ 81D87D0
waitmessage 64
seteffectwithchancetarget
faintpokemon TARGET, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Yawn: @ 81D87EE
attackcanceler
@@ -2571,7 +2571,7 @@ MoveEffect_Yawn: @ 81D87EE
waitanimation
printstring BATTLE_TEXT_DrowsyMade
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D882F: @ 81D882F
copyarray 0x2016003, 0x20160f8, 1
@@ -2580,7 +2580,7 @@ BattleScript_1D8839: @ 81D8839
pause 32
printstring BATTLE_TEXT_MadeIneffective2
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_KnockOff: @ 81D8847
setbyte 0x2024d21, 54
@@ -2614,7 +2614,7 @@ MoveEffect_SkillSwap: @ 81D8893
waitanimation
printstring BATTLE_TEXT_AbilitySwap
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Imprison: @ 81D88AF
attackcanceler
@@ -2625,7 +2625,7 @@ MoveEffect_Imprison: @ 81D88AF
waitanimation
printstring BATTLE_TEXT_SealedMove
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Refresh: @ 81D88C4
attackcanceler
@@ -2637,7 +2637,7 @@ MoveEffect_Refresh: @ 81D88C4
printstring BATTLE_TEXT_StatusNormal
waitmessage 64
atk98 1
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Grudge: @ 81D88DB
attackcanceler
@@ -2648,7 +2648,7 @@ MoveEffect_Grudge: @ 81D88DB
waitanimation
printstring BATTLE_TEXT_GrudgeBear
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Snatch: @ 81D88F0
attackcanceler
@@ -2660,7 +2660,7 @@ MoveEffect_Snatch: @ 81D88F0
pause 32
printstring BATTLE_TEXT_AwaitMove
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_LowKick: @ 81D8908
attackcanceler
@@ -2745,7 +2745,7 @@ MoveEffect_WaterSport: @ 81D89D7
waitanimation
printfromtable BattleTextList_4015D4
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_PoisonFang: @ 81D89EE
setbyte 0x2024d21, 6
@@ -2788,14 +2788,14 @@ BattleScript_1D8A55: @ 81D8A55
waitmessage 64
BattleScript_1D8A78: @ 81D8A78
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D8A7D: @ 81D8A7D
pause 32
orbyte 0x2024c68, 32
printstring BATTLE_TEXT_StatNoLower
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_CosmicPower: @ 81D8A91
attackcanceler
@@ -2823,7 +2823,7 @@ BattleScript_1D8AD1: @ 81D8AD1
waitmessage 64
BattleScript_1D8AF0: @ 81D8AF0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_SkyUppercut: @ 81D8AF5
orword 0x2024c6c, 0x10000
@@ -2855,7 +2855,7 @@ BattleScript_1D8B43: @ 81D8B43
waitmessage 64
BattleScript_1D8B62: @ 81D8B62
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_CalmMind: @ 81D8B67
attackcanceler
@@ -2883,14 +2883,14 @@ BattleScript_1D8BA7: @ 81D8BA7
waitmessage 64
BattleScript_1D8BC6: @ 81D8BC6
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D8BCB: @ 81D8BCB
pause 32
orbyte 0x2024c68, 32
printstring BATTLE_TEXT_StatNoHigher
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_DragonDance: @ 81D8BDF
attackcanceler
@@ -2918,7 +2918,7 @@ BattleScript_1D8C1F: @ 81D8C1F
waitmessage 64
BattleScript_1D8C3E: @ 81D8C3E
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
MoveEffect_Camouflage: @ 81D8C43
attackcanceler
@@ -2929,7 +2929,7 @@ MoveEffect_Camouflage: @ 81D8C43
waitanimation
printstring BATTLE_TEXT_TypeTransform
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D8C58:: @ 81D8C58
atk56 1
@@ -3188,11 +3188,11 @@ BattleScript_1D8EAD: @ 81D8EAD
BattleScript_1D8EEE: @ 81D8EEE
return
-gUnknown_081D8EEF:: @ 81D8EEF
+BattleScript_Pausex20:: @ 81D8EEF
pause 32
return
-gUnknown_081D8EF3:: @ 81D8EF3
+BattleScript_LevelUp:: @ 81D8EF3
atk55 0xe10016f
attackcanceler
setbyte 0x201609c, 0
@@ -3338,7 +3338,7 @@ BattleScript_1D9083: @ 81D9083
gUnknown_081D90A7:: @ 81D90A7
printstring BATTLE_TEXT_StoringEnergy
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D90B2:: @ 81D90B2
printstring BATTLE_TEXT_UnleashedEnergy
@@ -3359,7 +3359,7 @@ gUnknown_081D90B2:: @ 81D90B2
resultmessage
waitmessage 64
faintpokemon TARGET, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D90F1:: @ 81D90F1
printstring BATTLE_TEXT_UnleashedEnergy
@@ -3383,7 +3383,7 @@ BattleScript_1D9116: @ 81D9116
waitstateatk
printstring BATTLE_TEXT_DraggedOut
atk52 TARGET
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9128:: @ 81D9128
pause 32
@@ -3399,7 +3399,7 @@ gUnknown_081D9132:: @ 81D9132
gUnknown_081D9139:: @ 81D9139
printstring BATTLE_TEXT_MoveIsDisabled
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9144:: @ 81D9144
printstring2 BATTLE_TEXT_MoveIsDisabled
@@ -3527,7 +3527,7 @@ BattleScript_1D92AB: @ 81D92AB
BattleScript_1D92BF: @ 81D92BF
return
-gUnknown_081D92C0:: @ 81D92C0
+BattleScript_RapidSpinAway:: @ 81D92C0
breakfree
return
@@ -3601,19 +3601,19 @@ gUnknown_081D9369:: @ 81D9369
printstring2 BATTLE_TEXT_NoPP1
atk44
-gUnknown_081D936D:: @ 81D936D
+BattleScript_NoPPForMove:: @ 81D936D
attackstring
pause 32
printstring BATTLE_TEXT_NoPP2
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D937C:: @ 81D937C
printstring2 BATTLE_TEXT_TormentNoUse
atk44
printstring BATTLE_TEXT_TormentNoUse
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D938B:: @ 81D938B
printstring2 BATTLE_TEXT_TauntNoUse
@@ -3622,7 +3622,7 @@ gUnknown_081D938B:: @ 81D938B
gUnknown_081D938F:: @ 81D938F
printstring BATTLE_TEXT_TauntNoUse
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D939A:: @ 81D939A
atkd4 1, BattleScript_1D93C1
@@ -3657,7 +3657,7 @@ BattleScript_1D93EC: @ 81D93EC
pause 32
printstring BATTLE_TEXT_AnchoredItself
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D93FA:: @ 81D93FA
setbyte 0x20160dc, 0
@@ -3680,7 +3680,7 @@ BattleScript_1D9427: @ 81D9427
BattleScript_1D944A: @ 81D944A
return
-gUnknown_081D944B:: @ 81D944B
+BattleScript_KnockedOff:: @ 81D944B
playanimation TARGET, 5, 0x0
printstring BATTLE_TEXT_KnockedOffItem
waitmessage 64
@@ -3689,7 +3689,7 @@ gUnknown_081D944B:: @ 81D944B
gUnknown_081D9459:: @ 81D9459
printstring BATTLE_TEXT_SealedNoUse
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9464:: @ 81D9464
printstring2 BATTLE_TEXT_SealedNoUse
@@ -3700,7 +3700,7 @@ gUnknown_081D9468:: @ 81D9468
waitmessage 64
return
-gUnknown_081D946F:: @ 81D946F
+BattleScript_MagicCoatBounce:: @ 81D946F
attackstring
ppreduce
pause 32
@@ -3710,7 +3710,7 @@ gUnknown_081D946F:: @ 81D946F
atk76 USER, 1
return
-gUnknown_081D9487:: @ 81D9487
+BattleScript_SnatchedMove:: @ 81D9487
attackstring
ppreduce
snatchmove
@@ -3721,12 +3721,12 @@ gUnknown_081D9487:: @ 81D9487
atk5f
return
-gUnknown_081D94A2:: @ 81D94A2
+BattleScript_EnduredMsg:: @ 81D94A2
printstring BATTLE_TEXT_EnduredHit
waitmessage 64
return
-gUnknown_081D94A9:: @ 81D94A9
+BattleScript_OneHitKOMsg:: @ 81D94A9
printstring BATTLE_TEXT_GrandSlam
waitmessage 64
return
@@ -3755,7 +3755,7 @@ gUnknown_081D94EE:: @ 81D94EE
printstring BATTLE_TEXT_FastAsleep
waitmessage 64
statusanimation USER
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D94FB:: @ 81D94FB
bicword 0x2024c6c, 0x10
@@ -3796,7 +3796,7 @@ gUnknown_081D9545:: @ 81D9545
printstring BATTLE_TEXT_FrozenSolid
waitmessage 64
statusanimation USER
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9552:: @ 81D9552
printfromtable BattleTextList_4015C4
@@ -3814,12 +3814,12 @@ gUnknown_081D9566:: @ 81D9566
printstring BATTLE_TEXT_Paralyzed3
waitmessage 64
statusanimation USER
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9573:: @ 81D9573
printstring BATTLE_TEXT_Flinched
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D957E:: @ 81D957E
printfromtable BattleTextList_40155A
@@ -3850,7 +3850,7 @@ BattleScript_1D95AC: @ 81D95AC
graphicalhpupdate USER
datahpupdate USER
faintpokemon USER, 0, 0x0
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D95D3: @ 81D95D3
return
@@ -3885,7 +3885,7 @@ gUnknown_081D95FB:: @ 81D95FB
gUnknown_081D9608:: @ 81D9608
printstring BATTLE_TEXT_ImmobilizedBy
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9613:: @ 81D9613
printstring BATTLE_TEXT_NightmareLock
@@ -3899,7 +3899,7 @@ gUnknown_081D9624:: @ 81D9624
atk65 1, 0x10000000
jump BattleScript_1D9520
-gUnknown_081D9635:: @ 81D9635
+BattleScript_TargetPRLZHeal:: @ 81D9635
printstring BATTLE_TEXT_ParalysisHealed
waitmessage 64
atk98 0
@@ -3990,7 +3990,7 @@ BattleScript_1D96DB: @ 81D96DB
BattleScript_1D96F5: @ 81D96F5
return
-gUnknown_081D96F6:: @ 81D96F6
+BattleScript_ItemSteal:: @ 81D96F6
playanimation TARGET, 16, 0x0
printstring BATTLE_TEXT_StoleSomething
waitmessage 64
@@ -4103,7 +4103,7 @@ gUnknown_081D97FE:: @ 81D97FE
callatk BattleScript_1D9761
end3
-gUnknown_081D9812:: @ 81D9812
+BattleScript_TookAttack:: @ 81D9812
attackstring
pause 32
printstring BATTLE_TEXT_TookAttack2
@@ -4115,13 +4115,13 @@ gUnknown_081D9826:: @ 81D9826
pause 32
printstring BATTLE_TEXT_ProtectedBy
pause 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9834:: @ 81D9834
pause 32
printstring BATTLE_TEXT_PreventedBy
pause 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9842:: @ 81D9842
ppreduce
@@ -4135,7 +4135,7 @@ gUnknown_081D9843:: @ 81D9843
printstring BATTLE_TEXT_HPRestoredUsing
waitmessage 64
orbyte 0x2024c68, 8
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9865:: @ 81D9865
ppreduce
@@ -4146,7 +4146,7 @@ gUnknown_081D9866:: @ 81D9866
printstring BATTLE_TEXT_MadeUseless
waitmessage 64
orbyte 0x2024c68, 8
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D987B:: @ 81D987B
ppreduce
@@ -4156,13 +4156,13 @@ gUnknown_081D987C:: @ 81D987C
pause 32
printfromtable BattleTextList_401648
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D988D: @ 81D988D
pause 32
printstring BATTLE_TEXT_AnchorsItself
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D989B:: @ 81D989B
pause 32
@@ -4170,19 +4170,19 @@ gUnknown_081D989B:: @ 81D989B
waitmessage 64
return
-BattleScript_1D98A5:: @ 81D98A5
+BattleScript_BRNPrevention:: @ 81D98A5
pause 32
printfromtable BattleTextList_401630
waitmessage 64
return
-BattleScript_1D98B1:: @ 81D98B1
+BattleScript_PRLZPrevention:: @ 81D98B1
pause 32
printfromtable BattleTextList_401636
waitmessage 64
return
-BattleScript_1D98BD:: @ 81D98BD
+BattleScript_PSNPrevention:: @ 81D98BD
pause 32
printfromtable BattleTextList_40163C
waitmessage 64
@@ -4192,19 +4192,19 @@ gUnknown_081D98C9:: @ 81D98C9
pause 32
printstring BATTLE_TEXT_PreventedRomance
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
-gUnknown_081D98D7:: @ 81D98D7
+BattleScript_FlinchPrevention:: @ 81D98D7
pause 32
printstring BATTLE_TEXT_PreventedFlinching
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
BattleScript_1D98E5: @ 81D98E5
pause 32
printstring BATTLE_TEXT_PreventedConfusion
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D98F3:: @ 81D98F3
attackstring
@@ -4212,7 +4212,7 @@ gUnknown_081D98F3:: @ 81D98F3
pause 32
printstring BATTLE_TEXT_BlocksOther
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9903:: @ 81D9903
pause 32
@@ -4221,11 +4221,11 @@ gUnknown_081D9903:: @ 81D9903
setbyte 0x2024d23, 3
return
-gUnknown_081D9913:: @ 81D9913
+BattleScript_NoItemSteal:: @ 81D9913
pause 32
printstring BATTLE_TEXT_MadeIneffective
waitmessage 64
- jump BattleScript_1D6F62
+ jump BattleScript_EndTurn
gUnknown_081D9921:: @ 81D9921
printstring BATTLE_TEXT_MadeType
@@ -4296,7 +4296,7 @@ gUnknown_081D99A0:: @ 81D99A0
waitmessage 64
jump BattleScript_1D95AC
-gUnknown_081D99AB:: @ 81D99AB
+BattleScript_SubstituteFade:: @ 81D99AB
playanimation TARGET, 2, 0x0
printstring BATTLE_TEXT_SubFaded
return
@@ -4429,7 +4429,7 @@ gUnknown_081D9AC2:: @ 81D9AC2
printstring2 BATTLE_TEXT_ChoiceBand
atk44
-gUnknown_081D9AC6:: @ 81D9AC6
+BattleScript_HangedOnMsg:: @ 81D9AC6
playanimation TARGET, 9, 0x0
printstring BATTLE_TEXT_FocusSash
waitmessage 64
@@ -4455,7 +4455,7 @@ gUnknown_081D9AFE:: @ 81D9AFE
BattleScript_1D9B0B: @ 81D9B0B
setbyte 0x2024d23, 4
- callatk gUnknown_081D71E5
+ callatk BattleScript_StatUp
removeitem USER
end2
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 0ed54d11e..3f0dc8af1 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -52,7 +52,7 @@ BattleScript_1D9EBC: @ 81D9EBC
pokemoncatchfunction
gUnknown_081D9EC2:: @ 81D9EC2
- jumpifhalfword 0, gUnknown_02024C04, 5, BattleScript_1D9ED0
+ jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0
atk60 11
BattleScript_1D9ED0: @ 81D9ED0
@@ -60,25 +60,25 @@ BattleScript_1D9ED0: @ 81D9ED0
capturesomethingf1 BattleScript_1D9EE3
printstring BATTLE_TEXT_AddedToDex
waitstateatk
- setbyte gUnknown_02024D1E, 0
+ setbyte gBattleCommunication, 0
capturesomethingf2
BattleScript_1D9EE3: @ 81D9EE3
printstring BATTLE_TEXT_GiveNickname
waitstateatk
- setbyte gUnknown_02024D1E, 0
+ setbyte gBattleCommunication, 0
capturesomethingf3 BattleScript_1D9EF8
printstring BATTLE_TEXT_SentToPC
waitmessage 64
BattleScript_1D9EF8: @ 81D9EF8
catchpoke
- setbyte gUnknown_02024D26, 7
+ setbyte gBattleOutcome, 7
activesidesomething
gUnknown_081D9F00:: @ 81D9F00
printstring BATTLE_TEXT_BallCaught2
- setbyte gUnknown_02024D26, 7
+ setbyte gBattleOutcome, 7
activesidesomething
gUnknown_081D9F0A:: @ 81D9F0A
@@ -88,7 +88,7 @@ gUnknown_081D9F0A:: @ 81D9F0A
jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34
printstring BATTLE_TEXT_SafariOver
waitmessage 64
- setbyte gUnknown_02024D26, 8
+ setbyte gBattleOutcome, 8
BattleScript_1D9F34: @ 81D9F34
atkf6
@@ -112,7 +112,7 @@ BattleScript_1D9F4F: @ 81D9F4F
printstring BATTLE_TEXT_Used2
waitmessage 64
atk75
- orword gUnknown_02024C6C, 0x100
+ orword gHitMarker, 0x100
graphicalhpupdate USER
datahpupdate USER
printstring BATTLE_TEXT_RestoredHealth
@@ -161,7 +161,7 @@ BattleScript_1D9FBB: @ 81D9FBB
BattleScript_1D9FDA: @ 81D9FDA
atk54 17
- setbyte gUnknown_02024D26, 4
+ setbyte gBattleOutcome, 4
activesidesomething
BattleScript_1D9FE4: @ 81D9FE4
diff --git a/data/data2.s b/data/data2.s
index b8b6dc7db..00ef5c26e 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1029,79 +1029,79 @@ gUnknown_081FA724:: @ 81FA724
.2byte 0xFFFF
.align 2
-gUnknown_081FA73C:: @ 81FA73C
+gBattleScriptingCommandsTable:: @ 81FA73C
.4byte atk00_attackcanceler
.4byte atk01_accuracycheck
.4byte atk02_attackstring
.4byte atk03_ppreduce
.4byte atk04_critcalc
.4byte atk05_damagecalc1
- .4byte atk06_damagecalc2
- .4byte atk07_damagecalc3
- .4byte atk08_cmd8
- .4byte sub_801D8EC
- .4byte sub_801DA60
- .4byte sub_801DA80
+ .4byte atk06_typecalc
+ .4byte atk07_dmg_adjustment
+ .4byte atk08_dmg_adjustment2
+ .4byte atk09_attackanimation
+ .4byte atk0A_waitanimation
+ .4byte atk0B_healthbarupdate
.4byte atk0C_datahpupdate
.4byte atk0D_critmessage
- .4byte atk0E_missmessage
+ .4byte atk0E_effectiveness_sound
.4byte atk0F_resultmessage
.4byte atk10_printstring
- .4byte atk11_printstring2
+ .4byte atk11_printstring_playeronly
.4byte atk12_waitmessage
.4byte atk13_printfromtable
- .4byte atk14_printfromtable2
+ .4byte atk14_printfromtable_playeronly
.4byte atk15_seteffectwithchancetarget
- .4byte sub_801F708
- .4byte sub_801F718
- .4byte sub_801F728
- .4byte sub_801F7AC
- .4byte sub_801FB34
- .4byte atkE2_cmde2
+ .4byte atk16_seteffectprimary
+ .4byte atk17_seteffectsecondary
+ .4byte atk18_status_effect_clear
+ .4byte atk19_faint_pokemon
+ .4byte atk1A_faint_animation
+ .4byte atk1B_faint_effects_clear
.4byte atk1C_jumpifstatus
- .4byte atk1D_jumpifsecondarystatus
+ .4byte atk1D_jumpifstatus2
.4byte atk1E_jumpifability
- .4byte sub_801FDB4
- .4byte sub_801FE2C
- .4byte atk21_jumpifspecialstatusflag
- .4byte sub_801FFA8
- .4byte sub_8020004
- .4byte sub_80209B4
- .4byte atk25_resetflags
- .4byte sub_8020BB4
- .4byte atk27_cmd27
- .4byte sub_8020C14
+ .4byte atk1F_jumpifsideaffecting
+ .4byte atk20_jumpifstat
+ .4byte atk21_jumpifstatus3
+ .4byte atk22_jumpiftype
+ .4byte atk23_getexp
+ .4byte atk24
+ .4byte atk25_move_values_cleanup
+ .4byte atk26_set_multihit
+ .4byte atk27_decrement_multihit
+ .4byte atk28_goto
.4byte atk29_jumpifbyte
- .4byte sub_8020CD4
- .4byte sub_8020D7C
- .4byte sub_8020E30
- .4byte sub_8020EB8
- .4byte sub_8020F3C
- .4byte sub_8020F64
- .4byte sub_8020F90
+ .4byte atk2A_jumpifhalfword
+ .4byte atk2B_jumpifword
+ .4byte atk2C_jumpifarrayequal
+ .4byte atk2D_jumpifarraynotequal
+ .4byte atk2E_setbyte
+ .4byte atk2F_addbyte
+ .4byte atk30_subbyte
.4byte atk31_copyarray
- .4byte atk32_memcpy_with_offset
- .4byte sub_802107C
+ .4byte atk32_copyarray_withindex
+ .4byte atk33_orbyte
.4byte atk34_orhalfword
.4byte atk35_orword
- .4byte sub_8021124
+ .4byte atk36_bicbyte
.4byte atk37_bichalfword
.4byte atk38_bicword
.4byte atk39_pause
- .4byte sub_802120C
- .4byte atk3B_8022C68
+ .4byte atk3A_waitstate
+ .4byte atk3B_healthbar_update
.4byte atk3C_return
- .4byte sub_8021290
- .4byte sub_80212B0
+ .4byte atk3D_end
+ .4byte atk3E_end2
.4byte atk3F_end3
- .4byte atk40_801DBA0
+ .4byte atk40_jump_if_move_affected_by_protect
.4byte atk41_call
.4byte atk42_jumpiftype2
- .4byte sub_8021384
- .4byte sub_80213D0
- .4byte atk46_cmd46
- .4byte sub_80214B4
- .4byte atk47
+ .4byte atk43_jumpifabilitypresent
+ .4byte atk44
+ .4byte atk45_playanimation
+ .4byte atk46_playanimation2
+ .4byte atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues
.4byte atk48_playstatchangeanimation
.4byte sub_80217F8
.4byte atk4A_damageflags
@@ -1305,7 +1305,7 @@ gCriticalHitChance:: @ 81FAB50
.2byte 2 @ +4
.align 2
-gUnknown_081FAB5C:: @ 81FAB5C
+gStatusFlagsForMoveEffects:: @ 81FAB5C
.4byte 0x00000000
.4byte 0x00000007
.4byte 0x00000008
@@ -1368,7 +1368,7 @@ gUnknown_081FAB5C:: @ 81FAB5C
.4byte 0x00000000
.align 2
-gUnknown_081FAC4C:: @ 81FAC4C
+gMoveEffectBS_Ptrs:: @ 81FAC4C
.4byte BattleScript_1D963E
.4byte BattleScript_1D963E
.4byte BattleScript_1D965A
@@ -1514,38 +1514,38 @@ gBallCatchBonuses:: @ 81FAD90
.string "ターン$" @ "turn"
.align 2
-gUnknown_081FAD98:: @ 81FAD98
- .4byte dp01t_00_1_getattr
+gPlayerBufferCommands:: @ 81FAD98
+ .4byte PlayerHandleGetAttributes
.4byte sub_802ECF0
- .4byte dp01t_02_1_setattr
+ .4byte PlayerHandleSetAttributes
.4byte sub_802F7CC
- .4byte sub_802F840
- .4byte sub_802F8A8
- .4byte sub_802FAA0
- .4byte sub_802FBB4
- .4byte sub_802FCE0
- .4byte sub_802FDBC
+ .4byte PlayerHandleLoadPokeSprite
+ .4byte PlayerHandleSendOutPoke
+ .4byte PlayerHandleReturnPokeToBall
+ .4byte PlayerHandleTrainerThrow
+ .4byte PlayerHandleTrainerSlide
+ .4byte PlayerHandleTrainerSlideBack
.4byte sub_802FE7C
.4byte sub_802FF60
.4byte sub_802FF80
- .4byte sub_802FFD0
- .4byte sub_803002C
- .4byte dp01t_0F_1_move_anim
- .4byte sub_80302F4
- .4byte dp01t_11_1_message_for_player_only
+ .4byte PlayerHandleBallThrow
+ .4byte PlayerHandlePuase
+ .4byte PlayerHandleMoveAnimation
+ .4byte PlayerHandlePrintString
+ .4byte PlayerHandlePrintStringPlayerOnly
.4byte sub_803037C
.4byte nullsub_42
.4byte sub_8030468
- .4byte sub_8030530
+ .4byte PlayerHandleOpenBag
.4byte sub_8030594
.4byte sub_8030674
- .4byte sub_8030698
- .4byte sub_8030798
- .4byte sub_8030834
- .4byte sub_80308A8
- .4byte sub_8030910
+ .4byte PlayerHandleHealthBarUpdate
+ .4byte PlayerHandleExpBarUpdate
+ .4byte PlayerHandleStatusIconUpdate
+ .4byte PlayerHandleStatusAnimation
+ .4byte PlayerHandleStatusXor
.4byte sub_803097C
- .4byte sub_8030988
+ .4byte PlayerHandleDMATransfer
.4byte sub_8030A3C
.4byte sub_8030A6C
.4byte sub_8030A78
@@ -1556,20 +1556,20 @@ gUnknown_081FAD98:: @ 81FAD98
.4byte sub_8030AE4
.4byte sub_8030B1C
.4byte sub_8030B34
- .4byte dp01t_29_1_blink
+ .4byte PlayerHandleHitAnimation
.4byte sub_8030BCC
- .4byte sub_8030BD8
+ .4byte PlayerHandleEffectivenessSound
.4byte sub_8030C1C
- .4byte sub_8030C4C
- .4byte dp01t_2E_1_battle_intro
- .4byte sub_8030CC0
+ .4byte PlayerHandleFaintingCry
+ .4byte PlayerHandleIntroSlide
+ .4byte PlayerHandleTrainerBallThrow
.4byte sub_8030FAC
.4byte sub_80310A4
.4byte sub_80310F0
- .4byte dp01t_33_1_enemy_move
- .4byte bx_exec_buffer_A_ch0_tbl1
- .4byte dp01t_35_1_link_standby_message_and_free_vram
- .4byte sub_8031238
+ .4byte PlayerHandleSpriteInvisibility
+ .4byte PlayerHandleBattleAnimation
+ .4byte PlayerHandleLinkStandbyMsg
+ .4byte PlayerHandleResetActionMoveSelection
.4byte sub_80312A0
.4byte nullsub_43
@@ -1670,38 +1670,38 @@ gUnknown_081FAF4C:: @ 81FAF4C
.4byte 0x0200e000
.align 2
-gUnknown_081FAF5C:: @ 81FAF5C
- .4byte dp01t_00_7_getattr
+gOpponentBufferCommands:: @ 81FAF5C
+ .4byte OpponentHandleGetAttributes
.4byte dp01t_01_2_read_pokmon_data_slice
- .4byte dp01t_02_7_setattr
+ .4byte OpponentHandleSetAttributes
.4byte sub_8034744
- .4byte sub_80347B8
- .4byte sub_8034910
- .4byte sub_8034AE0
- .4byte sub_8034BFC
- .4byte sub_8034DC0
- .4byte sub_8034F84
+ .4byte OpponentHandleLoadPokeSprite
+ .4byte OpponentHandleSendOutPoke
+ .4byte OpponentHandleReturnPokeToBall
+ .4byte OpponentHandleTrainerThrow
+ .4byte OpponentHandleTrainerSlide
+ .4byte OpponentHandleTrainerSlideBack
.4byte sub_8035030
.4byte sub_80350D4
.4byte sub_80350E0
- .4byte sub_80350EC
- .4byte sub_80350F8
- .4byte sub_8035104
- .4byte sub_803539C
- .4byte sub_8035400
+ .4byte OpponentHandleBallThrow
+ .4byte OpponentHandlePause
+ .4byte OpponentHandleMoveAnimation
+ .4byte OpponentHandlePrintString
+ .4byte OpponentHandlePrintStringPlayerOnly
.4byte sub_803540C
.4byte sub_803541C
.4byte sub_8035428
.4byte sub_8035590
.4byte sub_80355C0
.4byte sub_80356C0
- .4byte sub_80356CC
- .4byte sub_80357BC
- .4byte sub_80357C8
- .4byte sub_803583C
- .4byte sub_80358A4
+ .4byte OpponentHandleHealthBarUpdate
+ .4byte OpponentHandleExpBarUpdate
+ .4byte OpponentHandleStatusIconUpdate
+ .4byte OpponentHandleStatusAnimation
+ .4byte OpponentHandleStatusXor
.4byte sub_80358B0
- .4byte sub_80358BC
+ .4byte OpponentHandleDMATransfer
.4byte sub_80358C8
.4byte sub_80358D4
.4byte sub_80358E0
@@ -1712,20 +1712,20 @@ gUnknown_081FAF5C:: @ 81FAF5C
.4byte sub_803592C
.4byte sub_8035964
.4byte sub_803597C
- .4byte dp01t_29_7_blink
+ .4byte OpponentHandleHitAnimation
.4byte sub_8035A14
- .4byte sub_8035A20
+ .4byte OpponentHandleEffectivenessSound
.4byte sub_8035A64
- .4byte sub_8035A94
+ .4byte OpponentHandleFaintingCry
.4byte dp01t_2E_7_battle_intro
.4byte sub_8035B04
.4byte dp01t_30_7_0803D67C
.4byte sub_8035E6C
.4byte sub_8035EB8
- .4byte sub_8035EC4
- .4byte dp01t_34_7_move_anim_start_t3
- .4byte sub_8035F8C
- .4byte sub_8035F98
+ .4byte OpponentHandleSpriteInvisibility
+ .4byte OpponentHandleBattleAnimation
+ .4byte OpponentHandleLinkStandbyMsg
+ .4byte OpponentHandleResetActionMoveSelection
.4byte sub_8035FA4
.4byte nullsub_46
@@ -1733,8 +1733,8 @@ gUnknown_081FAF5C:: @ 81FAF5C
.byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20
.align 2
-gUnknown_081FB048:: @ 81FB048
- .4byte dp01t_00_4_getattr
+gLinkOpponentBufferCommands:: @ 81FB048
+ .4byte LinkOpponentHandleGetAttributes
.4byte sub_803889C
.4byte sub_80388A8
.4byte sub_8039220
diff --git a/data/pokeball.s b/data/pokeball.s
deleted file mode 100644
index 788f8bdb7..000000000
--- a/data/pokeball.s
+++ /dev/null
@@ -1,137 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_0820A92C:: @ 820A92C
- obj_tiles gInterfaceGfx_PokeBall, 384, 0xd6d8 @ poke
- obj_tiles gInterfaceGfx_GreatBall, 384, 0xd6d9 @ great
- obj_tiles gInterfaceGfx_SafariBall, 384, 0xd6da @ safari
- obj_tiles gInterfaceGfx_UltraBall, 384, 0xd6db @ ultra
- obj_tiles gInterfaceGfx_MasterBall, 384, 0xd6dc @ master
- obj_tiles gInterfaceGfx_NetBall, 384, 0xd6dd @ net
- obj_tiles gInterfaceGfx_DiveBall, 384, 0xd6de @ dive
- obj_tiles gInterfaceGfx_NestBall, 384, 0xd6df @ nest
- obj_tiles gInterfaceGfx_RepeatBall, 384, 0xd6e0 @ repeat
- obj_tiles gInterfaceGfx_TimerBall, 384, 0xd6e1 @ timer
- obj_tiles gInterfaceGfx_LuxuryBall, 384, 0xd6e2 @ luxury
- obj_tiles gInterfaceGfx_PremierBall, 384, 0xd6e3 @ premier
-
- .align 2
-gUnknown_0820A98C:: @ 820A98C
- obj_pal gInterfacePal_PokeBall, 0xD6D8 @ poke
- obj_pal gInterfacePal_GreatBall, 0xD6D9 @ great
- obj_pal gInterfacePal_SafariBall, 0xD6DA @ safari
- obj_pal gInterfacePal_UltraBall, 0xD6DB @ ultra
- obj_pal gInterfacePal_MasterBall, 0xD6DC @ master
- obj_pal gInterfacePal_NetBall, 0xD6DD @ net
- obj_pal gInterfacePal_DiveBall, 0xD6DE @ dive
- obj_pal gInterfacePal_NestBall, 0xD6DF @ nest
- obj_pal gInterfacePal_RepeatBall, 0xD6E0 @ repeat
- obj_pal gInterfacePal_TimerBall, 0xD6E1 @ timer
- obj_pal gInterfacePal_LuxuryBall, 0xD6E2 @ luxury
- obj_pal gInterfacePal_PremierBall, 0xD6E3 @ premier
-
- .align 2
-gOamData_820A9EC:: @ 820A9EC
- .2byte 0x0300
- .2byte 0x4000
- .2byte 0x0800
-
- .align 2
-gSpriteAnim_820A9F4: @ 820A9F4
- obj_image_anim_frame 0, 5
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_820A9FC: @ 820A9FC
- obj_image_anim_frame 4, 1
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_820AA04: @ 820AA04
- obj_image_anim_frame 8, 5
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_820AA0C: @ 820AA0C
- obj_image_anim_frame 12, 1
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_820AA14:: @ 820AA14
- obj_image_anim_frame 0, 1
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_820AA1C:: @ 820AA1C
- obj_image_anim_frame 4, 5
- obj_image_anim_frame 8, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_820AA28:: @ 820AA28
- obj_image_anim_frame 4, 5
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_820AA34:: @ 820AA34
- .4byte gSpriteAnim_820AA14
- .4byte gSpriteAnim_820AA1C
- .4byte gSpriteAnim_820AA28
-
- @ unused?
- .4byte gSpriteAnim_820A9F4
- .4byte gSpriteAnim_820AA04
- .4byte gSpriteAnim_820A9FC
- .4byte gSpriteAnim_820AA0C
-
- .align 2
-gSpriteAffineAnim_820AA50:: @ 820AA50
- obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
- obj_rot_scal_anim_jump 0
-
- .align 2
-gSpriteAffineAnim_820AA60:: @ 820AA60
- obj_rot_scal_anim_frame 0x0, 0x0, -3, 1
- obj_rot_scal_anim_jump 0
-
- .align 2
-gSpriteAffineAnim_820AA70:: @ 820AA70
- obj_rot_scal_anim_frame 0x0, 0x0, 3, 1
- obj_rot_scal_anim_jump 0
-
- .align 2
-gSpriteAffineAnim_820AA80:: @ 820AA80
- obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
- obj_rot_scal_anim_end
-
- .align 2
-gSpriteAffineAnim_820AA90:: @ 820AA90
- obj_rot_scal_anim_frame 0x0, 0x0, 25, 1
- obj_rot_scal_anim_jump 0
-
- .align 2
-gSpriteAffineAnimTable_820AAA0:: @ 820AAA0
- .4byte gSpriteAffineAnim_820AA50
- .4byte gSpriteAffineAnim_820AA60
- .4byte gSpriteAffineAnim_820AA70
- .4byte gSpriteAffineAnim_820AA80
- .4byte gSpriteAffineAnim_820AA90
-
- .align 2
-gSpriteTemplate_820AAB4:: @ 820AAB4
- spr_template 55000, 55000, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55001, 55001, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55002, 55002, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55003, 55003, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55004, 55004, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55005, 55005, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55006, 55006, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55007, 55007, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55008, 55008, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55009, 55009, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55010, 55010, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
- spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
diff --git a/data/sine_degree_table.inc b/data/sine_degree_table.inc
deleted file mode 100644
index a9cf05b62..000000000
--- a/data/sine_degree_table.inc
+++ /dev/null
@@ -1,183 +0,0 @@
-@ values of sin(x) as Q4.12 fixed-point numbers from x = 0° to x = 179°
- .align 1
-gSineDegreeTable:: @ 82085C4
- .2byte 0x0000 @ sin(0°) = 0
- .2byte 0x0047 @ sin(1°) = 0.017333984375
- .2byte 0x008F @ sin(2°) = 0.034912109375
- .2byte 0x00D6 @ sin(3°) = 0.05224609375
- .2byte 0x011E @ sin(4°) = 0.06982421875
- .2byte 0x0165 @ sin(5°) = 0.087158203125
- .2byte 0x01AC @ sin(6°) = 0.1044921875
- .2byte 0x01F3 @ sin(7°) = 0.121826171875
- .2byte 0x023A @ sin(8°) = 0.13916015625
- .2byte 0x0281 @ sin(9°) = 0.156494140625
- .2byte 0x02C7 @ sin(10°) = 0.173583984375
- .2byte 0x030E @ sin(11°) = 0.19091796875
- .2byte 0x0354 @ sin(12°) = 0.2080078125
- .2byte 0x0399 @ sin(13°) = 0.224853515625
- .2byte 0x03DF @ sin(14°) = 0.241943359375
- .2byte 0x0424 @ sin(15°) = 0.2587890625
- .2byte 0x0469 @ sin(16°) = 0.275634765625
- .2byte 0x04AE @ sin(17°) = 0.29248046875
- .2byte 0x04F2 @ sin(18°) = 0.30908203125
- .2byte 0x0536 @ sin(19°) = 0.32568359375
- .2byte 0x0579 @ sin(20°) = 0.342041015625
- .2byte 0x05BC @ sin(21°) = 0.3583984375
- .2byte 0x05FE @ sin(22°) = 0.37451171875
- .2byte 0x0640 @ sin(23°) = 0.390625
- .2byte 0x0682 @ sin(24°) = 0.40673828125
- .2byte 0x06C3 @ sin(25°) = 0.422607421875
- .2byte 0x0704 @ sin(26°) = 0.4384765625
- .2byte 0x0744 @ sin(27°) = 0.4541015625
- .2byte 0x0783 @ sin(28°) = 0.469482421875
- .2byte 0x07C2 @ sin(29°) = 0.48486328125
- .2byte 0x0800 @ sin(30°) = 0.5
- .2byte 0x083E @ sin(31°) = 0.51513671875
- .2byte 0x087B @ sin(32°) = 0.530029296875
- .2byte 0x08B7 @ sin(33°) = 0.544677734375
- .2byte 0x08F2 @ sin(34°) = 0.55908203125
- .2byte 0x092D @ sin(35°) = 0.573486328125
- .2byte 0x0968 @ sin(36°) = 0.587890625
- .2byte 0x09A1 @ sin(37°) = 0.601806640625
- .2byte 0x09DA @ sin(38°) = 0.61572265625
- .2byte 0x0A12 @ sin(39°) = 0.62939453125
- .2byte 0x0A49 @ sin(40°) = 0.642822265625
- .2byte 0x0A7F @ sin(41°) = 0.656005859375
- .2byte 0x0AB5 @ sin(42°) = 0.669189453125
- .2byte 0x0AE9 @ sin(43°) = 0.681884765625
- .2byte 0x0B1D @ sin(44°) = 0.694580078125
- .2byte 0x0B50 @ sin(45°) = 0.70703125
- .2byte 0x0B82 @ sin(46°) = 0.71923828125
- .2byte 0x0BB4 @ sin(47°) = 0.7314453125
- .2byte 0x0BE4 @ sin(48°) = 0.7431640625
- .2byte 0x0C13 @ sin(49°) = 0.754638671875
- .2byte 0x0C42 @ sin(50°) = 0.76611328125
- .2byte 0x0C6F @ sin(51°) = 0.777099609375
- .2byte 0x0C9C @ sin(52°) = 0.7880859375
- .2byte 0x0CC7 @ sin(53°) = 0.798583984375
- .2byte 0x0CF2 @ sin(54°) = 0.80908203125
- .2byte 0x0D1B @ sin(55°) = 0.819091796875
- .2byte 0x0D44 @ sin(56°) = 0.8291015625
- .2byte 0x0D6B @ sin(57°) = 0.838623046875
- .2byte 0x0D92 @ sin(58°) = 0.84814453125
- .2byte 0x0DB7 @ sin(59°) = 0.857177734375
- .2byte 0x0DDB @ sin(60°) = 0.865966796875
- .2byte 0x0DFE @ sin(61°) = 0.87451171875
- .2byte 0x0E21 @ sin(62°) = 0.883056640625
- .2byte 0x0E42 @ sin(63°) = 0.89111328125
- .2byte 0x0E61 @ sin(64°) = 0.898681640625
- .2byte 0x0E80 @ sin(65°) = 0.90625
- .2byte 0x0E9E @ sin(66°) = 0.91357421875
- .2byte 0x0EBA @ sin(67°) = 0.92041015625
- .2byte 0x0ED6 @ sin(68°) = 0.92724609375
- .2byte 0x0EF0 @ sin(69°) = 0.93359375
- .2byte 0x0F09 @ sin(70°) = 0.939697265625
- .2byte 0x0F21 @ sin(71°) = 0.945556640625
- .2byte 0x0F38 @ sin(72°) = 0.951171875
- .2byte 0x0F4D @ sin(73°) = 0.956298828125
- .2byte 0x0F61 @ sin(74°) = 0.961181640625
- .2byte 0x0F74 @ sin(75°) = 0.9658203125
- .2byte 0x0F86 @ sin(76°) = 0.97021484375
- .2byte 0x0F97 @ sin(77°) = 0.974365234375
- .2byte 0x0FA6 @ sin(78°) = 0.97802734375
- .2byte 0x0FB5 @ sin(79°) = 0.981689453125
- .2byte 0x0FC2 @ sin(80°) = 0.98486328125
- .2byte 0x0FCE @ sin(81°) = 0.98779296875
- .2byte 0x0FD8 @ sin(82°) = 0.990234375
- .2byte 0x0FE1 @ sin(83°) = 0.992431640625
- .2byte 0x0FE9 @ sin(84°) = 0.994384765625
- .2byte 0x0FF0 @ sin(85°) = 0.99609375
- .2byte 0x0FF6 @ sin(86°) = 0.99755859375
- .2byte 0x0FFA @ sin(87°) = 0.99853515625
- .2byte 0x0FFD @ sin(88°) = 0.999267578125
- .2byte 0x0FFF @ sin(89°) = 0.999755859375
- .2byte 0x1000 @ sin(90°) = 1
- .2byte 0x0FFF @ sin(91°) = 0.999755859375
- .2byte 0x0FFD @ sin(92°) = 0.999267578125
- .2byte 0x0FFA @ sin(93°) = 0.99853515625
- .2byte 0x0FF6 @ sin(94°) = 0.99755859375
- .2byte 0x0FF0 @ sin(95°) = 0.99609375
- .2byte 0x0FE9 @ sin(96°) = 0.994384765625
- .2byte 0x0FE1 @ sin(97°) = 0.992431640625
- .2byte 0x0FD8 @ sin(98°) = 0.990234375
- .2byte 0x0FCE @ sin(99°) = 0.98779296875
- .2byte 0x0FC2 @ sin(100°) = 0.98486328125
- .2byte 0x0FB5 @ sin(101°) = 0.981689453125
- .2byte 0x0FA6 @ sin(102°) = 0.97802734375
- .2byte 0x0F97 @ sin(103°) = 0.974365234375
- .2byte 0x0F86 @ sin(104°) = 0.97021484375
- .2byte 0x0F74 @ sin(105°) = 0.9658203125
- .2byte 0x0F61 @ sin(106°) = 0.961181640625
- .2byte 0x0F4D @ sin(107°) = 0.956298828125
- .2byte 0x0F38 @ sin(108°) = 0.951171875
- .2byte 0x0F21 @ sin(109°) = 0.945556640625
- .2byte 0x0F09 @ sin(110°) = 0.939697265625
- .2byte 0x0EF0 @ sin(111°) = 0.93359375
- .2byte 0x0ED6 @ sin(112°) = 0.92724609375
- .2byte 0x0EBA @ sin(113°) = 0.92041015625
- .2byte 0x0E9E @ sin(114°) = 0.91357421875
- .2byte 0x0E80 @ sin(115°) = 0.90625
- .2byte 0x0E61 @ sin(116°) = 0.898681640625
- .2byte 0x0E42 @ sin(117°) = 0.89111328125
- .2byte 0x0E21 @ sin(118°) = 0.883056640625
- .2byte 0x0DFE @ sin(119°) = 0.87451171875
- .2byte 0x0DDB @ sin(120°) = 0.865966796875
- .2byte 0x0DB7 @ sin(121°) = 0.857177734375
- .2byte 0x0D92 @ sin(122°) = 0.84814453125
- .2byte 0x0D6B @ sin(123°) = 0.838623046875
- .2byte 0x0D44 @ sin(124°) = 0.8291015625
- .2byte 0x0D1B @ sin(125°) = 0.819091796875
- .2byte 0x0CF2 @ sin(126°) = 0.80908203125
- .2byte 0x0CC7 @ sin(127°) = 0.798583984375
- .2byte 0x0C9C @ sin(128°) = 0.7880859375
- .2byte 0x0C6F @ sin(129°) = 0.777099609375
- .2byte 0x0C42 @ sin(130°) = 0.76611328125
- .2byte 0x0C13 @ sin(131°) = 0.754638671875
- .2byte 0x0BE4 @ sin(132°) = 0.7431640625
- .2byte 0x0BB4 @ sin(133°) = 0.7314453125
- .2byte 0x0B82 @ sin(134°) = 0.71923828125
- .2byte 0x0B50 @ sin(135°) = 0.70703125
- .2byte 0x0B1D @ sin(136°) = 0.694580078125
- .2byte 0x0AE9 @ sin(137°) = 0.681884765625
- .2byte 0x0AB5 @ sin(138°) = 0.669189453125
- .2byte 0x0A7F @ sin(139°) = 0.656005859375
- .2byte 0x0A49 @ sin(140°) = 0.642822265625
- .2byte 0x0A12 @ sin(141°) = 0.62939453125
- .2byte 0x09DA @ sin(142°) = 0.61572265625
- .2byte 0x09A1 @ sin(143°) = 0.601806640625
- .2byte 0x0968 @ sin(144°) = 0.587890625
- .2byte 0x092D @ sin(145°) = 0.573486328125
- .2byte 0x08F2 @ sin(146°) = 0.55908203125
- .2byte 0x08B7 @ sin(147°) = 0.544677734375
- .2byte 0x087B @ sin(148°) = 0.530029296875
- .2byte 0x083E @ sin(149°) = 0.51513671875
- .2byte 0x0800 @ sin(150°) = 0.5
- .2byte 0x07C2 @ sin(151°) = 0.48486328125
- .2byte 0x0783 @ sin(152°) = 0.469482421875
- .2byte 0x0744 @ sin(153°) = 0.4541015625
- .2byte 0x0704 @ sin(154°) = 0.4384765625
- .2byte 0x06C3 @ sin(155°) = 0.422607421875
- .2byte 0x0682 @ sin(156°) = 0.40673828125
- .2byte 0x0640 @ sin(157°) = 0.390625
- .2byte 0x05FE @ sin(158°) = 0.37451171875
- .2byte 0x05BC @ sin(159°) = 0.3583984375
- .2byte 0x0579 @ sin(160°) = 0.342041015625
- .2byte 0x0536 @ sin(161°) = 0.32568359375
- .2byte 0x04F2 @ sin(162°) = 0.30908203125
- .2byte 0x04AE @ sin(163°) = 0.29248046875
- .2byte 0x0469 @ sin(164°) = 0.275634765625
- .2byte 0x0424 @ sin(165°) = 0.2587890625
- .2byte 0x03DF @ sin(166°) = 0.241943359375
- .2byte 0x0399 @ sin(167°) = 0.224853515625
- .2byte 0x0354 @ sin(168°) = 0.2080078125
- .2byte 0x030E @ sin(169°) = 0.19091796875
- .2byte 0x02C7 @ sin(170°) = 0.173583984375
- .2byte 0x0281 @ sin(171°) = 0.156494140625
- .2byte 0x023A @ sin(172°) = 0.13916015625
- .2byte 0x01F3 @ sin(173°) = 0.121826171875
- .2byte 0x01AC @ sin(174°) = 0.1044921875
- .2byte 0x0165 @ sin(175°) = 0.087158203125
- .2byte 0x011E @ sin(176°) = 0.06982421875
- .2byte 0x00D6 @ sin(177°) = 0.05224609375
- .2byte 0x008F @ sin(178°) = 0.034912109375
- .2byte 0x0047 @ sin(179°) = 0.017333984375
diff --git a/data/sine_table.inc b/data/sine_table.inc
deleted file mode 100644
index fd1a5da72..000000000
--- a/data/sine_table.inc
+++ /dev/null
@@ -1,323 +0,0 @@
-@ values of sin(x*(π/128)) as Q8.8 fixed-point numbers from x = 0 to x = 319
- .align 1
-gSineTable:: @ 8208344
- .2byte 0x0000 @ sin(0*(π/128)) = 0
- .2byte 0x0006 @ sin(1*(π/128)) = 0.0234375
- .2byte 0x000C @ sin(2*(π/128)) = 0.046875
- .2byte 0x0012 @ sin(3*(π/128)) = 0.0703125
- .2byte 0x0019 @ sin(4*(π/128)) = 0.09765625
- .2byte 0x001F @ sin(5*(π/128)) = 0.12109375
- .2byte 0x0025 @ sin(6*(π/128)) = 0.14453125
- .2byte 0x002B @ sin(7*(π/128)) = 0.16796875
- .2byte 0x0031 @ sin(8*(π/128)) = 0.19140625
- .2byte 0x0038 @ sin(9*(π/128)) = 0.21875
- .2byte 0x003E @ sin(10*(π/128)) = 0.2421875
- .2byte 0x0044 @ sin(11*(π/128)) = 0.265625
- .2byte 0x004A @ sin(12*(π/128)) = 0.2890625
- .2byte 0x0050 @ sin(13*(π/128)) = 0.3125
- .2byte 0x0056 @ sin(14*(π/128)) = 0.3359375
- .2byte 0x005C @ sin(15*(π/128)) = 0.359375
- .2byte 0x0061 @ sin(16*(π/128)) = 0.37890625
- .2byte 0x0067 @ sin(17*(π/128)) = 0.40234375
- .2byte 0x006D @ sin(18*(π/128)) = 0.42578125
- .2byte 0x0073 @ sin(19*(π/128)) = 0.44921875
- .2byte 0x0078 @ sin(20*(π/128)) = 0.46875
- .2byte 0x007E @ sin(21*(π/128)) = 0.4921875
- .2byte 0x0083 @ sin(22*(π/128)) = 0.51171875
- .2byte 0x0088 @ sin(23*(π/128)) = 0.53125
- .2byte 0x008E @ sin(24*(π/128)) = 0.5546875
- .2byte 0x0093 @ sin(25*(π/128)) = 0.57421875
- .2byte 0x0098 @ sin(26*(π/128)) = 0.59375
- .2byte 0x009D @ sin(27*(π/128)) = 0.61328125
- .2byte 0x00A2 @ sin(28*(π/128)) = 0.6328125
- .2byte 0x00A7 @ sin(29*(π/128)) = 0.65234375
- .2byte 0x00AB @ sin(30*(π/128)) = 0.66796875
- .2byte 0x00B0 @ sin(31*(π/128)) = 0.6875
- .2byte 0x00B5 @ sin(32*(π/128)) = 0.70703125
- .2byte 0x00B9 @ sin(33*(π/128)) = 0.72265625
- .2byte 0x00BD @ sin(34*(π/128)) = 0.73828125
- .2byte 0x00C1 @ sin(35*(π/128)) = 0.75390625
- .2byte 0x00C5 @ sin(36*(π/128)) = 0.76953125
- .2byte 0x00C9 @ sin(37*(π/128)) = 0.78515625
- .2byte 0x00CD @ sin(38*(π/128)) = 0.80078125
- .2byte 0x00D1 @ sin(39*(π/128)) = 0.81640625
- .2byte 0x00D4 @ sin(40*(π/128)) = 0.828125
- .2byte 0x00D8 @ sin(41*(π/128)) = 0.84375
- .2byte 0x00DB @ sin(42*(π/128)) = 0.85546875
- .2byte 0x00DE @ sin(43*(π/128)) = 0.8671875
- .2byte 0x00E1 @ sin(44*(π/128)) = 0.87890625
- .2byte 0x00E4 @ sin(45*(π/128)) = 0.890625
- .2byte 0x00E7 @ sin(46*(π/128)) = 0.90234375
- .2byte 0x00EA @ sin(47*(π/128)) = 0.9140625
- .2byte 0x00EC @ sin(48*(π/128)) = 0.921875
- .2byte 0x00EE @ sin(49*(π/128)) = 0.9296875
- .2byte 0x00F1 @ sin(50*(π/128)) = 0.94140625
- .2byte 0x00F3 @ sin(51*(π/128)) = 0.94921875
- .2byte 0x00F4 @ sin(52*(π/128)) = 0.953125
- .2byte 0x00F6 @ sin(53*(π/128)) = 0.9609375
- .2byte 0x00F8 @ sin(54*(π/128)) = 0.96875
- .2byte 0x00F9 @ sin(55*(π/128)) = 0.97265625
- .2byte 0x00FB @ sin(56*(π/128)) = 0.98046875
- .2byte 0x00FC @ sin(57*(π/128)) = 0.984375
- .2byte 0x00FD @ sin(58*(π/128)) = 0.98828125
- .2byte 0x00FE @ sin(59*(π/128)) = 0.9921875
- .2byte 0x00FE @ sin(60*(π/128)) = 0.9921875
- .2byte 0x00FF @ sin(61*(π/128)) = 0.99609375
- .2byte 0x00FF @ sin(62*(π/128)) = 0.99609375
- .2byte 0x00FF @ sin(63*(π/128)) = 0.99609375
- .2byte 0x0100 @ sin(64*(π/128)) = 1
- .2byte 0x00FF @ sin(65*(π/128)) = 0.99609375
- .2byte 0x00FF @ sin(66*(π/128)) = 0.99609375
- .2byte 0x00FF @ sin(67*(π/128)) = 0.99609375
- .2byte 0x00FE @ sin(68*(π/128)) = 0.9921875
- .2byte 0x00FE @ sin(69*(π/128)) = 0.9921875
- .2byte 0x00FD @ sin(70*(π/128)) = 0.98828125
- .2byte 0x00FC @ sin(71*(π/128)) = 0.984375
- .2byte 0x00FB @ sin(72*(π/128)) = 0.98046875
- .2byte 0x00F9 @ sin(73*(π/128)) = 0.97265625
- .2byte 0x00F8 @ sin(74*(π/128)) = 0.96875
- .2byte 0x00F6 @ sin(75*(π/128)) = 0.9609375
- .2byte 0x00F4 @ sin(76*(π/128)) = 0.953125
- .2byte 0x00F3 @ sin(77*(π/128)) = 0.94921875
- .2byte 0x00F1 @ sin(78*(π/128)) = 0.94140625
- .2byte 0x00EE @ sin(79*(π/128)) = 0.9296875
- .2byte 0x00EC @ sin(80*(π/128)) = 0.921875
- .2byte 0x00EA @ sin(81*(π/128)) = 0.9140625
- .2byte 0x00E7 @ sin(82*(π/128)) = 0.90234375
- .2byte 0x00E4 @ sin(83*(π/128)) = 0.890625
- .2byte 0x00E1 @ sin(84*(π/128)) = 0.87890625
- .2byte 0x00DE @ sin(85*(π/128)) = 0.8671875
- .2byte 0x00DB @ sin(86*(π/128)) = 0.85546875
- .2byte 0x00D8 @ sin(87*(π/128)) = 0.84375
- .2byte 0x00D4 @ sin(88*(π/128)) = 0.828125
- .2byte 0x00D1 @ sin(89*(π/128)) = 0.81640625
- .2byte 0x00CD @ sin(90*(π/128)) = 0.80078125
- .2byte 0x00C9 @ sin(91*(π/128)) = 0.78515625
- .2byte 0x00C5 @ sin(92*(π/128)) = 0.76953125
- .2byte 0x00C1 @ sin(93*(π/128)) = 0.75390625
- .2byte 0x00BD @ sin(94*(π/128)) = 0.73828125
- .2byte 0x00B9 @ sin(95*(π/128)) = 0.72265625
- .2byte 0x00B5 @ sin(96*(π/128)) = 0.70703125
- .2byte 0x00B0 @ sin(97*(π/128)) = 0.6875
- .2byte 0x00AB @ sin(98*(π/128)) = 0.66796875
- .2byte 0x00A7 @ sin(99*(π/128)) = 0.65234375
- .2byte 0x00A2 @ sin(100*(π/128)) = 0.6328125
- .2byte 0x009D @ sin(101*(π/128)) = 0.61328125
- .2byte 0x0098 @ sin(102*(π/128)) = 0.59375
- .2byte 0x0093 @ sin(103*(π/128)) = 0.57421875
- .2byte 0x008E @ sin(104*(π/128)) = 0.5546875
- .2byte 0x0088 @ sin(105*(π/128)) = 0.53125
- .2byte 0x0083 @ sin(106*(π/128)) = 0.51171875
- .2byte 0x007E @ sin(107*(π/128)) = 0.4921875
- .2byte 0x0078 @ sin(108*(π/128)) = 0.46875
- .2byte 0x0073 @ sin(109*(π/128)) = 0.44921875
- .2byte 0x006D @ sin(110*(π/128)) = 0.42578125
- .2byte 0x0067 @ sin(111*(π/128)) = 0.40234375
- .2byte 0x0061 @ sin(112*(π/128)) = 0.37890625
- .2byte 0x005C @ sin(113*(π/128)) = 0.359375
- .2byte 0x0056 @ sin(114*(π/128)) = 0.3359375
- .2byte 0x0050 @ sin(115*(π/128)) = 0.3125
- .2byte 0x004A @ sin(116*(π/128)) = 0.2890625
- .2byte 0x0044 @ sin(117*(π/128)) = 0.265625
- .2byte 0x003E @ sin(118*(π/128)) = 0.2421875
- .2byte 0x0038 @ sin(119*(π/128)) = 0.21875
- .2byte 0x0031 @ sin(120*(π/128)) = 0.19140625
- .2byte 0x002B @ sin(121*(π/128)) = 0.16796875
- .2byte 0x0025 @ sin(122*(π/128)) = 0.14453125
- .2byte 0x001F @ sin(123*(π/128)) = 0.12109375
- .2byte 0x0019 @ sin(124*(π/128)) = 0.09765625
- .2byte 0x0012 @ sin(125*(π/128)) = 0.0703125
- .2byte 0x000C @ sin(126*(π/128)) = 0.046875
- .2byte 0x0006 @ sin(127*(π/128)) = 0.0234375
- .2byte 0x0000 @ sin(128*(π/128)) = 0
- .2byte 0xFFFA @ sin(129*(π/128)) = -0.0234375
- .2byte 0xFFF4 @ sin(130*(π/128)) = -0.046875
- .2byte 0xFFEE @ sin(131*(π/128)) = -0.0703125
- .2byte 0xFFE7 @ sin(132*(π/128)) = -0.09765625
- .2byte 0xFFE1 @ sin(133*(π/128)) = -0.12109375
- .2byte 0xFFDB @ sin(134*(π/128)) = -0.14453125
- .2byte 0xFFD5 @ sin(135*(π/128)) = -0.16796875
- .2byte 0xFFCF @ sin(136*(π/128)) = -0.19140625
- .2byte 0xFFC8 @ sin(137*(π/128)) = -0.21875
- .2byte 0xFFC2 @ sin(138*(π/128)) = -0.2421875
- .2byte 0xFFBC @ sin(139*(π/128)) = -0.265625
- .2byte 0xFFB6 @ sin(140*(π/128)) = -0.2890625
- .2byte 0xFFB0 @ sin(141*(π/128)) = -0.3125
- .2byte 0xFFAA @ sin(142*(π/128)) = -0.3359375
- .2byte 0xFFA4 @ sin(143*(π/128)) = -0.359375
- .2byte 0xFF9F @ sin(144*(π/128)) = -0.37890625
- .2byte 0xFF99 @ sin(145*(π/128)) = -0.40234375
- .2byte 0xFF93 @ sin(146*(π/128)) = -0.42578125
- .2byte 0xFF8D @ sin(147*(π/128)) = -0.44921875
- .2byte 0xFF88 @ sin(148*(π/128)) = -0.46875
- .2byte 0xFF82 @ sin(149*(π/128)) = -0.4921875
- .2byte 0xFF7D @ sin(150*(π/128)) = -0.51171875
- .2byte 0xFF78 @ sin(151*(π/128)) = -0.53125
- .2byte 0xFF72 @ sin(152*(π/128)) = -0.5546875
- .2byte 0xFF6D @ sin(153*(π/128)) = -0.57421875
- .2byte 0xFF68 @ sin(154*(π/128)) = -0.59375
- .2byte 0xFF63 @ sin(155*(π/128)) = -0.61328125
- .2byte 0xFF5E @ sin(156*(π/128)) = -0.6328125
- .2byte 0xFF59 @ sin(157*(π/128)) = -0.65234375
- .2byte 0xFF55 @ sin(158*(π/128)) = -0.66796875
- .2byte 0xFF50 @ sin(159*(π/128)) = -0.6875
- .2byte 0xFF4B @ sin(160*(π/128)) = -0.70703125
- .2byte 0xFF47 @ sin(161*(π/128)) = -0.72265625
- .2byte 0xFF43 @ sin(162*(π/128)) = -0.73828125
- .2byte 0xFF3F @ sin(163*(π/128)) = -0.75390625
- .2byte 0xFF3B @ sin(164*(π/128)) = -0.76953125
- .2byte 0xFF37 @ sin(165*(π/128)) = -0.78515625
- .2byte 0xFF33 @ sin(166*(π/128)) = -0.80078125
- .2byte 0xFF2F @ sin(167*(π/128)) = -0.81640625
- .2byte 0xFF2C @ sin(168*(π/128)) = -0.828125
- .2byte 0xFF28 @ sin(169*(π/128)) = -0.84375
- .2byte 0xFF25 @ sin(170*(π/128)) = -0.85546875
- .2byte 0xFF22 @ sin(171*(π/128)) = -0.8671875
- .2byte 0xFF1F @ sin(172*(π/128)) = -0.87890625
- .2byte 0xFF1C @ sin(173*(π/128)) = -0.890625
- .2byte 0xFF19 @ sin(174*(π/128)) = -0.90234375
- .2byte 0xFF16 @ sin(175*(π/128)) = -0.9140625
- .2byte 0xFF14 @ sin(176*(π/128)) = -0.921875
- .2byte 0xFF12 @ sin(177*(π/128)) = -0.9296875
- .2byte 0xFF0F @ sin(178*(π/128)) = -0.94140625
- .2byte 0xFF0D @ sin(179*(π/128)) = -0.94921875
- .2byte 0xFF0C @ sin(180*(π/128)) = -0.953125
- .2byte 0xFF0A @ sin(181*(π/128)) = -0.9609375
- .2byte 0xFF08 @ sin(182*(π/128)) = -0.96875
- .2byte 0xFF07 @ sin(183*(π/128)) = -0.97265625
- .2byte 0xFF05 @ sin(184*(π/128)) = -0.98046875
- .2byte 0xFF04 @ sin(185*(π/128)) = -0.984375
- .2byte 0xFF03 @ sin(186*(π/128)) = -0.98828125
- .2byte 0xFF02 @ sin(187*(π/128)) = -0.9921875
- .2byte 0xFF02 @ sin(188*(π/128)) = -0.9921875
- .2byte 0xFF01 @ sin(189*(π/128)) = -0.99609375
- .2byte 0xFF01 @ sin(190*(π/128)) = -0.99609375
- .2byte 0xFF01 @ sin(191*(π/128)) = -0.99609375
- .2byte 0xFF00 @ sin(192*(π/128)) = -1
- .2byte 0xFF01 @ sin(193*(π/128)) = -0.99609375
- .2byte 0xFF01 @ sin(194*(π/128)) = -0.99609375
- .2byte 0xFF01 @ sin(195*(π/128)) = -0.99609375
- .2byte 0xFF02 @ sin(196*(π/128)) = -0.9921875
- .2byte 0xFF02 @ sin(197*(π/128)) = -0.9921875
- .2byte 0xFF03 @ sin(198*(π/128)) = -0.98828125
- .2byte 0xFF04 @ sin(199*(π/128)) = -0.984375
- .2byte 0xFF05 @ sin(200*(π/128)) = -0.98046875
- .2byte 0xFF07 @ sin(201*(π/128)) = -0.97265625
- .2byte 0xFF08 @ sin(202*(π/128)) = -0.96875
- .2byte 0xFF0A @ sin(203*(π/128)) = -0.9609375
- .2byte 0xFF0C @ sin(204*(π/128)) = -0.953125
- .2byte 0xFF0D @ sin(205*(π/128)) = -0.94921875
- .2byte 0xFF0F @ sin(206*(π/128)) = -0.94140625
- .2byte 0xFF12 @ sin(207*(π/128)) = -0.9296875
- .2byte 0xFF14 @ sin(208*(π/128)) = -0.921875
- .2byte 0xFF16 @ sin(209*(π/128)) = -0.9140625
- .2byte 0xFF19 @ sin(210*(π/128)) = -0.90234375
- .2byte 0xFF1C @ sin(211*(π/128)) = -0.890625
- .2byte 0xFF1F @ sin(212*(π/128)) = -0.87890625
- .2byte 0xFF22 @ sin(213*(π/128)) = -0.8671875
- .2byte 0xFF25 @ sin(214*(π/128)) = -0.85546875
- .2byte 0xFF28 @ sin(215*(π/128)) = -0.84375
- .2byte 0xFF2C @ sin(216*(π/128)) = -0.828125
- .2byte 0xFF2F @ sin(217*(π/128)) = -0.81640625
- .2byte 0xFF33 @ sin(218*(π/128)) = -0.80078125
- .2byte 0xFF37 @ sin(219*(π/128)) = -0.78515625
- .2byte 0xFF3B @ sin(220*(π/128)) = -0.76953125
- .2byte 0xFF3F @ sin(221*(π/128)) = -0.75390625
- .2byte 0xFF43 @ sin(222*(π/128)) = -0.73828125
- .2byte 0xFF47 @ sin(223*(π/128)) = -0.72265625
- .2byte 0xFF4B @ sin(224*(π/128)) = -0.70703125
- .2byte 0xFF50 @ sin(225*(π/128)) = -0.6875
- .2byte 0xFF55 @ sin(226*(π/128)) = -0.66796875
- .2byte 0xFF59 @ sin(227*(π/128)) = -0.65234375
- .2byte 0xFF5E @ sin(228*(π/128)) = -0.6328125
- .2byte 0xFF63 @ sin(229*(π/128)) = -0.61328125
- .2byte 0xFF68 @ sin(230*(π/128)) = -0.59375
- .2byte 0xFF6D @ sin(231*(π/128)) = -0.57421875
- .2byte 0xFF72 @ sin(232*(π/128)) = -0.5546875
- .2byte 0xFF78 @ sin(233*(π/128)) = -0.53125
- .2byte 0xFF7D @ sin(234*(π/128)) = -0.51171875
- .2byte 0xFF82 @ sin(235*(π/128)) = -0.4921875
- .2byte 0xFF88 @ sin(236*(π/128)) = -0.46875
- .2byte 0xFF8D @ sin(237*(π/128)) = -0.44921875
- .2byte 0xFF93 @ sin(238*(π/128)) = -0.42578125
- .2byte 0xFF99 @ sin(239*(π/128)) = -0.40234375
- .2byte 0xFF9F @ sin(240*(π/128)) = -0.37890625
- .2byte 0xFFA4 @ sin(241*(π/128)) = -0.359375
- .2byte 0xFFAA @ sin(242*(π/128)) = -0.3359375
- .2byte 0xFFB0 @ sin(243*(π/128)) = -0.3125
- .2byte 0xFFB6 @ sin(244*(π/128)) = -0.2890625
- .2byte 0xFFBC @ sin(245*(π/128)) = -0.265625
- .2byte 0xFFC2 @ sin(246*(π/128)) = -0.2421875
- .2byte 0xFFC8 @ sin(247*(π/128)) = -0.21875
- .2byte 0xFFCF @ sin(248*(π/128)) = -0.19140625
- .2byte 0xFFD5 @ sin(249*(π/128)) = -0.16796875
- .2byte 0xFFDB @ sin(250*(π/128)) = -0.14453125
- .2byte 0xFFE1 @ sin(251*(π/128)) = -0.12109375
- .2byte 0xFFE7 @ sin(252*(π/128)) = -0.09765625
- .2byte 0xFFEE @ sin(253*(π/128)) = -0.0703125
- .2byte 0xFFF4 @ sin(254*(π/128)) = -0.046875
- .2byte 0xFFFA @ sin(255*(π/128)) = -0.0234375
- .2byte 0x0000 @ sin(256*(π/128)) = 0
- .2byte 0x0006 @ sin(257*(π/128)) = 0.0234375
- .2byte 0x000C @ sin(258*(π/128)) = 0.046875
- .2byte 0x0012 @ sin(259*(π/128)) = 0.0703125
- .2byte 0x0019 @ sin(260*(π/128)) = 0.09765625
- .2byte 0x001F @ sin(261*(π/128)) = 0.12109375
- .2byte 0x0025 @ sin(262*(π/128)) = 0.14453125
- .2byte 0x002B @ sin(263*(π/128)) = 0.16796875
- .2byte 0x0031 @ sin(264*(π/128)) = 0.19140625
- .2byte 0x0038 @ sin(265*(π/128)) = 0.21875
- .2byte 0x003E @ sin(266*(π/128)) = 0.2421875
- .2byte 0x0044 @ sin(267*(π/128)) = 0.265625
- .2byte 0x004A @ sin(268*(π/128)) = 0.2890625
- .2byte 0x0050 @ sin(269*(π/128)) = 0.3125
- .2byte 0x0056 @ sin(270*(π/128)) = 0.3359375
- .2byte 0x005C @ sin(271*(π/128)) = 0.359375
- .2byte 0x0061 @ sin(272*(π/128)) = 0.37890625
- .2byte 0x0067 @ sin(273*(π/128)) = 0.40234375
- .2byte 0x006D @ sin(274*(π/128)) = 0.42578125
- .2byte 0x0073 @ sin(275*(π/128)) = 0.44921875
- .2byte 0x0078 @ sin(276*(π/128)) = 0.46875
- .2byte 0x007E @ sin(277*(π/128)) = 0.4921875
- .2byte 0x0083 @ sin(278*(π/128)) = 0.51171875
- .2byte 0x0088 @ sin(279*(π/128)) = 0.53125
- .2byte 0x008E @ sin(280*(π/128)) = 0.5546875
- .2byte 0x0093 @ sin(281*(π/128)) = 0.57421875
- .2byte 0x0098 @ sin(282*(π/128)) = 0.59375
- .2byte 0x009D @ sin(283*(π/128)) = 0.61328125
- .2byte 0x00A2 @ sin(284*(π/128)) = 0.6328125
- .2byte 0x00A7 @ sin(285*(π/128)) = 0.65234375
- .2byte 0x00AB @ sin(286*(π/128)) = 0.66796875
- .2byte 0x00B0 @ sin(287*(π/128)) = 0.6875
- .2byte 0x00B5 @ sin(288*(π/128)) = 0.70703125
- .2byte 0x00B9 @ sin(289*(π/128)) = 0.72265625
- .2byte 0x00BD @ sin(290*(π/128)) = 0.73828125
- .2byte 0x00C1 @ sin(291*(π/128)) = 0.75390625
- .2byte 0x00C5 @ sin(292*(π/128)) = 0.76953125
- .2byte 0x00C9 @ sin(293*(π/128)) = 0.78515625
- .2byte 0x00CD @ sin(294*(π/128)) = 0.80078125
- .2byte 0x00D1 @ sin(295*(π/128)) = 0.81640625
- .2byte 0x00D4 @ sin(296*(π/128)) = 0.828125
- .2byte 0x00D8 @ sin(297*(π/128)) = 0.84375
- .2byte 0x00DB @ sin(298*(π/128)) = 0.85546875
- .2byte 0x00DE @ sin(299*(π/128)) = 0.8671875
- .2byte 0x00E1 @ sin(300*(π/128)) = 0.87890625
- .2byte 0x00E4 @ sin(301*(π/128)) = 0.890625
- .2byte 0x00E7 @ sin(302*(π/128)) = 0.90234375
- .2byte 0x00EA @ sin(303*(π/128)) = 0.9140625
- .2byte 0x00EC @ sin(304*(π/128)) = 0.921875
- .2byte 0x00EE @ sin(305*(π/128)) = 0.9296875
- .2byte 0x00F1 @ sin(306*(π/128)) = 0.94140625
- .2byte 0x00F3 @ sin(307*(π/128)) = 0.94921875
- .2byte 0x00F4 @ sin(308*(π/128)) = 0.953125
- .2byte 0x00F6 @ sin(309*(π/128)) = 0.9609375
- .2byte 0x00F8 @ sin(310*(π/128)) = 0.96875
- .2byte 0x00F9 @ sin(311*(π/128)) = 0.97265625
- .2byte 0x00FB @ sin(312*(π/128)) = 0.98046875
- .2byte 0x00FC @ sin(313*(π/128)) = 0.984375
- .2byte 0x00FD @ sin(314*(π/128)) = 0.98828125
- .2byte 0x00FE @ sin(315*(π/128)) = 0.9921875
- .2byte 0x00FE @ sin(316*(π/128)) = 0.9921875
- .2byte 0x00FF @ sin(317*(π/128)) = 0.99609375
- .2byte 0x00FF @ sin(318*(π/128)) = 0.99609375
- .2byte 0x00FF @ sin(319*(π/128)) = 0.99609375
diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc
index d0c8f74d5..7a47caa0e 100644
--- a/data/text/battle_strings.inc
+++ b/data/text/battle_strings.inc
@@ -1177,7 +1177,7 @@ gUnknown_08400F78:: @ 8400F78
.4byte ContestStatText_TooSour
.align 2
-gUnknown_08400F8C:: @ 8400F8C
+gBattleStringsTable:: @ 8400F8C
.4byte BattleText_UnknownString
.4byte BattleText_GainExpPoints
.4byte BattleText_GrewLevel
@@ -1531,8 +1531,8 @@ gUnknown_08400F8C:: @ 8400F8C
.4byte BattleText_NoEffectOn
.align 1
-gUnknown_08401508:: @ 8401508
-@ Each entry refers to a text pointer in gUnknown_08400F8C, but the values are offset
+gMissStrings:: @ 8401508
+@ Each entry refers to a text pointer in gBattleStringsTable, but the values are offset
@ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the
@ 11th entry in the pointer table.
.2byte BATTLE_TEXT_AttackMissed
@@ -1790,13 +1790,13 @@ BattleTextList_401648:: @ 8401648
.2byte BATTLE_TEXT_RaisedFirePower
.2byte BATTLE_TEXT_MadeIneffective
-gUnknown_0840164C:: @ 840164C
- .2byte BATTLE_TEXT_StopLearning
- .2byte BATTLE_TEXT_FellAsleep
- .2byte BATTLE_TEXT_SpeltHealthy
- .2byte BATTLE_TEXT_SubTookDamage
- .2byte BATTLE_TEXT_CoinScatter
- .2byte BATTLE_TEXT_SandTombTrapped
+gTrappingMoves:: @ 840164C
+ .2byte MOVE_BIND
+ .2byte MOVE_WRAP
+ .2byte MOVE_FIRE_SPIN
+ .2byte MOVE_CLAMP
+ .2byte MOVE_WHIRLPOOL
+ .2byte MOVE_SAND_TOMB
.2byte 0xFFFF
.align 2
diff --git a/data/trig.s b/data/trig.s
deleted file mode 100644
index 6f9c95971..000000000
--- a/data/trig.s
+++ /dev/null
@@ -1,10 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-@ 8208344
- .include "data/sine_table.inc"
-
-@ 82085C4
- .include "data/sine_degree_table.inc"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 10:32:00 +0000