From d316d1e359c7672277a9cf644acd4e40170f5968 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 5 Apr 2021 22:05:09 -0500 Subject: Preproc all the data (#35) * actually put C files in preproc and use it for formatted type names. Cleaned up makefile like pokeemerald * finish adding all colors and text macros to charmap * preproc all the data and use text macros * move all of wonder_mail_1 to src * unify wonder_mail and wonder_mail_mid * small code cleanup * name two more exclusive pokemon funcs * decomp a few more wonder mail funcs * clean up MemoryFill call * doc more of wonder mail in main menu --- src/adventure_log.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/adventure_log.c') diff --git a/src/adventure_log.c b/src/adventure_log.c index 2a02840..420d71d 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -31,8 +31,23 @@ struct AdventureLog }; extern struct AdventureLog *gAdventureLog; -extern struct unkData gUnknown_80E2008; -extern struct unkData gUnknown_80E1FF0; + +const struct unkData gUnknown_80E1FF0 = { + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, + NULL +}; +const struct unkData gUnknown_80E2008 = { + 0x00, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, + 0x1A, 0x00, 0x04, + 0x06, 0x00, + NULL +}; // Adventure Log Text const u8 gAdventureLogHeaderText[] = "Adventure Log"; @@ -43,8 +58,8 @@ extern void *MemoryAlloc(u32, u32); extern void MemoryFree(void *); extern void sub_8006518(struct unkData *); extern void sub_800641C(void *, u32, u32); -extern void sub_8032084(); -extern void DisplayAdventureLog(); +void sub_8032084(); +void DisplayAdventureLog(); extern void sub_8013818(void *, u32, u32, u32); extern u8 sub_8013938(void *); extern void sub_8013660(void *); -- cgit v1.2.3