diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-05-23 16:19:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 16:19:35 -0500 |
| commit | eaa141c612dd1689936a21bd57018a55ff686b69 (patch) | |
| tree | fafe2a9a562af6a8e36716ff76a5b3e8b30d4411 /src/code_2.c | |
| parent | f402e46cd3c8b7236673d6edbae77903a7cc0618 (diff) | |
Keep on keepin on (#38)
* end of may dump of work
* move save text to src
* decomp a little more
Diffstat (limited to 'src/code_2.c')
| -rw-r--r-- | src/code_2.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/code_2.c b/src/code_2.c index 08db080..c4362b3 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -8,6 +8,7 @@ #include "music.h" #include "play_time.h" #include "save.h" +#include "gUnknown_203B46C.h" extern void NDS_DebugInit(void); extern void sub_801180C(void); @@ -15,7 +16,7 @@ extern void NDS_LoadOverlay_GroundMain(void); extern void sub_8014144(void); extern void LoadMonsterParameters(void); extern void sub_8097670(void); -extern void sub_8094980(void); +extern void LoadGameOptions(void); extern void sub_8094C14(void); extern void LoadExclusivePokemon(void); extern void LoadItemParameters(void); @@ -24,7 +25,7 @@ extern void LoadWazaParameters(void); extern void sub_80950BC(void); extern void sub_80958E8(void); extern void sub_800CD64(u32, u32); -extern void sub_8094998(u32); +extern void InitializeGameOptions(u32); extern void SetWindowTitle(char *); extern void sub_800DAAC(void); extern void SetSavingIconCoords(u32); @@ -71,7 +72,7 @@ extern u16 gUnknown_2026E4E; extern s32 gUnknown_2000A80; extern struct OpenedFile *gTitlePaletteFile; extern struct Inputs gRealInputs; -extern u8 *gUnknown_203B46C; +extern struct UnkSaveStruct1 *gUnknown_203B46C; extern char gPMDBuildVersion[]; @@ -92,7 +93,7 @@ void GameLoop(void) LoadMonsterParameters(); sub_8097670(); InitializePlayTime(); - sub_8094980(); + LoadGameOptions(); sub_8094C14(); LoadExclusivePokemon(); LoadFriendAreas(); @@ -103,7 +104,7 @@ void GameLoop(void) sub_80958E8(); sub_800CD64(0x8000, 0); sub_8012284(); - sub_8094998(1); + InitializeGameOptions(1); SetWindowTitle(gPMDBuildVersion); sub_800DAAC(); SetSavingIconCoords(0); @@ -207,7 +208,7 @@ void xxx_update_stuff(u32 r0) { xxx_draw_string_80144C4(); sub_8005838(0, 0); - nullsub_8(gUnknown_203B46C[10]); + nullsub_8(gUnknown_203B46C->unkA); sub_8005180(); sub_80060EC(); sub_8011860(); |