Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-29 05:18:30 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf

Browse Source
This commit is contained in:
Bassoonian
2024-08-07 19:05:46 +02:00
parent 9f845a79e5 312749dd31
commit cb4e687917
9 changed files with 571 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/battle.h
View File

@@ -839,11 +839,24 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER
gBattleMons[battlerId].type3 = TYPE_MYSTERY; \
}
<<<<<<< HEAD
#define RESTORE_BATTLER_TYPE(battlerId) \
{ \
gBattleMons[battlerId].type1 = gSpeciesInfo[gBattleMons[battlerId].species].types[0]; \
gBattleMons[battlerId].type2 = gSpeciesInfo[gBattleMons[battlerId].species].types[1]; \
gBattleMons[battlerId].type3 = TYPE_MYSTERY; \
=======
#define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY)
#define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY)
#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0))
#define IS_BATTLER_OF_TYPE(battlerId, type)((gBattleMons[battlerId].types[0] == type || gBattleMons[battlerId].types[1] == type))
#define SET_BATTLER_TYPE(battlerId, type) \
{ \
gBattleMons[battlerId].types[0] = type; \
gBattleMons[battlerId].types[1] = type; \
>>>>>>> 312749dd3109e607779bb1a15f3669ea2b0979dc
}
#define IS_BATTLER_PROTECTED(battlerId)(gProtectStructs[battlerId].protected \

4
include/battle_controllers.h
View File

@@ -125,10 +125,14 @@ struct ChooseMoveStruct
u8 currentPp[MAX_MON_MOVES];
u8 maxPp[MAX_MON_MOVES];
u16 species;
<<<<<<< HEAD
u8 monType1;
u8 monType2;
u8 monType3;
struct ZMoveData zmove;
=======
u8 monTypes[2];
>>>>>>> 312749dd3109e607779bb1a15f3669ea2b0979dc
};
enum

20
include/pokemon.h
View File

@@ -322,6 +322,7 @@ struct BattlePokemon
/*0x17*/ u32 spDefenseIV:5;
/*0x17*/ u32 abilityNum:2;
/*0x18*/ s8 statStages[NUM_BATTLE_STATS];
<<<<<<< HEAD
/*0x20*/ u16 ability;
/*0x22*/ u8 type1;
/*0x23*/ u8 type2;
@@ -342,6 +343,25 @@ struct BattlePokemon
/*0x55*/ u32 otId;
/*0x59*/ u8 metLevel;
/*0x5A*/ bool8 isShiny;
=======
/*0x20*/ u8 ability;
/*0x21*/ u8 types[2];
/*0x23*/ u8 unknown;
/*0x24*/ u8 pp[MAX_MON_MOVES];
/*0x28*/ u16 hp;
/*0x2A*/ u8 level;
/*0x2B*/ u8 friendship;
/*0x2C*/ u16 maxHP;
/*0x2E*/ u16 item;
/*0x30*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
/*0x3B*/ u8 ppBonuses;
/*0x3C*/ u8 otName[PLAYER_NAME_LENGTH + 1];
/*0x44*/ u32 experience;
/*0x48*/ u32 personality;
/*0x4C*/ u32 status1;
/*0x50*/ u32 status2;
/*0x54*/ u32 otId;
>>>>>>> 312749dd3109e607779bb1a15f3669ea2b0979dc
};
struct Evolution