From 10470ef536132c317f0c478e42ad37657a0f00aa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 28 Nov 2017 23:02:09 +0100 Subject: start working on battle setup --- 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 d3d40af28..38abcdd4c 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -105,7 +105,7 @@ void SafariZoneRetirePrompt(void) ScriptContext1_SetupScript(EventScript_2A4B6F); } -void sub_80FC190(void) +void CB2_EndSafariBattle(void) { sSafariZoneFleedMons += gBattleResults.field_1F; if (gBattleOutcome == BATTLE_CAUGHT) -- cgit v1.2.3 From 8ac17e09486006c7d2d066173c8fa907aceb72de Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 11 Dec 2017 16:52:28 +0100 Subject: move data from asm to pokeblock.c --- 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 d3d40af28..53027b57e 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -5,6 +5,7 @@ #include "main.h" #include "battle.h" #include "string_util.h" +#include "pokeblock.h" struct PokeblockFeeder { @@ -24,7 +25,6 @@ extern u8 EventScript_2A4B8A[]; extern u8 EventScript_2A4B6F[]; extern u8 EventScript_2A4B4C[]; extern u8 EventScript_2A4B9B[]; -extern const u8* const gPokeblockNames[]; extern void sub_80EE44C(u8, u8); extern void IncrementGameStat(u8 index); -- cgit v1.2.3