summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYamaArashi <YamaArashi@users.noreply.github.com>2016-12-16 17:48:14 -0800
committerGitHub <noreply@github.com>2016-12-16 17:48:14 -0800
commit1d5641f054a69f24ad0ea22232a20d4e70d5cb31 (patch)
tree0ddd50dc6e9b3cdeeddc19dcd5be334b7f7ce4ef /include
parentbf434629af83d7193db0d6c7f0e690ac9301e841 (diff)
parent2b99f7bcec8a658c502e104f735cb638047f0de7 (diff)
Merge pull request #129 from marijnvdwerf/decompile/money
Decompile money
Diffstat (limited to 'include')
-rw-r--r--include/asm.inc.h9
-rw-r--r--include/money.h17
-rw-r--r--include/text.h1
3 files changed, 18 insertions, 9 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 7585e70e1..c9d43c5b9 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -297,15 +297,6 @@ void *picbox_close(void);
// asm/naming_screen.o
void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4);
-// asm/money.o
-bool8 IsEnoughMoney(u32, u32);
-void sub_80B79B8(u32 *, u32);
-void sub_80B79E0(u32 *, u32);
-void sub_80B7AEC(u32, u8 left, u8 top);
-void sub_80B7BEC(u32, u8, u8);
-void sub_80B7C14(u32, u8, u8);
-void RemoveMoneyLabelObject(u8, u8);
-
// asm/secret_base.o
void sub_80BB5B4(void);
u8 sub_80BBB24(void);
diff --git a/include/money.h b/include/money.h
new file mode 100644
index 000000000..49015ee19
--- /dev/null
+++ b/include/money.h
@@ -0,0 +1,17 @@
+#ifndef GUARD_MONEY_H
+#define GUARD_MONEY_H
+
+bool8 IsEnoughMoney(u32, u32);
+void sub_80B79B8(u32 *, u32);
+void sub_80B79E0(u32 *, u32);
+void sub_80B79F8(u8 *buffer, u32 arg1, u8 arg2);
+void sub_80B7A94(u32 arg0, u8 arg1, u8 x, u8 y);
+void sub_80B7AEC(u32, u8 left, u8 top);
+void sub_80B7B34(void);
+void sub_80B7BEC(u32, u8, u8);
+void sub_80B7C14(u32, u8, u8);
+void RemoveMoneyLabelObject(u8, u8);
+bool8 sub_80B7CE8(void);
+void sub_80B7D0C(void);
+
+#endif // GUARD_MONEY_H
diff --git a/include/text.h b/include/text.h
index d0d418eab..2c66f30dc 100644
--- a/include/text.h
+++ b/include/text.h
@@ -4,6 +4,7 @@
#define CHAR_SPACE 0x00
#define CHAR_QUESTION_MARK 0xAC
#define CHAR_HYPHEN 0xAE
+#define CHAR_CURRENCY 0xB7
#define CHAR_COLON 0xF0
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
#define PLACEHOLDER_BEGIN 0xFD // string placeholder