From 71d3e605290b2069d3571478a3736b04d658decb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 00:22:48 -0600 Subject: save work --- src/scene/new_game.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/scene/new_game.c') diff --git a/src/scene/new_game.c b/src/scene/new_game.c index ee042a0de..e3d6996ac 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -89,7 +89,8 @@ void sub_8052DA8(void) sub_80B2D1C(); for (i = 0; i < 5; i++) - gSaveBlock1.sbStruct.unkSB1.sb1_2EFC_struct[i] = gUnknown_08216604; + gSaveBlock1.contestWinners[i] = gUnknown_08216604; + //gSaveBlock1.sbStruct.unkSB1.sb1_2EFC_struct[i] = gUnknown_08216604; } void ZeroBattleTowerData(void) -- cgit v1.2.3 From 2415720ea6760217355f286da83b9955c881bf1b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 00:57:31 -0600 Subject: fix 0x2DFC in SaveBlock1 --- src/scene/new_game.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/scene/new_game.c') diff --git a/src/scene/new_game.c b/src/scene/new_game.c index e3d6996ac..98ef0853d 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -24,6 +24,7 @@ #include "rtc.h" #include "script.h" #include "secret_base.h" +#include "text.h" #include "tv.h" EWRAM_DATA u8 gDifferentSaveFile = 0; @@ -35,14 +36,10 @@ extern u16 gSaveFileStatus; extern u8 gUnknown_0819FA81[]; -const struct SB1_2EFC_Struct gUnknown_08216604 = +static const struct ContestWinner sEmptyContestWinner = { - 0x0000, - { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - } + .nickname = {EOS}, + .trainerName = {EOS}, }; void write_word_to_mem(u32 var, u8 *dataPtr) @@ -89,8 +86,7 @@ void sub_8052DA8(void) sub_80B2D1C(); for (i = 0; i < 5; i++) - gSaveBlock1.contestWinners[i] = gUnknown_08216604; - //gSaveBlock1.sbStruct.unkSB1.sb1_2EFC_struct[i] = gUnknown_08216604; + gSaveBlock1.contestWinners[8 + i] = sEmptyContestWinner; } void ZeroBattleTowerData(void) -- cgit v1.2.3 From d108f8dbe7f5fb08557d9ea82a0a9710532cac54 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 01:57:16 -0600 Subject: finish decompiling contest.s --- src/scene/new_game.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/scene/new_game.c') diff --git a/src/scene/new_game.c b/src/scene/new_game.c index 98ef0853d..1a3d40e0c 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -36,7 +36,7 @@ extern u16 gSaveFileStatus; extern u8 gUnknown_0819FA81[]; -static const struct ContestWinner sEmptyContestWinner = +static const struct ContestWinner sEmptyMuseumPortrait = { .nickname = {EOS}, .trainerName = {EOS}, @@ -86,7 +86,7 @@ void sub_8052DA8(void) sub_80B2D1C(); for (i = 0; i < 5; i++) - gSaveBlock1.contestWinners[8 + i] = sEmptyContestWinner; + gSaveBlock1.museumPortraits[i] = sEmptyMuseumPortrait; } void ZeroBattleTowerData(void) -- cgit v1.2.3 From ce74d72c31a3ebda26adc6ae888700213f64b113 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 14:19:09 -0600 Subject: label and clean up some things in contest.c --- src/scene/new_game.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/scene/new_game.c') diff --git a/src/scene/new_game.c b/src/scene/new_game.c index 1a3d40e0c..0279f99c6 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -80,11 +80,11 @@ void ClearPokedexFlags(void) memset(&gSaveBlock2.pokedex.seen, 0, sizeof(gSaveBlock2.pokedex.seen)); } -void sub_8052DA8(void) +void ResetContestAndMuseumWinners(void) { s32 i; - sub_80B2D1C(); + Contest_ResetWinners(); for (i = 0; i < 5; i++) gSaveBlock1.museumPortraits[i] = sEmptyMuseumPortrait; } @@ -139,7 +139,7 @@ void NewGameInitData(void) gSaveBlock1.money = 3000; ResetLinkContestBoolean(); ResetGameStats(); - sub_8052DA8(); + ResetContestAndMuseumWinners(); InitLinkBattleRecords(); InitShroomishSizeRecord(); InitBarboachSizeRecord(); -- cgit v1.2.3