diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_string_ids.h | 47 | ||||
| -rw-r--r-- | include/constants/battle_script_commands.h | 2 |
2 files changed, 26 insertions, 23 deletions
diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index a030a7b48..ede2dbe3b 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -1,10 +1,6 @@ #ifndef GUARD_BATTLE_STRING_IDS_H #define GUARD_BATTLE_STRING_IDS_H -#include "global.h" - -#define BATTLESTRINGS_COUNT 369 - #define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved #define STRINGID_INTROMSG 0 @@ -367,23 +363,30 @@ #define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360 #define STRINGID_BUTNOEFFECT 361 #define STRINGID_PKMNSXHADNOEFFECTONY 362 -#define STRINGID_TWOENEMIESDEFEATED 363 -#define STRINGID_TRAINER2LOSETEXT 364 -#define STRINGID_PKMNINCAPABLEOFPOWER 365 -#define STRINGID_GLINTAPPEARSINEYE 366 -#define STRINGID_PKMNGETTINGINTOPOSITION 367 -#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368 -#define STRINGID_PKMNEAGERFORMORE 369 -#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370 -#define STRINGID_LOSTTOOPPONENTBYREFEREE 371 -#define STRINGID_TIEDOPPONENTBYREFEREE 372 -#define STRINGID_QUESTIONFORFEITMATCH 373 -#define STRINGID_FORFEITEDMATCH 374 -#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375 -#define STRINGID_PKMNTRANSFERREDLANETTESPC 376 -#define STRINGID_PKMNBOXSOMEONESPCFULL 377 -#define STRINGID_PKMNBOXLANETTESPCFULL 378 -#define STRINGID_TRAINER1WINTEXT 379 -#define STRINGID_TRAINER2WINTEXT 380 +#define STRINGID_OAKPLAYERWON 363 +#define STRINGID_OAKPLAYERLOST 364 +#define STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER 365 +#define STRINGID_PLAYERPAIDPRIZEMONEY 366 +#define STRINGID_PKMNTRANSFERREDSOMEONESPC 367 +#define STRINGID_PKMNTRANSFERREDBILLSPC 368 +#define STRINGID_PKMNBOXSOMEONESPCFULL 369 +#define STRINGID_PKMNBOXBILLSPCFULL 370 +#define STRINGID_POKEDUDEUSED 371 +#define STRINGID_POKEFLUTECATCHY 372 +#define STRINGID_POKEFLUTE 373 +#define STRINGID_MONHEARINGFLUTEAWOKE 374 +#define STRINGID_TRAINER2CLASS 375 +#define STRINGID_TRAINER2NAME 376 +#define STRINGID_PLAYERWHITEDOUT 377 +#define STRINGID_MONTOOSCAREDTOMOVE 378 +#define STRINGID_GHOSTGETOUTGETOUT 379 +#define STRINGID_SILPHSCOPEUNVEILED 380 +#define STRINGID_GHOSTWASMAROWAK 381 +#define STRINGID_TRAINER1MON1COMEBACK 382 +#define STRINGID_TRAINER1WINTEXT 383 +#define STRINGID_TRAINER1MON2COMEBACK 384 +#define STRINGID_TRAINER1MON1AND2COMEBACK 385 + +#define BATTLESTRINGS_COUNT 386 #endif // GUARD_BATTLE_STRING_IDS_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index 3809610ba..c618ffb4b 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -38,8 +38,8 @@ #define BS_ATTACKER 1 #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 -#define BS_BATTLER_0 7 #define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon +#define BS_BATTLER_0 7 #define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability #define BS_SCRIPTING 10 |