summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-12 22:55:39 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-12 22:55:39 -0500
commit2265d49ac2e8868e0b3362f8e7a4d22355eed202 (patch)
treee893041efd23c489e97fcd2c6a0cfdeeb2aee0cc /include
parenta6db7b2419e0130a7f9686edd998764dc205d449 (diff)
decompiled up to sub_81B5A8C
Diffstat (limited to 'include')
-rw-r--r--include/easy_chat.h3
-rwxr-xr-xinclude/fldeff_softboiled.h1
-rw-r--r--include/item_menu.h1
-rw-r--r--include/link_rfu.h1
-rw-r--r--include/pokemon_icon.h2
-rw-r--r--include/region_map.h1
-rw-r--r--include/rom_8011DC0.h4
-rw-r--r--include/strings.h16
-rw-r--r--include/trade.h5
9 files changed, 34 insertions, 0 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 541fa6c1b..23fd9ed83 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1,6 +1,8 @@
#ifndef GUARD_EASYCHAT_H
#define GUARD_EASYCHAT_H
+#include "main.h"
+
void InitEasyChatPhrases(void);
void easy_chat_input_maybe(void);
u8 * CopyEasyChatWord(u8 *dest, u16 word);
@@ -12,5 +14,6 @@ u16 sub_811EE38(u16 group);
u16 sub_811F01C(void);
bool16 EasyChat_GetNumWordsInGroup(u8);
u16 sub_811EE90(u16);
+void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam);
#endif // GUARD_EASYCHAT_H
diff --git a/include/fldeff_softboiled.h b/include/fldeff_softboiled.h
index 8579c6cfe..abb3c7913 100755
--- a/include/fldeff_softboiled.h
+++ b/include/fldeff_softboiled.h
@@ -2,5 +2,6 @@
#define GUARD_FLDEFF_SOFTBOILED_H
void sub_81615A8(u8 taskId);
+void sub_8161560(u8 taskId);
#endif // GUARD_FLDEFF_SOFTBOILED_H
diff --git a/include/item_menu.h b/include/item_menu.h
index 649eb934c..6214c69fc 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -60,5 +60,6 @@ void CB2_BagMenuFromStartMenu(void);
u8 sub_81ABB2C(u8 pocketId);
bool8 UseRegisteredKeyItemOnField(void);
void CB2_GoToSellMenu(void);
+void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
#endif //GUARD_item_menu_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index 426565e56..e394e2611 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -2,6 +2,7 @@
#define GUARD_LINK_RFU_H
#include "librfu.h"
+#include "link.h"
// Exported type declarations
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index f1c8a3e61..17c7d5573 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -16,5 +16,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
u8 UpdateMonIconFrame(struct Sprite *sprite);
void LoadMonIconPalette(u16 species);
void sub_80D328C(struct Sprite *sprite);
+void sub_80D3014(struct Sprite *sprite);
+void sub_80D32C8(struct Sprite *sprite, u8 animNum);
#endif // GUARD_POKEMON_ICON_H
diff --git a/include/region_map.h b/include/region_map.h
index 0c82232cf..ed1c1a201 100644
--- a/include/region_map.h
+++ b/include/region_map.h
@@ -107,6 +107,7 @@ u8 *sub_8124610(u8 *dest, u16 mapSecId);
u16 CorrectSpecialMapSecId(u16 mapSecId);
void sub_8122D88(struct RegionMap *regionMap);
void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y);
+void MCB2_FlyMap(void);
extern const struct RegionMapLocation gRegionMapEntries[];
diff --git a/include/rom_8011DC0.h b/include/rom_8011DC0.h
index 1aa663bc7..c1bdbdf34 100644
--- a/include/rom_8011DC0.h
+++ b/include/rom_8011DC0.h
@@ -5,6 +5,10 @@
// Exported RAM declarations
+extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38;
+extern u16 gUnknown_02022C3C;
+extern u8 gUnknown_02022C3E;
+
// Exported ROM declarations
void sub_8018438(void);
diff --git a/include/strings.h b/include/strings.h
index 0ec3526ea..f46554cc5 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -407,6 +407,22 @@ extern const u8 gText_SwitchedPkmnItem[];
extern const u8 gText_BagFullCouldNotRemoveItem[];
extern const u8 gText_PkmnCantParticipate[];
extern const u8 gText_PkmnNotHolding[];
+extern const u8 gText_ThrowAwayItem[];
+extern const u8 gText_ItemThrownAway[];
+extern const u8 gText_SendMailToPC[];
+extern const u8 gText_MailSentToPC[];
+extern const u8 gText_PCMailboxFull[];
+extern const u8 gText_MailMessageWillBeLost[];
+extern const u8 gText_MailTakenFromPkmn[];
+extern const u8 gText_NoMoreThanVar1Pkmn[];
+extern const u8 gText_PkmnCantBeTradedNow[];
+extern const u8 gText_EggCantBeTradedNow[];
+extern const u8 gText_OnlyPkmnForBattle[];
+extern const u8 gJPText_PutVar1IntoSpinner[];
+extern const u8 gText_PauseUntilPress[];
+extern const u8 gText_CantUseUntilNewBadge[];
+extern const u8 gText_ReturnToHealingSpot[];
+extern const u8 gText_EscapeFromHere[];
//pokedex text
extern const u8 gText_CryOf[];
diff --git a/include/trade.h b/include/trade.h
index af4da0015..e3c18bffd 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -1,6 +1,8 @@
#ifndef GUARD_TRADE_H
#define GUARD_TRADE_H
+#include "link_rfu.h"
+
// Exported type declarations
// Exported RAM declarations
@@ -10,5 +12,8 @@
s32 sub_807A728(void);
void sub_80773AC(void);
void sub_807AE50(void);
+int sub_807A8D0(u32 /* probably wrong */, u16, u16, u8);
+int sub_807A7E0(u32 /* probably wrong */, u32 /* probably wrong */, u16, u16, u16, u16, u8);
+int sub_807A918(struct Pokemon*, u16);
#endif //GUARD_TRADE_H