Merge pull request #144 from PikalaxALT/dism_more_data

Dump battle scripts and several rfu3 strings

4 files changed, 19 insertions, 8 deletions

diff --git a/include/constants/battle.h b/include/constants/battle.h
index 910b50562..2da89d815 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -169,14 +169,14 @@
 #define HITMARKER_UNABLE_TO_USE_MOVE    0x00080000
 #define HITMARKER_x100000               0x00100000
 #define HITMARKER_x200000               0x00200000
-#define HITMARKER_x400000               0x00400000
+#define HITMARKER_PLAYER_FAINTED        0x00400000
 #define HITMARKER_x800000               0x00800000
 #define HITMARKER_GRUDGE                0x01000000
 #define HITMARKER_OBEYS                 0x02000000
 #define HITMARKER_x4000000              0x04000000
 #define HITMARKER_CHARGING              0x08000000
 #define HITMARKER_FAINTED(battler)      (gBitTable[battler] << 0x1C)
-#define HITMARKER_UNK(battler)          (0x10000000 << battler)
+#define HITMARKER_FAINTED2(battler)     (0x10000000 << battler)
 
 // Per-side statuses that affect an entire party
 #define SIDE_STATUS_REFLECT          (1 << 0)
@@ -215,6 +215,7 @@
 #define WEATHER_ANY                 (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
 
 // Move Effects
+#define MOVE_EFFECT_NOTHING_0           0x0
 #define MOVE_EFFECT_SLEEP               0x1
 #define MOVE_EFFECT_POISON              0x2
 #define MOVE_EFFECT_BURN                0x3
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h
index 22793032f..962cad668 100644
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -351,7 +351,7 @@
 #define B_ANIM_STATS_CHANGE             0x1
 #define B_ANIM_SUBSTITUTE_FADE          0x2
 #define B_ANIM_SUBSTITUTE_APPEAR        0x3
-#define B_ANIM_POKEBLOCK_THROW          0x4
+#define B_ANIM_BAIT_THROW               0x4
 #define B_ANIM_ITEM_KNOCKOFF            0x5
 #define B_ANIM_TURN_TRAP                0x6
 #define B_ANIM_ITEM_EFFECT              0x7
@@ -370,7 +370,11 @@
 #define B_ANIM_FOCUS_PUNCH_SETUP        0x14
 #define B_ANIM_INGRAIN_HEAL             0x15
 #define B_ANIM_WISH_HEAL                0x16
-#define B_ANIM_x19                      0x19
+#define B_ANIM_MON_SCARED               0x17
+#define B_ANIM_GHOST_GET_OUT            0x18
+#define B_ANIM_SILPH_SCOPED             0x19
+#define B_ANIM_ROCK_THROW               0x1A
+#define B_ANIM_SAFARI_REACTION          0x1B
 
 // special animations table
 #define B_ANIM_LVL_UP                   0x0
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 3809610ba..de1b2a65e 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -38,8 +38,10 @@
 #define BS_ATTACKER                 1
 #define BS_EFFECT_BATTLER           2
 #define BS_FAINTED                  3
-#define BS_BATTLER_0                7
 #define BS_ATTACKER_WITH_PARTNER    4 // for atk98_updatestatusicon
+#define BS_UNKNOWN_5                5 // for openpartyscreen
+#define BS_UNKNOWN_6                6 // for openpartyscreen
+#define BS_BATTLER_0                7
 #define BS_ATTACKER_SIDE            8 // for atk1E_jumpifability
 #define BS_NOT_ATTACKER_SIDE        9 // for atk1E_jumpifability
 #define BS_SCRIPTING                10
@@ -48,6 +50,9 @@
 #define BS_PLAYER2                  13 // for atk98_updatestatusicon
 #define BS_OPPONENT2                14
 
+// used for openpartyscreen
+#define OPEN_PARTY_ALLOW_CANCEL     0x80
+
 // atk 01, accuracy calc
 #define NO_ACC_CALC 0xFFFE
 #define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF
@@ -70,12 +75,12 @@
 #define VARIOUS_CASE_4                          4
 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
-#define VARIOUS_CASE_7                          7
+#define VARIOUS_RESET_PLAYER_FAINTED_FLAG                          7
 #define VARIOUS_CASE_8                          8
 #define VARIOUS_RETURN_OPPONENT_MON1            9
 #define VARIOUS_RETURN_OPPONENT_MON2            10
-#define VARIOUS_CASE_11                         11
-#define VARIOUS_CASE_12                         12
+#define VARIOUS_CHECK_POKEFLUTE                 11
+#define VARIOUS_WAIT_FANFARE                    12
 
 // atk80, dmg manipulation
 #define ATK80_DMG_CHANGE_SIGN                               0
diff --git a/include/constants/trainers.h b/include/constants/trainers.h
index d8c429ed5..30e11c14f 100644
--- a/include/constants/trainers.h
+++ b/include/constants/trainers.h
@@ -165,6 +165,7 @@
 #define TRAINER_PIC_LADY                  146
 #define TRAINER_PIC_PAINTER               147
 
+// Leftover from R/S
 #define TRAINER_SECRET_BASE                 1024
 
 #define F_TRAINER_FEMALE (1 << 7)