Merge branch 'master' into quest_log

2018-10-12 20:18:48 -04:00
parent e143072f96 bd88c80379
commit 6c52f7ce04
88 changed files with 8986 additions and 17161 deletions
@@ -28,7 +28,7 @@
 #define SIDE_OPPONENT   0x1

 #define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank]))
-#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE))
+#define GET_BANK_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE))
 #define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE))

 #define BATTLE_TYPE_DOUBLE          0x0001
@@ -47,7 +47,7 @@
 #define BATTLE_TYPE_LEGENDARY       0x2000
 #define BATTLE_TYPE_REGI            0x4000
 #define BATTLE_TYPE_TWO_OPPONENTS   0x8000
-#define BATTLE_TYPE_DOME            0x10000
+#define BATTLE_TYPE_DOME            0x10000 // this is used in pokemon.c, but its clearly not the correct name for FR/LG. TODO: Fix these
 #define BATTLE_TYPE_PALACE          0x20000
 #define BATTLE_TYPE_ARENA           0x40000
 #define BATTLE_TYPE_FACTORY         0x80000
@@ -210,7 +210,7 @@ struct TrainerMonNoItemDefaultMoves
 };

 u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg);
-u8 GetBankSide(u8 bank);
+u8 GetBattlerSide(u8 bank);

 struct TrainerMonItemDefaultMoves
 {
@@ -545,7 +545,7 @@ struct BattleStruct
    u8 field_46;
    u8 field_47;
    u8 focusPunchBank;
-    u8 field_49;
+    u8 battlerPreventingSwitchout;
    u8 moneyMultiplier;
    u8 savedTurnActionNumber;
    u8 switchInAbilitiesCounter;
@@ -598,7 +598,7 @@ struct BattleStruct
    u8 field_A7;
    u16 hpOnSwitchout[2];
    u32 savedBattleTypeFlags;
-    u8 field_B0;
+    u8 abilityPreventingSwitchout;
    u8 hpScale;
    u8 synchronizeMoveEffect;
    u8 field_B3;
@@ -646,6 +646,9 @@ extern struct BattleStruct* gBattleStruct;
        typeArg = gBattleMoves[move].type;                  \
 }

+#define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY)
+#define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY)
+
 #define MOVE_EFFECT_SLEEP               0x1
 #define MOVE_EFFECT_POISON              0x2
 #define MOVE_EFFECT_BURN                0x3
@@ -847,9 +850,9 @@ enum
 };

 // rom_80A5C6C
-u8 GetBankSide(u8 bank);
-u8 GetBankIdentity(u8 bank);
-u8 GetBankByIdentity(u8 bank);
+u8 GetBattlerSide(u8 bank);
+u8 GetBattlerPosition(u8 bank);
+u8 GetBattlerAtPosition(u8 bank);

 struct BattleSpriteInfo
 {
@@ -961,5 +964,17 @@ extern u16 gLastUsedItem;
 extern u32 gBattleTypeFlags;
 extern struct MonSpritesGfx* gMonSpritesGfxPtr;
 extern u16 gTrainerBattleOpponent_A;
+extern u16 gMoveToLearn;
+extern u16 gBattleMovePower;
+extern struct BattleEnigmaBerry gEnigmaBerries[MAX_BATTLERS_COUNT];
+extern u16 gCurrentMove;
+extern u8 gCritMultiplier;
+extern u16 gBattleWeather;
+extern u8 gLastUsedAbility;
+extern u8 gBattlerInMenuId;
+extern u8 gPotentialItemEffectBattler;
+extern u8 gBattlersCount;
+extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
+extern s32 gBattleMoveDamage;

 #endif // GUARD_BATTLE_H
@@ -181,7 +181,7 @@ void sub_8033648(void);
 void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);

 // emitters
-void EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
+void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
 void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
 void EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
 void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused
@@ -30,6 +30,10 @@
 #define ABILITYEFFECT_CHECK_ON_FIELD            0x13
 #define ABILITYEFFECT_SWITCH_IN_WEATHER         0xFF

+#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0))
+#define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0))
+#define ABILITY_ON_FIELD2(abilityId)(AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0))
+
 #define ITEMEFFECT_ON_SWITCH_IN                 0x0

 #define WEATHER_HAS_EFFECT ((!AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_CLOUD_NINE, 0, 0) && !AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, ABILITY_AIR_LOCK, 0, 0)))
@@ -80,5 +84,6 @@ void ClearFuryCutterDestinyBondGrudge(u8 bank);
 void HandleAction_RunBattleScript(void);
 u8 GetMoveTarget(u16 move, u8 useMoveTarget);
 u8 IsMonDisobedient(void);
+void MarkBufferBankForExecution(u8 battlerId);

 #endif // GUARD_BATTLE_UTIL_H
@@ -1286,6 +1286,13 @@
 #define TRAINERS_FLAG_NO    0x356
 #define CODE_FLAGS          (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860

+// TODO: Find what these are
+#define FLAG_UNK820         0x820
+#define FLAG_UNK824         0x824
+#define FLAG_UNK826         0x826
+
+#define FLAG_UNK843         0x843
+
 // SYSTEM FLAGS

 // 0x860
@@ -390,4 +390,7 @@
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8

+// Check if the item is one that can be used on a Pokemon.
+#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
+
 #endif  // GUARD_CONSTANTS_ITEMS_H
@@ -0,0 +1,80 @@
+#ifndef GUARD_CONSTANTS_POKEMON_H
+#define GUARD_CONSTANTS_POKEMON_H
+
+// Pokemon types
+#define TYPE_NORMAL   0x00
+#define TYPE_FIGHTING 0x01
+#define TYPE_FLYING   0x02
+#define TYPE_POISON   0x03
+#define TYPE_GROUND   0x04
+#define TYPE_ROCK     0x05
+#define TYPE_BUG      0x06
+#define TYPE_GHOST    0x07
+#define TYPE_STEEL    0x08
+#define TYPE_MYSTERY  0x09
+#define TYPE_FIRE     0x0a
+#define TYPE_WATER    0x0b
+#define TYPE_GRASS    0x0c
+#define TYPE_ELECTRIC 0x0d
+#define TYPE_PSYCHIC  0x0e
+#define TYPE_ICE      0x0f
+#define TYPE_DRAGON   0x10
+#define TYPE_DARK     0x11
+#define NUMBER_OF_MON_TYPES     0x12
+
+// Pokemon egg groups
+#define EGG_GROUP_NONE 0
+#define EGG_GROUP_MONSTER 1
+#define EGG_GROUP_WATER_1 2
+#define EGG_GROUP_BUG 3
+#define EGG_GROUP_FLYING 4
+#define EGG_GROUP_FIELD 5
+#define EGG_GROUP_FAIRY 6
+#define EGG_GROUP_GRASS 7
+#define EGG_GROUP_HUMAN_LIKE 8
+#define EGG_GROUP_WATER_3 9
+#define EGG_GROUP_MINERAL 10
+#define EGG_GROUP_AMORPHOUS 11
+#define EGG_GROUP_WATER_2 12
+#define EGG_GROUP_DITTO 13
+#define EGG_GROUP_DRAGON 14
+#define EGG_GROUP_UNDISCOVERED 15
+
+// Pokemon natures
+#define NATURE_HARDY 0
+#define NATURE_LONELY 1
+#define NATURE_BRAVE 2
+#define NATURE_ADAMANT 3
+#define NATURE_NAUGHTY 4
+#define NATURE_BOLD 5
+#define NATURE_DOCILE 6
+#define NATURE_RELAXED 7
+#define NATURE_IMPISH 8
+#define NATURE_LAX 9
+#define NATURE_TIMID 10
+#define NATURE_HASTY 11
+#define NATURE_SERIOUS 12
+#define NATURE_JOLLY 13
+#define NATURE_NAIVE 14
+#define NATURE_MODEST 15
+#define NATURE_MILD 16
+#define NATURE_QUIET 17
+#define NATURE_BASHFUL 18
+#define NATURE_RASH 19
+#define NATURE_CALM 20
+#define NATURE_GENTLE 21
+#define NATURE_SASSY 22
+#define NATURE_CAREFUL 23
+#define NATURE_QUIRKY 24
+
+// Pokemon Stats
+#define STAT_HP 0
+#define STAT_ATK 1
+#define STAT_DEF 2
+#define STAT_SPEED 3
+#define STAT_SPATK 4
+#define STAT_SPDEF 5
+#define STAT_ACC 6 // only in battles
+#define STAT_EVASION 7 // only in battles
+
+#endif // GUARD_CONSTANTS_POKEMON_H
@@ -28,6 +28,7 @@ char* strcpy(char *dst0, const char *src0);
 // Converts a number to Q4.12 fixed-point format
 #define Q_4_12(n)  ((s16)((n) * 4096))

+#define POKEMON_SLOTS_NUMBER 412
 #define POKEMON_NAME_LENGTH 10
 #define OT_NAME_LENGTH 7

@@ -239,6 +240,18 @@ struct SaveBlock2

 extern struct SaveBlock2 *gSaveBlock2Ptr;

+#define PARTY_SIZE 6
+
+struct SecretBaseParty
+{
+    u32 personality[PARTY_SIZE];
+    u16 moves[PARTY_SIZE * 4];
+    u16 species[PARTY_SIZE];
+    u16 heldItems[PARTY_SIZE];
+    u8 levels[PARTY_SIZE];
+    u8 EVs[PARTY_SIZE];
+};
+
 struct SecretBaseRecord
 {
    /*0x1A9C*/ u8 secretBaseId;
@@ -246,7 +259,7 @@ struct SecretBaseRecord
    /*0x1A9D*/ u8 gender:1;
    /*0x1A9D*/ u8 sbr_field_1_5:1;
    /*0x1A9D*/ u8 sbr_field_1_6:2;
-    /*0x1A9E*/ u8 trainerName[OT_NAME_LENGTH];
+    /*0x1A9E*/ u8 trainerName[7]; // TODO: Change PLAYER_NAME_LENGTH to 7
    /*0x1AA5*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
    /*0x1AA9*/ u8 language;
    /*0x1AAA*/ u16 sbr_field_e;
@@ -254,12 +267,7 @@ struct SecretBaseRecord
    /*0x1AAD*/ u8 sbr_field_11;
    /*0x1AAE*/ u8 decorations[16];
    /*0x1ABE*/ u8 decorationPos[16];
-    /*0x1AD0*/ u32 partyPersonality[6];
-    /*0x1AE8*/ u16 partyMoves[6 * 4];
-    /*0x1B18*/ u16 partySpecies[6];
-    /*0x1B24*/ u16 partyHeldItems[6];
-    /*0x1B2E*/ u8 partyLevels[6];
-    /*0x1B34*/ u8 partyEVs[6];
+    /*0x1AD0*/ struct SecretBaseParty party;
 };

 #include "constants/game_stat.h"
@@ -535,7 +543,9 @@ struct SaveBlock1
    /*0x1000*/ u16 vars[VARS_COUNT];
    /*0x1200*/ u8 filler1200[0x100];
    /*0x1300*/ struct QuestLog questLog[4];
-    /*0x2ca0*/ u8 filler2CA0[0x7c0];
+    /*0x2ca0*/ u8 filler2CA0[0x44C];
+	/*0x30EC*/ struct EnigmaBerry enigmaBerry;
+	/*0x3120*/ u8 filler3120[0x340];
    /*0x3460*/ struct MysteryEventStruct unk_3460;
    /*0x3464*/ u8 filler_3464[0x1b8];
    /*0x361C*/ struct RamScript ramScript;
@@ -69,7 +69,7 @@ struct LinkPlayer
    /* 0x08 */ u8 name[11];
    /* 0x13 */ u8 gender;
    /* 0x14 */ u32 linkType;
-    /* 0x18 */ u16 lp_field_18; // battle bank in battles
+    /* 0x18 */ u16 id; // battle bank in battles
    /* 0x1A */ u16 language;
 };

@@ -511,23 +511,22 @@ struct Evolution

 #define EVOS_PER_MON 5

-struct EvolutionData
-{
-    struct Evolution evolutions[EVOS_PER_MON];
-};
-
 extern u8 gPlayerPartyCount;
 extern struct Pokemon gPlayerParty[PARTY_SIZE];
 extern u8 gEnemyPartyCount;
 extern struct Pokemon gEnemyParty[PARTY_SIZE];
 extern const struct BaseStats gBaseStats[];
 extern const u8 *const gItemEffectTable[];
-extern const struct EvolutionData gEvolutionTable[];
+extern const struct Evolution gEvolutionTable[][EVOS_PER_MON];
+extern const u8 gStatStageRatios[][2];
+extern struct SpriteTemplate gMultiuseSpriteTemplate;
 extern struct PokemonStorage* gPokemonStoragePtr;
 extern const u32 gExperienceTables[][MAX_MON_LEVEL + 1];
 extern const u16 *const gLevelUpLearnsets[];
+extern const u8 gFacilityClassToPicIndex[];
+extern const u8 gFacilityClassToTrainerClass[];

-u8 CountAliveMonsInBattle(u8 caseId);
+u8 CountAliveMons(u8 caseId);
 #define BATTLE_ALIVE_EXCEPT_ACTIVE  0
 #define BATTLE_ALIVE_ATK_SIDE       1
 #define BATTLE_ALIVE_DEF_SIDE       2
@@ -558,6 +557,8 @@ void GiveMonInitialMoveset(struct Pokemon *mon);
 void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon);
 void DeleteFirstMoveAndGiveMoveToMon(struct Pokemon *mon, u16 move);
 void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
+bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
+bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e);

 u8 GetMonGender(struct Pokemon *mon);
 u8 GetBoxMonGender(struct BoxPokemon *boxMon);
@@ -653,6 +654,7 @@ u8 GetSecretBaseTrainerPicIndex(void);
 bool8 TryIncrementMonLevel(struct Pokemon *mon);
 void BoxMonToMon(struct BoxPokemon *srcMon, struct Pokemon *dstMon);
 u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves);
+bool8 HealStatusConditions(struct Pokemon *mon, u32 battlePartyId, u32 healMask, u8 battlerId);

 #include "sprite.h"