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

Merge branch 'master' into berry_fix_program

Browse Source
This commit is contained in:
PikalaxALT
2017-09-18 19:24:09 -04:00
parent d48c4ab7a9 e23fb64dad
commit 60f8369a89
21 changed files with 6969 additions and 11534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6431
src/battle_3.c Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/battle_ai.c
View File

@@ -87,7 +87,7 @@ static u8 BattleAI_ChooseMoveOrAction_Singles(void);
static u8 BattleAI_ChooseMoveOrAction_Doubles(void);
static void RecordLastUsedMoveByTarget(void);
static void BattleAI_DoAIProcessing(void);
static void AIStackPushVar(u8 *);
static void AIStackPushVar(const u8 *);
static bool8 AIStackPop(void);
static void BattleAICmd_if_random_less_than(void);
@@ -192,7 +192,7 @@ static void BattleAICmd_if_holds_item(void);
// ewram
EWRAM_DATA u8 *gAIScriptPtr = NULL;
EWRAM_DATA const u8 *gAIScriptPtr = NULL;
EWRAM_DATA static u8 sBank_AI = 0;
// const rom data
@@ -2902,7 +2902,7 @@ static void BattleAICmd_if_flash_fired(void)
gAIScriptPtr += 6;
}
static void AIStackPushVar(u8 *var)
static void AIStackPushVar(const u8 *var)
{
gBattleResources->AI_ScriptsStack->ptr[gBattleResources->AI_ScriptsStack->size++] = var;
}

4
src/hall_of_fame.c Normal file
View File

@@ -0,0 +1,4 @@
#include "global.h"
#include "hall_of_fame.h"