diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
| commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
| tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /include/trade_scene.h | |
| parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
| parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) | |
fix PR merge 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 |