summaryrefslogtreecommitdiff
path: root/src/pokemon_1.c
diff options
context:
space:
mode:
authorMarijn van der Werf <marijn.vanderwerf@gmail.com>2016-12-02 19:06:22 +0100
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-12-02 10:06:22 -0800
commit1f222c04ef1d10ff5a5c6bb98cd4380ecf2bba86 (patch)
tree573d6368233110b17292e498f49532c1c9244404 /src/pokemon_1.c
parent4258e60771aa9fdabd678930eca534423bd371b8 (diff)
[WIP] Extract all external function declarations to headers (#114)
* Extract other external function declarations * Fix GBA compilation * Revert `sub_803C434` to asm
Diffstat (limited to 'src/pokemon_1.c')
-rw-r--r--src/pokemon_1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index 0c34279f7..3971e08dd 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -1,7 +1,9 @@
#include "global.h"
+#include "asm.h"
#include "text.h"
#include "string_util.h"
#include "pokemon.h"
+#include "rom4.h"
#include "species.h"
#include "main.h"
#include "rng.h"
@@ -13,8 +15,6 @@
//Extracts the lower 16 bits of a 32-bit number
#define LOHALF(n) ((n) & 0xFFFF)
-extern u8 sav1_map_get_name();
-
extern struct Pokemon gPlayerParty[6]; // 0x3004360
extern struct Pokemon gEnemyParty[6]; // 0x30045C0