From b37d8c0821997038c96723d85bcc95734af0c159 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 16 Nov 2017 20:38:10 +0100 Subject: start decompiling wild encounter --- include/global.h | 2 +- include/pokeblock.h | 2 +- include/vars.h | 1 + include/wild_encounter.h | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 include/wild_encounter.h (limited to 'include') diff --git a/include/global.h b/include/global.h index 3421517d7..7547d523b 100644 --- a/include/global.h +++ b/include/global.h @@ -579,7 +579,7 @@ struct SaveBlock1 /*0x2BB0*/ u16 unk2BB0[6]; /*0x2BBC*/ u16 unk2BBC[6]; /*0x2BC8*/ u16 unk2BC8[6]; - /*0x2BD4*/ u16 unk2BD4[3]; + /*0x2BD4*/ u16 unk2BD4[6]; /*0x2BE0*/ struct MailStruct mail[16]; /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system /*0x2E25*/ u8 unk2E25[3]; // possibly padding? diff --git a/include/pokeblock.h b/include/pokeblock.h index 5d52f8e55..b0e93f0e5 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -23,6 +23,7 @@ enum }; void ClearPokeblocks(void); +s16 PokeblockGetGain(u8, const struct Pokeblock *); /* void sub_810B96C(void); @@ -32,7 +33,6 @@ s16 GetPokeblockData(const struct Pokeblock *, u8); u8 sub_810C9E8(struct Pokeblock *); void sub_810BA7C(u8); bool8 PokeblockClearIfExists(u8); -s16 PokeblockGetGain(u8, const struct Pokeblock *); u8 sub_810CB68(u8, u8*); void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest); void CB2_PreparePokeblockFeedScene(void); diff --git a/include/vars.h b/include/vars.h index f8057d4b5..763b7379d 100644 --- a/include/vars.h +++ b/include/vars.h @@ -30,6 +30,7 @@ #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_0x4037 0x4037 +#define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_DAYS 0x4040 #define VAR_DEPT_STORE_FLOOR 0x4043 diff --git a/include/wild_encounter.h b/include/wild_encounter.h new file mode 100644 index 000000000..c9d7c3fa1 --- /dev/null +++ b/include/wild_encounter.h @@ -0,0 +1,39 @@ +#ifndef GUARD_WILD_ENCOUNTER_H +#define GUARD_WILD_ENCOUNTER_H + +struct WildPokemon +{ + u8 minLevel; + u8 maxLevel; + u16 species; +}; + +struct WildPokemonInfo +{ + u8 encounterRate; + const struct WildPokemon *wildPokemon; +}; + +struct WildPokemonHeader +{ + u8 mapGroup; + u8 mapNum; + const struct WildPokemonInfo *landMonsInfo; + const struct WildPokemonInfo *waterMonsInfo; + const struct WildPokemonInfo *rockSmashMonsInfo; + const struct WildPokemonInfo *fishingMonsInfo; +}; + +extern const struct WildPokemonHeader gWildMonHeaders[]; + +void DisableWildEncounters(bool8 disabled); +bool8 StandardWildEncounter(u16 a, u16 b); +void ScrSpecial_RockSmashWildEncounter(void); +bool8 SweetScentWildEncounter(void); +bool8 DoesCurrentMapHaveFishingMons(void); +void FishingWildEncounter(u8 rod); +u16 GetLocalWildMon(bool8 *isWaterMon); +u16 GetLocalWaterMon(void); +bool8 UpdateRepelCounter(void); + +#endif // GUARD_WILD_ENCOUNTER_H -- cgit v1.2.3 From a2a17bba926d1465108ab55c47f9145494ff78e5 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 17 Nov 2017 17:50:07 +0100 Subject: more work on wild encounter --- include/battle_setup.h | 3 +++ include/flags.h | 2 ++ include/global.h | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_setup.h b/include/battle_setup.h index e4acd8601..0168022cc 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -4,6 +4,9 @@ void BattleSetup_StartScriptedWildBattle(void); u8 BattleSetup_GetTerrainId(void); u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); +void BattleSetup_StartBattlePikeWildBattle(void); +void BattleSetup_StartWildBattle(void); +void BattleSetup_StartRoamerBattle(void); u8 HasTrainerAlreadyBeenFought(u16); void trainer_flag_set(u16); diff --git a/include/flags.h b/include/flags.h index 6dfae9ab2..7cc310633 100644 --- a/include/flags.h +++ b/include/flags.h @@ -1,6 +1,8 @@ #ifndef GUARD_FLAGS_H #define GUARD_FLAGS_H +#define FLAG_LEGENDARIES_IN_SOOTOPOLIS 0x53 + #define FLAG_TRAINER_FLAG_START 0x500 #define TRAINERS_FLAG_NO 0x356 #define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 diff --git a/include/global.h b/include/global.h index 7547d523b..490ebe64e 100644 --- a/include/global.h +++ b/include/global.h @@ -215,7 +215,9 @@ struct SaveBlock2 /*0xCA9*/ u8 field_CA9_d : 1; // 0x20 /*0xCA9*/ u8 field_CA9_e : 1; // 0x40 /*0xCA9*/ u8 field_CA9_f : 1; // 0x80 - /*0xCAA*/ u16 field_CAA[0x2e]; + /*0xCAA*/ u16 field_CAA[4]; + /*0xCB2*/ u16 battlePyramidWildHeaderId; + /*0xCB4*/ u8 field_CB4[88]; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; /*0xd08*/ u8 filler_D08[0x112]; @@ -590,7 +592,7 @@ struct SaveBlock1 /*0x3030*/ struct DaycareData daycare; /*0x3150*/ struct LinkBattleRecord linkBattleRecords[5]; /*0x31A0*/ u8 unk_31A0; - /*0x31A1*/ u8 filler_31A1[7]; + /*0x31A1*/ u8 filler_31A1[3]; /*0x31A8*/ u8 giftRibbons[52]; /*0x31DC*/ struct Roamer roamer; /*0x31F8*/ struct EnigmaBerry enigmaBerry; -- cgit v1.2.3 From 6b075ae0ffc82a8aff6ae5812f9f6f7675c08031 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 17 Nov 2017 22:28:55 +0100 Subject: wild encounter file is decompiled --- include/global.h | 7 +++---- include/link.h | 1 + include/tv.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 490ebe64e..c05d6a309 100644 --- a/include/global.h +++ b/include/global.h @@ -217,10 +217,10 @@ struct SaveBlock2 /*0xCA9*/ u8 field_CA9_f : 1; // 0x80 /*0xCAA*/ u16 field_CAA[4]; /*0xCB2*/ u16 battlePyramidWildHeaderId; - /*0xCB4*/ u8 field_CB4[88]; + /*0xCB4*/ u8 field_CB4[82]; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; - /*0xd08*/ u8 filler_D08[0x112]; + /*0xD08*/ u8 filler_D08[0x112]; /*0xE1A*/ u16 battlePyramidFloor; // possibly? /*0xE1C*/ u8 field_E1C[16]; /*0xE2C*/ struct PyramidBag pyramidBag; @@ -587,12 +587,11 @@ struct SaveBlock1 /*0x2E25*/ u8 unk2E25[3]; // possibly padding? /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff - /*0x2e8c*/ u8 filler_2E8C[0x4]; /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum /*0x3030*/ struct DaycareData daycare; /*0x3150*/ struct LinkBattleRecord linkBattleRecords[5]; /*0x31A0*/ u8 unk_31A0; - /*0x31A1*/ u8 filler_31A1[3]; + /*0x31A1*/ u8 filler_31A1[7]; /*0x31A8*/ u8 giftRibbons[52]; /*0x31DC*/ struct Roamer roamer; /*0x31F8*/ struct EnigmaBerry enigmaBerry; diff --git a/include/link.h b/include/link.h index 7a6563144..ddd809ebe 100644 --- a/include/link.h +++ b/include/link.h @@ -179,6 +179,7 @@ void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); u8 GetLinkPlayerCount(void); +bool32 InUnionRoom(void); void sub_800E0E8(void); bool8 sub_800A520(void); diff --git a/include/tv.h b/include/tv.h index 43f36d69f..3f48af569 100644 --- a/include/tv.h +++ b/include/tv.h @@ -13,5 +13,6 @@ void sub_80EE184(void); void sub_80EEA70(void); void sub_80F14F8(TVShow *shows); size_t sub_80EF370(int value); +void SetPokemonAnglerSpecies(u16 species); #endif //GUARD_TV_H -- cgit v1.2.3 From f8b40754c70679bb3ec4c0611613a0658f679225 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Nov 2017 12:27:10 +0100 Subject: wild encounter done --- include/wild_encounter.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/wild_encounter.h b/include/wild_encounter.h index c9d7c3fa1..55bbaa7dd 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -1,6 +1,11 @@ #ifndef GUARD_WILD_ENCOUNTER_H #define GUARD_WILD_ENCOUNTER_H +#define LAND_WILD_COUNT 12 +#define WATER_WILD_COUNT 5 +#define ROCK_WILD_COUNT 5 +#define FISH_WILD_COUNT 10 + struct WildPokemon { u8 minLevel; @@ -27,7 +32,7 @@ struct WildPokemonHeader extern const struct WildPokemonHeader gWildMonHeaders[]; void DisableWildEncounters(bool8 disabled); -bool8 StandardWildEncounter(u16 a, u16 b); +bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior); void ScrSpecial_RockSmashWildEncounter(void); bool8 SweetScentWildEncounter(void); bool8 DoesCurrentMapHaveFishingMons(void); -- cgit v1.2.3 From 8fd30813062f9588529461f44df333a6bcfde411 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Nov 2017 16:11:34 +0100 Subject: start working on berry blender --- include/berry.h | 10 ++++++++++ include/decompress.h | 2 ++ include/flags.h | 1 + include/gba/m4a_internal.h | 2 +- include/item_menu_icons.h | 6 ++++++ include/items.h | 4 ++++ include/new_menu_helpers.h | 1 + 7 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 include/item_menu_icons.h (limited to 'include') diff --git a/include/berry.h b/include/berry.h index f51503d41..f1f3a8afb 100644 --- a/include/berry.h +++ b/include/berry.h @@ -11,6 +11,16 @@ enum BERRY_FIRMNESS_SUPER_HARD, }; +enum +{ + FLAVOUR_SPICY, + FLAVOUR_DRY, + FLAVOUR_SWEET, + FLAVOUR_BITTER, + FLAVOUR_SOUR, + FLAVOUR_COUNT +}; + #define NUM_BERRIES 44 extern const u8 *const gBerryTreeFieldObjectGraphicsIdTablePointers[NUM_BERRIES]; diff --git a/include/decompress.h b/include/decompress.h index 36be803e0..34a678cda 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -28,4 +28,6 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); +u32 sub_8034974(const u8 *ptr); + #endif // GUARD_DECOMPRESS_H diff --git a/include/flags.h b/include/flags.h index a891cc13f..1cb56a7f4 100644 --- a/include/flags.h +++ b/include/flags.h @@ -2,6 +2,7 @@ #define GUARD_FLAGS_H #define FLAG_PENDING_DAYCARE_EGG 0x86 +#define FLAG_340 0x340 #define FLAG_TRAINER_FLAG_START 0x500 diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index 6cdfd13e1..659302fd5 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -406,7 +406,7 @@ void m4aSoundVSyncOff(void); void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo); void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume); -void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch); +void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch); void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan); void ClearModM(struct MusicPlayerTrack *track); void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth); diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h new file mode 100644 index 000000000..553e7c262 --- /dev/null +++ b/include/item_menu_icons.h @@ -0,0 +1,6 @@ +#ifndef GUARD_ITEM_MENU_ICONS +#define GUARD_ITEM_MENU_ICONS + +u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3); + +#endif // GUARD_ITEM_MENU_ICONS diff --git a/include/items.h b/include/items.h index 1f6c288c5..1a6df42db 100644 --- a/include/items.h +++ b/include/items.h @@ -386,6 +386,10 @@ enum ITEM_OLD_SEA_MAP, // 0x178 }; +#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY +#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY +#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) + #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 42b8c60b1..c52184972 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -13,5 +13,6 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); +u8 GetPlayerTextSpeed(void); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 185402fe213935c577a64684e28df2a8850066c1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Nov 2017 21:38:57 +0100 Subject: more work on berry blender --- include/link.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/link.h b/include/link.h index 7a6563144..b3f7c8d60 100644 --- a/include/link.h +++ b/include/link.h @@ -2,6 +2,7 @@ #define GUARD_LINK_H #define MAX_LINK_PLAYERS 4 +#define MAX_RFU_PLAYERS 5 #define CMD_LENGTH 8 #define QUEUE_CAPACITY 50 #define BLOCK_BUFFER_SIZE 0x100 @@ -131,7 +132,7 @@ struct BlockRequest extern const struct BlockRequest sBlockRequestLookupTable[5]; extern struct Link gLink; -extern u16 gRecvCmds[CMD_LENGTH][MAX_LINK_PLAYERS]; +extern u16 gRecvCmds[MAX_RFU_PLAYERS][CMD_LENGTH]; extern u8 gBlockSendBuffer[BLOCK_BUFFER_SIZE]; extern u16 gLinkType; extern u32 gLinkStatus; -- cgit v1.2.3 From a3b5af17eabb255e983e61c6306e30f27de82524 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 19 Nov 2017 22:48:46 +0100 Subject: berry blender is done --- include/berry_blender.h | 8 ++++++++ include/menu.h | 3 +++ include/pokeblock.h | 23 ++++++----------------- include/text.h | 2 ++ include/tv.h | 1 + 5 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 include/berry_blender.h (limited to 'include') diff --git a/include/berry_blender.h b/include/berry_blender.h new file mode 100644 index 000000000..fb62e3fa3 --- /dev/null +++ b/include/berry_blender.h @@ -0,0 +1,8 @@ +#ifndef GUARD_BERRY_BLENDER_H +#define GUARD_BERRY_BLENDER_H + +void DoBerryBlending(void); +u16 GetBlenderArrowPosition(void); +void ShowBerryBlenderRecordWindow(void); + +#endif // GUARD_BERRY_BLENDER_H diff --git a/include/menu.h b/include/menu.h index e93d688e4..2052a8dad 100644 --- a/include/menu.h +++ b/include/menu.h @@ -1,6 +1,7 @@ #ifndef GUARD_MENU_H #define GUARD_MENU_H +#include "text.h" #include "window.h" struct MenuAction @@ -31,5 +32,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs s8 sub_8198C58(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); +void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); +void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); #endif // GUARD_MENU_H diff --git a/include/pokeblock.h b/include/pokeblock.h index 5d52f8e55..0247ab2e0 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -22,24 +22,13 @@ enum PBLOCK_FEEL, }; +// rom6 void ClearPokeblocks(void); +s8 GetFirstFreePokeblockSlot(void); -/* -void sub_810B96C(void); -u8 sub_810BA50(s16, s16, u8); -u8 sub_810C9B0(struct Pokeblock *); -s16 GetPokeblockData(const struct Pokeblock *, u8); -u8 sub_810C9E8(struct Pokeblock *); -void sub_810BA7C(u8); -bool8 PokeblockClearIfExists(u8); -s16 PokeblockGetGain(u8, const struct Pokeblock *); -u8 sub_810CB68(u8, u8*); -void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest); -void CB2_PreparePokeblockFeedScene(void); - -#include "main.h" - -void sub_8136130(struct Pokeblock *, MainCallback); -*/ +bool32 AddPokeblock(struct Pokeblock *pokeblock); +u8 GetHighestPokeblocksFlavourLevel(const struct Pokeblock *pokeblock); +u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock); +u8 GetPokeblocksFlavour(const struct Pokeblock *pokeblock); #endif // GUARD_POKEBLOCK_H diff --git a/include/text.h b/include/text.h index 594661717..86a25df3a 100644 --- a/include/text.h +++ b/include/text.h @@ -85,6 +85,8 @@ #define NUM_TEXT_PRINTERS 32 +#define TEXT_SPEED_FF 0xFF + struct TextPrinterSubStruct { u8 font_type:4; // 0x14 diff --git a/include/tv.h b/include/tv.h index 43f36d69f..35b41cef9 100644 --- a/include/tv.h +++ b/include/tv.h @@ -13,5 +13,6 @@ void sub_80EE184(void); void sub_80EEA70(void); void sub_80F14F8(TVShow *shows); size_t sub_80EF370(int value); +bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language); #endif //GUARD_TV_H -- cgit v1.2.3 From ef18d3b8ec2ec0e0c0d7f4c48c9da921e34c5b02 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 23 Nov 2017 11:23:05 -0500 Subject: Decompile asm/unk_text_util.s --- include/unk_text_util.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/unk_text_util.h (limited to 'include') diff --git a/include/unk_text_util.h b/include/unk_text_util.h new file mode 100644 index 000000000..72243a90e --- /dev/null +++ b/include/unk_text_util.h @@ -0,0 +1,9 @@ +#ifndef GUARD_UNK_TEXT_UTIL_H +#define GUARD_UNK_TEXT_UTIL_H + +void UnkTextUtil_Reset(void); +void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr); +u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src); +const u8 *UnkTextUtil_GetPtrI(u8 idx); + +#endif //GUARD_UNK_TEXT_UTIL_H -- cgit v1.2.3 From e8b1059345c87b15c74262b2a761e5c7be526a5f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 23 Nov 2017 13:29:11 -0500 Subject: CHAR_SPECIAL_F7 constant Preface for string decompilation --- include/text.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/text.h b/include/text.h index 594661717..1da5141aa 100644 --- a/include/text.h +++ b/include/text.h @@ -65,6 +65,7 @@ #define CHAR_x 0xEC #define CHAR_y 0xED #define CHAR_z 0xEE +#define CHAR_SPECIAL_F7 0xF7 #define CHAR_SPECIAL_F9 0xF9 #define CHAR_COLON 0xF0 #define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog -- cgit v1.2.3 From 9151a6d0942c5211f648154bbc675ce4d3a495a7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 25 Nov 2017 18:42:31 +0100 Subject: dump battlescripts, rename battlescripts --- include/battle.h | 4 +- include/battle_controllers.h | 4 +- include/battle_move_effects.h | 2 +- include/battle_script_commands.h | 6 +- include/battle_scripts.h | 640 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 651 insertions(+), 5 deletions(-) create mode 100644 include/battle_scripts.h (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 0939c92b6..ada5282dc 100644 --- a/include/battle.h +++ b/include/battle.h @@ -272,6 +272,8 @@ #define BS_GET_TARGET 0 #define BS_GET_ATTACKER 1 #define BS_GET_EFFECT_BANK 2 +#define BS_GET_gBank1 3 +#define BS_GET_BANK_0 7 #define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update #define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability @@ -847,7 +849,7 @@ struct BattleScripting u8 field_F; u8 animArg1; u8 animArg2; - u8 field_12; + u8 tripleKickPower; u8 field_13; u8 atk49_state; u8 field_15; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 973a723e0..c69cb1017 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -198,7 +198,7 @@ void EmitBallThrowAnim(u8 bufferId, u8 caseId); void EmitPause(u8 bufferId, u8 toWait, void *data); // unused void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit); void EmitPrintString(u8 bufferId, u16 stringId); -void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId); +void EmitPrintSelectionString(u8 bufferId, u16 stringId); void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2); void EmitUnknownYesNoBox(u8 bufferId); void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData); @@ -224,7 +224,7 @@ void EmitCmd39(u8 bufferId); // unused void EmitCmd40(u8 bufferId); // unused void EmitHitAnimation(u8 bufferId); void EmitCmd42(u8 bufferId); -void EmitEffectivenessSound(u8 bufferId, u16 songId); +void EmitPlaySE(u8 bufferId, u16 songId); void EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM); void EmitFaintingCry(u8 bufferId); void EmitIntroSlide(u8 bufferId, u8 terrainId); diff --git a/include/battle_move_effects.h b/include/battle_move_effects.h index 4a9415379..003913380 100644 --- a/include/battle_move_effects.h +++ b/include/battle_move_effects.h @@ -153,7 +153,7 @@ enum EFFECT_EARTHQUAKE, EFFECT_FUTURE_SIGHT, EFFECT_GUST, - EFFECT_FLINCH_HIT_2, // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM + EFFECT_STOMP, // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM EFFECT_SOLARBEAM, EFFECT_THUNDER, EFFECT_TELEPORT, diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index ebfeabccc..80fabaa64 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -1,6 +1,10 @@ #ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H #define GUARD_BATTLE_SCRIPT_COMMANDS_H +#define NO_ACC_CALC 0xFFFE +#define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF +#define ACC_CURR_MOVE 0 + #define CMP_EQUAL 0x0 #define CMP_NOT_EQUAL 0x1 #define CMP_GREATER_THAN 0x2 @@ -21,7 +25,7 @@ #define VARIOUS_CANCEL_MULTI_TURN_MOVES 0 #define VARIOUS_SET_MAGIC_COAT_TARGET 1 -#define VARIOUS_CAN_RUN_FROM_BATTLE 2 +#define VARIOUS_IS_RUNNING_IMPOSSIBLE 2 #define VARIOUS_GET_MOVE_TARGET 3 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 diff --git a/include/battle_scripts.h b/include/battle_scripts.h new file mode 100644 index 000000000..b04a82673 --- /dev/null +++ b/include/battle_scripts.h @@ -0,0 +1,640 @@ +#ifndef GUARD_BATTLE_SCRIPTS_H +#define GUARD_BATTLE_SCRIPTS_H + +extern const u8 BattleScript_EffectHit[]; +extern const u8 BattleScript_HitFromAtkCanceler[]; +extern const u8 BattleScript_HitFromAccCheck[]; +extern const u8 BattleScript_HitFromAtkString[]; +extern const u8 BattleScript_HitFromCritCalc[]; +extern const u8 BattleScript_HitFromAtkAnimation[]; +extern const u8 BattleScript_MoveEnd[]; +extern const u8 BattleScript_MakeMoveMissed[]; +extern const u8 BattleScript_PrintMoveMissed[]; +extern const u8 BattleScript_MoveMissedPause[]; +extern const u8 BattleScript_MoveMissed[]; +extern const u8 BattleScript_EffectSleep[]; +extern const u8 BattleScript_82D8AB0[]; +extern const u8 BattleScript_82D8AC1[]; +extern const u8 BattleScript_82D8ACF[]; +extern const u8 BattleScript_EffectPoisonHit[]; +extern const u8 BattleScript_EffectAbsorb[]; +extern const u8 BattleScript_82D8B26[]; +extern const u8 BattleScript_82D8B2E[]; +extern const u8 BattleScript_82D8B45[]; +extern const u8 BattleScript_EffectBurnHit[]; +extern const u8 BattleScript_EffectFreezeHit[]; +extern const u8 BattleScript_EffectParalyzeHit[]; +extern const u8 BattleScript_EffectExplosion[]; +extern const u8 BattleScript_82D8B94[]; +extern const u8 BattleScript_82D8B96[]; +extern const u8 BattleScript_82D8BCF[]; +extern const u8 BattleScript_82D8BEA[]; +extern const u8 BattleScript_EffectDreamEater[]; +extern const u8 BattleScript_82D8C0E[]; +extern const u8 BattleScript_82D8C18[]; +extern const u8 BattleScript_82D8C56[]; +extern const u8 BattleScript_EffectMirrorMove[]; +extern const u8 BattleScript_EffectAttackUp[]; +extern const u8 BattleScript_EffectDefenseUp[]; +extern const u8 BattleScript_EffectSpecialAttackUp[]; +extern const u8 BattleScript_EffectEvasionUp[]; +extern const u8 BattleScript_EffectStatUp[]; +extern const u8 BattleScript_EffectStatUpAfterAtkCanceler[]; +extern const u8 BattleScript_82D8CBD[]; +extern const u8 BattleScript_82D8CBF[]; +extern const u8 BattleScript_82D8CC7[]; +extern const u8 BattleScript_82D8CCF[]; +extern const u8 BattleScript_StatUp[]; +extern const u8 BattleScript_EffectAttackDown[]; +extern const u8 BattleScript_EffectDefenseDown[]; +extern const u8 BattleScript_EffectSpeedDown[]; +extern const u8 BattleScript_EffectAccuracyDown[]; +extern const u8 BattleScript_EffectEvasionDown[]; +extern const u8 BattleScript_EffectStatDown[]; +extern const u8 BattleScript_82D8D4E[]; +extern const u8 BattleScript_82D8D58[]; +extern const u8 BattleScript_82D8D60[]; +extern const u8 BattleScript_StatDown[]; +extern const u8 BattleScript_EffectHaze[]; +extern const u8 BattleScript_EffectBide[]; +extern const u8 BattleScript_EffectRampage[]; +extern const u8 BattleScript_82D8DAE[]; +extern const u8 BattleScript_EffectRoar[]; +extern const u8 BattleScript_EffectMultiHit[]; +extern const u8 BattleScript_82D8DFD[]; +extern const u8 BattleScript_82D8E1F[]; +extern const u8 BattleScript_82D8E71[]; +extern const u8 BattleScript_82D8E74[]; +extern const u8 BattleScript_82D8E93[]; +extern const u8 BattleScript_EffectConversion[]; +extern const u8 BattleScript_EffectFlinchHit[]; +extern const u8 BattleScript_EffectRestoreHp[]; +extern const u8 BattleScript_EffectToxic[]; +extern const u8 BattleScript_AlreadyPoisoned[]; +extern const u8 BattleScript_82D8F63[]; +extern const u8 BattleScript_EffectPayDay[]; +extern const u8 BattleScript_EffectLightScreen[]; +extern const u8 BattleScript_EffectTriAttack[]; +extern const u8 BattleScript_EffectRest[]; +extern const u8 BattleScript_82D8FC6[]; +extern const u8 BattleScript_82D8FD6[]; +extern const u8 BattleScript_EffectOhko[]; +extern const u8 BattleScript_82D9008[]; +extern const u8 BattleScript_EffectRazorWind[]; +extern const u8 BattleScript_82D9040[]; +extern const u8 BattleScript_82D906F[]; +extern const u8 BattleScript_EffectSuperFang[]; +extern const u8 BattleScript_EffectDragonRage[]; +extern const u8 BattleScript_EffectTrap[]; +extern const u8 BattleScript_82D9105[]; +extern const u8 BattleScript_EffectDoubleHit[]; +extern const u8 BattleScript_EffectRecoilIfMiss[]; +extern const u8 BattleScript_82D9135[]; +extern const u8 BattleScript_EffectMist[]; +extern const u8 BattleScript_EffectFocusEnergy[]; +extern const u8 BattleScript_EffectRecoil[]; +extern const u8 BattleScript_EffectConfuse[]; +extern const u8 BattleScript_82D9201[]; +extern const u8 BattleScript_EffectAttackUp2[]; +extern const u8 BattleScript_EffectDefenseUp2[]; +extern const u8 BattleScript_EffectSpeedUp2[]; +extern const u8 BattleScript_EffectSpecialAttackUp2[]; +extern const u8 BattleScript_EffectSpecialDefenseUp2[]; +extern const u8 BattleScript_EffectTransform[]; +extern const u8 BattleScript_EffectAttackDown2[]; +extern const u8 BattleScript_EffectDefenseDown2[]; +extern const u8 BattleScript_EffectSpeedDown2[]; +extern const u8 BattleScript_EffectSpecialDefenseDown2[]; +extern const u8 BattleScript_EffectReflect[]; +extern const u8 BattleScript_82D928C[]; +extern const u8 BattleScript_EffectPoison[]; +extern const u8 BattleScript_EffectParalyze[]; +extern const u8 BattleScript_82D9351[]; +extern const u8 BattleScript_82D9362[]; +extern const u8 BattleScript_EffectAttackDownHit[]; +extern const u8 BattleScript_EffectDefenseDownHit[]; +extern const u8 BattleScript_EffectSpeedDownHit[]; +extern const u8 BattleScript_EffectSpecialAttackDownHit[]; +extern const u8 BattleScript_EffectSpecialDefenseDownHit[]; +extern const u8 BattleScript_EffectAccuracyDownHit[]; +extern const u8 BattleScript_EffectSkyAttack[]; +extern const u8 BattleScript_EffectConfuseHit[]; +extern const u8 BattleScript_EffectTwineedle[]; +extern const u8 BattleScript_EffectSubstitute[]; +extern const u8 BattleScript_82D942B[]; +extern const u8 BattleScript_82D9431[]; +extern const u8 BattleScript_82D943E[]; +extern const u8 BattleScript_EffectRecharge[]; +extern const u8 BattleScript_MoveUsedMustRecharge[]; +extern const u8 BattleScript_EffectRage[]; +extern const u8 BattleScript_82D9487[]; +extern const u8 BattleScript_EffectMimic[]; +extern const u8 BattleScript_EffectMetronome[]; +extern const u8 BattleScript_EffectLeechSeed[]; +extern const u8 BattleScript_82D94E5[]; +extern const u8 BattleScript_EffectSplash[]; +extern const u8 BattleScript_EffectDisable[]; +extern const u8 BattleScript_EffectLevelDamage[]; +extern const u8 BattleScript_EffectPsywave[]; +extern const u8 BattleScript_EffectCounter[]; +extern const u8 BattleScript_EffectEncore[]; +extern const u8 BattleScript_EffectPainSplit[]; +extern const u8 BattleScript_EffectSnore[]; +extern const u8 BattleScript_82D95CE[]; +extern const u8 BattleScript_82D95E2[]; +extern const u8 BattleScript_EffectConversion2[]; +extern const u8 BattleScript_EffectLockOn[]; +extern const u8 BattleScript_EffectSketch[]; +extern const u8 BattleScript_EffectSleepTalk[]; +extern const u8 BattleScript_82D965E[]; +extern const u8 BattleScript_82D967E[]; +extern const u8 BattleScript_EffectDestinyBond[]; +extern const u8 BattleScript_EffectFlail[]; +extern const u8 BattleScript_EffectSpite[]; +extern const u8 BattleScript_EffectHealBell[]; +extern const u8 BattleScript_82D96ED[]; +extern const u8 BattleScript_82D96FE[]; +extern const u8 BattleScript_EffectTripleKick[]; +extern const u8 BattleScript_82D9718[]; +extern const u8 BattleScript_82D973A[]; +extern const u8 BattleScript_82D9799[]; +extern const u8 BattleScript_82D97AD[]; +extern const u8 BattleScript_82D97D7[]; +extern const u8 BattleScript_EffectThief[]; +extern const u8 BattleScript_EffectMeanLook[]; +extern const u8 BattleScript_EffectNightmare[]; +extern const u8 BattleScript_NightmareWorked[]; +extern const u8 BattleScript_EffectMinimize[]; +extern const u8 BattleScript_EffectCurse[]; +extern const u8 BattleScript_82D9892[]; +extern const u8 BattleScript_82D98B8[]; +extern const u8 BattleScript_82D98CC[]; +extern const u8 BattleScript_82D98E0[]; +extern const u8 BattleScript_82D98E5[]; +extern const u8 BattleScript_82D98F6[]; +extern const u8 BattleScript_EffectProtect[]; +extern const u8 BattleScript_EffectSpikes[]; +extern const u8 BattleScript_EffectForesight[]; +extern const u8 BattleScript_EffectPerishSong[]; +extern const u8 BattleScript_PerishSongLoop[]; +extern const u8 BattleScript_PerishSongLoopIncrement[]; +extern const u8 BattleScript_PerishSongNotAffected[]; +extern const u8 BattleScript_EffectSandstorm[]; +extern const u8 BattleScript_EffectRollout[]; +extern const u8 BattleScript_82D99CD[]; +extern const u8 BattleScript_82D99D4[]; +extern const u8 BattleScript_EffectSwagger[]; +extern const u8 BattleScript_82D9A1E[]; +extern const u8 BattleScript_EffectFuryCutter[]; +extern const u8 BattleScript_82D9A43[]; +extern const u8 BattleScript_EffectAttract[]; +extern const u8 BattleScript_EffectReturn[]; +extern const u8 BattleScript_EffectPresent[]; +extern const u8 BattleScript_EffectSafeguard[]; +extern const u8 BattleScript_EffectThawHit[]; +extern const u8 BattleScript_EffectMagnitude[]; +extern const u8 BattleScript_EffectBatonPass[]; +extern const u8 BattleScript_EffectRapidSpin[]; +extern const u8 BattleScript_EffectSonicboom[]; +extern const u8 BattleScript_EffectMorningSun[]; +extern const u8 BattleScript_EffectHiddenPower[]; +extern const u8 BattleScript_EffectRainDance[]; +extern const u8 BattleScript_82D9B41[]; +extern const u8 BattleScript_EffectSunnyDay[]; +extern const u8 BattleScript_EffectDefenseUpHit[]; +extern const u8 BattleScript_EffectAttackUpHit[]; +extern const u8 BattleScript_EffectAllStatsUpHit[]; +extern const u8 BattleScript_EffectBellyDrum[]; +extern const u8 BattleScript_EffectPsychUp[]; +extern const u8 BattleScript_EffectMirrorCoat[]; +extern const u8 BattleScript_EffectSkullBash[]; +extern const u8 BattleScript_82D9C16[]; +extern const u8 BattleScript_EffectTwister[]; +extern const u8 BattleScript_82D9C35[]; +extern const u8 BattleScript_EffectEarthquake[]; +extern const u8 BattleScript_82D9C44[]; +extern const u8 BattleScript_82D9C64[]; +extern const u8 BattleScript_82D9C73[]; +extern const u8 BattleScript_82D9CAC[]; +extern const u8 BattleScript_EffectFutureSight[]; +extern const u8 BattleScript_EffectGust[]; +extern const u8 BattleScript_EffectStomp[]; +extern const u8 BattleScript_EffectSolarbeam[]; +extern const u8 BattleScript_82D9D28[]; +extern const u8 BattleScript_82D9D50[]; +extern const u8 BattleScript_EffectThunder[]; +extern const u8 BattleScript_EffectTeleport[]; +extern const u8 BattleScript_EffectBeatUp[]; +extern const u8 BattleScript_BeatUpLoop[]; +extern const u8 BattleScript_BeatUpAttack[]; +extern const u8 BattleScript_BeatUpEnd[]; +extern const u8 BattleScript_EffectFly[]; +extern const u8 BattleScript_82D9E52[]; +extern const u8 BattleScript_82D9E5D[]; +extern const u8 BattleScript_82D9E68[]; +extern const u8 BattleScript_82D9E6E[]; +extern const u8 BattleScript_82D9E79[]; +extern const u8 BattleScript_82D9EA3[]; +extern const u8 BattleScript_82D9EB0[]; +extern const u8 BattleScript_EffectDefenseCurl[]; +extern const u8 BattleScript_82D9ED3[]; +extern const u8 BattleScript_EffectSoftboiled[]; +extern const u8 BattleScript_PresentHealTarget[]; +extern const u8 BattleScript_AlreadyAtFullHp[]; +extern const u8 BattleScript_EffectFakeOut[]; +extern const u8 BattleScript_ButItFailedAtkStringPpReduce[]; +extern const u8 BattleScript_ButItFailedPpReduce[]; +extern const u8 BattleScript_ButItFailed[]; +extern const u8 BattleScript_NotAffected[]; +extern const u8 BattleScript_EffectUproar[]; +extern const u8 BattleScript_82D9F5A[]; +extern const u8 BattleScript_EffectStockpile[]; +extern const u8 BattleScript_EffectSpitUp[]; +extern const u8 BattleScript_SpitUpFail[]; +extern const u8 BattleScript_82D9FA2[]; +extern const u8 BattleScript_EffectSwallow[]; +extern const u8 BattleScript_SwallowFail[]; +extern const u8 BattleScript_EffectHail[]; +extern const u8 BattleScript_EffectTorment[]; +extern const u8 BattleScript_EffectFlatter[]; +extern const u8 BattleScript_82DA03A[]; +extern const u8 BattleScript_EffectWillOWisp[]; +extern const u8 BattleScript_82DA0A1[]; +extern const u8 BattleScript_82DA0BB[]; +extern const u8 BattleScript_EffectMemento[]; +extern const u8 BattleScript_82DA119[]; +extern const u8 BattleScript_82DA13C[]; +extern const u8 BattleScript_82DA148[]; +extern const u8 BattleScript_82DA153[]; +extern const u8 BattleScript_82DA15A[]; +extern const u8 BattleScript_EffectFacade[]; +extern const u8 BattleScript_FacadeDoubleDmg[]; +extern const u8 BattleScript_EffectFocusPunch[]; +extern const u8 BattleScript_EffectSmellingsalt[]; +extern const u8 BattleScript_82DA1BA[]; +extern const u8 BattleScript_EffectFollowMe[]; +extern const u8 BattleScript_EffectNaturePower[]; +extern const u8 BattleScript_EffectCharge[]; +extern const u8 BattleScript_EffectTaunt[]; +extern const u8 BattleScript_EffectHelpingHand[]; +extern const u8 BattleScript_EffectTrick[]; +extern const u8 BattleScript_EffectRolePlay[]; +extern const u8 BattleScript_EffectWish[]; +extern const u8 BattleScript_EffectAssist[]; +extern const u8 BattleScript_EffectIngrain[]; +extern const u8 BattleScript_EffectSuperpower[]; +extern const u8 BattleScript_EffectMagicCoat[]; +extern const u8 BattleScript_EffectRecycle[]; +extern const u8 BattleScript_EffectRevenge[]; +extern const u8 BattleScript_EffectBrickBreak[]; +extern const u8 BattleScript_82DA306[]; +extern const u8 BattleScript_82DA319[]; +extern const u8 BattleScript_EffectYawn[]; +extern const u8 BattleScript_82DA378[]; +extern const u8 BattleScript_82DA382[]; +extern const u8 BattleScript_EffectKnockOff[]; +extern const u8 BattleScript_EffectEndeavor[]; +extern const u8 BattleScript_EffectEruption[]; +extern const u8 BattleScript_EffectSkillSwap[]; +extern const u8 BattleScript_EffectImprison[]; +extern const u8 BattleScript_EffectRefresh[]; +extern const u8 BattleScript_EffectGrudge[]; +extern const u8 BattleScript_EffectSnatch[]; +extern const u8 BattleScript_EffectLowKick[]; +extern const u8 BattleScript_EffectSecretPower[]; +extern const u8 BattleScript_EffectDoubleEdge[]; +extern const u8 BattleScript_EffectTeeterDance[]; +extern const u8 BattleScript_82DA47B[]; +extern const u8 BattleScript_82DA4C7[]; +extern const u8 BattleScript_82DA4D0[]; +extern const u8 BattleScript_82DA4E5[]; +extern const u8 BattleScript_82DA4F3[]; +extern const u8 BattleScript_82DA501[]; +extern const u8 BattleScript_82DA50F[]; +extern const u8 BattleScript_82DA520[]; +extern const u8 BattleScript_EffectMudSport[]; +extern const u8 BattleScript_EffectPoisonFang[]; +extern const u8 BattleScript_EffectWeatherBall[]; +extern const u8 BattleScript_EffectOverheat[]; +extern const u8 BattleScript_EffectTickle[]; +extern const u8 BattleScript_82DA571[]; +extern const u8 BattleScript_82DA5A7[]; +extern const u8 BattleScript_82DA5CA[]; +extern const u8 BattleScript_82DA5CF[]; +extern const u8 BattleScript_EffectCosmicPower[]; +extern const u8 BattleScript_82DA5F8[]; +extern const u8 BattleScript_82DA623[]; +extern const u8 BattleScript_82DA642[]; +extern const u8 BattleScript_EffectSkyUppercut[]; +extern const u8 BattleScript_EffectBulkUp[]; +extern const u8 BattleScript_82DA66A[]; +extern const u8 BattleScript_82DA695[]; +extern const u8 BattleScript_82DA6B4[]; +extern const u8 BattleScript_EffectCalmMind[]; +extern const u8 BattleScript_82DA6CE[]; +extern const u8 BattleScript_82DA6F9[]; +extern const u8 BattleScript_82DA718[]; +extern const u8 BattleScript_CantRaiseMultipleStats[]; +extern const u8 BattleScript_EffectDragonDance[]; +extern const u8 BattleScript_82DA746[]; +extern const u8 BattleScript_82DA771[]; +extern const u8 BattleScript_82DA790[]; +extern const u8 BattleScript_EffectCamouflage[]; +extern const u8 BattleScript_FaintAttacker[]; +extern const u8 BattleScript_FaintTarget[]; +extern const u8 BattleScript_82DA7C4[]; +extern const u8 BattleScript_82DA7CD[]; +extern const u8 BattleScript_82DA816[]; +extern const u8 BattleScript_82DA8D0[]; +extern const u8 BattleScript_82DA8F5[]; +extern const u8 BattleScript_82DA8F6[]; +extern const u8 BattleScript_82DA8FC[]; +extern const u8 BattleScript_82DA908[]; +extern const u8 BattleScript_82DA92C[]; +extern const u8 BattleScript_LocalTrainerBattleWon[]; +extern const u8 BattleScript_82DA943[]; +extern const u8 BattleScript_82DA946[]; +extern const u8 BattleScript_82DA963[]; +extern const u8 BattleScript_PayDayMoneyAndPickUpItems[]; +extern const u8 BattleScript_LocalBattleLost[]; +extern const u8 BattleScript_82DA9B1[]; +extern const u8 BattleScript_82DA9BD[]; +extern const u8 BattleScript_82DA9BE[]; +extern const u8 BattleScript_82DA9C9[]; +extern const u8 BattleScript_82DAA01[]; +extern const u8 BattleScript_82DAA0A[]; +extern const u8 BattleScript_82DAA0B[]; +extern const u8 BattleScript_82DAA31[]; +extern const u8 BattleScript_LinkBattleWonOrLost[]; +extern const u8 BattleScript_82DAA58[]; +extern const u8 BattleScript_82DAA5C[]; +extern const u8 BattleScript_82DAA83[]; +extern const u8 BattleScript_FrontierTrainerBattleWon[]; +extern const u8 BattleScript_82DAAAB[]; +extern const u8 BattleScript_82DAAAE[]; +extern const u8 BattleScript_82DAACB[]; +extern const u8 BattleScript_82DAADA[]; +extern const u8 BattleScript_SmokeBallEscape[]; +extern const u8 BattleScript_RanAwayUsingMonAbility[]; +extern const u8 BattleScript_GotAwaySafely[]; +extern const u8 BattleScript_WildMonFled[]; +extern const u8 BattleScript_82DAAFE[]; +extern const u8 BattleScript_PrintFailedToRunString[]; +extern const u8 BattleScript_82DAB0B[]; +extern const u8 BattleScript_82DAB11[]; +extern const u8 BattleScript_ActionSwitch[]; +extern const u8 BattleScript_82DAB35[]; +extern const u8 BattleScript_82DAB37[]; +extern const u8 BattleScript_82DAB44[]; +extern const u8 BattleScript_82DAB77[]; +extern const u8 BattleScript_82DABB8[]; +extern const u8 BattleScript_Pausex20[]; +extern const u8 BattleScript_LevelUp[]; +extern const u8 BattleScript_TryLearnMoveLoop[]; +extern const u8 BattleScript_AskToLearnMove[]; +extern const u8 BattleScript_ForgotAndLearnedNewMove[]; +extern const u8 BattleScript_LearnedNewMove[]; +extern const u8 BattleScript_LearnMoveReturn[]; +extern const u8 BattleScript_82DAC2C[]; +extern const u8 BattleScript_82DAC46[]; +extern const u8 BattleScript_82DAC47[]; +extern const u8 BattleScript_82DAC5F[]; +extern const u8 BattleScript_82DACA0[]; +extern const u8 BattleScript_82DACBF[]; +extern const u8 BattleScript_82DACC9[]; +extern const u8 BattleScript_82DACD2[]; +extern const u8 BattleScript_82DACE0[]; +extern const u8 BattleScript_82DACE7[]; +extern const u8 BattleScript_82DACFA[]; +extern const u8 BattleScript_82DAD01[]; +extern const u8 BattleScript_82DAD0B[]; +extern const u8 BattleScript_LeechSeedTurnDrain[]; +extern const u8 BattleScript_82DAD47[]; +extern const u8 BattleScript_82DAD4D[]; +extern const u8 BattleScript_BideStoringEnergy[]; +extern const u8 BattleScript_BideAttack[]; +extern const u8 BattleScript_BideNoEnergyToAttack[]; +extern const u8 BattleScript_82DADD8[]; +extern const u8 BattleScript_82DADF1[]; +extern const u8 BattleScript_MistProtected[]; +extern const u8 BattleScript_RageIsBuilding[]; +extern const u8 BattleScript_MoveUsedIsDisabled[]; +extern const u8 BattleScript_82DAE1F[]; +extern const u8 BattleScript_DisabledNoMore[]; +extern const u8 BattleScript_82DAE2A[]; +extern const u8 BattleScript_82DAE2D[]; +extern const u8 BattleScript_EncoredNoMore[]; +extern const u8 BattleScript_DestinyBondTakesLife[]; +extern const u8 BattleScript_SpikesOnAttacker[]; +extern const u8 BattleScript_82DAE7A[]; +extern const u8 BattleScript_SpikesOnTarget[]; +extern const u8 BattleScript_82DAEB1[]; +extern const u8 BattleScript_SpikesOngBank1[]; +extern const u8 BattleScript_82DAEE8[]; +extern const u8 BattleScript_82DAEFE[]; +extern const u8 BattleScript_82DAF05[]; +extern const u8 BattleScript_82DAF20[]; +extern const u8 BattleScript_AllStatsUp[]; +extern const u8 BattleScript_82DAF54[]; +extern const u8 BattleScript_82DAF72[]; +extern const u8 BattleScript_82DAF86[]; +extern const u8 BattleScript_82DAF9A[]; +extern const u8 BattleScript_82DAFAE[]; +extern const u8 BattleScript_82DAFC2[]; +extern const u8 BattleScript_RapidSpinAway[]; +extern const u8 BattleScript_WrapFree[]; +extern const u8 BattleScript_LeechSeedFree[]; +extern const u8 BattleScript_SpikesFree[]; +extern const u8 BattleScript_82DAFE4[]; +extern const u8 BattleScript_82DB001[]; +extern const u8 BattleScript_82DB008[]; +extern const u8 BattleScript_82DB020[]; +extern const u8 BattleScript_82DB027[]; +extern const u8 BattleScript_82DB03F[]; +extern const u8 BattleScript_82DB058[]; +extern const u8 BattleScript_NoMovesLeft[]; +extern const u8 BattleScript_82DB076[]; +extern const u8 BattleScript_NoPPForMove[]; +extern const u8 BattleScript_82DB089[]; +extern const u8 BattleScript_82DB08D[]; +extern const u8 BattleScript_82DB098[]; +extern const u8 BattleScript_82DB0A0[]; +extern const u8 BattleScript_MoveUsedIsTaunted[]; +extern const u8 BattleScript_82DB0AF[]; +extern const u8 BattleScript_WishComesTrue[]; +extern const u8 BattleScript_82DB0DE[]; +extern const u8 BattleScript_IngrainTurnHeal[]; +extern const u8 BattleScript_82DB109[]; +extern const u8 BattleScript_AtkDefDown[]; +extern const u8 BattleScript_82DB144[]; +extern const u8 BattleScript_82DB167[]; +extern const u8 BattleScript_KnockedOff[]; +extern const u8 BattleScript_MoveUsedIsImprisoned[]; +extern const u8 BattleScript_82DB181[]; +extern const u8 BattleScript_82DB185[]; +extern const u8 BattleScript_GrudgeTakesPp[]; +extern const u8 BattleScript_MagicCoatBounce[]; +extern const u8 BattleScript_SnatchedMove[]; +extern const u8 BattleScript_EnduredMsg[]; +extern const u8 BattleScript_OneHitKOMsg[]; +extern const u8 BattleScript_SAtkDown2[]; +extern const u8 BattleScript_82DB1FE[]; +extern const u8 BattleScript_FocusPunchSetUp[]; +extern const u8 BattleScript_MoveUsedIsAsleep[]; +extern const u8 BattleScript_MoveUsedWokeUp[]; +extern const u8 BattleScript_82DB234[]; +extern const u8 BattleScript_PoisonTurnDmg[]; +extern const u8 BattleScript_82DB243[]; +extern const u8 BattleScript_82DB245[]; +extern const u8 BattleScript_82DB25E[]; +extern const u8 BattleScript_BurnTurnDmg[]; +extern const u8 BattleScript_MoveUsedIsFrozen[]; +extern const u8 BattleScript_MoveUsedUnfroze[]; +extern const u8 BattleScript_DefrostedViaFireMove[]; +extern const u8 BattleScript_MoveUsedIsParalyzed[]; +extern const u8 BattleScript_MoveUsedFlinched[]; +extern const u8 BattleScript_82DB2A6[]; +extern const u8 BattleScript_ThrashConfuses[]; +extern const u8 BattleScript_MoveUsedIsConfused[]; +extern const u8 BattleScript_82DB2D4[]; +extern const u8 BattleScript_82DB2FF[]; +extern const u8 BattleScript_MoveUsedIsConfusedNoMore[]; +extern const u8 BattleScript_PrintPayDayMoneyString[]; +extern const u8 BattleScript_WrapTurnDmg[]; +extern const u8 BattleScript_WrapEnds[]; +extern const u8 BattleScript_MoveUsedIsInLove[]; +extern const u8 BattleScript_MoveUsedIsParalyzedCantAttack[]; +extern const u8 BattleScript_NightmareTurnDmg[]; +extern const u8 BattleScript_CurseTurnDmg[]; +extern const u8 BattleScript_TargetPRLZHeal[]; +extern const u8 BattleScript_MoveEffectSleep[]; +extern const u8 BattleScript_82DB374[]; +extern const u8 BattleScript_YawnMakesAsleep[]; +extern const u8 BattleScript_MoveEffectPoison[]; +extern const u8 BattleScript_MoveEffectBurn[]; +extern const u8 BattleScript_MoveEffectFreeze[]; +extern const u8 BattleScript_MoveEffectParalysis[]; +extern const u8 BattleScript_MoveEffectUproar[]; +extern const u8 BattleScript_MoveEffectToxic[]; +extern const u8 BattleScript_MoveEffectPayDay[]; +extern const u8 BattleScript_MoveEffectWrap[]; +extern const u8 BattleScript_MoveEffectConfusion[]; +extern const u8 BattleScript_MoveEffectRecoil33[]; +extern const u8 BattleScript_82DB407[]; +extern const u8 BattleScript_82DB421[]; +extern const u8 BattleScript_ItemSteal[]; +extern const u8 BattleScript_DrizzleActivates[]; +extern const u8 BattleScript_SpeedBoostActivates[]; +extern const u8 BattleScript_TraceActivates[]; +extern const u8 BattleScript_RainDishActivates[]; +extern const u8 BattleScript_SandstreamActivates[]; +extern const u8 BattleScript_ShedSkinActivates[]; +extern const u8 BattleScript_82DB48D[]; +extern const u8 BattleScript_82DB493[]; +extern const u8 BattleScript_CastformChange[]; +extern const u8 BattleScript_82DB4AF[]; +extern const u8 BattleScript_82DB4B8[]; +extern const u8 BattleScript_82DB4BE[]; +extern const u8 BattleScript_82DB4C1[]; +extern const u8 BattleScript_82DB4CD[]; +extern const u8 BattleScript_82DB510[]; +extern const u8 BattleScript_82DB51B[]; +extern const u8 BattleScript_82DB51C[]; +extern const u8 BattleScript_DroughtActivates[]; +extern const u8 BattleScript_TookAttack[]; +extern const u8 BattleScript_SturdyPreventsOHKO[]; +extern const u8 BattleScript_DampStopsExplosion[]; +extern const u8 BattleScript_MoveHPDrain_PPLoss[]; +extern const u8 BattleScript_MoveHPDrain[]; +extern const u8 BattleScript_82DB591[]; +extern const u8 BattleScript_82DB592[]; +extern const u8 BattleScript_FlashFireBoost_PPLoss[]; +extern const u8 BattleScript_FlashFireBoost[]; +extern const u8 BattleScript_82DB5B9[]; +extern const u8 BattleScript_AbilityNoStatLoss[]; +extern const u8 BattleScript_BRNPrevention[]; +extern const u8 BattleScript_PRLZPrevention[]; +extern const u8 BattleScript_PSNPrevention[]; +extern const u8 BattleScript_ObliviousPreventsAttraction[]; +extern const u8 BattleScript_FlinchPrevention[]; +extern const u8 BattleScript_82DB611[]; +extern const u8 BattleScript_SoundproofProtected[]; +extern const u8 BattleScript_AbilityNoSpecificStatLoss[]; +extern const u8 BattleScript_StickyHoldActivates[]; +extern const u8 BattleScript_ColorChangeActivates[]; +extern const u8 BattleScript_RoughSkinActivates[]; +extern const u8 BattleScript_CuteCharmActivates[]; +extern const u8 BattleScript_ApplySecondaryEffect[]; +extern const u8 BattleScript_SynchronizeActivates[]; +extern const u8 BattleScript_NoItemSteal[]; +extern const u8 BattleScript_82DB68C[]; +extern const u8 BattleScript_82DB695[]; +extern const u8 BattleScript_82DB6A5[]; +extern const u8 BattleScript_MoveUsedLoafingAround[]; +extern const u8 BattleScript_82DB6C7[]; +extern const u8 BattleScript_82DB6D9[]; +extern const u8 BattleScript_82DB6F0[]; +extern const u8 BattleScript_SubstituteFade[]; +extern const u8 BattleScript_BerryCurePrlzEnd2[]; +extern const u8 BattleScript_BerryCureParRet[]; +extern const u8 BattleScript_BerryCurePsnEnd2[]; +extern const u8 BattleScript_BerryCurePsnRet[]; +extern const u8 BattleScript_BerryCureBrnEnd2[]; +extern const u8 BattleScript_BerryCureBrnRet[]; +extern const u8 BattleScript_BerryCureFrzEnd2[]; +extern const u8 BattleScript_BerryCureFrzRet[]; +extern const u8 BattleScript_BerryCureSlpEnd2[]; +extern const u8 BattleScript_BerryCureSlpRet[]; +extern const u8 BattleScript_BerryCureConfusionEnd2[]; +extern const u8 BattleScript_BerryCureConfusionRet[]; +extern const u8 BattleScript_BerryCureChosenStatusEnd2[]; +extern const u8 BattleScript_BerryCureChosenStatusRet[]; +extern const u8 BattleScript_WhiteHerbEnd2[]; +extern const u8 BattleScript_WhiteHerbRet[]; +extern const u8 BattleScript_ItemHealHP_RemoveItem[]; +extern const u8 BattleScript_BerryPPHealEnd2[]; +extern const u8 BattleScript_ItemHealHP_End2[]; +extern const u8 BattleScript_ItemHealHP_Ret[]; +extern const u8 BattleScript_82DB812[]; +extern const u8 BattleScript_HangedOnMsg[]; +extern const u8 BattleScript_BerryConfuseHealEnd2[]; +extern const u8 BattleScript_BerryStatRaiseEnd2[]; +extern const u8 BattleScript_82DB85B[]; +extern const u8 BattleScript_BerryFocusEnergyEnd2[]; +extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[]; +extern const u8 BattleScript_82DB87D[]; +extern const u8 BattleScript_82DB881[]; +extern const u8 BattleScript_82DB887[]; +extern const u8 BattleScript_82DB89D[]; +extern const u8 BattleScript_82DB8BE[]; +extern const u8 BattleScript_82DB8E0[]; +extern const u8 BattleScript_82DB8F3[]; +extern const u8 BattleScript_82DB973[]; +extern const u8 BattleScript_82DB992[]; +extern const u8 BattleScript_82DB9BA[]; +extern const u8 BattleScript_82DB9C1[]; +extern const u8 BattleScript_82DB9C8[]; +extern const u8 BattleScript_82DBD68[]; +extern const u8 BattleScript_82DBD7A[]; +extern const u8 BattleScript_82DBD7E[]; +extern const u8 BattleScript_SuccessBallThrow[]; +extern const u8 BattleScript_82DBD92[]; +extern const u8 BattleScript_82DBDA5[]; +extern const u8 BattleScript_82DBDC2[]; +extern const u8 BattleScript_82DBDC3[]; +extern const u8 BattleScript_WallyBallThrow[]; +extern const u8 BattleScript_ShakeBallThrow[]; +extern const u8 BattleScript_82DBE01[]; +extern const u8 BattleScript_TrainerBallBlock[]; +extern const u8 BattleScript_82DBE12[]; +extern const u8 BattleScript_82DBE1C[]; +extern const u8 BattleScript_82DBE4B[]; +extern const u8 BattleScript_82DBE6F[]; +extern const u8 BattleScript_82DBE91[]; +extern const u8 BattleScript_RunByUsingItem[]; +extern const u8 BattleScript_82DBEBD[]; +extern const u8 BattleScript_82DBEC4[]; +extern const u8 BattleScript_82DBECD[]; +extern const u8 BattleScript_82DBEE3[]; + +#endif // GUARD_BATTLE_SCRIPTS_H -- cgit v1.2.3 From 76f4a8b195932b4fbac9945eca8d97ffbbc0f84b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 00:33:40 +0100 Subject: clean up and use names for printfromtable --- include/battle.h | 2 +- include/battle_move_effects.h | 2 +- include/battle_scripts.h | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index ada5282dc..5e37ef77c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -846,7 +846,7 @@ struct BattleScripting s32 bideDmg; u8 multihitString[6]; u8 dmgMultiplier; - u8 field_F; + u8 twoTurnsMoveStringId; u8 animArg1; u8 animArg2; u8 tripleKickPower; diff --git a/include/battle_move_effects.h b/include/battle_move_effects.h index 003913380..23c19ded7 100644 --- a/include/battle_move_effects.h +++ b/include/battle_move_effects.h @@ -158,7 +158,7 @@ enum EFFECT_THUNDER, EFFECT_TELEPORT, EFFECT_BEAT_UP, - EFFECT_FLY, + EFFECT_SEMI_INVULNERABLE, EFFECT_DEFENSE_CURL, EFFECT_SOFTBOILED, EFFECT_FAKE_OUT, diff --git a/include/battle_scripts.h b/include/battle_scripts.h index b04a82673..85e1488d7 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -78,11 +78,11 @@ extern const u8 BattleScript_EffectTriAttack[]; extern const u8 BattleScript_EffectRest[]; extern const u8 BattleScript_82D8FC6[]; extern const u8 BattleScript_82D8FD6[]; -extern const u8 BattleScript_EffectOhko[]; -extern const u8 BattleScript_82D9008[]; +extern const u8 BattleScript_EffectOHKO[]; +extern const u8 BattleScript_KOFail[]; extern const u8 BattleScript_EffectRazorWind[]; extern const u8 BattleScript_82D9040[]; -extern const u8 BattleScript_82D906F[]; +extern const u8 BattleScriptFirstChargingTurn[]; extern const u8 BattleScript_EffectSuperFang[]; extern const u8 BattleScript_EffectDragonRage[]; extern const u8 BattleScript_EffectTrap[]; @@ -228,14 +228,14 @@ extern const u8 BattleScript_EffectBeatUp[]; extern const u8 BattleScript_BeatUpLoop[]; extern const u8 BattleScript_BeatUpAttack[]; extern const u8 BattleScript_BeatUpEnd[]; -extern const u8 BattleScript_EffectFly[]; -extern const u8 BattleScript_82D9E52[]; -extern const u8 BattleScript_82D9E5D[]; -extern const u8 BattleScript_82D9E68[]; -extern const u8 BattleScript_82D9E6E[]; -extern const u8 BattleScript_82D9E79[]; +extern const u8 BattleScript_EffectSemiInvulnerable[]; +extern const u8 BattleScript_FirstTurnBounce[]; +extern const u8 BattleScript_FirstTurnDive[]; +extern const u8 BattleScript_FirstTurnFly[]; +extern const u8 BattleScript_FirstTurnSemiInvulnerable[]; +extern const u8 BattleScript_SecondTurnSemiInvulnerable[]; extern const u8 BattleScript_82D9EA3[]; -extern const u8 BattleScript_82D9EB0[]; +extern const u8 BattleScript_SemiInvulnerableMiss[]; extern const u8 BattleScript_EffectDefenseCurl[]; extern const u8 BattleScript_82D9ED3[]; extern const u8 BattleScript_EffectSoftboiled[]; @@ -632,9 +632,9 @@ extern const u8 BattleScript_82DBE4B[]; extern const u8 BattleScript_82DBE6F[]; extern const u8 BattleScript_82DBE91[]; extern const u8 BattleScript_RunByUsingItem[]; -extern const u8 BattleScript_82DBEBD[]; -extern const u8 BattleScript_82DBEC4[]; -extern const u8 BattleScript_82DBECD[]; +extern const u8 BattleScript_ActionWatchesCarefully[]; +extern const u8 BattleScript_ActionGetNear[]; +extern const u8 BattleScript_ActionThrowPokeblock[]; extern const u8 BattleScript_82DBEE3[]; #endif // GUARD_BATTLE_SCRIPTS_H -- cgit v1.2.3 From 938d346b6d905709deed5336086c888c98a24247 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 01:19:57 +0100 Subject: fixes and labels --- include/battle_scripts.h | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'include') diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 85e1488d7..3c6d63e88 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -40,10 +40,10 @@ extern const u8 BattleScript_EffectSpecialAttackUp[]; extern const u8 BattleScript_EffectEvasionUp[]; extern const u8 BattleScript_EffectStatUp[]; extern const u8 BattleScript_EffectStatUpAfterAtkCanceler[]; -extern const u8 BattleScript_82D8CBD[]; -extern const u8 BattleScript_82D8CBF[]; -extern const u8 BattleScript_82D8CC7[]; -extern const u8 BattleScript_82D8CCF[]; +extern const u8 BattleScript_StatUpAttackAnim[]; +extern const u8 BattleScript_StatUpDoAnim[]; +extern const u8 BattleScript_StatUpPrintString[]; +extern const u8 BattleScript_StatUpEnd[]; extern const u8 BattleScript_StatUp[]; extern const u8 BattleScript_EffectAttackDown[]; extern const u8 BattleScript_EffectDefenseDown[]; @@ -51,8 +51,8 @@ extern const u8 BattleScript_EffectSpeedDown[]; extern const u8 BattleScript_EffectAccuracyDown[]; extern const u8 BattleScript_EffectEvasionDown[]; extern const u8 BattleScript_EffectStatDown[]; -extern const u8 BattleScript_82D8D4E[]; -extern const u8 BattleScript_82D8D58[]; +extern const u8 BattleScript_StatDownDoAnim[]; +extern const u8 BattleScript_StatDownPrintString[]; extern const u8 BattleScript_82D8D60[]; extern const u8 BattleScript_StatDown[]; extern const u8 BattleScript_EffectHaze[]; @@ -71,7 +71,7 @@ extern const u8 BattleScript_EffectFlinchHit[]; extern const u8 BattleScript_EffectRestoreHp[]; extern const u8 BattleScript_EffectToxic[]; extern const u8 BattleScript_AlreadyPoisoned[]; -extern const u8 BattleScript_82D8F63[]; +extern const u8 BattleScript_ImmunityProtected[]; extern const u8 BattleScript_EffectPayDay[]; extern const u8 BattleScript_EffectLightScreen[]; extern const u8 BattleScript_EffectTriAttack[]; @@ -110,7 +110,7 @@ extern const u8 BattleScript_82D928C[]; extern const u8 BattleScript_EffectPoison[]; extern const u8 BattleScript_EffectParalyze[]; extern const u8 BattleScript_82D9351[]; -extern const u8 BattleScript_82D9362[]; +extern const u8 BattleScript_LimberProtected[]; extern const u8 BattleScript_EffectAttackDownHit[]; extern const u8 BattleScript_EffectDefenseDownHit[]; extern const u8 BattleScript_EffectSpeedDownHit[]; @@ -127,7 +127,7 @@ extern const u8 BattleScript_82D943E[]; extern const u8 BattleScript_EffectRecharge[]; extern const u8 BattleScript_MoveUsedMustRecharge[]; extern const u8 BattleScript_EffectRage[]; -extern const u8 BattleScript_82D9487[]; +extern const u8 BattleScript_RageMiss[]; extern const u8 BattleScript_EffectMimic[]; extern const u8 BattleScript_EffectMetronome[]; extern const u8 BattleScript_EffectLeechSeed[]; @@ -146,8 +146,8 @@ extern const u8 BattleScript_EffectConversion2[]; extern const u8 BattleScript_EffectLockOn[]; extern const u8 BattleScript_EffectSketch[]; extern const u8 BattleScript_EffectSleepTalk[]; -extern const u8 BattleScript_82D965E[]; -extern const u8 BattleScript_82D967E[]; +extern const u8 BattleScript_SleepTalkIsAsleep[]; +extern const u8 BattleScript_SleepTalkUsingMove[]; extern const u8 BattleScript_EffectDestinyBond[]; extern const u8 BattleScript_EffectFlail[]; extern const u8 BattleScript_EffectSpite[]; @@ -166,12 +166,12 @@ extern const u8 BattleScript_EffectNightmare[]; extern const u8 BattleScript_NightmareWorked[]; extern const u8 BattleScript_EffectMinimize[]; extern const u8 BattleScript_EffectCurse[]; -extern const u8 BattleScript_82D9892[]; -extern const u8 BattleScript_82D98B8[]; -extern const u8 BattleScript_82D98CC[]; -extern const u8 BattleScript_82D98E0[]; -extern const u8 BattleScript_82D98E5[]; -extern const u8 BattleScript_82D98F6[]; +extern const u8 BattleScript_CurseTrySpeed[]; +extern const u8 BattleScript_CurseTryAttack[]; +extern const u8 BattleScript_CurseTryDefence[]; +extern const u8 BattleScript_CurseEnd[]; +extern const u8 BattleScript_GhostCurse[]; +extern const u8 BattleScript_DoGhostCurse[]; extern const u8 BattleScript_EffectProtect[]; extern const u8 BattleScript_EffectSpikes[]; extern const u8 BattleScript_EffectForesight[]; @@ -221,7 +221,7 @@ extern const u8 BattleScript_EffectGust[]; extern const u8 BattleScript_EffectStomp[]; extern const u8 BattleScript_EffectSolarbeam[]; extern const u8 BattleScript_82D9D28[]; -extern const u8 BattleScript_82D9D50[]; +extern const u8 BattleScript_SolarbeamOnFirstTurn[]; extern const u8 BattleScript_EffectThunder[]; extern const u8 BattleScript_EffectTeleport[]; extern const u8 BattleScript_EffectBeatUp[]; @@ -259,7 +259,7 @@ extern const u8 BattleScript_EffectTorment[]; extern const u8 BattleScript_EffectFlatter[]; extern const u8 BattleScript_82DA03A[]; extern const u8 BattleScript_EffectWillOWisp[]; -extern const u8 BattleScript_82DA0A1[]; +extern const u8 BattleScript_WaterVeilPrevents[]; extern const u8 BattleScript_82DA0BB[]; extern const u8 BattleScript_EffectMemento[]; extern const u8 BattleScript_82DA119[]; @@ -352,9 +352,9 @@ extern const u8 BattleScript_82DA8FC[]; extern const u8 BattleScript_82DA908[]; extern const u8 BattleScript_82DA92C[]; extern const u8 BattleScript_LocalTrainerBattleWon[]; -extern const u8 BattleScript_82DA943[]; -extern const u8 BattleScript_82DA946[]; -extern const u8 BattleScript_82DA963[]; +extern const u8 BattleScript_LocalTwoTrainersDefeated[]; +extern const u8 BattleScript_LocalBattleWonLoseTexts[]; +extern const u8 BattleScript_LocalBattleWonReward[]; extern const u8 BattleScript_PayDayMoneyAndPickUpItems[]; extern const u8 BattleScript_LocalBattleLost[]; extern const u8 BattleScript_82DA9B1[]; @@ -406,7 +406,7 @@ extern const u8 BattleScript_82DACD2[]; extern const u8 BattleScript_82DACE0[]; extern const u8 BattleScript_82DACE7[]; extern const u8 BattleScript_82DACFA[]; -extern const u8 BattleScript_82DAD01[]; +extern const u8 BattleScript_SafeguardProtected[]; extern const u8 BattleScript_82DAD0B[]; extern const u8 BattleScript_LeechSeedTurnDrain[]; extern const u8 BattleScript_82DAD47[]; @@ -520,8 +520,8 @@ extern const u8 BattleScript_MoveEffectPayDay[]; extern const u8 BattleScript_MoveEffectWrap[]; extern const u8 BattleScript_MoveEffectConfusion[]; extern const u8 BattleScript_MoveEffectRecoil33[]; -extern const u8 BattleScript_82DB407[]; -extern const u8 BattleScript_82DB421[]; +extern const u8 BattleScript_DoRecoil33[]; +extern const u8 BattleScript_Recoil33End[]; extern const u8 BattleScript_ItemSteal[]; extern const u8 BattleScript_DrizzleActivates[]; extern const u8 BattleScript_SpeedBoostActivates[]; @@ -529,8 +529,8 @@ extern const u8 BattleScript_TraceActivates[]; extern const u8 BattleScript_RainDishActivates[]; extern const u8 BattleScript_SandstreamActivates[]; extern const u8 BattleScript_ShedSkinActivates[]; -extern const u8 BattleScript_82DB48D[]; -extern const u8 BattleScript_82DB493[]; +extern const u8 BattleScript_WeatherFormChanges[]; +extern const u8 BattleScript_WeatherFormChangesLoop[]; extern const u8 BattleScript_CastformChange[]; extern const u8 BattleScript_82DB4AF[]; extern const u8 BattleScript_82DB4B8[]; @@ -557,7 +557,7 @@ extern const u8 BattleScript_PRLZPrevention[]; extern const u8 BattleScript_PSNPrevention[]; extern const u8 BattleScript_ObliviousPreventsAttraction[]; extern const u8 BattleScript_FlinchPrevention[]; -extern const u8 BattleScript_82DB611[]; +extern const u8 BattleScript_OwnTempoPrevents[]; extern const u8 BattleScript_SoundproofProtected[]; extern const u8 BattleScript_AbilityNoSpecificStatLoss[]; extern const u8 BattleScript_StickyHoldActivates[]; @@ -614,9 +614,9 @@ extern const u8 BattleScript_82DB992[]; extern const u8 BattleScript_82DB9BA[]; extern const u8 BattleScript_82DB9C1[]; extern const u8 BattleScript_82DB9C8[]; -extern const u8 BattleScript_82DBD68[]; -extern const u8 BattleScript_82DBD7A[]; -extern const u8 BattleScript_82DBD7E[]; +extern const u8 BattleScript_BallThrow[]; +extern const u8 BattleScript_BallThrowByWally[]; +extern const u8 BattleScript_SafariBallThrow[]; extern const u8 BattleScript_SuccessBallThrow[]; extern const u8 BattleScript_82DBD92[]; extern const u8 BattleScript_82DBDA5[]; -- cgit v1.2.3 From cc572f7c00b7a07161b5298868bcb495b7c87b61 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 11:55:17 +0100 Subject: clear battle code and battlescripts --- include/battle.h | 3 ++- include/battle_message.h | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 5e37ef77c..e65833b4f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -837,9 +837,10 @@ extern struct BattleStruct* gBattleStruct; #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40 #define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit -#define SET_STAT_BUFF_ID(n)((n & 0xF)) #define SET_STAT_BUFF_VALUE(n)(((s8)(((s8)(n) << 4)) & 0xF0)) +#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + (stage << 4) + (goesDown << 7)) + struct BattleScripting { s32 painSplitHp; diff --git a/include/battle_message.h b/include/battle_message.h index 3f9b38cad..8b724a316 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -74,6 +74,14 @@ #define B_BUFF_PLACEHOLDER_BEGIN 0xFD #define B_BUFF_EOS 0xFF +#define PREPARE_FLAVOUR_BUFFER(textVar, flavourId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_NEGATIVE_FLAVOUR; \ + textVar[2] = flavourId; \ + textVar[3] = B_BUFF_EOS; \ +} + #define PREPARE_STAT_BUFFER(textVar, statId) \ { \ textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ -- cgit v1.2.3 From 9886eeb5d8b0a19e31537fbc3e1245f20577d513 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 13:26:58 +0100 Subject: fix, rename, label battle labels and battlescripts --- include/battle.h | 10 +--------- include/battle_scripts.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index e65833b4f..c172cb0f6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -706,13 +706,6 @@ struct BattleStruct extern struct BattleStruct* gBattleStruct; -#define MEME_ACCESS_U8(structName, structPtr, arrayId, offsetField, value) \ -{ \ - u8* var2 = (u8*)((u32)(arrayId)); \ - var2 = (u32)(structPtr) + var2; \ - var2[offsetof(struct structName, offsetField)] = value; \ -} - #define GET_MOVE_TYPE(move, typeArg) \ { \ if (gBattleStruct->dynamicMoveType) \ @@ -850,8 +843,7 @@ struct BattleScripting u8 twoTurnsMoveStringId; u8 animArg1; u8 animArg2; - u8 tripleKickPower; - u8 field_13; + u16 tripleKickPower; u8 atk49_state; u8 field_15; u8 field_16; diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 3c6d63e88..053942b9f 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -13,9 +13,9 @@ extern const u8 BattleScript_PrintMoveMissed[]; extern const u8 BattleScript_MoveMissedPause[]; extern const u8 BattleScript_MoveMissed[]; extern const u8 BattleScript_EffectSleep[]; -extern const u8 BattleScript_82D8AB0[]; -extern const u8 BattleScript_82D8AC1[]; -extern const u8 BattleScript_82D8ACF[]; +extern const u8 BattleScript_AlreadyAsleep[]; +extern const u8 BattleScript_WasntAffected[]; +extern const u8 BattleScript_CantMakeAsleep[]; extern const u8 BattleScript_EffectPoisonHit[]; extern const u8 BattleScript_EffectAbsorb[]; extern const u8 BattleScript_82D8B26[]; @@ -94,7 +94,7 @@ extern const u8 BattleScript_EffectMist[]; extern const u8 BattleScript_EffectFocusEnergy[]; extern const u8 BattleScript_EffectRecoil[]; extern const u8 BattleScript_EffectConfuse[]; -extern const u8 BattleScript_82D9201[]; +extern const u8 BattleScript_AlreadyConfused[]; extern const u8 BattleScript_EffectAttackUp2[]; extern const u8 BattleScript_EffectDefenseUp2[]; extern const u8 BattleScript_EffectSpeedUp2[]; @@ -109,7 +109,7 @@ extern const u8 BattleScript_EffectReflect[]; extern const u8 BattleScript_82D928C[]; extern const u8 BattleScript_EffectPoison[]; extern const u8 BattleScript_EffectParalyze[]; -extern const u8 BattleScript_82D9351[]; +extern const u8 BattleScript_AlreadyParalyzed[]; extern const u8 BattleScript_LimberProtected[]; extern const u8 BattleScript_EffectAttackDownHit[]; extern const u8 BattleScript_EffectDefenseDownHit[]; @@ -155,11 +155,11 @@ extern const u8 BattleScript_EffectHealBell[]; extern const u8 BattleScript_82D96ED[]; extern const u8 BattleScript_82D96FE[]; extern const u8 BattleScript_EffectTripleKick[]; -extern const u8 BattleScript_82D9718[]; +extern const u8 BattleScript_TripleKickLoop[]; extern const u8 BattleScript_82D973A[]; -extern const u8 BattleScript_82D9799[]; -extern const u8 BattleScript_82D97AD[]; -extern const u8 BattleScript_82D97D7[]; +extern const u8 BattleScript_TripleKickNoMoreHits[]; +extern const u8 BattleScript_TripleKickPrintStrings[]; +extern const u8 BattleScript_TripleKickEnd[]; extern const u8 BattleScript_EffectThief[]; extern const u8 BattleScript_EffectMeanLook[]; extern const u8 BattleScript_EffectNightmare[]; -- cgit v1.2.3 From 8c30c42c36b7904c223277b9739f5a7e78be1793 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 14:17:02 +0100 Subject: more labelling and changes --- include/battle_message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_message.h b/include/battle_message.h index 8b724a316..59d747db1 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -197,7 +197,7 @@ struct StringInfoBattle { u16 currentMove; - u16 lastMove; + u16 originallyUsedMove; u16 lastItem; u8 lastAbility; u8 scrActive; -- cgit v1.2.3 From 1bb5b1fd07260cd027d9504a0debfdc294cebc9f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 17:15:28 +0100 Subject: more battle labels --- include/battle_scripts.h | 148 +++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'include') diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 053942b9f..9c3f4906a 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -76,17 +76,17 @@ extern const u8 BattleScript_EffectPayDay[]; extern const u8 BattleScript_EffectLightScreen[]; extern const u8 BattleScript_EffectTriAttack[]; extern const u8 BattleScript_EffectRest[]; -extern const u8 BattleScript_82D8FC6[]; -extern const u8 BattleScript_82D8FD6[]; +extern const u8 BattleScript_RestCantSleep[]; +extern const u8 BattleScript_RestIsAlreadyAsleep[]; extern const u8 BattleScript_EffectOHKO[]; extern const u8 BattleScript_KOFail[]; extern const u8 BattleScript_EffectRazorWind[]; -extern const u8 BattleScript_82D9040[]; +extern const u8 BattleScript_TwoTurnMovesSecondTurn[]; extern const u8 BattleScriptFirstChargingTurn[]; extern const u8 BattleScript_EffectSuperFang[]; extern const u8 BattleScript_EffectDragonRage[]; extern const u8 BattleScript_EffectTrap[]; -extern const u8 BattleScript_82D9105[]; +extern const u8 BattleScript_DoWrapEffect[]; extern const u8 BattleScript_EffectDoubleHit[]; extern const u8 BattleScript_EffectRecoilIfMiss[]; extern const u8 BattleScript_82D9135[]; @@ -106,7 +106,7 @@ extern const u8 BattleScript_EffectDefenseDown2[]; extern const u8 BattleScript_EffectSpeedDown2[]; extern const u8 BattleScript_EffectSpecialDefenseDown2[]; extern const u8 BattleScript_EffectReflect[]; -extern const u8 BattleScript_82D928C[]; +extern const u8 BattleScript_PrintReflectLightScreenSafeguardString[]; extern const u8 BattleScript_EffectPoison[]; extern const u8 BattleScript_EffectParalyze[]; extern const u8 BattleScript_AlreadyParalyzed[]; @@ -121,9 +121,9 @@ extern const u8 BattleScript_EffectSkyAttack[]; extern const u8 BattleScript_EffectConfuseHit[]; extern const u8 BattleScript_EffectTwineedle[]; extern const u8 BattleScript_EffectSubstitute[]; -extern const u8 BattleScript_82D942B[]; -extern const u8 BattleScript_82D9431[]; -extern const u8 BattleScript_82D943E[]; +extern const u8 BattleScript_SubstituteAnim[]; +extern const u8 BattleScript_SubstituteString[]; +extern const u8 BattleScript_AlreadyHasSubstitute[]; extern const u8 BattleScript_EffectRecharge[]; extern const u8 BattleScript_MoveUsedMustRecharge[]; extern const u8 BattleScript_EffectRage[]; @@ -131,7 +131,7 @@ extern const u8 BattleScript_RageMiss[]; extern const u8 BattleScript_EffectMimic[]; extern const u8 BattleScript_EffectMetronome[]; extern const u8 BattleScript_EffectLeechSeed[]; -extern const u8 BattleScript_82D94E5[]; +extern const u8 BattleScript_DoLeechSeed[]; extern const u8 BattleScript_EffectSplash[]; extern const u8 BattleScript_EffectDisable[]; extern const u8 BattleScript_EffectLevelDamage[]; @@ -140,8 +140,8 @@ extern const u8 BattleScript_EffectCounter[]; extern const u8 BattleScript_EffectEncore[]; extern const u8 BattleScript_EffectPainSplit[]; extern const u8 BattleScript_EffectSnore[]; -extern const u8 BattleScript_82D95CE[]; -extern const u8 BattleScript_82D95E2[]; +extern const u8 BattleScript_SnoreIsAsleep[]; +extern const u8 BattleScript_DoSnore[]; extern const u8 BattleScript_EffectConversion2[]; extern const u8 BattleScript_EffectLockOn[]; extern const u8 BattleScript_EffectSketch[]; @@ -152,11 +152,11 @@ extern const u8 BattleScript_EffectDestinyBond[]; extern const u8 BattleScript_EffectFlail[]; extern const u8 BattleScript_EffectSpite[]; extern const u8 BattleScript_EffectHealBell[]; -extern const u8 BattleScript_82D96ED[]; -extern const u8 BattleScript_82D96FE[]; +extern const u8 BattleScript_CheckHealBellMon2Unaffected[]; +extern const u8 BattleScript_PartyHealEnd[]; extern const u8 BattleScript_EffectTripleKick[]; extern const u8 BattleScript_TripleKickLoop[]; -extern const u8 BattleScript_82D973A[]; +extern const u8 BattleScript_DoTripleKickAttack[]; extern const u8 BattleScript_TripleKickNoMoreHits[]; extern const u8 BattleScript_TripleKickPrintStrings[]; extern const u8 BattleScript_TripleKickEnd[]; @@ -181,12 +181,12 @@ extern const u8 BattleScript_PerishSongLoopIncrement[]; extern const u8 BattleScript_PerishSongNotAffected[]; extern const u8 BattleScript_EffectSandstorm[]; extern const u8 BattleScript_EffectRollout[]; -extern const u8 BattleScript_82D99CD[]; -extern const u8 BattleScript_82D99D4[]; +extern const u8 BattleScript_RolloutCheckAccuracy[]; +extern const u8 BattleScript_RolloutHit[]; extern const u8 BattleScript_EffectSwagger[]; -extern const u8 BattleScript_82D9A1E[]; +extern const u8 BattleScript_SwaggerTryConfuse[]; extern const u8 BattleScript_EffectFuryCutter[]; -extern const u8 BattleScript_82D9A43[]; +extern const u8 BattleScript_FuryCutterHit[]; extern const u8 BattleScript_EffectAttract[]; extern const u8 BattleScript_EffectReturn[]; extern const u8 BattleScript_EffectPresent[]; @@ -199,7 +199,7 @@ extern const u8 BattleScript_EffectSonicboom[]; extern const u8 BattleScript_EffectMorningSun[]; extern const u8 BattleScript_EffectHiddenPower[]; extern const u8 BattleScript_EffectRainDance[]; -extern const u8 BattleScript_82D9B41[]; +extern const u8 BattleScript_MoveWeatherChange[]; extern const u8 BattleScript_EffectSunnyDay[]; extern const u8 BattleScript_EffectDefenseUpHit[]; extern const u8 BattleScript_EffectAttackUpHit[]; @@ -208,9 +208,9 @@ extern const u8 BattleScript_EffectBellyDrum[]; extern const u8 BattleScript_EffectPsychUp[]; extern const u8 BattleScript_EffectMirrorCoat[]; extern const u8 BattleScript_EffectSkullBash[]; -extern const u8 BattleScript_82D9C16[]; +extern const u8 BattleScript_SkullBashEnd[]; extern const u8 BattleScript_EffectTwister[]; -extern const u8 BattleScript_82D9C35[]; +extern const u8 BattleScript_FlinchEffect[]; extern const u8 BattleScript_EffectEarthquake[]; extern const u8 BattleScript_82D9C44[]; extern const u8 BattleScript_82D9C64[]; @@ -220,7 +220,7 @@ extern const u8 BattleScript_EffectFutureSight[]; extern const u8 BattleScript_EffectGust[]; extern const u8 BattleScript_EffectStomp[]; extern const u8 BattleScript_EffectSolarbeam[]; -extern const u8 BattleScript_82D9D28[]; +extern const u8 BattleScript_SolarbeamDecideTurn[]; extern const u8 BattleScript_SolarbeamOnFirstTurn[]; extern const u8 BattleScript_EffectThunder[]; extern const u8 BattleScript_EffectTeleport[]; @@ -234,10 +234,10 @@ extern const u8 BattleScript_FirstTurnDive[]; extern const u8 BattleScript_FirstTurnFly[]; extern const u8 BattleScript_FirstTurnSemiInvulnerable[]; extern const u8 BattleScript_SecondTurnSemiInvulnerable[]; -extern const u8 BattleScript_82D9EA3[]; +extern const u8 BattleScript_SemiInvulnerableTryHit[]; extern const u8 BattleScript_SemiInvulnerableMiss[]; extern const u8 BattleScript_EffectDefenseCurl[]; -extern const u8 BattleScript_82D9ED3[]; +extern const u8 BattleScript_DefenseCurlDoStatUpAnim[]; extern const u8 BattleScript_EffectSoftboiled[]; extern const u8 BattleScript_PresentHealTarget[]; extern const u8 BattleScript_AlreadyAtFullHp[]; @@ -247,7 +247,7 @@ extern const u8 BattleScript_ButItFailedPpReduce[]; extern const u8 BattleScript_ButItFailed[]; extern const u8 BattleScript_NotAffected[]; extern const u8 BattleScript_EffectUproar[]; -extern const u8 BattleScript_82D9F5A[]; +extern const u8 BattleScript_UproarHit[]; extern const u8 BattleScript_EffectStockpile[]; extern const u8 BattleScript_EffectSpitUp[]; extern const u8 BattleScript_SpitUpFail[]; @@ -257,10 +257,10 @@ extern const u8 BattleScript_SwallowFail[]; extern const u8 BattleScript_EffectHail[]; extern const u8 BattleScript_EffectTorment[]; extern const u8 BattleScript_EffectFlatter[]; -extern const u8 BattleScript_82DA03A[]; +extern const u8 BattleScript_FlatterTryConfuse[]; extern const u8 BattleScript_EffectWillOWisp[]; extern const u8 BattleScript_WaterVeilPrevents[]; -extern const u8 BattleScript_82DA0BB[]; +extern const u8 BattleScript_AlreadyBurned[]; extern const u8 BattleScript_EffectMemento[]; extern const u8 BattleScript_82DA119[]; extern const u8 BattleScript_82DA13C[]; @@ -317,28 +317,28 @@ extern const u8 BattleScript_EffectPoisonFang[]; extern const u8 BattleScript_EffectWeatherBall[]; extern const u8 BattleScript_EffectOverheat[]; extern const u8 BattleScript_EffectTickle[]; -extern const u8 BattleScript_82DA571[]; -extern const u8 BattleScript_82DA5A7[]; -extern const u8 BattleScript_82DA5CA[]; -extern const u8 BattleScript_82DA5CF[]; +extern const u8 BattleScript_TickleDoMoveAnim[]; +extern const u8 BattleScript_TickleTryLowerDef[]; +extern const u8 BattleScript_TickleEnd[]; +extern const u8 BattleScript_CantLowerMultipleStats[]; extern const u8 BattleScript_EffectCosmicPower[]; -extern const u8 BattleScript_82DA5F8[]; -extern const u8 BattleScript_82DA623[]; -extern const u8 BattleScript_82DA642[]; +extern const u8 BattleScript_CosmicPowerDoMoveAnim[]; +extern const u8 BattleScript_CosmicPowerTrySpDef[]; +extern const u8 BattleScript_CosmicPowerEnd[]; extern const u8 BattleScript_EffectSkyUppercut[]; extern const u8 BattleScript_EffectBulkUp[]; -extern const u8 BattleScript_82DA66A[]; -extern const u8 BattleScript_82DA695[]; -extern const u8 BattleScript_82DA6B4[]; +extern const u8 BattleScript_BulkUpDoMoveAnim[]; +extern const u8 BattleScript_BulkUpTryDef[]; +extern const u8 BattleScript_BulkUpEnd[]; extern const u8 BattleScript_EffectCalmMind[]; -extern const u8 BattleScript_82DA6CE[]; -extern const u8 BattleScript_82DA6F9[]; -extern const u8 BattleScript_82DA718[]; +extern const u8 BattleScript_CalmMindDoMoveAnim[]; +extern const u8 BattleScript_CalmMindTrySpDef[]; +extern const u8 BattleScript_CalmMindEnd[]; extern const u8 BattleScript_CantRaiseMultipleStats[]; extern const u8 BattleScript_EffectDragonDance[]; -extern const u8 BattleScript_82DA746[]; -extern const u8 BattleScript_82DA771[]; -extern const u8 BattleScript_82DA790[]; +extern const u8 BattleScript_DragonDanceDoMoveAnim[]; +extern const u8 BattleScript_DragonDanceTrySpeed[]; +extern const u8 BattleScript_DragonDanceEnd[]; extern const u8 BattleScript_EffectCamouflage[]; extern const u8 BattleScript_FaintAttacker[]; extern const u8 BattleScript_FaintTarget[]; @@ -357,16 +357,16 @@ extern const u8 BattleScript_LocalBattleWonLoseTexts[]; extern const u8 BattleScript_LocalBattleWonReward[]; extern const u8 BattleScript_PayDayMoneyAndPickUpItems[]; extern const u8 BattleScript_LocalBattleLost[]; -extern const u8 BattleScript_82DA9B1[]; -extern const u8 BattleScript_82DA9BD[]; -extern const u8 BattleScript_82DA9BE[]; -extern const u8 BattleScript_82DA9C9[]; -extern const u8 BattleScript_82DAA01[]; -extern const u8 BattleScript_82DAA0A[]; +extern const u8 BattleScript_LocalBattleLostPrintWhiteOut[]; +extern const u8 BattleScript_LocalBattleLostEnd[]; +extern const u8 BattleScript_CheckDomeDrew[]; +extern const u8 BattleScript_LocalBattleLostPrintTrainersWinText[]; +extern const u8 BattleScript_LocalBattleLostDoTrainer2WinText[]; +extern const u8 BattleScript_LocalBattleLostEnd_[]; extern const u8 BattleScript_82DAA0B[]; extern const u8 BattleScript_82DAA31[]; extern const u8 BattleScript_LinkBattleWonOrLost[]; -extern const u8 BattleScript_82DAA58[]; +extern const u8 BattleScript_LinkBattleWonOrLostWaitEnd[]; extern const u8 BattleScript_82DAA5C[]; extern const u8 BattleScript_82DAA83[]; extern const u8 BattleScript_FrontierTrainerBattleWon[]; @@ -381,7 +381,7 @@ extern const u8 BattleScript_WildMonFled[]; extern const u8 BattleScript_82DAAFE[]; extern const u8 BattleScript_PrintFailedToRunString[]; extern const u8 BattleScript_82DAB0B[]; -extern const u8 BattleScript_82DAB11[]; +extern const u8 BattleScript_PrintFullBox[]; extern const u8 BattleScript_ActionSwitch[]; extern const u8 BattleScript_82DAB35[]; extern const u8 BattleScript_82DAB37[]; @@ -395,19 +395,19 @@ extern const u8 BattleScript_AskToLearnMove[]; extern const u8 BattleScript_ForgotAndLearnedNewMove[]; extern const u8 BattleScript_LearnedNewMove[]; extern const u8 BattleScript_LearnMoveReturn[]; -extern const u8 BattleScript_82DAC2C[]; -extern const u8 BattleScript_82DAC46[]; -extern const u8 BattleScript_82DAC47[]; -extern const u8 BattleScript_82DAC5F[]; -extern const u8 BattleScript_82DACA0[]; -extern const u8 BattleScript_82DACBF[]; -extern const u8 BattleScript_82DACC9[]; -extern const u8 BattleScript_82DACD2[]; -extern const u8 BattleScript_82DACE0[]; -extern const u8 BattleScript_82DACE7[]; -extern const u8 BattleScript_82DACFA[]; +extern const u8 BattleScript_RainContinuesOrEnds[]; +extern const u8 BattleScript_RainContinuesOrEndsEnd[]; +extern const u8 BattleScript_DamagingWeatherContinues[]; +extern const u8 BattleScript_DamagingWeatherLoop[]; +extern const u8 BattleScript_DamagingWeatherLoopIncrement[]; +extern const u8 BattleScript_DamagingWeatherContinuesEnd[]; +extern const u8 BattleScript_SandStormHailEnds[]; +extern const u8 BattleScript_SunlightContinues[]; +extern const u8 BattleScript_SunlightFaded[]; +extern const u8 BattleScript_OverworldWeatherStarts[]; +extern const u8 BattleScript_SideStatusWoreOff[]; extern const u8 BattleScript_SafeguardProtected[]; -extern const u8 BattleScript_82DAD0B[]; +extern const u8 BattleScript_SafeguardEnds[]; extern const u8 BattleScript_LeechSeedTurnDrain[]; extern const u8 BattleScript_82DAD47[]; extern const u8 BattleScript_82DAD4D[]; @@ -419,7 +419,7 @@ extern const u8 BattleScript_82DADF1[]; extern const u8 BattleScript_MistProtected[]; extern const u8 BattleScript_RageIsBuilding[]; extern const u8 BattleScript_MoveUsedIsDisabled[]; -extern const u8 BattleScript_82DAE1F[]; +extern const u8 BattleScript_SelectingDisabledMove[]; extern const u8 BattleScript_DisabledNoMore[]; extern const u8 BattleScript_82DAE2A[]; extern const u8 BattleScript_82DAE2D[]; @@ -453,12 +453,12 @@ extern const u8 BattleScript_82DB027[]; extern const u8 BattleScript_82DB03F[]; extern const u8 BattleScript_82DB058[]; extern const u8 BattleScript_NoMovesLeft[]; -extern const u8 BattleScript_82DB076[]; +extern const u8 BattleScript_SelectingMoveWithNoPP[]; extern const u8 BattleScript_NoPPForMove[]; -extern const u8 BattleScript_82DB089[]; +extern const u8 BattleScript_SelectingTormentedMove[]; extern const u8 BattleScript_82DB08D[]; extern const u8 BattleScript_82DB098[]; -extern const u8 BattleScript_82DB0A0[]; +extern const u8 BattleScript_SelectingNotAllowedMoveTaunt[]; extern const u8 BattleScript_MoveUsedIsTaunted[]; extern const u8 BattleScript_82DB0AF[]; extern const u8 BattleScript_WishComesTrue[]; @@ -470,7 +470,7 @@ extern const u8 BattleScript_82DB144[]; extern const u8 BattleScript_82DB167[]; extern const u8 BattleScript_KnockedOff[]; extern const u8 BattleScript_MoveUsedIsImprisoned[]; -extern const u8 BattleScript_82DB181[]; +extern const u8 BattleScript_SelectingImprisionedMove[]; extern const u8 BattleScript_82DB185[]; extern const u8 BattleScript_GrudgeTakesPp[]; extern const u8 BattleScript_MagicCoatBounce[]; @@ -546,8 +546,8 @@ extern const u8 BattleScript_SturdyPreventsOHKO[]; extern const u8 BattleScript_DampStopsExplosion[]; extern const u8 BattleScript_MoveHPDrain_PPLoss[]; extern const u8 BattleScript_MoveHPDrain[]; -extern const u8 BattleScript_82DB591[]; -extern const u8 BattleScript_82DB592[]; +extern const u8 BattleScript_MonMadeMoveUseless_PPLoss[]; +extern const u8 BattleScript_MonMadeMoveUseless[]; extern const u8 BattleScript_FlashFireBoost_PPLoss[]; extern const u8 BattleScript_FlashFireBoost[]; extern const u8 BattleScript_82DB5B9[]; @@ -567,12 +567,12 @@ extern const u8 BattleScript_CuteCharmActivates[]; extern const u8 BattleScript_ApplySecondaryEffect[]; extern const u8 BattleScript_SynchronizeActivates[]; extern const u8 BattleScript_NoItemSteal[]; -extern const u8 BattleScript_82DB68C[]; +extern const u8 BattleScript_AbilityCuredStatus[]; extern const u8 BattleScript_82DB695[]; -extern const u8 BattleScript_82DB6A5[]; +extern const u8 BattleScript_IgnoresAndUsesRandomMove[]; extern const u8 BattleScript_MoveUsedLoafingAround[]; extern const u8 BattleScript_82DB6C7[]; -extern const u8 BattleScript_82DB6D9[]; +extern const u8 BattleScript_IgnoresAndFallsAsleep[]; extern const u8 BattleScript_82DB6F0[]; extern const u8 BattleScript_SubstituteFade[]; extern const u8 BattleScript_BerryCurePrlzEnd2[]; @@ -595,7 +595,7 @@ extern const u8 BattleScript_ItemHealHP_RemoveItem[]; extern const u8 BattleScript_BerryPPHealEnd2[]; extern const u8 BattleScript_ItemHealHP_End2[]; extern const u8 BattleScript_ItemHealHP_Ret[]; -extern const u8 BattleScript_82DB812[]; +extern const u8 BattleScript_SelectingNotAllowedMoveChoiceItem[]; extern const u8 BattleScript_HangedOnMsg[]; extern const u8 BattleScript_BerryConfuseHealEnd2[]; extern const u8 BattleScript_BerryStatRaiseEnd2[]; -- cgit v1.2.3 From 59f64c622bf2ed7a0fcc6d45975813bc55c84141 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 17:26:11 +0100 Subject: name more battlescripts --- include/battle_scripts.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 9c3f4906a..5131778a8 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -378,9 +378,9 @@ extern const u8 BattleScript_SmokeBallEscape[]; extern const u8 BattleScript_RanAwayUsingMonAbility[]; extern const u8 BattleScript_GotAwaySafely[]; extern const u8 BattleScript_WildMonFled[]; -extern const u8 BattleScript_82DAAFE[]; +extern const u8 BattleScript_PrintCantRunFromTrainer[]; extern const u8 BattleScript_PrintFailedToRunString[]; -extern const u8 BattleScript_82DAB0B[]; +extern const u8 BattleScript_PrintCantEscapeFromBattle[]; extern const u8 BattleScript_PrintFullBox[]; extern const u8 BattleScript_ActionSwitch[]; extern const u8 BattleScript_82DAB35[]; @@ -432,8 +432,8 @@ extern const u8 BattleScript_82DAEB1[]; extern const u8 BattleScript_SpikesOngBank1[]; extern const u8 BattleScript_82DAEE8[]; extern const u8 BattleScript_82DAEFE[]; -extern const u8 BattleScript_82DAF05[]; -extern const u8 BattleScript_82DAF20[]; +extern const u8 BattleScript_PerishSongTakesLife[]; +extern const u8 BattleScript_PerishSongCountGoesDown[]; extern const u8 BattleScript_AllStatsUp[]; extern const u8 BattleScript_82DAF54[]; extern const u8 BattleScript_82DAF72[]; @@ -445,7 +445,7 @@ extern const u8 BattleScript_RapidSpinAway[]; extern const u8 BattleScript_WrapFree[]; extern const u8 BattleScript_LeechSeedFree[]; extern const u8 BattleScript_SpikesFree[]; -extern const u8 BattleScript_82DAFE4[]; +extern const u8 BattleScript_MonTookFutureAttack[]; extern const u8 BattleScript_82DB001[]; extern const u8 BattleScript_82DB008[]; extern const u8 BattleScript_82DB020[]; @@ -482,7 +482,7 @@ extern const u8 BattleScript_82DB1FE[]; extern const u8 BattleScript_FocusPunchSetUp[]; extern const u8 BattleScript_MoveUsedIsAsleep[]; extern const u8 BattleScript_MoveUsedWokeUp[]; -extern const u8 BattleScript_82DB234[]; +extern const u8 BattleScript_MonWokeUpInUproar[]; extern const u8 BattleScript_PoisonTurnDmg[]; extern const u8 BattleScript_82DB243[]; extern const u8 BattleScript_82DB245[]; @@ -493,7 +493,7 @@ extern const u8 BattleScript_MoveUsedUnfroze[]; extern const u8 BattleScript_DefrostedViaFireMove[]; extern const u8 BattleScript_MoveUsedIsParalyzed[]; extern const u8 BattleScript_MoveUsedFlinched[]; -extern const u8 BattleScript_82DB2A6[]; +extern const u8 BattleScript_PrintUproarOverTurns[]; extern const u8 BattleScript_ThrashConfuses[]; extern const u8 BattleScript_MoveUsedIsConfused[]; extern const u8 BattleScript_82DB2D4[]; @@ -611,7 +611,7 @@ extern const u8 BattleScript_82DB8E0[]; extern const u8 BattleScript_82DB8F3[]; extern const u8 BattleScript_82DB973[]; extern const u8 BattleScript_82DB992[]; -extern const u8 BattleScript_82DB9BA[]; +extern const u8 BattleScript_AskIfWantsToForfeitMatch[]; extern const u8 BattleScript_82DB9C1[]; extern const u8 BattleScript_82DB9C8[]; extern const u8 BattleScript_BallThrow[]; -- cgit v1.2.3 From 237261e193d75addf47fc0736b2d9ed10c8d3195 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 27 Nov 2017 20:03:41 +0100 Subject: berry blender review changes --- include/battle_message.h | 2 +- include/berry.h | 12 ++++++------ include/pokeblock.h | 4 ++-- include/pokemon.h | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/battle_message.h b/include/battle_message.h index 3f9b38cad..c1ee8baa2 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -67,7 +67,7 @@ #define B_BUFF_STAT 5 #define B_BUFF_SPECIES 6 #define B_BUFF_MON_NICK 7 -#define B_BUFF_NEGATIVE_FLAVOUR 8 +#define B_BUFF_NEGATIVE_FLAVOR 8 #define B_BUFF_ABILITY 9 #define B_BUFF_ITEM 10 diff --git a/include/berry.h b/include/berry.h index f1f3a8afb..425a664c9 100644 --- a/include/berry.h +++ b/include/berry.h @@ -13,12 +13,12 @@ enum enum { - FLAVOUR_SPICY, - FLAVOUR_DRY, - FLAVOUR_SWEET, - FLAVOUR_BITTER, - FLAVOUR_SOUR, - FLAVOUR_COUNT + FLAVOR_SPICY, + FLAVOR_DRY, + FLAVOR_SWEET, + FLAVOR_BITTER, + FLAVOR_SOUR, + FLAVOR_COUNT }; #define NUM_BERRIES 44 diff --git a/include/pokeblock.h b/include/pokeblock.h index 00fbd1e45..a145cbada 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -25,9 +25,9 @@ enum void ClearPokeblocks(void); s8 GetFirstFreePokeblockSlot(void); bool32 AddPokeblock(struct Pokeblock *pokeblock); -u8 GetHighestPokeblocksFlavourLevel(const struct Pokeblock *pokeblock); +u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock); u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock); -u8 GetPokeblocksFlavour(const struct Pokeblock *pokeblock); +u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock); s16 PokeblockGetGain(u8, const struct Pokeblock *); #endif // GUARD_POKEBLOCK_H diff --git a/include/pokemon.h b/include/pokemon.h index 1eb052f4e..480c8d9b9 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -642,8 +642,8 @@ u8 CheckPartyPokerus(struct Pokemon *party, u8 selection); u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection); void UpdatePartyPokerusTime(u16 days); void PartySpreadPokerus(struct Pokemon *party); -s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2); -s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); +s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2); +s8 GetFlavorRelationByPersonality(u32 personality, u8 a2); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); u8 GetDefaultMoveTarget(u8 atkBank); u16 PlayerGenderToFrontTrainerPicId(u8 playerGender); -- cgit v1.2.3 From 7144b3b7afc60597168fd85d31f333bb3a4b1826 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 27 Nov 2017 21:24:34 +0100 Subject: fix flavour flavor not building, fuccing americans --- include/battle_message.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_message.h b/include/battle_message.h index a820ff287..7ea4fc2f6 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -74,10 +74,10 @@ #define B_BUFF_PLACEHOLDER_BEGIN 0xFD #define B_BUFF_EOS 0xFF -#define PREPARE_FLAVOUR_BUFFER(textVar, flavourId) \ +#define PREPARE_FLAVOR_BUFFER(textVar, flavourId) \ { \ textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ - textVar[1] = B_BUFF_NEGATIVE_FLAVOUR; \ + textVar[1] = B_BUFF_NEGATIVE_FLAVOR; \ textVar[2] = flavourId; \ textVar[3] = B_BUFF_EOS; \ } -- cgit v1.2.3 From 7275585d564ba7c619d6c585fc64d71666ae9eb1 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 27 Nov 2017 21:54:15 +0100 Subject: its flavour, not flavor --- include/battle_message.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/battle_message.h b/include/battle_message.h index 7ea4fc2f6..30ddca469 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -67,18 +67,18 @@ #define B_BUFF_STAT 5 #define B_BUFF_SPECIES 6 #define B_BUFF_MON_NICK 7 -#define B_BUFF_NEGATIVE_FLAVOR 8 +#define B_BUFF_NEGATIVE_FLAVOR 8 #define B_BUFF_ABILITY 9 #define B_BUFF_ITEM 10 #define B_BUFF_PLACEHOLDER_BEGIN 0xFD #define B_BUFF_EOS 0xFF -#define PREPARE_FLAVOR_BUFFER(textVar, flavourId) \ +#define PREPARE_FLAVOR_BUFFER(textVar, flavorId) \ { \ textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ - textVar[1] = B_BUFF_NEGATIVE_FLAVOR; \ - textVar[2] = flavourId; \ + textVar[1] = B_BUFF_NEGATIVE_FLAVOR; \ + textVar[2] = flavorId; \ textVar[3] = B_BUFF_EOS; \ } -- cgit v1.2.3