From 91e305255cb4861ad1ecc486c7e07c94476016f0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 5 Nov 2019 21:27:47 -0500 Subject: Dump battle scripts 1 --- include/constants/battle_script_commands.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 3809610ba..c618ffb4b 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -38,8 +38,8 @@ #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_BATTLER_0 7 #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability #define BS_SCRIPTING 10 -- cgit v1.2.3 From 95d19b8e8821d8ac8ad998d4b7109b456335d6bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 11:26:22 -0500 Subject: Sync battle script commands with emerald --- include/constants/battle.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/constants') diff --git a/include/constants/battle.h b/include/constants/battle.h index 910b50562..e025af630 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -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 -- cgit v1.2.3 From 69edfecc16f040a56376c4cd55bb91b15cf6a340 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 12:56:03 -0500 Subject: Update battle scripts with more defines --- include/constants/battle_anim.h | 4 +++- include/constants/battle_script_commands.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 22793032f..b9b176956 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -370,7 +370,9 @@ #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 // 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 c618ffb4b..cbe3a8209 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -75,7 +75,7 @@ #define VARIOUS_RETURN_OPPONENT_MON1 9 #define VARIOUS_RETURN_OPPONENT_MON2 10 #define VARIOUS_CASE_11 11 -#define VARIOUS_CASE_12 12 +#define VARIOUS_WAIT_FANFARE 12 // atk80, dmg manipulation #define ATK80_DMG_CHANGE_SIGN 0 -- cgit v1.2.3 From f3be95d0c0a76f6bf6f5a03792b2ceaf012bc25b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 14:06:51 -0500 Subject: Dump battle_scripts_2.s --- include/constants/battle_anim.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index b9b176956..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 @@ -373,6 +373,8 @@ #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 -- cgit v1.2.3 From 629cb532d8886ba5874b137cab6f148e29a1e753 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 15:05:04 -0500 Subject: Update macros for battle_scripts_2 --- include/constants/battle_script_commands.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index cbe3a8209..49ecfeafa 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -74,7 +74,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_CHECK_POKEFLUTE 11 #define VARIOUS_WAIT_FANFARE 12 // atk80, dmg manipulation -- cgit v1.2.3 From d97eb6353d7f21c28983642dc94033e04bfb488b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 15:52:58 -0500 Subject: Sync battle script documentation with Emerald, 1 --- include/constants/battle.h | 4 ++-- include/constants/battle_script_commands.h | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'include/constants') diff --git a/include/constants/battle.h b/include/constants/battle.h index e025af630..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) diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 49ecfeafa..de1b2a65e 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -39,6 +39,8 @@ #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 #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 @@ -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,7 +75,7 @@ #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 -- cgit v1.2.3 From 64485f5cd106285e6ed7ec461db49e02b6308d8a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 7 Nov 2019 09:23:21 -0500 Subject: TRAINER_SECRET_BASE propagation --- include/constants/trainers.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/constants') 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) -- cgit v1.2.3