summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-28 21:34:39 -0700
committerYamaArashi <shadow962@live.com>2016-10-28 21:34:39 -0700
commit2cb71076125e6c3ef133140968df3fe5e77e9242 (patch)
tree7a6219b79f36898910a9cd2a19396e9da0892987 /data
parent02c4a47cee294ea6f9e34ad3d415c1c402a71e2a (diff)
name battle AI commands by macro names
Diffstat (limited to 'data')
-rw-r--r--data/data2.s190
-rw-r--r--data/specials.inc2
2 files changed, 96 insertions, 96 deletions
diff --git a/data/data2.s b/data/data2.s
index 0fa893e83..bd5f3f9ae 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -23879,101 +23879,101 @@ gUnknown_083F6140:: @ 83F6140
.space 4
.align 2
-gUnknown_083F6144:: @ 83F6144
- .4byte sub_810752C
- .4byte sub_810756C
- .4byte sub_81075AC
- .4byte sub_81075EC
- .4byte sub_810762C
- .4byte sub_8107668
- .4byte sub_81076D0
- .4byte sub_8107738
- .4byte sub_81077A0
- .4byte sub_8107808
- .4byte sub_810787C
- .4byte sub_81078F0
- .4byte sub_8107964
- .4byte sub_81079D8
- .4byte sub_8107A48
- .4byte sub_8107AB8
- .4byte sub_8107B34
- .4byte sub_8107BB0
- .4byte sub_8107BE8
- .4byte sub_8107C20
- .4byte sub_8107C58
- .4byte sub_8107C90
- .4byte sub_8107CE0
- .4byte sub_8107D30
- .4byte sub_8107D80
- .4byte sub_8107DD0
- .4byte sub_8107E10
- .4byte sub_8107E50
- .4byte sub_8107EB4
- .4byte sub_8107F1C
- .4byte sub_8107F84
- .4byte sub_8107FF0
- .4byte sub_8108060
- .4byte sub_81080D0
- .4byte sub_81080F0
- .4byte sub_81081CC
- .4byte sub_81081F4
- .4byte sub_81083D4
- .4byte sub_8108424
- .4byte sub_810845C
- .4byte tai28_unk
- .4byte tai29_unk
- .4byte nullsub_25
- .4byte nullsub_26
- .4byte tai2C_unk
- .4byte sub_8108630
- .4byte sub_8108648
- .4byte sub_8108670
- .4byte tai30_unk
- .4byte dp15_simulate_damage_bonus_jump_if_eq
- .4byte nullsub_71
- .4byte nullsub_90
- .4byte sub_8108964
- .4byte sub_8108A28
- .4byte sub_8108AEC
- .4byte sub_8108B48
- .4byte sub_8108B90
- .4byte sub_8108BD8
- .4byte sub_8108C40
- .4byte sub_8108CA8
- .4byte sub_8108D10
- .4byte tai3D_unk
- .4byte dp15_determine_move_damage_jump_if_not_fatal
- .4byte tai40_unk
- .4byte sub_8109010
- .4byte sub_81090E4
- .4byte sub_81091D4
- .4byte tai43_unk
- .4byte sub_8109330
- .4byte sub_81093B8
- .4byte sub_81093C8
- .4byte sub_810942C
- .4byte dp15_get_held_item_x12__8
- .4byte tai49_unk
- .4byte sub_810950C
- .4byte sub_8109554
- .4byte sub_810959C
- .4byte sub_81095C0
- .4byte sub_8109604
- .4byte sub_810962C
- .4byte sub_8109654
- .4byte sub_810967C
- .4byte nullsub_27
- .4byte nullsub_28
- .4byte nullsub_29
- .4byte nullsub_30
- .4byte nullsub_31
- .4byte nullsub_32
- .4byte sub_81096DC
- .4byte sub_810970C
- .4byte sub_810972C
- .4byte dp15_compare_attacker_defender_levels
- .4byte sub_8109824
- .4byte sub_8109874
+gBattleAICmdTable:: @ 83F6144
+ .4byte BattleAICmd_if_random
+ .4byte BattleAICmd_if_not_random
+ .4byte BattleAICmd_if_random_1
+ .4byte BattleAICmd_if_not_random_1
+ .4byte BattleAICmd_score
+ .4byte BattleAICmd_if_hp_less_than
+ .4byte BattleAICmd_if_hp_more_than
+ .4byte BattleAICmd_if_hp_equal
+ .4byte BattleAICmd_if_hp_not_equal
+ .4byte BattleAICmd_if_status
+ .4byte BattleAICmd_if_not_status
+ .4byte BattleAICmd_if_status2
+ .4byte BattleAICmd_if_not_status2
+ .4byte BattleAICmd_if_status3
+ .4byte BattleAICmd_if_not_status3
+ .4byte BattleAICmd_if_status4
+ .4byte BattleAICmd_if_not_status4
+ .4byte BattleAICmd_if_less_than
+ .4byte BattleAICmd_if_more_than
+ .4byte BattleAICmd_if_equal
+ .4byte BattleAICmd_if_not_equal
+ .4byte BattleAICmd_if_less_than_32
+ .4byte BattleAICmd_if_more_than_32
+ .4byte BattleAICmd_if_equal_32
+ .4byte BattleAICmd_if_not_equal_32
+ .4byte BattleAICmd_if_move
+ .4byte BattleAICmd_if_not_move
+ .4byte BattleAICmd_if_in_bytes
+ .4byte BattleAICmd_if_not_in_bytes
+ .4byte BattleAICmd_if_in_words
+ .4byte BattleAICmd_if_not_in_words
+ .4byte BattleAICmd_if_user_can_damage
+ .4byte BattleAICmd_if_user_cant_damage
+ .4byte BattleAICmd_unk_21
+ .4byte BattleAICmd_get_type
+ .4byte BattleAICmd_unk_23
+ .4byte BattleAICmd_unk_24
+ .4byte BattleAICmd_get_move
+ .4byte BattleAICmd_if_type
+ .4byte BattleAICmd_unk_27
+ .4byte BattleAICmd_if_would_go_first
+ .4byte BattleAICmd_if_would_not_go_first
+ .4byte BattleAICmd_unk_2A
+ .4byte BattleAICmd_unk_2B
+ .4byte BattleAICmd_count_alive_pokemon
+ .4byte BattleAICmd_unk_2D
+ .4byte BattleAICmd_unk_2E
+ .4byte BattleAICmd_get_ability
+ .4byte BattleAICmd_unk_30
+ .4byte BattleAICmd_if_damage_bonus
+ .4byte BattleAICmd_unk_32
+ .4byte BattleAICmd_unk_33
+ .4byte BattleAICmd_if_status_in_party
+ .4byte BattleAICmd_if_status_not_in_party
+ .4byte BattleAICmd_unk_36
+ .4byte BattleAICmd_if_effect
+ .4byte BattleAICmd_if_not_effect
+ .4byte BattleAICmd_if_stat_level_less_than
+ .4byte BattleAICmd_if_stat_level_more_than
+ .4byte BattleAICmd_if_stat_level_equal
+ .4byte BattleAICmd_if_stat_level_not_equal
+ .4byte BattleAICmd_if_can_faint
+ .4byte BattleAICmd_if_cant_faint
+ .4byte BattleAICmd_unk_3F
+ .4byte BattleAICmd_unk_40
+ .4byte BattleAICmd_if_move_effect
+ .4byte BattleAICmd_if_not_move_effect
+ .4byte BattleAICmd_if_last_move_did_damage
+ .4byte BattleAICmd_if_encored
+ .4byte BattleAICmd_unk_45
+ .4byte BattleAICmd_if_random_2
+ .4byte BattleAICmd_unk_47
+ .4byte BattleAICmd_get_hold_effect
+ .4byte BattleAICmd_get_gender
+ .4byte BattleAICmd_is_first_turn
+ .4byte BattleAICmd_get_stockpile_count
+ .4byte BattleAICmd_unk_4C
+ .4byte BattleAICmd_get_item
+ .4byte BattleAICmd_unk_4E
+ .4byte BattleAICmd_unk_4F
+ .4byte BattleAICmd_unk_50
+ .4byte BattleAICmd_get_protect_count
+ .4byte BattleAICmd_unk_52
+ .4byte BattleAICmd_unk_53
+ .4byte BattleAICmd_unk_54
+ .4byte BattleAICmd_unk_55
+ .4byte BattleAICmd_unk_56
+ .4byte BattleAICmd_unk_57
+ .4byte BattleAICmd_call
+ .4byte BattleAICmd_jump
+ .4byte BattleAICmd_unk_5A
+ .4byte BattleAICmd_if_level_cond
+ .4byte BattleAICmd_if_taunted
+ .4byte BattleAICmd_if_not_taunted
gUnknown_083F62BC:: @ 83F62BC
.incbin "baserom.gba", 0x003f62bc, 0x1c
diff --git a/data/specials.inc b/data/specials.inc
index b7ac9ad90..a3eac3160 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -233,7 +233,7 @@ gSpecials::
.4byte GetLeadMonFriendshipScore
.4byte sub_8134548
.4byte sub_81347F8
- .4byte sub_81352E4
+ .4byte CheckPartyBattleTowerBanlist
.4byte sub_8135474
.4byte sub_81360C0
.4byte sub_813556C