From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- src/safari_zone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/safari_zone.c') diff --git a/src/safari_zone.c b/src/safari_zone.c index 8c2b63469..74f1a9f0b 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -1,6 +1,6 @@ +#include "field_fadetransition.h" #include "global.h" #include "safari_zone.h" -#include "asm.h" #include "event_data.h" #include "field_player_avatar.h" #include "main.h" -- cgit v1.2.3 From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:01:42 +0200 Subject: Sort includes --- src/safari_zone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/safari_zone.c') diff --git a/src/safari_zone.c b/src/safari_zone.c index 74f1a9f0b..f3fc2a0ad 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -1,7 +1,7 @@ -#include "field_fadetransition.h" #include "global.h" #include "safari_zone.h" #include "event_data.h" +#include "field_fadetransition.h" #include "field_player_avatar.h" #include "main.h" #include "rom4.h" -- cgit v1.2.3 From 8435b8835a9b5c5348b2849e943e36ffdd8c76b3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 15 Jun 2017 03:34:11 -0400 Subject: move player_pc data to C file and do a lot of labeling --- src/safari_zone.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/safari_zone.c') diff --git a/src/safari_zone.c b/src/safari_zone.c index 8c2b63469..986412826 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -29,7 +29,7 @@ EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 gSafariZoneStepCounter = 0; EWRAM_DATA static struct PokeblockFeeder gPokeblockFeeders[NUM_POKEBLOCK_FEEDERS] = {0}; -extern void (*gUnknown_0300485C)(void); +extern void (*gFieldCallback)(void); extern u8 gUnknown_081C340A; extern u8 gUnknown_081C342D; @@ -103,7 +103,7 @@ void sub_80C824C(void) { ScriptContext2_RunNewScript(&gUnknown_081C340A); warp_in(); - gUnknown_0300485C = sub_8080E44; + gFieldCallback = sub_8080E44; SetMainCallback2(CB2_LoadMap); } else if (gUnknown_02024D26 == 7) -- cgit v1.2.3