summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data2.s253
-rw-r--r--data/sprite.s2
2 files changed, 252 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s
index 8a1ac0d23..09a3ff8d0 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1344,8 +1344,257 @@ gUnknown_0831BCF3:: @ 831BCF3
gUnknown_0831BCF8:: @ 831BCF8
.incbin "baserom.gba", 0x31bcf8, 0x18
-gUnknown_0831BD10:: @ 831BD10
- .incbin "baserom.gba", 0x31bd10, 0x3e4
+ .align 2, 0
+gBattleScriptingCommandsTable:: @ 831BD10
+ .4byte atk00_attackcanceler
+ .4byte atk01_accuracycheck
+ .4byte atk02_attackstring
+ .4byte atk03_ppreduce
+ .4byte atk04_critcalc
+ .4byte atk05_cmd5
+ .4byte sub_8047038
+ .4byte atk07_cmd7
+ .4byte atk08_cmd8
+ .4byte atk09_attackanimation
+ .4byte sub_8047DC8
+ .4byte atk0B_graphicalhpupdate
+ .4byte atk0C_datahpupdate
+ .4byte atk0D_critmessage
+ .4byte atk0E_missmessage
+ .4byte atk0F_resultmessage
+ .4byte atk10_printstring
+ .4byte atk11_printstring2
+ .4byte atk12_waitmessage
+ .4byte atk13_printfromtable
+ .4byte atk14_printfromtable2
+ .4byte atk15_seteffectwithchancetarget
+ .4byte sub_8049AC0
+ .4byte sub_8049AD0
+ .4byte sub_8049AE0
+ .4byte atk19_faintpokemon
+ .4byte sub_8049E40
+ .4byte sub_8049E7C
+ .4byte atk1C_jumpifstatus
+ .4byte atk1D_jumpifsecondarystatus
+ .4byte atk1E_jumpifability
+ .4byte sub_804A0DC
+ .4byte sub_804A154
+ .4byte atk21_jumpifspecialstatusflag
+ .4byte sub_804A2D0
+ .4byte sub_804A32C
+ .4byte sub_804ACD0
+ .4byte atk25_cmd25
+ .4byte atk26_80225F0_storebyteforjump
+ .4byte atk27_cmd27
+ .4byte atk28_goto
+ .4byte atk29_jumpifbyte
+ .4byte sub_804B0A8
+ .4byte sub_804B150
+ .4byte sub_804B204
+ .4byte sub_804B28C
+ .4byte sub_804B310
+ .4byte sub_804B338
+ .4byte sub_804B364
+ .4byte atk31_copyarray
+ .4byte atk32_memcpy_with_offset
+ .4byte atk33_orbyte
+ .4byte atk34_orhalfword
+ .4byte atk35_orword
+ .4byte atk36_bicbyte
+ .4byte atk37_bichalfword
+ .4byte atk38_bicword
+ .4byte atk39_pause
+ .4byte sub_804B5E0
+ .4byte atk3B_8022C68
+ .4byte atk3C_return
+ .4byte sub_804B664
+ .4byte atk3E_end2
+ .4byte atk3F_end3
+ .4byte atk40_801DBA0
+ .4byte atk41_call
+ .4byte atk42_jumpiftype2
+ .4byte sub_804B784
+ .4byte sub_804B7D0
+ .4byte atk46_cmd46
+ .4byte sub_804B8B0
+ .4byte sub_804B97C
+ .4byte atk48_playstatchangeanimation
+ .4byte sub_804BBCC
+ .4byte atk4A_damagecalc2
+ .4byte atk4B_cmd4b
+ .4byte atk4C_switch1
+ .4byte sub_804C904
+ .4byte atk4E_switch3
+ .4byte atk4F_jumpifcannotswitch
+ .4byte atk50_openpartyscreen
+ .4byte atk51_cmd51
+ .4byte atk52_cmd52
+ .4byte sub_804DDA8
+ .4byte atk54_802511C
+ .4byte sub_804DE14
+ .4byte atk56_8025194
+ .4byte atk57_80251C4_flee
+ .4byte atk58_cmd58
+ .4byte atk59_8025230
+ .4byte sub_804E038
+ .4byte atk5B_80256E0
+ .4byte atk5C_cmd5c
+ .4byte sub_804E6D8
+ .4byte atk5E_8025A70
+ .4byte atk5F_8025B24
+ .4byte atk60_cmd60
+ .4byte atk61_8025BA4
+ .4byte atk62_08025C6C
+ .4byte atk63_jumptoattack
+ .4byte atk64_statusanimation
+ .4byte atk65_8025D90
+ .4byte atk66_8025E38
+ .4byte atk67_8025ECC
+ .4byte sub_804ECA4
+ .4byte atk69_8025FE0
+ .4byte atk6A_stash_item_for_side
+ .4byte atk6B_end_battle_80261CC
+ .4byte atk6C_8026208
+ .4byte sub_804F4D4
+ .4byte atk6E_state0_side_becomes_attacker
+ .4byte atk6F_8026810
+ .4byte atk70_record_ability_usage_of_side
+ .4byte atk71_80268A0
+ .4byte atk72_flee
+ .4byte atk73_cmd73
+ .4byte atk74_hp_tresholds_2
+ .4byte atk75_8026A58
+ .4byte sub_804F7AC
+ .4byte atk77_setprotect
+ .4byte atk78_faintifabilitynotdamp
+ .4byte atk79_setuserhptozero
+ .4byte sub_8050044
+ .4byte sub_80500E8
+ .4byte sub_8050164
+ .4byte sub_80502C8
+ .4byte atk7E_setreflect
+ .4byte sub_80503E8
+ .4byte atk80_manipulatedamage
+ .4byte atk81_setrest
+ .4byte atk82_jumpifnotfirstturn
+ .4byte sub_8050640
+ .4byte sub_80506EC
+ .4byte sub_8050768
+ .4byte atk86_stockpiletobasedamage
+ .4byte atk87_stockpiletohprecovery
+ .4byte atk88_negativedamage
+ .4byte atk89_statbuffchange
+ .4byte atk8A_normalisebuffs
+ .4byte atk8B_setbide
+ .4byte atk8C_confuseifrepeatingattackends
+ .4byte atk8D_setloopcounter
+ .4byte atk8E_cmd8e
+ .4byte sub_805112C
+ .4byte sub_8051424
+ .4byte atk91_givemoney
+ .4byte atk92_setlightscreen
+ .4byte atk93_ko_move
+ .4byte atk94_gethalfcurrentenemyhp
+ .4byte sub_8051AC0
+ .4byte sub_8051B18
+ .4byte atk97_tryinfatuatetarget
+ .4byte sub_8051E48
+ .4byte atk99_setmisteffect
+ .4byte atk9A_setincreasedcriticalchance
+ .4byte atk9B_transformdataexecution
+ .4byte sub_80521FC
+ .4byte atk9D_copyattack
+ .4byte sub_80524DC
+ .4byte atk9F_nightshadedamageeffect
+ .4byte atkA0_psywavedamageeffect
+ .4byte atkA1_counterdamagecalculator
+ .4byte atkA2_mirrorcoatdamagecalculator
+ .4byte atkA3_disablelastusedattack
+ .4byte atkA4_setencore
+ .4byte sub_8052A70
+ .4byte atkA6_settypetorandomresistance
+ .4byte atkA7_setalwayshitflag
+ .4byte atkA8_copymovepermanently
+ .4byte sub_8053018
+ .4byte atkAA_destinybondeffect
+ .4byte atkAB_802A458
+ .4byte atkAC_remaininghptopower
+ .4byte atkAD_reducepprandom
+ .4byte atkAE_clearstatusifnotsoundproofed
+ .4byte atkAF_cursetarget
+ .4byte atkB0_setspikes
+ .4byte atkB1_setforesight
+ .4byte atkB2_setperishsong
+ .4byte atkB3_rolloutdamagecalculation
+ .4byte atkB4_jumpifconfusedandattackmaxed
+ .4byte sub_8053AF8
+ .4byte atkB6_happinesstodamagecalculation
+ .4byte atkB7_presentdamagecalculation
+ .4byte atkB8_setsafeguard
+ .4byte atkB9_magnitudedamagecalculation
+ .4byte atkBA_802B140
+ .4byte sub_805405C
+ .4byte atkBC_maxattackhalvehp
+ .4byte atkBD_copyfoestats
+ .4byte atkBE_breakfree
+ .4byte atkBF_setcurled
+ .4byte atkC0_recoverbasedonsunlight
+ .4byte sub_8054400
+ .4byte atkC2_selectnexttarget
+ .4byte atkC3_setfutureattack
+ .4byte atkC4_802B910
+ .4byte atkC5_hidepreattack
+ .4byte atkC6_unhidepostattack
+ .4byte atkC7_setminimize
+ .4byte sub_8054A48
+ .4byte atkC9_jumpifattackandspecialattackcannotfall
+ .4byte atkCA_setforcedtarget
+ .4byte atkCB_setcharge
+ .4byte atkCC_callterrainattack
+ .4byte atkCD_cureifburnedparalysedorpoisoned
+ .4byte atkCE_settorment
+ .4byte atkCF_jumpifnodamage
+ .4byte atkD0_settaunt
+ .4byte atkD1_sethelpinghand
+ .4byte sub_8054EB4
+ .4byte sub_8055148
+ .4byte atkD4_802C408
+ .4byte sub_8055294
+ .4byte atkD6_doubledamagedealtifdamaged
+ .4byte sub_805534C
+ .4byte atkD8_setdamagetohealthdifference
+ .4byte atkD9_scaledamagebyhealthratio
+ .4byte atkDA_abilityswap
+ .4byte atkDB_imprisoneffect
+ .4byte atkDC_setgrudge
+ .4byte atkDD_weightdamagecalculation
+ .4byte atkDE_asistattackselect
+ .4byte atkDF_setmagiccoat
+ .4byte atkE0_setstealstatchange
+ .4byte atkE1_802CBE4
+ .4byte atkE2_cmde2
+ .4byte atkE3_jumpiffainted
+ .4byte sub_8055B48
+ .4byte atkE5_pickupitemcalculation
+ .4byte atkE6_castform_transform
+ .4byte atkE7_castform_switch
+ .4byte atkE8_settypebasedhalvers
+ .4byte atkE9_seteffectbyweather
+ .4byte atkEA_recycleitem
+ .4byte atkEB_settypetoterrain
+ .4byte atkEC_802D2A0
+ .4byte atkED_802D364
+ .4byte atkEE_removereflectlightscreen
+ .4byte sub_8056300
+ .4byte atkF0_catch_pokemon
+ .4byte atkF1_802D95C
+ .4byte sub_80568CC
+ .4byte atkF3_receive_new_pokemon_maybe
+ .4byte sub_8056E78
+ .4byte atkF5_reset_attacker_bd_x4C
+ .4byte sub_8056ED0
+ .4byte sub_8056EDC
+ .4byte sub_8056EF8
gUnknown_0831C0F4:: @ 831C0F4
.incbin "baserom.gba", 0x31c0f4, 0x34
diff --git a/data/sprite.s b/data/sprite.s
index 59308d286..ba7d5eaf8 100644
--- a/data/sprite.s
+++ b/data/sprite.s
@@ -9,7 +9,7 @@
gUnknown_082EC634:: @ 82EC634
.incbin "baserom.gba", 0x2ec634, 0x18
-gUnknown_082EC64C:: @ 82EC64C
+sDummySprite:: @ 82EC64C
.incbin "baserom.gba", 0x2ec64c, 0x44
@ off-screen and low priority relative to background