dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

up to x50

Browse Source
This commit is contained in:
DizzyEggg
2017-09-24 00:29:52 +02:00
parent 7bb0fcf182
commit 898d0b20ad
10 changed files with 422 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/battle.h
View File

@@ -561,23 +561,9 @@ struct BattleStruct
u8 field_52;
u8 sentInPokes;
u8 field_54[4];
u8 field_58;
u8 field_59;
u8 field_5A;
u8 field_5B;
u8 field_58[4];
u8 field_5C[4];
u8 field_60;
u8 field_61;
u8 field_62;
u8 field_63;
u8 field_64;
u8 field_65;
u8 field_66;
u8 field_67;
u8 field_68;
u8 field_69;
u8 field_6A;
u8 field_6B;
u8 field_60[4][3];
u8 field_6C;
u8 field_6D;
u8 field_6E;
@@ -792,6 +778,8 @@ extern struct BattleStruct* gBattleStruct;
#define ATK48_BIT_x4 0x4
#define ATK48_LOWER_FAIL_CHECK 0x8
#define ATK4F_DONT_CHECK_STATUSES 0x80
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE(n)((n & 0xF0) >> 4) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit
@@ -840,6 +828,7 @@ void PrepareStringBattle(u16 stringId, u8 bank);
u8 GetBattleBank(u8 caseId);
void UndoEffectsAfterFainting(void);
bool8 HasMoveFailed(u8 bank);
void SwitchInClearStructs(void);
// battle_3
void BattleScriptPush(const u8* bsPtr);

4
include/battle_controllers.h
View File

@@ -11,6 +11,10 @@ void EmitFaintAnimation(u8 bufferId);
void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
void EmitReturnPokeToBall(u8 bufferId, u8 arg1);
void EmitGetAttributes(u8 bufferId, u8 arg1, u8 arg2);
void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, const u8* arg4);
void MarkBufferBankForExecution(u8 bank);

3
include/pokemon.h
View File

@@ -623,6 +623,9 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality);
void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies);
bool8 IsTradedMon(struct Pokemon *mon);
void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality);
s32 sub_806D864(u16 a1);
bool16 sub_806D82C(u8 id);
#include "sprite.h"