summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCameron Hall <camthesaxman@users.noreply.github.com>2017-05-08 18:52:58 -0500
committerYamaArashi <YamaArashi@users.noreply.github.com>2017-05-08 16:52:58 -0700
commite75c3262f37483d3503126bebf8bf8b7b662d345 (patch)
treebd8c4561f47417cf4aa33c6da23330cee1f141d0 /include
parente6868bbdb2b9a0f00085029817d3a451781973cd (diff)
Decompile battle interface (#281)
* start decompiling * more decompilation * sub_8044804 refuses to match. moving on... * decompile sub_80451A0 * more decompilation * finish decompiling * clean up a bit * remove trailing whitespace and change tabs to spaces
Diffstat (limited to 'include')
-rw-r--r--include/songs.h6
-rw-r--r--include/text.h5
2 files changed, 7 insertions, 4 deletions
diff --git a/include/songs.h b/include/songs.h
index 01ecf9fe0..244bb9808 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -117,9 +117,9 @@ enum
SE_PN_OFF,
SE_Z_SEARCH,
SE_TAMAGO,
- SE_TB_START,
- SE_TB_KON,
- SE_TB_KARA,
+ /*0x72*/ SE_TB_START,
+ /*0x73*/ SE_TB_KON,
+ /*0x74*/ SE_TB_KARA,
SE_BIDORO,
SE_W085,
SE_W085B,
diff --git a/include/text.h b/include/text.h
index 4f52e3cdd..f01af1547 100644
--- a/include/text.h
+++ b/include/text.h
@@ -4,7 +4,10 @@
#define CHAR_SPACE 0x00
#define CHAR_QUESTION_MARK 0xAC
#define CHAR_HYPHEN 0xAE
+#define CHAR_MALE 0xB5
+#define CHAR_FEMALE 0xB6
#define CHAR_CURRENCY 0xB7
+#define CHAR_SLASH 0xBA
#define CHAR_COLON 0xF0
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
#define PLACEHOLDER_BEGIN 0xFD // string placeholder
@@ -155,7 +158,7 @@ u8 sub_8002F44(struct Window *win);
u8 sub_8003418(struct Window *win);
u8 sub_8003460(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 top);
-void sub_80034D4(u8 *tileData, u8 *text);
+void sub_80034D4(u8 *tileData, const u8 *text);
u8 sub_80034EC(u8 *str);
u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType);
u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType);