summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/pokedex_cry_screen.h10
-rw-r--r--src/data/graphics.c4
-rw-r--r--src/debug/sound_check_menu.c14
-rw-r--r--src/pokedex.c121
-rw-r--r--src/pokedex_cry_screen.c32
-rw-r--r--sym_common.txt4
6 files changed, 93 insertions, 92 deletions
diff --git a/include/pokedex_cry_screen.h b/include/pokedex_cry_screen.h
index ee586a092..8e64bde8a 100644
--- a/include/pokedex_cry_screen.h
+++ b/include/pokedex_cry_screen.h
@@ -1,7 +1,7 @@
#ifndef GUARD_POKEDEX_CRY_SCREEN_H
#define GUARD_POKEDEX_CRY_SCREEN_H
-struct CryRelatedStruct
+struct CryScreenWindow
{
u16 unk0;
u8 unk2;
@@ -10,10 +10,10 @@ struct CryRelatedStruct
u8 yPos;
};
-u8 ShowPokedexCryScreen(struct CryRelatedStruct *, u8);
-u8 sub_8119E3C(struct CryRelatedStruct *, u8);
-void sub_8119F88(u8 a);
-void sub_811A050(u16 species);
+u8 ShowPokedexCryScreen(struct CryScreenWindow *, u8);
+u8 LoadCryWaveformWindow(struct CryScreenWindow *, u8);
+void UpdateCryWaveformWindow(u8 a);
+void CryScreenPlayButton(u16 species);
void DestroyCryMeterNeedleSprite();
#endif // GUARD_POKEDEX_CRY_SCREEN_H
diff --git a/src/data/graphics.c b/src/data/graphics.c
index 7e37c92e3..34bcef5ff 100644
--- a/src/data/graphics.c
+++ b/src/data/graphics.c
@@ -1185,8 +1185,8 @@ const u16 gMonIconPalettes[][16] =
const u8 gUnknown_08E96738[] = INCBIN_U8("graphics/unknown/unknown_E96738.bin.lz");
const u8 gPokedexStartMenuMain_Tilemap[] = INCBIN_U8("graphics/pokedex/pokedex_list_menu.bin.lz");
const u8 gPokedexStartMenuSearchResults_Tilemap[] = INCBIN_U8("graphics/pokedex/pokedex_listing_menu.bin.lz");
-const u8 gUnknown_08E96ACC[] = INCBIN_U8("graphics/pokedex/pokedex_navbar.bin.lz");
-const u8 gUnknown_08E96B58[] = INCBIN_U8("graphics/pokedex/pokedex_navbar_3.bin.lz");
+const u8 gPokedexScreenSelectBarMain_Tilemap[] = INCBIN_U8("graphics/pokedex/pokedex_navbar.bin.lz");
+const u8 gPokedexScreenSelectBarSubmenu_Tilemap[] = INCBIN_U8("graphics/pokedex/pokedex_navbar_3.bin.lz");
const u8 gUnknown_08E96BD4[] = INCBIN_U8("graphics/pokedex/pokedex_detail_layout.bin.lz");
const u8 gPokedexMenuSearch_Tilemap[] = INCBIN_U8("graphics/unknown/unknown_E96D2C.bin.lz");
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index 5b7a26f97..4a67a0ebc 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);
@@ -1224,9 +1224,9 @@ void Task_InitCryTest(u8 taskId)
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;
@@ -1236,7 +1236,7 @@ void Task_InitCryTest(u8 taskId)
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/pokedex.c b/src/pokedex.c
index 3ea641ca1..e542b6eb9 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -123,15 +123,15 @@ struct SearchMenuItem
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern u8 gReservedSpritePaletteCount;
extern struct SpriteTemplate gCreatingSpriteTemplate;
-extern u8 gUnknown_03005E98;
+extern u8 gDexCryScreenState;
extern const u8 gPokedexMenu_Gfx[];
extern const u8 gUnknown_08E96738[];
extern const u8 gPokedexStartMenuMain_Tilemap[];
extern const u8 gPokedexStartMenuSearchResults_Tilemap[];
extern const u8 gUnknown_08E9C6DC[];
extern const u8 gUnknown_08E96BD4[];
-extern const u8 gUnknown_08E96ACC[];
-extern const u8 gUnknown_08E96B58[];
+extern const u8 gPokedexScreenSelectBarMain_Tilemap[];
+extern const u8 gPokedexScreenSelectBarSubmenu_Tilemap[];
extern const u16 gPokedexMenu_Pal[];
extern const u16 gPokedexMenu2_Pal[];
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
@@ -149,7 +149,7 @@ static EWRAM_DATA u8 sPokeBallRotation = 0;
static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL;
u8 gUnusedPokedexU8;
-IntrCallback gUnknown_03005CEC;
+IntrCallback gPokedexVBlankCB;
static u8 LoadSearchMenu(void);
@@ -497,7 +497,7 @@ static const u8 gUnknown_083A05F8[] = _("");
#elif GERMAN
#include "data/pokedex_entries_de.h"
#endif
-static const u16 gUnknown_083B4EC4[16] = {0};
+static const u16 sSizeScreenSilhouette_Pal[16] = {0};
static const u8 *const sMonFootprintTable[] =
{
gMonFootprint_Bulbasaur,
@@ -1242,13 +1242,13 @@ static void Task_AreaScreenProcessInput(u8 taskId);
static void sub_808FA00(u8 taskId);
static void Task_InitCryScreenMultistep(u8 taskId);
static void Task_CryScreenProcessInput(u8 taskId);
-static void sub_808FFBC(u8 taskId);
-static void sub_8090040(u8 a);
+static void Task_SwitchScreensFromCryScreen(u8 taskId);
+static void LoadPlayArrowPalette(u8 cryPlaying);
static void Task_InitSizeScreenMultistep(u8 taskId);
static void Task_SizeScreenProcessInput(u8 taskId);
-static void sub_8090498(u8 taskId);
-static void LoadScreenSelectBarMain(u16 a);
-static void sub_8090540(u16 a);
+static void Task_SwitchScreensFromSizeScreen(u8 taskId);
+static void LoadScreenSelectBarMain(u16 screenBase);
+static void LoadScreenSelectBarSubmenu(u16 screenBase);
static void HighlightScreenSelectBarItem(u8 a, u16 b);
static void sub_8090644(u8 a, u16 b);
static void sub_8090750(u8);
@@ -2902,7 +2902,7 @@ static void Task_InitPageScreenMultistep(u8 taskId)
gPokedexView->currentPage = 1;
gPokedexView->descriptionPageNum = 0;
- gUnknown_03005CEC = gMain.vblankCallback;
+ gPokedexVBlankCB = gMain.vblankCallback;
SetVBlankCallback(NULL);
r2 = 0;
if (gTasks[taskId].data[1] != 0)
@@ -2971,7 +2971,7 @@ static void Task_InitPageScreenMultistep(u8 taskId)
if (gTasks[taskId].data[1] != 0)
excludedPalettes |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16));
BeginNormalPaletteFade(~excludedPalettes, 0, 16, 0, RGB(0, 0, 0));
- SetVBlankCallback(gUnknown_03005CEC);
+ SetVBlankCallback(gPokedexVBlankCB);
gMain.state++;
}
break;
@@ -3103,7 +3103,7 @@ static void Task_InitAreaScreenMultistep(u8 taskId)
if (!gPaletteFade.active)
{
gPokedexView->currentPage = 5;
- gUnknown_03005CEC = gMain.vblankCallback;
+ gPokedexVBlankCB = gMain.vblankCallback;
SetVBlankCallback(NULL);
ResetOtherVideoRegisters(0x200);
gPokedexView->selectedScreen = AREA_SCREEN;
@@ -3111,7 +3111,7 @@ static void Task_InitAreaScreenMultistep(u8 taskId)
}
break;
case 1:
- sub_8090540(0xD);
+ LoadScreenSelectBarSubmenu(0xD);
sub_8090644(1, 0xD);
LoadPokedexBgPalette();
REG_BG1CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(13) | BGCNT_16COLOR | BGCNT_TXT256x256;
@@ -3119,7 +3119,7 @@ static void Task_InitAreaScreenMultistep(u8 taskId)
break;
case 2:
ShowPokedexAreaScreen(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), &gPokedexView->screenSwitchState);
- SetVBlankCallback(gUnknown_03005CEC);
+ SetVBlankCallback(gPokedexVBlankCB);
gPokedexView->screenSwitchState = 0;
gMain.state = 0;
gTasks[taskId].func = Task_AreaScreenProcessInput;
@@ -3160,7 +3160,7 @@ static void Task_InitCryScreenMultistep(u8 taskId)
{
m4aMPlayStop(&gMPlayInfo_BGM);
gPokedexView->currentPage = 6;
- gUnknown_03005CEC = gMain.vblankCallback;
+ gPokedexVBlankCB = gMain.vblankCallback;
SetVBlankCallback(NULL);
ResetOtherVideoRegisters(0x200);
gPokedexView->selectedScreen = CRY_SCREEN;
@@ -3173,7 +3173,7 @@ static void Task_InitCryScreenMultistep(u8 taskId)
gMain.state++;
break;
case 2:
- sub_8090540(0xD);
+ LoadScreenSelectBarSubmenu(0xD);
sub_8090644(2, 0xD);
LoadPokedexBgPalette();
DmaClear16(3, (void *)(VRAM + 0xF800), 0x500);
@@ -3194,28 +3194,28 @@ static void Task_InitCryScreenMultistep(u8 taskId)
gTasks[taskId].data[4] =
CreateMonSpriteFromNationalDexNumber(sPokedexListItem->dexNum, 0x30, 0x38, 0);
gSprites[gTasks[taskId].data[4]].oam.priority = 0;
- gUnknown_03005E98 = 0;
+ gDexCryScreenState = 0;
gMain.state++;
break;
case 6:
{
- struct CryRelatedStruct sp8;
-
- sp8.unk0 = 0x4020;
- sp8.unk2 = 0x1F;
- sp8.paletteNo = 8;
- sp8.yPos = 0x1E;
- sp8.xPos = 0xC;
- if (sub_8119E3C(&sp8, 0) != 0)
+ struct CryScreenWindow waveformWindow;
+
+ waveformWindow.unk0 = 0x4020;
+ waveformWindow.unk2 = 0x1F;
+ waveformWindow.paletteNo = 8;
+ waveformWindow.yPos = 0x1E;
+ waveformWindow.xPos = 0xC;
+ if (LoadCryWaveformWindow(&waveformWindow, 0) != 0)
{
gMain.state++;
- gUnknown_03005E98 = 0;
+ gDexCryScreenState = 0;
}
}
break;
case 7:
{
- struct CryRelatedStruct sp10;
+ struct CryScreenWindow sp10;
sp10.unk0 = 0x3000;
sp10.unk2 = 0xE;
@@ -3228,7 +3228,7 @@ static void Task_InitCryScreenMultistep(u8 taskId)
break;
case 8:
BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0));
- SetVBlankCallback(gUnknown_03005CEC);
+ SetVBlankCallback(gPokedexVBlankCB);
gMain.state++;
break;
case 9:
@@ -3251,17 +3251,17 @@ static void Task_InitCryScreenMultistep(u8 taskId)
static void Task_CryScreenProcessInput(u8 taskId)
{
- sub_8119F88(0);
+ UpdateCryWaveformWindow(0);
if (IsCryPlaying())
- sub_8090040(1);
+ LoadPlayArrowPalette(1);
else
- sub_8090040(0);
+ LoadPlayArrowPalette(0);
if (gMain.newKeys & A_BUTTON)
{
- sub_8090040(1);
- sub_811A050(NationalPokedexNumToSpecies(sPokedexListItem->dexNum));
+ LoadPlayArrowPalette(1);
+ CryScreenPlayButton(NationalPokedexNumToSpecies(sPokedexListItem->dexNum));
return;
}
else if (!gPaletteFade.active)
@@ -3271,7 +3271,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
m4aMPlayContinue(&gMPlayInfo_BGM);
gPokedexView->screenSwitchState = 1;
- gTasks[taskId].func = sub_808FFBC;
+ gTasks[taskId].func = Task_SwitchScreensFromCryScreen;
PlaySE(SE_PC_OFF);
return;
}
@@ -3281,7 +3281,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
m4aMPlayContinue(&gMPlayInfo_BGM);
gPokedexView->screenSwitchState = 2;
- gTasks[taskId].func = sub_808FFBC;
+ gTasks[taskId].func = Task_SwitchScreensFromCryScreen;
PlaySE(SE_DEX_PAGE);
return;
}
@@ -3297,7 +3297,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
m4aMPlayContinue(&gMPlayInfo_BGM);
gPokedexView->screenSwitchState = 3;
- gTasks[taskId].func = sub_808FFBC;
+ gTasks[taskId].func = Task_SwitchScreensFromCryScreen;
PlaySE(SE_DEX_PAGE);
}
return;
@@ -3305,7 +3305,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
}
}
-static void sub_808FFBC(u8 taskId)
+static void Task_SwitchScreensFromCryScreen(u8 taskId)
{
if (!gPaletteFade.active)
{
@@ -3326,15 +3326,15 @@ static void sub_808FFBC(u8 taskId)
}
}
-static void sub_8090040(u8 a)
+static void LoadPlayArrowPalette(u8 cryPlaying)
{
- u16 unk;
+ u16 color;
- if (a != 0)
- unk = 0x392;
+ if (cryPlaying)
+ color = RGB(18, 28, 0);
else
- unk = 0x2AF;
- LoadPalette(&unk, 0x5D, 2);
+ color = RGB(15, 21, 0);
+ LoadPalette(&color, 0x5D, 2);
}
static void Task_InitSizeScreenMultistep(u8 taskId)
@@ -3348,7 +3348,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId)
if (!gPaletteFade.active)
{
gPokedexView->currentPage = 7;
- gUnknown_03005CEC = gMain.vblankCallback;
+ gPokedexVBlankCB = gMain.vblankCallback;
SetVBlankCallback(NULL);
ResetOtherVideoRegisters(0x200);
gPokedexView->selectedScreen = SIZE_SCREEN;
@@ -3361,13 +3361,14 @@ static void Task_InitSizeScreenMultistep(u8 taskId)
gMain.state++;
break;
case 2:
- sub_8090540(0xD);
+ LoadScreenSelectBarSubmenu(0xD);
sub_8090644(3, 0xD);
LoadPokedexBgPalette();
gMain.state++;
break;
case 3:
{
+ // This only needs to be 25 chars long (31 in German).
u8 string[40]; //I hope this is the correct size
Text_LoadWindowTemplate(&gWindowTemplate_81E702C);
@@ -3390,7 +3391,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId)
gSprites[spriteId].oam.priority = 0;
gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale);
- LoadPalette(gUnknown_083B4EC4, (gSprites[spriteId].oam.paletteNum + 16) * 16, sizeof(gUnknown_083B4EC4));
+ LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, sizeof(sSizeScreenSilhouette_Pal));
gMain.state++;
break;
case 6:
@@ -3400,12 +3401,12 @@ static void Task_InitSizeScreenMultistep(u8 taskId)
gSprites[spriteId].oam.priority = 0;
gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale);
- LoadPalette(gUnknown_083B4EC4, (gSprites[spriteId].oam.paletteNum + 16) * 16, sizeof(gUnknown_083B4EC4));
+ LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, sizeof(sSizeScreenSilhouette_Pal));
gMain.state++;
break;
case 7:
BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0));
- SetVBlankCallback(gUnknown_03005CEC);
+ SetVBlankCallback(gPokedexVBlankCB);
gMain.state++;
break;
case 8:
@@ -3433,7 +3434,7 @@ static void Task_SizeScreenProcessInput(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gPokedexView->screenSwitchState = 1;
- gTasks[taskId].func = sub_8090498;
+ gTasks[taskId].func = Task_SwitchScreensFromSizeScreen;
PlaySE(SE_PC_OFF);
}
else if ((gMain.newKeys & DPAD_LEFT)
@@ -3441,12 +3442,12 @@ static void Task_SizeScreenProcessInput(u8 taskId)
{
BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
gPokedexView->screenSwitchState = 2;
- gTasks[taskId].func = sub_8090498;
+ gTasks[taskId].func = Task_SwitchScreensFromSizeScreen;
PlaySE(SE_DEX_PAGE);
}
}
-static void sub_8090498(u8 taskId)
+static void Task_SwitchScreensFromSizeScreen(u8 taskId)
{
if (!gPaletteFade.active)
{
@@ -3463,16 +3464,16 @@ static void sub_8090498(u8 taskId)
}
}
-static void LoadScreenSelectBarMain(u16 a)
+static void LoadScreenSelectBarMain(u16 screenBase)
{
- LZ77UnCompVram(gUnknown_08E96ACC, (void *)(VRAM + a * 0x800));
- DmaClear16(3, (void *)(VRAM + a * 0x800 + 0xC0), 0x440);
+ LZ77UnCompVram(gPokedexScreenSelectBarMain_Tilemap, (void *)(VRAM + screenBase * 0x800));
+ DmaClear16(3, (void *)(VRAM + screenBase * 0x800 + 0xC0), 0x440);
}
-static void sub_8090540(u16 a)
+static void LoadScreenSelectBarSubmenu(u16 screenBase)
{
- LZ77UnCompVram(gUnknown_08E96B58, (void *)(VRAM + a * 0x800));
- DmaClear16(3, (void *)(VRAM + a * 0x800 + 0xC0), 0x440);
+ LZ77UnCompVram(gPokedexScreenSelectBarSubmenu_Tilemap, (void *)(VRAM + screenBase * 0x800));
+ DmaClear16(3, (void *)(VRAM + screenBase * 0x800 + 0xC0), 0x440);
}
#ifdef NONMATCHING
@@ -3795,7 +3796,7 @@ static void sub_8090750(u8 taskId)
default:
if (!gPaletteFade.active)
{
- gUnknown_03005CEC = gMain.vblankCallback;
+ gPokedexVBlankCB = gMain.vblankCallback;
SetVBlankCallback(NULL);
ResetOtherVideoRegisters(0x100);
gTasks[taskId].data[0] = 1;
@@ -3843,7 +3844,7 @@ static void sub_8090750(u8 taskId)
spriteId = CreateMonSpriteFromNationalDexNumber(dexNum, 0x30, 0x38, 0);
gSprites[spriteId].oam.priority = 0;
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
- SetVBlankCallback(gUnknown_03005CEC);
+ SetVBlankCallback(gPokedexVBlankCB);
gTasks[taskId].data[3] = spriteId;
gTasks[taskId].data[0]++;
break;
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 9abea27a1..59fc6566b 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -41,7 +41,7 @@ void sub_811A350(u8, u16, u8);
void sub_811A534(struct Sprite *);
void sub_811A6D8(s8);
-u8 gUnknown_03005E98;
+u8 gDexCryScreenState;
// data/pokedex_cry_screen.o
@@ -204,7 +204,7 @@ struct SpritePalette gCryMeterNeedleSpritePalettes[] = {
#ifdef NONMATCHING
// caused by some switch branch weirdness
-u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
+u8 LoadCryWaveformWindow(struct CryScreenWindow *cry, u8 arg1)
{
u8 i;
u8 j;
@@ -213,7 +213,7 @@ u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
u8 r9 = FALSE;
u32 offset;
- switch (gUnknown_03005E98)
+ switch (gDexCryScreenState)
{
case 0:
gPokedexCryScreenPtr->unk0014 = cry->unk0;
@@ -231,7 +231,7 @@ u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
DmaCopy16(3, gUnknown_083FB718, gSharedMem[32 * i + j], 32);
}
}
- gUnknown_03005E98++;
+ gDexCryScreenState++;
break;
case 1:
r7 = cry->unk2 << 11;
@@ -250,7 +250,7 @@ u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
{
sub_811A1C8(i, 0);
}
- gUnknown_03005E98++;
+ gDexCryScreenState++;
break;
case 2:
sub_811A324();
@@ -261,7 +261,7 @@ u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
return r9;
}
#else
-NAKED u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
+NAKED u8 LoadCryWaveformWindow(struct CryScreenWindow *cry, u8 arg1)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r9\n"
@@ -272,7 +272,7 @@ NAKED u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
"\tlsrs r2, r1, 24\n"
"\tmovs r0, 0\n"
"\tmov r9, r0\n"
- "\tldr r6, _08119E60 @ =gUnknown_03005E98\n"
+ "\tldr r6, _08119E60 @ =gDexCryScreenState\n"
"\tldrb r0, [r6]\n"
"\tcmp r0, 0x1\n"
"\tbeq _08119EE0\n"
@@ -282,7 +282,7 @@ NAKED u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
"\tbeq _08119E6A\n"
"\tb _08119F74\n"
"\t.align 2, 0\n"
- "_08119E60: .4byte gUnknown_03005E98\n"
+ "_08119E60: .4byte gDexCryScreenState\n"
"_08119E64:\n"
"\tcmp r0, 0x2\n"
"\tbeq _08119F60\n"
@@ -402,7 +402,7 @@ NAKED u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
"\tcmp r4, r0\n"
"\tblt _08119F38\n"
"_08119F4E:\n"
- "\tldr r1, _08119F5C @ =gUnknown_03005E98\n"
+ "\tldr r1, _08119F5C @ =gDexCryScreenState\n"
"_08119F50:\n"
"\tldrb r0, [r1]\n"
"\tadds r0, 0x1\n"
@@ -410,7 +410,7 @@ NAKED u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
"\tb _08119F74\n"
"\t.align 2, 0\n"
"_08119F58: .4byte gSharedMem + 0x1C000\n"
- "_08119F5C: .4byte gUnknown_03005E98\n"
+ "_08119F5C: .4byte gDexCryScreenState\n"
"_08119F60:\n"
"\tbl sub_811A324\n"
"\tldr r0, _08119F84 @ =gUnknown_083FB6F8\n"
@@ -433,7 +433,7 @@ NAKED u8 sub_8119E3C(struct CryRelatedStruct *cry, u8 arg1)
}
#endif // NONMATCHING
-void sub_8119F88(u8 a0)
+void UpdateCryWaveformWindow(u8 a0)
{
u8 r4;
sub_811A324();
@@ -472,7 +472,7 @@ void sub_8119F88(u8 a0)
gPokedexCryScreenPtr->unk0010++;
}
-void sub_811A050(u16 species)
+void CryScreenPlayButton(u16 species)
{
if (gMPlayInfo_BGM.status & MUSICPLAYER_STATUS_PAUSE && !gPokedexCryScreenPtr->unk001A)
{
@@ -827,15 +827,15 @@ void sub_811A350(u8 a0, u16 a1, u8 a2)
}
}
-u8 ShowPokedexCryScreen(struct CryRelatedStruct *cry, u8 arg1) {
+u8 ShowPokedexCryScreen(struct CryScreenWindow *cry, u8 arg1) {
int returnVal = FALSE;
- switch (gUnknown_03005E98)
+ switch (gDexCryScreenState)
{
case 0:
LZ77UnCompVram(gUnknown_083FAF3C, (void *) (VRAM + cry->unk0));
LoadPalette(&gUnknown_083FAF1C, cry->paletteNo * 16, 0x20);
- gUnknown_03005E98 += 1;
+ gDexCryScreenState += 1;
break;
case 1:
@@ -859,7 +859,7 @@ u8 ShowPokedexCryScreen(struct CryRelatedStruct *cry, u8 arg1) {
}
}
- gUnknown_03005E98 += 1;
+ gDexCryScreenState += 1;
break;
}
diff --git a/sym_common.txt b/sym_common.txt
index ed5fda76a..fca25afb0 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -245,7 +245,7 @@ SYMBOL(gPostMenuFieldCallback, 4)
// pokedex.c
SYMBOL(gUnusedPokedexU8, 4)
-SYMBOL(gUnknown_03005CEC, 4)
+SYMBOL(gPokedexVBlankCB, 4)
// pokemon_summary_screen.o
SYMBOL(gUnknown_03005CF0, 4)
@@ -319,7 +319,7 @@ gUnknown_Debug_03005FB8 = .;
#endif
// pokedex_cry_screen.c
-SYMBOL(gUnknown_03005E98, 4)
+SYMBOL(gDexCryScreenState, 4)
// save.c
SYMBOL(gFirstSaveSector, 4)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:34:50 +0000