diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/battle_setup.h | 2 | ||||
| -rw-r--r-- | include/constants/battle_setup.h | 2 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 6 | ||||
| -rw-r--r-- | include/strings.h | 76 | ||||
| -rw-r--r-- | include/trainer_see.h | 2 |
7 files changed, 48 insertions, 46 deletions
diff --git a/include/battle.h b/include/battle.h index c4a0fe9a5..9e67e8ec5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -479,10 +479,10 @@ struct BattleStruct u16 changedItems[MAX_BATTLERS_COUNT]; u8 intimidateBattler; u8 switchInItemsCounter; - u8 field_DA; + u8 arenaTurnCounter; u8 turnSideTracker; u8 fillerDC[0xDF-0xDC]; - u8 field_DF; + u8 givenExpMons; // Bits for enemy party's pokemon that gave exp to player's party. u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte] u16 castformPalette[MAX_BATTLERS_COUNT][16]; u8 field_180; diff --git a/include/battle_setup.h b/include/battle_setup.h index 98c366acd..3b327e3f7 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -38,7 +38,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); -void sub_80B16D8(void); +void SetUpTrainerMovement(void); u8 GetTrainerBattleMode(void); bool8 GetTrainerFlag(void); bool8 HasTrainerBeenFought(u16 trainerId); diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 329bfa650..d98e1762f 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -10,7 +10,7 @@ #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 #define TRAINER_BATTLE_REMATCH_DOUBLE 7 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 -#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_PYRAMID 9 #define TRAINER_BATTLE_SET_TRAINER_A 10 #define TRAINER_BATTLE_SET_TRAINER_B 11 #define TRAINER_BATTLE_12 12 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1a4741574..f63d755ad 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -2,6 +2,7 @@ #define GUARD_CONSTANTS_POKEMON_H // Pokemon types +#define TYPE_NONE 0xFF #define TYPE_NORMAL 0x00 #define TYPE_FIGHTING 0x01 #define TYPE_FLYING 0x02 @@ -22,6 +23,7 @@ #define TYPE_DARK 0x11 #define NUMBER_OF_MON_TYPES 0x12 + // Pokemon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 diff --git a/include/event_scripts.h b/include/event_scripts.h index 058cec39b..7f69ef3ae 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -10,11 +10,11 @@ extern const u8 EventScript_275D0C[]; extern const u8 EventScript_275D1F[]; extern const u8 EventScript_275D2E[]; extern const u8 EventScript_271354[]; -extern const u8 EventScript_2713C2[]; +extern const u8 EventScript_DoTainerBattle[]; extern const u8 EventScript_TryDoDoubleTrainerBattle[]; -extern const u8 EventScript_271362[]; +extern const u8 EventScript_TryDoNormalTrainerBattle[]; extern const u8 EventScript_TryDoDoubleRematchBattle[]; -extern const u8 EventScript_2713D1[]; +extern const u8 EventScript_TryDoRematchBattle[]; extern const u8 EventScript_SecretPower1[]; extern const u8 EventScript_SecretPower2[]; diff --git a/include/strings.h b/include/strings.h index 887ccdfe6..22d12aa18 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1000,44 +1000,44 @@ extern const u8 gUnknown_085E8840[]; extern const u8 gUnknown_085E887C[]; extern const u8 gUnknown_085E88A6[]; extern const u8 gUnknown_085E88C8[]; -extern const u8 gUnknown_085E88DF[]; -extern const u8 gUnknown_085E88E9[]; -extern const u8 gUnknown_085E88F6[]; -extern const u8 gUnknown_085E8905[]; -extern const u8 gUnknown_085E8911[]; -extern const u8 gUnknown_085E891F[]; -extern const u8 gUnknown_085E892D[]; -extern const u8 gUnknown_085E893A[]; -extern const u8 gUnknown_085E8948[]; -extern const u8 gUnknown_085E894C[]; -extern const u8 gUnknown_085E8950[]; -extern const u8 gUnknown_085E8954[]; -extern const u8 gUnknown_085E8958[]; -extern const u8 gUnknown_085E895C[]; -extern const u8 gUnknown_085E8960[]; -extern const u8 gUnknown_085E8964[]; -extern const u8 gUnknown_085E8968[]; -extern const u8 gUnknown_085E896B[]; -extern const u8 gUnknown_085E896F[]; -extern const u8 gUnknown_085E8974[]; -extern const u8 gUnknown_085E897B[]; -extern const u8 gUnknown_085E8981[]; -extern const u8 gUnknown_085E8987[]; -extern const u8 gUnknown_085E898D[]; -extern const u8 gUnknown_085E8994[]; -extern const u8 gUnknown_085E8999[]; -extern const u8 gUnknown_085E899F[]; -extern const u8 gUnknown_085E89A4[]; -extern const u8 gUnknown_085E89BB[]; -extern const u8 gUnknown_085E89D4[]; -extern const u8 gUnknown_085E8A02[]; -extern const u8 gUnknown_085E8A37[]; -extern const u8 gUnknown_085E8A73[]; -extern const u8 gUnknown_085E8AAF[]; -extern const u8 gUnknown_085E8AEA[]; -extern const u8 gUnknown_085E8B25[]; -extern const u8 gUnknown_085E8B26[]; -extern const u8 gUnknown_085E8B35[]; +extern const u8 gText_DexHoennTitle[]; +extern const u8 gText_DexNatTitle[]; +extern const u8 gText_DexSortNumericalTitle[]; +extern const u8 gText_DexSortAtoZTitle[]; +extern const u8 gText_DexSortHeaviestTitle[]; +extern const u8 gText_DexSortLightestTitle[]; +extern const u8 gText_DexSortTallestTitle[]; +extern const u8 gText_DexSortSmallestTitle[]; +extern const u8 gText_DexSearchAlphaABC[]; +extern const u8 gText_DexSearchAlphaDEF[]; +extern const u8 gText_DexSearchAlphaGHI[]; +extern const u8 gText_DexSearchAlphaJKL[]; +extern const u8 gText_DexSearchAlphaMNO[]; +extern const u8 gText_DexSearchAlphaPQR[]; +extern const u8 gText_DexSearchAlphaSTU[]; +extern const u8 gText_DexSearchAlphaVWX[]; +extern const u8 gText_DexSearchAlphaYZ[]; +extern const u8 gText_DexSearchColorRed[]; +extern const u8 gText_DexSearchColorBlue[]; +extern const u8 gText_DexSearchColorYellow[]; +extern const u8 gText_DexSearchColorGreen[]; +extern const u8 gText_DexSearchColorBlack[]; +extern const u8 gText_DexSearchColorBrown[]; +extern const u8 gText_DexSearchColorPurple[]; +extern const u8 gText_DexSearchColorGray[]; +extern const u8 gText_DexSearchColorWhite[]; +extern const u8 gText_DexSearchColorPink[]; +extern const u8 gText_DexHoennDescription[]; +extern const u8 gText_DexNatDescription[]; +extern const u8 gText_DexSortNumericalDescription[]; +extern const u8 gText_DexSortAtoZDescription[]; +extern const u8 gText_DexSortHeaviestDescription[]; +extern const u8 gText_DexSortLightestDescription[]; +extern const u8 gText_DexSortTallestDescription[]; +extern const u8 ggText_DexSortSmallestDescription[]; +extern const u8 gText_DexEmptyString[]; +extern const u8 gText_DexSearchDontSpecify[]; +extern const u8 gText_DexSearchTypeNone[]; extern const u8 gUnknown_085EAEC3[]; extern const u8 gUnknown_085EAED6[]; diff --git a/include/trainer_see.h b/include/trainer_see.h index 43f8b82d2..a9b92d71b 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -19,7 +19,7 @@ extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); void sub_80B4578(struct EventObject *var); void EndTrainerApproach(void); -void sub_80B45D0(void); +void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); |