From 42650e1507008d0ad3a710e0b8ec27d8ad97bd26 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 17 Jun 2021 14:32:35 -0400 Subject: document ewram macros in BattleStartClearSetData --- src/debug/tomomichi_debug_menu.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/debug/tomomichi_debug_menu.c') diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 64da15dc7..c4ce87f33 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -4477,38 +4477,38 @@ static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0) switch (a0) { case 0: - ewram15DDF = 0; - ewram15DDE = 0; + gBattleStruct->contestWinnerIsForArtist = 0; + gBattleStruct->contestWinnerSaveIdx = 0; contestEntry->contestType = sPicTest_ContestType - 1; StringCopy(contestEntry->trainer_name, sDummyTrainerName); StringCopy(contestEntry->pokemon_name, sDummyNickname); break; case 1: - ewram15DDF = 0; - ewram15DDE = 8; + gBattleStruct->contestWinnerIsForArtist = 0; + gBattleStruct->contestWinnerSaveIdx = 8; contestEntry->contestType = sPicTest_MuseumArtTitleType - 1; StringCopy(contestEntry->pokemon_name, sDummyNickname); break; case 2: - ewram15DDF = 1; - ewram15DDE = 8; + gBattleStruct->contestWinnerIsForArtist = 1; + gBattleStruct->contestWinnerSaveIdx = 8; contestEntry->contestType = sPicTest_PreviewType - 1; break; case 3: - ewram15DDF = 0; - ewram15DDE = 8; + gBattleStruct->contestWinnerIsForArtist = 0; + gBattleStruct->contestWinnerSaveIdx = 8; contestEntry->contestType = 0; StringCopy(contestEntry->pokemon_name, sDummyNickname); break; case 4: - ewram15DDF = 0; - ewram15DDE = 8; + gBattleStruct->contestWinnerIsForArtist = 0; + gBattleStruct->contestWinnerSaveIdx = 8; contestEntry->contestType = 3; StringCopy(contestEntry->pokemon_name, sDummyNickname); break; case 5: - ewram15DDF = 0; - ewram15DDE = 8; + gBattleStruct->contestWinnerIsForArtist = 0; + gBattleStruct->contestWinnerSaveIdx = 8; contestEntry->contestType = 9; StringCopy(contestEntry->pokemon_name, sDummyNickname); break; -- cgit v1.2.3 From b6bdaedb77a740893ebb66a85ebecbfa64353ba6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Jun 2021 14:28:58 -0400 Subject: Sync image_processing_effects from emerald, 1 --- src/debug/tomomichi_debug_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/debug/tomomichi_debug_menu.c') diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index c4ce87f33..771aa7d18 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -4470,7 +4470,7 @@ NAKED void PicTest_Redraw(u8 a0) static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0) { - struct ContestEntry *contestEntry = &ewram15DE0; + struct ContestWinner *contestEntry = &eContestPaintingWinner; contestEntry->species = sPicTest_Species; contestEntry->otId = sPicTest_OTID; contestEntry->personality = sPicTest_Personality; -- cgit v1.2.3 From c5dd8f884abbcdcab67bcb89e4b8cc84a47f6d64 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 18 Jun 2021 14:36:48 -0400 Subject: Revert these symbols back to ewram.h --- src/debug/tomomichi_debug_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/debug/tomomichi_debug_menu.c') diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 771aa7d18..81435c366 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -4470,7 +4470,7 @@ NAKED void PicTest_Redraw(u8 a0) static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0) { - struct ContestWinner *contestEntry = &eContestPaintingWinner; + struct ContestWinner *contestEntry = &eCurContestWinner; contestEntry->species = sPicTest_Species; contestEntry->otId = sPicTest_OTID; contestEntry->personality = sPicTest_Personality; -- cgit v1.2.3 From 10ae28cd3615d16f2fbf9d94e58cf65ef9e086e0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 24 Jun 2021 10:44:43 -0400 Subject: Finish porting contest data to C --- src/debug/tomomichi_debug_menu.c | 48 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/debug/tomomichi_debug_menu.c') diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 81435c366..94b697954 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -4477,40 +4477,40 @@ static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0) switch (a0) { case 0: - gBattleStruct->contestWinnerIsForArtist = 0; - gBattleStruct->contestWinnerSaveIdx = 0; - contestEntry->contestType = sPicTest_ContestType - 1; - StringCopy(contestEntry->trainer_name, sDummyTrainerName); - StringCopy(contestEntry->pokemon_name, sDummyNickname); + eCurContestWinnerIsForArtist = FALSE; + eCurContestWinnerSaveIdx = 0; + contestEntry->contestCategory = sPicTest_ContestType - 1; + StringCopy(contestEntry->trainerName, sDummyTrainerName); + StringCopy(contestEntry->nickname, sDummyNickname); break; case 1: - gBattleStruct->contestWinnerIsForArtist = 0; - gBattleStruct->contestWinnerSaveIdx = 8; - contestEntry->contestType = sPicTest_MuseumArtTitleType - 1; - StringCopy(contestEntry->pokemon_name, sDummyNickname); + eCurContestWinnerIsForArtist = FALSE; + eCurContestWinnerSaveIdx = 8; + contestEntry->contestCategory = sPicTest_MuseumArtTitleType - 1; + StringCopy(contestEntry->nickname, sDummyNickname); break; case 2: - gBattleStruct->contestWinnerIsForArtist = 1; - gBattleStruct->contestWinnerSaveIdx = 8; - contestEntry->contestType = sPicTest_PreviewType - 1; + eCurContestWinnerIsForArtist = TRUE; + eCurContestWinnerSaveIdx = 8; + contestEntry->contestCategory = sPicTest_PreviewType - 1; break; case 3: - gBattleStruct->contestWinnerIsForArtist = 0; - gBattleStruct->contestWinnerSaveIdx = 8; - contestEntry->contestType = 0; - StringCopy(contestEntry->pokemon_name, sDummyNickname); + eCurContestWinnerIsForArtist = FALSE; + eCurContestWinnerSaveIdx = 8; + contestEntry->contestCategory = 0; + StringCopy(contestEntry->nickname, sDummyNickname); break; case 4: - gBattleStruct->contestWinnerIsForArtist = 0; - gBattleStruct->contestWinnerSaveIdx = 8; - contestEntry->contestType = 3; - StringCopy(contestEntry->pokemon_name, sDummyNickname); + eCurContestWinnerIsForArtist = FALSE; + eCurContestWinnerSaveIdx = 8; + contestEntry->contestCategory = 3; + StringCopy(contestEntry->nickname, sDummyNickname); break; case 5: - gBattleStruct->contestWinnerIsForArtist = 0; - gBattleStruct->contestWinnerSaveIdx = 8; - contestEntry->contestType = 9; - StringCopy(contestEntry->pokemon_name, sDummyNickname); + eCurContestWinnerIsForArtist = FALSE; + eCurContestWinnerSaveIdx = 8; + contestEntry->contestCategory = 9; + StringCopy(contestEntry->nickname, sDummyNickname); break; } } -- cgit v1.2.3