diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
| commit | 6cbea9af6dba53cf5b74a37d0161188f7eb3b3ac (patch) | |
| tree | a2c5ca082bf9359ab056743afe4811f8c378be8a /src/pokeblock.c | |
| parent | 4a71a61e58507281252eb0406fea966d6fb7ebd4 (diff) | |
| parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'src/pokeblock.c')
| -rw-r--r-- | src/pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index b9d1d94c6..b9a1f6bf3 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -74,7 +74,7 @@ extern void (*gFieldCallback)(void); extern const u16 gUnknown_0860F074[]; -extern void c2_exit_to_overworld_2_switch(void); +extern void CB2_ReturnToField(void); extern bool8 sub_81221EC(void); extern void sub_809882C(u8, u16, u8); extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); @@ -374,7 +374,7 @@ void OpenPokeblockCaseInBattle(void) void OpenPokeblockCaseOnFeeder(void) { - OpenPokeblockCase(PBLOCK_CASE_FEEDER, c2_exit_to_overworld_2_switch); + OpenPokeblockCase(PBLOCK_CASE_FEEDER, CB2_ReturnToField); } static void CB2_PokeblockMenu(void) |