diff options
| -rw-r--r-- | data/data_8466FB8.s | 15 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/mevent.h | 12 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/mevent.c | 12 | ||||
| -rw-r--r-- | src/mevent_server.c | 2 |
6 files changed, 31 insertions, 14 deletions
diff --git a/data/data_8466FB8.s b/data/data_8466FB8.s index 3f4fd49cd..21ee2e1df 100644 --- a/data/data_8466FB8.s +++ b/data/data_8466FB8.s @@ -2,7 +2,14 @@ .align 2 gUnknown_8466F60:: @ 8466F60 - .incbin "baserom.gba", 0x466F60, 0x20 + .4byte sub_8144C34 + .4byte sub_8144C5C + .4byte sub_8144C60 + .4byte sub_8144C80 + .4byte sub_8144CA0 + .4byte sub_8144E6C + .4byte sub_8144E84 + .4byte sub_8144EBC .align 2 gUnknown_8466F80:: @ 8466F80 @@ -26,7 +33,11 @@ gUnknown_8467000:: @ 8467000 .align 2 gUnknown_8467030:: @ 8467030 - .incbin "baserom.gba", 0x467030, 0x14 + .4byte sub_8145080 + .4byte sub_8145088 + .4byte sub_814508C + .4byte sub_81450A8 + .4byte sub_81450C4 .align 2 gUnknown_8467044:: @ 8467044 diff --git a/include/global.h b/include/global.h index 1dae2f75f..5b07796cc 100644 --- a/include/global.h +++ b/include/global.h @@ -28,6 +28,8 @@ #endif // __APPLE__ #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) +// GF's lingo +#define NELEMS ARRAY_COUNT // useful math macros diff --git a/include/mevent.h b/include/mevent.h index ae301263f..31e1041fe 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -21,6 +21,18 @@ struct MEventStruct_Unk1442CC u8 unk_60; }; +struct MEvent_Str_1 +{ + u16 unk_000; + size_t unk_004; + const void * unk_008; +}; + +struct MEvent_Str_2 +{ + u8 fill_00[0x40]; +}; + struct MysteryEventStruct * sub_8143D94(void); bool32 sub_8143E1C(void); diff --git a/ld_script.txt b/ld_script.txt index 237166975..88ad583b6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -244,6 +244,7 @@ SECTIONS { asm/mystery_gift_menu.o(.text); asm/link_rfu_4.o(.text); src/mevent.o(.text); + src/mevent_server.o(.text); asm/mevent_server.o(.text); asm/mevent_8145654.o(.text); src/menews_jisan.o(.text); @@ -379,6 +380,7 @@ SECTIONS { src/fame_checker.o(.rodata); data/data_845FD54.o(.rodata); src/mevent.o(.rodata); + src/mevent_server.o(.rodata); data/data_8466FB8.o(.rodata); src/menews_jisan.o(.rodata); src/menews_jisan.o(.rodata.str1.4); diff --git a/src/mevent.c b/src/mevent.c index a65433999..c81712de6 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -19,18 +19,6 @@ #include "menews_jisan.h" #include "mevent.h" -struct MEvent_Str_1 -{ - u16 unk_000; - size_t unk_004; - const void * unk_008; -}; - -struct MEvent_Str_2 -{ - u8 fill_00[0x40]; -}; - struct MEventTaskData1 { u16 t00; diff --git a/src/mevent_server.c b/src/mevent_server.c new file mode 100644 index 000000000..529b4ba77 --- /dev/null +++ b/src/mevent_server.c @@ -0,0 +1,2 @@ +#include "global.h" +#include "mevent.h" |