diff options
| author | shinny456 <shinny456@users.noreply.github.com> | 2019-01-19 10:44:58 -0500 |
|---|---|---|
| committer | shinny456 <shinny456@users.noreply.github.com> | 2019-01-19 10:44:58 -0500 |
| commit | 1b30da21d9a0f1264ba3649e725ac1a62eca3e3a (patch) | |
| tree | 3105ab0101ffd0768589279130163a971c8365ca /src/overworld.c | |
| parent | 8a5fce7837b7314adb9bf6996ef06c009e853c29 (diff) | |
| parent | 6857b73ee348b16ecbd11d3dd12de022c08af3a5 (diff) | |
merge trainer hill changes
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/overworld.c b/src/overworld.c index 9df69e360..a67b4b68f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -19,7 +19,6 @@ #include "field_tasks.h" #include "field_weather.h" #include "fieldmap.h" -// #include "fldeff_flash.h" #include "gpu_regs.h" #include "heal_location.h" #include "link.h" @@ -50,6 +49,7 @@ #include "task.h" // #include "tileset_anim.h" #include "time_events.h" +#include "trainer_hill.h" #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" @@ -106,7 +106,6 @@ extern void apply_map_tileset2_palette(const struct MapLayout *); extern void copy_map_tileset2_to_vram_2(const struct MapLayout *); extern void RestartWildEncounterImmunitySteps(void); extern void ShowMapNamePopup(void); -extern bool32 InTrainerHill(void); extern bool32 sub_808651C(void); extern bool8 sub_80AF6A4(void); extern bool8 sub_80E909C(void); @@ -129,14 +128,11 @@ extern void WriteFlashScanlineEffectBuffer(u8); extern void sub_81AA2F8(void); extern void InitMatchCallCounters(void); extern void sub_80EDB44(void); -extern void sub_81D64C0(void); extern void InitFieldMessageBox(void); extern void copy_map_tileset1_to_vram(const struct MapLayout *); extern void copy_map_tileset2_to_vram(const struct MapLayout *); extern void FieldUpdateBgTilemapScroll(void); extern void TransferTilesetAnimsBuffer(void); -extern bool32 sub_81D5F48(void); -extern u8 GetCurrentTrainerHillMapId(void); extern bool8 warp0_in_pokecenter(void); extern void ResetAllPicSprites(void); extern void FieldEffectActiveListClear(void); |