summaryrefslogtreecommitdiff
path: root/src/debug
diff options
context:
space:
mode:
Diffstat (limited to 'src/debug')
-rw-r--r--src/debug/crash.c6
-rw-r--r--src/debug/matsuda_debug_menu.c60
-rw-r--r--src/debug/sound_check_menu.c22
-rw-r--r--src/debug/start_menu_debug.c21
-rw-r--r--src/debug/taya_debug_window.c4
-rw-r--r--src/debug/tomomichi_debug_menu.c50
-rw-r--r--src/debug/watanabe_debug_menu.c194
7 files changed, 178 insertions, 179 deletions
diff --git a/src/debug/crash.c b/src/debug/crash.c
index 85058d285..3f9e2d685 100644
--- a/src/debug/crash.c
+++ b/src/debug/crash.c
@@ -4,7 +4,7 @@
#include "text.h"
#include "palette.h"
-extern struct Window gUnknown_03004210;
+extern struct Window gWindowTemplate_Contest_MoveDescription;
static void CB2_CrashIdle(void);
@@ -37,9 +37,9 @@ void Crash(u8 *text)
SetMainCallback2(CB2_CrashIdle);
DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000);
Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8);
- Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8);
+ Text_InitWindowWithTemplate(&gWindowTemplate_Contest_MoveDescription, &gWindowTemplate_81E6FD8);
LoadFontDefaultPalette(&gWindowTemplate_81E6FD8);
- Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7);
+ Text_InitWindowAndPrintText(&gWindowTemplate_Contest_MoveDescription, text, 1, 9, 7);
}
static void CB2_CrashIdle(void)
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 27d2db66b..959614caa 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -2,21 +2,21 @@
#include "matsuda_debug_menu.h"
#include "battle.h"
#include "contest.h"
-#include "contest_link_80C2020.h"
-#include "contest_link_80C857C.h"
+#include "contest_link.h"
+#include "contest_link_util.h"
#include "data2.h"
+#include "ewram.h"
#include "link.h"
#include "main.h"
#include "menu.h"
-#include "palette.h"
#include "overworld.h"
+#include "palette.h"
+#include "scanline_effect.h"
#include "sprite.h"
#include "start_menu.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
-#include "scanline_effect.h"
-#include "ewram.h"
extern u8 gUnknown_0203856C;
extern u8 gContestMonPartyIndex;
@@ -109,7 +109,7 @@ static void sub_80A9BE4(u8 taskId)
DestroyTask(taskId);
if (!(gIsLinkContest & 1))
- sub_80AF668();
+ CalculateFinalScores();
sub_80C2358();
}
@@ -149,12 +149,12 @@ static void sub_80A9C98(u8 taskId)
static void sub_80A9CC0(u8 taskId)
{
- SetTaskFuncWithFollowupFunc(taskId, sub_80C88AC, sub_80A9CDC);
+ SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_CommunicateRng, sub_80A9CDC);
}
static void sub_80A9CDC(u8 taskId)
{
- SetTaskFuncWithFollowupFunc(taskId, sub_80C8E1C, sub_80A9D58);
+ SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_CommunicateLeaderIds, sub_80A9D58);
}
static void sub_80A9CF8(u8 taskId)
@@ -169,7 +169,7 @@ static void sub_80A9CF8(u8 taskId)
static void sub_80A9D30(u8 taskId)
{
- sub_800832C();
+ SetCloseLinkCallback();
gTasks[taskId].func = sub_80A9CF8;
}
@@ -181,15 +181,15 @@ static void sub_80A9D58(u8 taskId)
for (i = 0; i < 4; i++)
dest[i] = gTasks[taskId].data[5 + i];
- gUnknown_0203869B = sub_80C4B34(dest);
- InitContestMonConditions((u8)gSpecialVar_ContestCategory);
- sub_80B0F28(0);
- SetTaskFuncWithFollowupFunc(taskId, sub_80C8EBC, sub_80A9DBC);
+ gContestLinkLeaderIndex = LinkContest_GetLeaderIndex(dest);
+ CalculateRound1Points((u8)gSpecialVar_ContestCategory);
+ SortContestants(0);
+ SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_CommunicateRound1Points, sub_80A9DBC);
}
static void sub_80A9DBC(u8 taskId)
{
- SetTaskFuncWithFollowupFunc(taskId, sub_80C8F34, sub_80A9DD8);
+ SetTaskFuncWithFollowupFunc(taskId, Task_LinkContest_CommunicateTurnOrder, sub_80A9DD8);
}
static void sub_80A9DD8(u8 taskId)
@@ -607,7 +607,7 @@ void sub_80AA5E8(u8 var)
static void sub_80AA614(u8 var1, u8 var2)
{
- u16 var = InitContestMonConditionI(var1, var2);
+ u16 var = CalculateContestantRound1Points(var1, var2);
ConvertIntToDecimalStringN(gSharedMem, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC);
@@ -682,8 +682,8 @@ void sub_80AA754(struct Sprite *sprite)
sub_80AAD08(sprite, 1);
break;
}
- sprite->pos1.x = gUnknown_083C9296[sprite->data[0] + sprite->data[1] * 2];
- sprite->pos1.y = gUnknown_083C92A8[sprite->data[1]];
+ sprite->x = gUnknown_083C9296[sprite->data[0] + sprite->data[1] * 2];
+ sprite->y = gUnknown_083C92A8[sprite->data[1]];
}
static void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2)
@@ -859,7 +859,7 @@ void sub_80AACC4(void)
{
SetDebugMonForContest();
if (!(gIsLinkContest & 1))
- InitContestMonConditions(eMatsudaDebugVar);
+ CalculateRound1Points(gSharedMem[0]);
SetMainCallback2(CB2_StartContest);
}
}
@@ -868,7 +868,7 @@ void sub_80AAD08(struct Sprite *sprite, s8 var2)
{
if (var2 == 1)
{
- eMatsudaDebugVar = sprite->data[3];
+ gSharedMem[0] = sprite->data[3];
SetMainCallback2(sub_80AACC4);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
}
@@ -882,7 +882,7 @@ void sub_80AAD44(struct Sprite *sprite, s8 var2)
SetDebugMonForContest();
for (i = 0; i < 4; i++)
- gContestMonConditions[i] = InitContestMonConditionI(i, gSpecialVar_ContestCategory);
+ gContestMonRound1Points[i] = CalculateContestantRound1Points(i, gSpecialVar_ContestCategory);
SetMainCallback2(c2_exit_to_overworld_1_sub_8080DEC);
}
}
@@ -950,16 +950,16 @@ void sub_80AAF30(void)
for (i = 0; i < 3; i++)
{
- gContestMonConditions[i] = 0;
- gUnknown_02038680[i] = 0;
- gUnknown_02038678[i] = 0;
+ gContestMonRound1Points[i] = 0;
+ gContestMonAppealPointTotals[i] = 0;
+ gContestMonTotalPoints[i] = 0;
gContestMons[i] = gContestMons[3];
}
- gContestMonConditions[3] = 0x12C;
- gUnknown_02038680[3] = 0x190;
- gUnknown_02038678[3] = 0x190;
- Contest_SaveWinner(0xFE);
+ gContestMonRound1Points[3] = 0x12C;
+ gContestMonAppealPointTotals[3] = 0x190;
+ gContestMonTotalPoints[3] = 0x190;
+ Contest_SaveWinner(CONTEST_SAVE_FOR_ARTIST);
}
u8 MatsudaDebugMenu_SetHighScore(void)
@@ -976,9 +976,9 @@ u8 MatsudaDebugMenu_ResetHighScore(void)
gUnknown_0203856C = 0;
for (i = 0; i < 4; i++)
{
- gContestMonConditions[i] = 0;
- gUnknown_02038680[i] = 0;
- gUnknown_02038678[i] = 0;
+ gContestMonRound1Points[i] = 0;
+ gContestMonAppealPointTotals[i] = 0;
+ gContestMonTotalPoints[i] = 0;
}
CloseMenu();
return 1;
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 5b7a26f97..6f6ee58dd 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -56,7 +56,7 @@ static EWRAM_DATA u8 gUnknown_020387D8 = 0;
static EWRAM_DATA u8 gUnknown_020387D9 = 0;
u16 gSoundTestCryNum;
-extern u8 gUnknown_03005E98;
+extern u8 gDexCryScreenState;
struct MusicPlayerInfo *gUnknown_03005D30;
@@ -1208,7 +1208,7 @@ SOUND_LIST_SE
void Task_InitCryTest(u8 taskId)
{
- struct CryRelatedStruct cryStruct, cryStruct2;
+ struct CryScreenWindow cryStruct, cryStruct2;
u8 zero;
Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C);
@@ -1217,26 +1217,26 @@ void Task_InitCryTest(u8 taskId)
ResetSpriteData();
FreeAllSpritePalettes();
- cryStruct.unk0 = 0x2000;
- cryStruct.unk2 = 29;
+ cryStruct.charBase = 0x2000;
+ cryStruct.screenBase = 29;
cryStruct.paletteNo = 12;
cryStruct.yPos = 30;
cryStruct.xPos = 4;
zero = 0; // wtf?
- gUnknown_03005E98 = 0;
+ gDexCryScreenState = 0;
- while (sub_8119E3C(&cryStruct, 3) == FALSE)
+ while (LoadCryWaveformWindow(&cryStruct, 3) == FALSE)
;
- cryStruct2.unk0 = 0;
- cryStruct2.unk2 = 15;
+ cryStruct2.charBase = 0;
+ cryStruct2.screenBase = 15;
cryStruct2.paletteNo = 13;
cryStruct2.xPos = 12;
cryStruct2.yPos = 12;
zero = 0; // wtf?
- gUnknown_03005E98 = 0;
+ gDexCryScreenState = 0;
while (ShowPokedexCryScreen(&cryStruct2, 2) == FALSE)
;
@@ -1255,11 +1255,11 @@ void Task_InitCryTest(u8 taskId)
void Task_ProcessCryTestInput(u8 taskId)
{
- sub_8119F88(3);
+ UpdateCryWaveformWindow(3);
if (gMain.newKeys & A_BUTTON)
{
- sub_811A050(gSoundTestCryNum);
+ CryScreenPlayButton(gSoundTestCryNum);
}
if (gMain.newKeys & R_BUTTON)
{
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index 1501fdd49..d875acefa 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -905,7 +905,7 @@ u8 DebugMenu_OpenWatanabe(void)
u8 DebugMenu_EndSequenceDemo(void)
{
CloseMenu();
- SetMainCallback2(sub_81439D0);
+ SetMainCallback2(CB2_StartCreditsSequence);
ScriptContext2_Enable();
return TRUE;
}
@@ -1015,7 +1015,7 @@ u8 DebugMenu_NationalDex(void)
GetSetPokedexFlag(i + 1, 2);
GetSetPokedexFlag(i + 1, 3);
}
- gUnknown_03005CE8 = TRUE;
+ gUnusedPokedexU8 = TRUE;
CloseMenu();
return TRUE;
}
@@ -1030,7 +1030,7 @@ u8 DebugMenu_HoennDex(void)
GetSetPokedexFlag(nati, 2);
GetSetPokedexFlag(nati, 3);
}
- gUnknown_03005CE8 = TRUE;
+ gUnusedPokedexU8 = TRUE;
CloseMenu();
return TRUE;
}
@@ -2417,8 +2417,7 @@ void DebugMenu_8078B94(void)
for (i = 0; i < ARRAY_COUNT(gSaveBlock1.pokeblocks); i++)
{
- if (gUnknown_Debug_839C444[i].color == 0)
- break;
+ if (gUnknown_Debug_839C444[i].color == 0) break;
gSaveBlock1.pokeblocks[i] = gUnknown_Debug_839C444[i];
}
}
@@ -2589,10 +2588,10 @@ void DebugMenu_8078E68(u8 a0, u8 * a1, u32 a2)
}
struct GameTimeDebugMenuStruct {
- u16 unk0;
- u16 unk2;
- u8 unk4;
- u8 unk5;
+ u16 totalPoints;
+ u16 excitementAppealBonus;
+ u8 round1Points;
+ u8 contestant;
};
const struct GameTimeDebugMenuStruct gUnknown_Debug_839C5F4[] = {
@@ -2604,7 +2603,7 @@ const struct GameTimeDebugMenuStruct gUnknown_Debug_839C5F4[] = {
void DebugMenu_8078E80(s16 * a0)
{
Menu_BlankWindowRect(2, 15, 22, 16);
- sub_8071F60(0xd0, gUnknown_Debug_839C5F4[*a0].unk4, 15);
+ sub_8071F60(0xd0, gUnknown_Debug_839C5F4[*a0].round1Points, 15);
}
void DebugMenu_8078EB0(s16 * a0)
@@ -2669,7 +2668,7 @@ void DebugMenu_8078F68(u8 taskId)
else
{
const struct GameTimeDebugMenuStruct *r2 = gUnknown_Debug_839C5F4 + data[0];
- if (DebugMenu_8077DD8(data + r2->unk5, r2->unk0, r2->unk2, gMain.newAndRepeatedKeys) == TRUE)
+ if (DebugMenu_8077DD8(data + r2->contestant, r2->totalPoints, r2->excitementAppealBonus, gMain.newAndRepeatedKeys) == TRUE)
DebugMenu_8078EB0(data);
}
}
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c
index ca66ca01a..9a997a566 100644
--- a/src/debug/taya_debug_window.c
+++ b/src/debug/taya_debug_window.c
@@ -69,7 +69,7 @@ const u8 gUnknown_Debug_083C4EB0[] = _("Interview(BT)");
const struct {
const u8 * text;
- u32 unk4;
+ u32 round1Points;
} gUnknown_Debug_083C4EC0[] = {
{gUnknown_Debug_083C4E54, 0x0},
{gUnknown_Debug_083C4E5C, 0x1},
@@ -281,7 +281,7 @@ bool8 debug_sub_809089C(void)
case -2:
return FALSE;
default:
- gSpecialVar_0x8004 = gUnknown_Debug_083C4EC0[input].unk4;
+ gSpecialVar_0x8004 = gUnknown_Debug_083C4EC0[input].round1Points;
switch (gSpecialVar_0x8004)
{
case 5:
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 64da15dc7..94b697954 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -4470,47 +4470,47 @@ NAKED void PicTest_Redraw(u8 a0)
static void PrepareDebugOverlayBeforeShowingContestPainting(u8 a0)
{
- struct ContestEntry *contestEntry = &ewram15DE0;
+ struct ContestWinner *contestEntry = &eCurContestWinner;
contestEntry->species = sPicTest_Species;
contestEntry->otId = sPicTest_OTID;
contestEntry->personality = sPicTest_Personality;
switch (a0)
{
case 0:
- ewram15DDF = 0;
- ewram15DDE = 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:
- ewram15DDF = 0;
- ewram15DDE = 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:
- ewram15DDF = 1;
- ewram15DDE = 8;
- contestEntry->contestType = sPicTest_PreviewType - 1;
+ eCurContestWinnerIsForArtist = TRUE;
+ eCurContestWinnerSaveIdx = 8;
+ contestEntry->contestCategory = sPicTest_PreviewType - 1;
break;
case 3:
- ewram15DDF = 0;
- ewram15DDE = 8;
- contestEntry->contestType = 0;
- StringCopy(contestEntry->pokemon_name, sDummyNickname);
+ eCurContestWinnerIsForArtist = FALSE;
+ eCurContestWinnerSaveIdx = 8;
+ contestEntry->contestCategory = 0;
+ StringCopy(contestEntry->nickname, sDummyNickname);
break;
case 4:
- ewram15DDF = 0;
- ewram15DDE = 8;
- contestEntry->contestType = 3;
- StringCopy(contestEntry->pokemon_name, sDummyNickname);
+ eCurContestWinnerIsForArtist = FALSE;
+ eCurContestWinnerSaveIdx = 8;
+ contestEntry->contestCategory = 3;
+ StringCopy(contestEntry->nickname, sDummyNickname);
break;
case 5:
- ewram15DDF = 0;
- ewram15DDE = 8;
- contestEntry->contestType = 9;
- StringCopy(contestEntry->pokemon_name, sDummyNickname);
+ eCurContestWinnerIsForArtist = FALSE;
+ eCurContestWinnerSaveIdx = 8;
+ contestEntry->contestCategory = 9;
+ StringCopy(contestEntry->nickname, sDummyNickname);
break;
}
}
diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c
index 205d4d5e3..752c710d0 100644
--- a/src/debug/watanabe_debug_menu.c
+++ b/src/debug/watanabe_debug_menu.c
@@ -33,9 +33,9 @@
#include "field_effect.h"
struct WatanabeDebugMenuItemSubstruct {
- u32 unk0;
- u32 unk4;
- u8 unk8;
+ u32 totalPoints;
+ u32 round1Points;
+ u8 random;
u8 unk9;
};
@@ -54,13 +54,13 @@ struct WatanabeEwram17000 {
u8 unk1_0:4;
u8 unk1_4:1;
u8 unk1_5:3;
- u8 unk2;
+ u8 excitementAppealBonus;
u8 unk3;
u8 fill4[5];
u8 unk9;
u8 unkA;
u8 unkB;
- u8 unkC;
+ u8 contestant;
};
struct WatanabeEwram18000 {
@@ -74,18 +74,18 @@ struct WatanabeEwram18000 {
};
struct WatanabeEwram18000_2 {
- u16 unk0;
- u8 unk2;
+ u16 totalPoints;
+ u8 excitementAppealBonus;
u8 unk3;
- u8 unk4;
- u8 unk5;
+ u8 round1Points;
+ u8 contestant;
u8 unk6;
u8 unk7;
- u8 unk8;
+ u8 random;
u8 unk9;
u8 unkA;
struct PlttData unkC;
- u16 unk10[16];
+ u16 personality2[16];
};
#define eWatanabe17000 (*(struct WatanabeEwram17000 *)(gSharedMem + 0x17000))
@@ -446,25 +446,25 @@ void debug_80C3A50(u8 taskId)
debug_80C3800(species, 18, 17);
- spriteId = sub_8091A4C(saveBlock2->playerGender, 0x98, 0x28, 0);
+ spriteId = CreateSizeScreenTrainerPic(saveBlock2->playerGender, 0x98, 0x28, 0);
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 2;
gSprites[spriteId].oam.priority = 0;
gSprites[spriteId].oam.paletteNum = 0;
FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(0));
- gSprites[spriteId].pos2.y = gPokedexEntries[natDexNum].trainerOffset;
+ gSprites[spriteId].y2 = gPokedexEntries[natDexNum].trainerOffset;
SetOamMatrix(2, gPokedexEntries[natDexNum].trainerScale, 0, 0, gPokedexEntries[natDexNum].trainerScale);
gTasks[taskId].data[3] = spriteId;
gTasks[taskId].data[4] = gPokedexEntries[natDexNum].trainerOffset;
gTasks[taskId].data[6] = gPokedexEntries[natDexNum].trainerScale;
- spriteId2 = sub_80918EC(natDexNum, 0x58, 0x28, 1);
+ spriteId2 = CreateMonSpriteFromNationalDexNumber(natDexNum, 0x58, 0x28, 1);
gSprites[spriteId2].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId2].oam.matrixNum = 1;
gSprites[spriteId2].oam.priority = 0;
gSprites[spriteId2].oam.paletteNum = 0;
FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(0));
- gSprites[spriteId2].pos2.y = gPokedexEntries[natDexNum].pokemonOffset;
+ gSprites[spriteId2].y2 = gPokedexEntries[natDexNum].pokemonOffset;
SetOamMatrix(1, gPokedexEntries[natDexNum].pokemonScale, 0, 0, gPokedexEntries[natDexNum].pokemonScale);
gTasks[taskId].data[2] = spriteId2;
gTasks[taskId].data[5] = gPokedexEntries[natDexNum].pokemonOffset;
@@ -601,7 +601,7 @@ NAKED void debug_80C3A50(u8 taskId)
"\tmov\tr1, #0x98\n"
"\tmov\tr2, #0x28\n"
"\tmov\tr3, #0x0\n"
- "\tbl\tsub_8091A4C\n"
+ "\tbl\tCreateSizeScreenTrainerPic\n"
"\tmov\tr2, sp\n"
"\tstrh\tr0, [r2, #0x10]\n"
"\tadd\tr3, r0, #0\n"
@@ -668,7 +668,7 @@ NAKED void debug_80C3A50(u8 taskId)
"\tmov\tr1, #0x58\n"
"\tmov\tr2, #0x28\n"
"\tmov\tr3, #0x1\n"
- "\tbl\tsub_80918EC\n"
+ "\tbl\tCreateMonSpriteFromNationalDexNumber\n"
"\tmov\tr3, sp\n"
"\tstrh\tr0, [r3, #0x1c]\n"
"\tlsl\tr0, r0, #0x10\n"
@@ -912,14 +912,14 @@ void debug_80C3D2C(u8 taskId)
SetOamMatrix(1, scale, 0, 0, scale);
debug_80C68CC(scale, 1, 3, 4);
debug_80C68CC(offset, 1, 7, 4);
- gSprites[gTasks[taskId].data[2]].pos2.y = offset;
+ gSprites[gTasks[taskId].data[2]].y2 = offset;
scale = gTasks[taskId].data[6];
offset = gTasks[taskId].data[4];
SetOamMatrix(2, scale, 0, 0, scale);
debug_80C68CC(scale, 25, 3, 4);
debug_80C68CC(offset, 25, 7, 4);
- gSprites[gTasks[taskId].data[3]].pos2.y = offset;
+ gSprites[gTasks[taskId].data[3]].y2 = offset;
REG_WIN0H = ((gTasks[taskId].data[8] * 64 + 0x38) << 8) + (gTasks[taskId].data[8] * 64 + 0x78);
}
@@ -1362,12 +1362,12 @@ void debug_80C4AC4(u8 taskId)
PlaySE(SE_SELECT);
gTrainerBattleOpponent = SECRET_BASE_OPPONENT;
eWatanabe17000.unk1_4 = 0;
- eWatanabe17000.unk2 = 0xAC;
+ eWatanabe17000.excitementAppealBonus = 0xAC;
eWatanabe17000.unk3 = 0xFF;
eWatanabe17000.unk9 = 0;
eWatanabe17000.unkA = 0;
eWatanabe17000.unkB = 0;
- eWatanabe17000.unkC = 0;
+ eWatanabe17000.contestant = 0;
gTasks[taskId].func = debug_80C4F48;
}
else if (gMain.newAndRepeatedKeys & DPAD_UP)
@@ -2362,11 +2362,11 @@ const u32 gUnknown_Debug_083F8768[] = {
void debug_80C6544(u8 a0)
{
u32 r7 = debug_80C5B60(gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]);
- u32 r5 = gUnknown_Debug_083F8554[gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]].data.type4->unk0;
- u32 r4 = gUnknown_Debug_083F8554[gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]].data.type4->unk4;
+ u32 r5 = gUnknown_Debug_083F8554[gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]].data.type4->totalPoints;
+ u32 r4 = gUnknown_Debug_083F8554[gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]].data.type4->round1Points;
u32 r3 = gUnknown_Debug_083F8768[gUnknown_Debug_2038A1C->unk16a];
- if (gUnknown_Debug_083F8554[gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]].data.type4->unk8 == 0)
+ if (gUnknown_Debug_083F8554[gUnknown_Debug_083F8698[gUnknown_Debug_2038A1C->unk168].text[gUnknown_Debug_2038A1C->unk169]].data.type4->random == 0)
{
switch (a0)
{
@@ -2568,13 +2568,13 @@ void InitSeePokemonGraphics(void)
REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON;
CreateTask(debug_80C6B00, 0);
gUnknown_Debug_2038A20 = &eWatanabe18000_2;
- gUnknown_Debug_2038A20->unk0 = 0x115;
- gUnknown_Debug_2038A20->unk2 = 0;
+ gUnknown_Debug_2038A20->totalPoints = 0x115;
+ gUnknown_Debug_2038A20->excitementAppealBonus = 0;
gUnknown_Debug_2038A20->unk3 = 0;
- gUnknown_Debug_2038A20->unk5 = 0;
+ gUnknown_Debug_2038A20->contestant = 0;
gUnknown_Debug_2038A20->unk7 = 0;
gUnknown_Debug_2038A20->unkA = 0;
- gUnknown_Debug_2038A20->unk8 = 0;
+ gUnknown_Debug_2038A20->random = 0;
spriteId = CreateSprite(&gSpriteTemplate_83F8874, 0x6C, 0x74, 0);
gSprites[spriteId].data[0] = 0;
StartSpriteAnim(gSprites + spriteId, 0);
@@ -2670,33 +2670,33 @@ void debug_80C6B00(u8 taskId)
void debug_80C6CB8(u8 taskId)
{
- DecompressPicFromTable_2(gMonFrontPicTable + gUnknown_Debug_2038A20->unk0, gMonFrontPicCoords[gUnknown_Debug_2038A20->unk0].coords, gMonFrontPicCoords[gUnknown_Debug_2038A20->unk0].y_offset, gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], gUnknown_Debug_2038A20->unk0);
- LoadCompressedObjectPalette(gMonPaletteTable + gUnknown_Debug_2038A20->unk0);
- GetMonSpriteTemplate_803C56C(gUnknown_Debug_2038A20->unk0, 1);
- gUnknown_Debug_2038A20->unk2 = CreateSprite(&gUnknown_02024E8C, 0x28, 0x28, 0);
- gSprites[gUnknown_Debug_2038A20->unk2].callback = debug_69;
- gSprites[gUnknown_Debug_2038A20->unk2].oam.priority = 0;
-
- DecompressPicFromTable_2(gMonBackPicTable + gUnknown_Debug_2038A20->unk0, gMonBackPicCoords[gUnknown_Debug_2038A20->unk0].coords, gMonBackPicCoords[gUnknown_Debug_2038A20->unk0].y_offset, gUnknown_081FAF4C[0], gUnknown_081FAF4C[2], gUnknown_Debug_2038A20->unk0);
- LoadCompressedObjectPalette(gMonPaletteTable + gUnknown_Debug_2038A20->unk0);
- GetMonSpriteTemplate_803C56C(gUnknown_Debug_2038A20->unk0, 2);
- gUnknown_Debug_2038A20->unk3 = CreateSprite(&gUnknown_02024E8C, 0x28, 0x78, 0);
+ DecompressPicFromTable_2(gMonFrontPicTable + gUnknown_Debug_2038A20->totalPoints, gMonFrontPicCoords[gUnknown_Debug_2038A20->totalPoints].coords, gMonFrontPicCoords[gUnknown_Debug_2038A20->totalPoints].y_offset, gMonSpriteGfx_Sprite_ptr[0], gMonSpriteGfx_Sprite_ptr[1], gUnknown_Debug_2038A20->totalPoints);
+ LoadCompressedObjectPalette(gMonPaletteTable + gUnknown_Debug_2038A20->totalPoints);
+ GetMonSpriteTemplate_803C56C(gUnknown_Debug_2038A20->totalPoints, 1);
+ gUnknown_Debug_2038A20->excitementAppealBonus = CreateSprite(&gCreatingSpriteTemplate, 0x28, 0x28, 0);
+ gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].callback = debug_69;
+ gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].oam.priority = 0;
+
+ DecompressPicFromTable_2(gMonBackPicTable + gUnknown_Debug_2038A20->totalPoints, gMonBackPicCoords[gUnknown_Debug_2038A20->totalPoints].coords, gMonBackPicCoords[gUnknown_Debug_2038A20->totalPoints].y_offset, gMonSpriteGfx_Sprite_ptr[0], gMonSpriteGfx_Sprite_ptr[2], gUnknown_Debug_2038A20->totalPoints);
+ LoadCompressedObjectPalette(gMonPaletteTable + gUnknown_Debug_2038A20->totalPoints);
+ GetMonSpriteTemplate_803C56C(gUnknown_Debug_2038A20->totalPoints, 2);
+ gUnknown_Debug_2038A20->unk3 = CreateSprite(&gCreatingSpriteTemplate, 0x28, 0x78, 0);
gSprites[gUnknown_Debug_2038A20->unk3].callback = debug_69;
gSprites[gUnknown_Debug_2038A20->unk3].oam.priority = 0;
- gUnknown_Debug_2038A20->unk4 = CreateMonIcon(gUnknown_Debug_2038A20->unk0, sub_809D62C, 0x68, 0x2C, 0, 0);
+ gUnknown_Debug_2038A20->round1Points = CreateMonIcon(gUnknown_Debug_2038A20->totalPoints, SpriteCB_PokemonIcon, 0x68, 0x2C, 0, 0);
- sub_8091738(SpeciesToNationalPokedexNum(gUnknown_Debug_2038A20->unk0), 2, 0x3fc);
+ PrintFootprint(SpeciesToNationalPokedexNum(gUnknown_Debug_2038A20->totalPoints), 2, 0x3fc);
((u16 *)(VRAM + 0xF858))[0] = 0xF3FC;
((u16 *)(VRAM + 0xF858))[1] = 0xF3FD;
((u16 *)(VRAM + 0xF858))[32] = 0xF3FE;
((u16 *)(VRAM + 0xF858))[33] = 0xF3FF;
- debug_80C3800(gUnknown_Debug_2038A20->unk0, 17, 3);
- debug_80C376C(gUnknown_Debug_2038A20->unk0, 26, 5);
+ debug_80C3800(gUnknown_Debug_2038A20->totalPoints, 17, 3);
+ debug_80C376C(gUnknown_Debug_2038A20->totalPoints, 26, 5);
- gUnknown_Debug_2038A20->unk6 = gSprites[gUnknown_Debug_2038A20->unk2].oam.paletteNum;
+ gUnknown_Debug_2038A20->unk6 = gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].oam.paletteNum;
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferUnfaded + 0x80, 0x20);
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferFaded + 0x80, 0x20);
@@ -2704,13 +2704,13 @@ void debug_80C6CB8(u8 taskId)
gUnknown_Debug_2038A20->unk9 = 0;
StopCryAndClearCrySongs();
- PlayCry1(gUnknown_Debug_2038A20->unk0, 0);
+ PlayCry1(gUnknown_Debug_2038A20->totalPoints, 0);
}
void debug_80C6EE8(u8 taskId)
{
u16 hue;
- CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->unk10, 32);
+ CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->personality2, 32);
hue = gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81];
gUnknown_Debug_2038A20->unkC.r = hue & 0x1f;
gUnknown_Debug_2038A20->unkC.g = (hue & 0x3e0) >> 5;
@@ -2734,17 +2734,17 @@ void debug_80C6FA8(u8 taskId)
}
else if (gMain.newAndRepeatedKeys & R_BUTTON)
{
- gUnknown_Debug_2038A20->unk0 = debug_80C3878(0, gUnknown_Debug_2038A20->unk0);
+ gUnknown_Debug_2038A20->totalPoints = debug_80C3878(0, gUnknown_Debug_2038A20->totalPoints);
gTasks[taskId].func = debug_80C71FC;
}
else if (gMain.newAndRepeatedKeys & L_BUTTON)
{
- gUnknown_Debug_2038A20->unk0 = debug_80C3878(1, gUnknown_Debug_2038A20->unk0);
+ gUnknown_Debug_2038A20->totalPoints = debug_80C3878(1, gUnknown_Debug_2038A20->totalPoints);
gTasks[taskId].func = debug_80C71FC;
}
else if (gMain.newKeys & A_BUTTON)
{
- gUnknown_Debug_2038A20->unk5 = 1;
+ gUnknown_Debug_2038A20->contestant = 1;
REG_WIN0H = 0x51EF;
REG_WIN0V = 0x4167;
gTasks[taskId].func = debug_80C7294;
@@ -2767,9 +2767,9 @@ void debug_80C6FA8(u8 taskId)
{
gUnknown_Debug_2038A20->unk9 ^= 1;
if (gUnknown_Debug_2038A20->unk9)
- LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->unk0, 0, 0), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->totalPoints, 0, 0), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
else
- LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->unk0, 0, 9), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->totalPoints, 0, 9), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferUnfaded + 0x80, 32);
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferFaded + 0x80, 32);
gTasks[taskId].func = debug_80C6EE8;
@@ -2779,11 +2779,11 @@ void debug_80C6FA8(u8 taskId)
if (gMain.newKeys & SELECT_BUTTON)
{
StopCryAndClearCrySongs();
- PlayCry1(gUnknown_Debug_2038A20->unk0, 0);
+ PlayCry1(gUnknown_Debug_2038A20->totalPoints, 0);
}
- gUnknown_Debug_2038A20->unk8 += 4;
- gUnknown_Debug_2038A20->unk8 &= 0x1f;
- ((u16 *)PLTT)[0xa1 + gUnknown_Debug_2038A20->unk7] = gUnknown_Debug_083F8790[gUnknown_Debug_2038A20->unk8];
+ gUnknown_Debug_2038A20->random += 4;
+ gUnknown_Debug_2038A20->random &= 0x1f;
+ ((u16 *)PLTT)[0xa1 + gUnknown_Debug_2038A20->unk7] = gUnknown_Debug_083F8790[gUnknown_Debug_2038A20->random];
}
}
#else
@@ -3088,11 +3088,11 @@ NAKED void debug_80C6FA8(u8 taskId)
void debug_80C71FC(u8 taskId)
{
- FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[gUnknown_Debug_2038A20->unk2].oam.paletteNum));
- DestroySprite(gSprites + gUnknown_Debug_2038A20->unk2);
+ FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].oam.paletteNum));
+ DestroySprite(gSprites + gUnknown_Debug_2038A20->excitementAppealBonus);
FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[gUnknown_Debug_2038A20->unk3].oam.paletteNum));
DestroySprite(gSprites + gUnknown_Debug_2038A20->unk3);
- sub_809D510(gSprites + gUnknown_Debug_2038A20->unk4);
+ sub_809D510(gSprites + gUnknown_Debug_2038A20->round1Points);
gTasks[taskId].func = debug_80C6CB8;
}
@@ -3100,20 +3100,20 @@ void debug_80C7294(u8 taskId)
{
if (gMain.newKeys & A_BUTTON)
{
- gUnknown_Debug_2038A20->unk5 = 0;
+ gUnknown_Debug_2038A20->contestant = 0;
REG_WIN0H = 0x51EF;
REG_WIN0V = 0x699F;
gTasks[taskId].func = debug_80C6EE8;
}
else if (gMain.newKeys & B_BUTTON)
{
- gUnknown_Debug_2038A20->unk5 = 0;
+ gUnknown_Debug_2038A20->contestant = 0;
REG_WIN0H = 0x51EF;
REG_WIN0V = 0x699F;
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferUnfaded + 0x80, 32);
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferFaded + 0x80, 32);
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferUnfaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferFaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferUnfaded + 0x80, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferFaded + 0x80, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferUnfaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferFaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
gTasks[taskId].func = debug_80C6EE8;
}
else if (gMain.newAndRepeatedKeys & DPAD_DOWN && gUnknown_Debug_2038A20->unkA < 2)
@@ -3181,7 +3181,7 @@ void debug_80C74E4(u8 taskId)
void debug_80C7584(struct Sprite *sprite)
{
- if (!gUnknown_Debug_2038A20->unk5)
+ if (!gUnknown_Debug_2038A20->contestant)
sprite->invisible = TRUE;
else
{
@@ -3199,8 +3199,8 @@ void debug_80C7584(struct Sprite *sprite)
shade = gUnknown_Debug_2038A20->unkC.b;
break;
}
- sprite->pos2.x = 4 * shade;
- sprite->pos2.y = 8 * sprite->data[0];
+ sprite->x2 = 4 * shade;
+ sprite->y2 = 8 * sprite->data[0];
sprite->data[1]++;
if (sprite->data[0] == gUnknown_Debug_2038A20->unkA && !(sprite->data[1] & 0x08))
sprite->invisible = TRUE;
@@ -3237,13 +3237,13 @@ void InitSeeTrainers(void)
REG_DISPCNT = 0x3340;
CreateTask(debug_80C777C, 0);
gUnknown_Debug_2038A20 = &eWatanabe18000_2;
- gUnknown_Debug_2038A20->unk0 = 0;
- gUnknown_Debug_2038A20->unk2 = 0;
+ gUnknown_Debug_2038A20->totalPoints = 0;
+ gUnknown_Debug_2038A20->excitementAppealBonus = 0;
gUnknown_Debug_2038A20->unk3 = 0;
- gUnknown_Debug_2038A20->unk5 = 0;
+ gUnknown_Debug_2038A20->contestant = 0;
gUnknown_Debug_2038A20->unk7 = 0;
gUnknown_Debug_2038A20->unkA = 0;
- gUnknown_Debug_2038A20->unk8 = 0;
+ gUnknown_Debug_2038A20->random = 0;
spriteId = CreateSprite(&gSpriteTemplate_83F8874, 0x6c, 0x74, 0);
gSprites[spriteId].data[0] = 0;
StartSpriteAnim(gSprites + spriteId, 0);
@@ -3297,16 +3297,16 @@ void debug_80C777C(u8 taskId)
void debug_80C7934(u8 taskId)
{
- DecompressPicFromTable_2(gTrainerFrontPicTable + gUnknown_Debug_2038A20->unk0, gTrainerFrontPicCoords[gUnknown_Debug_2038A20->unk0].coords, gTrainerFrontPicCoords[gUnknown_Debug_2038A20->unk0].y_offset, gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], gUnknown_Debug_2038A20->unk0);
- LoadCompressedObjectPalette(gTrainerFrontPicPaletteTable + gUnknown_Debug_2038A20->unk0);
- GetMonSpriteTemplate_803C5A0(gUnknown_Debug_2038A20->unk0, 1);
- gUnknown_Debug_2038A20->unk2 = CreateSprite(&gUnknown_02024E8C, 0x28, 0x28, 0);
- gSprites[gUnknown_Debug_2038A20->unk2].callback = debug_69;
- gSprites[gUnknown_Debug_2038A20->unk2].oam.priority = 0;
+ DecompressPicFromTable_2(gTrainerFrontPicTable + gUnknown_Debug_2038A20->totalPoints, gTrainerFrontPicCoords[gUnknown_Debug_2038A20->totalPoints].coords, gTrainerFrontPicCoords[gUnknown_Debug_2038A20->totalPoints].y_offset, gMonSpriteGfx_Sprite_ptr[0], gMonSpriteGfx_Sprite_ptr[1], gUnknown_Debug_2038A20->totalPoints);
+ LoadCompressedObjectPalette(gTrainerFrontPicPaletteTable + gUnknown_Debug_2038A20->totalPoints);
+ GetMonSpriteTemplate_803C5A0(gUnknown_Debug_2038A20->totalPoints, 1);
+ gUnknown_Debug_2038A20->excitementAppealBonus = CreateSprite(&gCreatingSpriteTemplate, 0x28, 0x28, 0);
+ gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].callback = debug_69;
+ gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].oam.priority = 0;
- debug_80C376C(gUnknown_Debug_2038A20->unk0, 26, 5);
+ debug_80C376C(gUnknown_Debug_2038A20->totalPoints, 26, 5);
- gUnknown_Debug_2038A20->unk6 = gSprites[gUnknown_Debug_2038A20->unk2].oam.paletteNum;
+ gUnknown_Debug_2038A20->unk6 = gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].oam.paletteNum;
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferUnfaded + 0x80, 0x20);
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferFaded + 0x80, 0x20);
@@ -3318,7 +3318,7 @@ void debug_80C7934(u8 taskId)
void debug_80C7A54(u8 taskId)
{
u16 hue;
- CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->unk10, 32);
+ CpuCopy16(gPlttBufferUnfaded + 0x80, gUnknown_Debug_2038A20->personality2, 32);
hue = gPlttBufferUnfaded[gUnknown_Debug_2038A20->unk7 + 0x81];
gUnknown_Debug_2038A20->unkC.r = hue & 0x1f;
gUnknown_Debug_2038A20->unkC.g = (hue & 0x3e0) >> 5;
@@ -3342,17 +3342,17 @@ void debug_80C7B14(u8 taskId)
}
else if (gMain.newAndRepeatedKeys & R_BUTTON)
{
- gUnknown_Debug_2038A20->unk0 = debug_80C38B4(0, gUnknown_Debug_2038A20->unk0);
+ gUnknown_Debug_2038A20->totalPoints = debug_80C38B4(0, gUnknown_Debug_2038A20->totalPoints);
gTasks[taskId].func = debug_80C7D44;
}
else if (gMain.newAndRepeatedKeys & L_BUTTON)
{
- gUnknown_Debug_2038A20->unk0 = debug_80C38B4(1, gUnknown_Debug_2038A20->unk0);
+ gUnknown_Debug_2038A20->totalPoints = debug_80C38B4(1, gUnknown_Debug_2038A20->totalPoints);
gTasks[taskId].func = debug_80C7D44;
}
else if (gMain.newKeys & A_BUTTON)
{
- gUnknown_Debug_2038A20->unk5 = 1;
+ gUnknown_Debug_2038A20->contestant = 1;
REG_WIN0H = 0x51EF;
REG_WIN0V = 0x4167;
gTasks[taskId].func = debug_80C7DDC;
@@ -3376,11 +3376,11 @@ void debug_80C7B14(u8 taskId)
gUnknown_Debug_2038A20->unk9 ^= 1;
if (gUnknown_Debug_2038A20->unk9)
{
- LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->unk0, 0, 0), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->totalPoints, 0, 0), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
}
else
{
- LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->unk0, 0, 9), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(gUnknown_Debug_2038A20->totalPoints, 0, 9), gUnknown_Debug_2038A20->unk6 * 16 + 0x100, 0x20);
}
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferUnfaded + 0x80, 32);
CpuCopy16(gPlttBufferUnfaded + gUnknown_Debug_2038A20->unk6 * 16 + 0x100, gPlttBufferFaded + 0x80, 32);
@@ -3388,9 +3388,9 @@ void debug_80C7B14(u8 taskId)
}
else
{
- gUnknown_Debug_2038A20->unk8 += 4;
- gUnknown_Debug_2038A20->unk8 &= 0x1f;
- ((u16 *)PLTT)[0xa1 + gUnknown_Debug_2038A20->unk7] = gUnknown_Debug_083F8790[gUnknown_Debug_2038A20->unk8];
+ gUnknown_Debug_2038A20->random += 4;
+ gUnknown_Debug_2038A20->random &= 0x1f;
+ ((u16 *)PLTT)[0xa1 + gUnknown_Debug_2038A20->unk7] = gUnknown_Debug_083F8790[gUnknown_Debug_2038A20->random];
}
}
#else
@@ -3679,11 +3679,11 @@ NAKED void debug_80C7B14(u8 taskId)
void debug_80C7D44(u8 taskId)
{
- FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[gUnknown_Debug_2038A20->unk2].oam.paletteNum));
- DestroySprite(gSprites + gUnknown_Debug_2038A20->unk2);
+ FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[gUnknown_Debug_2038A20->excitementAppealBonus].oam.paletteNum));
+ DestroySprite(gSprites + gUnknown_Debug_2038A20->excitementAppealBonus);
FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[gUnknown_Debug_2038A20->unk3].oam.paletteNum));
DestroySprite(gSprites + gUnknown_Debug_2038A20->unk3);
- sub_809D510(gSprites + gUnknown_Debug_2038A20->unk4);
+ sub_809D510(gSprites + gUnknown_Debug_2038A20->round1Points);
gTasks[taskId].func = debug_80C7934;
}
@@ -3691,20 +3691,20 @@ void debug_80C7DDC(u8 taskId)
{
if (gMain.newKeys & A_BUTTON)
{
- gUnknown_Debug_2038A20->unk5 = 0;
+ gUnknown_Debug_2038A20->contestant = 0;
REG_WIN0H = 0x51EF;
REG_WIN0V = 0x699F;
gTasks[taskId].func = debug_80C7A54;
}
else if (gMain.newKeys & B_BUTTON)
{
- gUnknown_Debug_2038A20->unk5 = 0;
+ gUnknown_Debug_2038A20->contestant = 0;
REG_WIN0H = 0x51EF;
REG_WIN0V = 0x699F;
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferUnfaded + 0x80, 32);
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferFaded + 0x80, 32);
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferUnfaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
- CpuCopy16(gUnknown_Debug_2038A20->unk10, gPlttBufferFaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferUnfaded + 0x80, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferFaded + 0x80, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferUnfaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
+ CpuCopy16(gUnknown_Debug_2038A20->personality2, gPlttBufferFaded + 0x100 + gUnknown_Debug_2038A20->unk6 * 16, 32);
gTasks[taskId].func = debug_80C7A54;
}
else if (gMain.newAndRepeatedKeys & DPAD_DOWN && gUnknown_Debug_2038A20->unkA < 2)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 21:12:03 +0000