diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /include/trade_scene.h | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'include/trade_scene.h')
| -rw-r--r-- | include/trade_scene.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trade_scene.h b/include/trade_scene.h index 13cb1a56c..52e80e418 100644 --- a/include/trade_scene.h +++ b/include/trade_scene.h @@ -7,11 +7,11 @@ void DoInGameTradeScene(void); void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed); u16 GetInGameTradeSpeciesInfo(void); u16 GetTradeSpecies(void); -void sub_805049C(void); -void sub_80504B0(void); +void InitTradeSequenceBgGpuRegs(void); +void LinkTradeDrawWindow(void); void LoadTradeAnimGfx(void); extern const u16 gUnknown_826601C[]; -extern const struct WindowTemplate gUnknown_826D1CC; +extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate; #endif //GUARD_TRADE_SCENE_H |