diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-19 20:49:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 20:49:58 -0500 |
| commit | 6999b237ebbc36c3aa751335027bcba6b5b3556f (patch) | |
| tree | 993f5737fbe70a21f062e7d18908267a456f145d /src/main_menu.c | |
| parent | c2ddb92c9e0905a6625f83f7b5e0936b630c0597 (diff) | |
| parent | 752982552e212dcb33d57c66342f87eba3ce9089 (diff) | |
Merge pull request #1309 from GriffinRichards/misc-macro
Use constants for item data, misc other constants/fixes
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 2c27b673a..74af96da8 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1799,7 +1799,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) ResetBgsAndClearDma3BusyFlags(0); SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - InitBgsFromTemplates(0, sMainMenuBgTemplates, 2); + InitBgsFromTemplates(0, sMainMenuBgTemplates, ARRAY_COUNT(sMainMenuBgTemplates)); InitBgFromTemplate(&sBirchBgTemplate); SetVBlankCallback(NULL); SetGpuReg(REG_OFFSET_BG2CNT, 0); @@ -2097,7 +2097,7 @@ static void NewGameBirchSpeech_ShowGenderMenu(void) { DrawMainMenuWindowBorder(&gNewGameBirchSpeechTextWindows[1], 0xF3); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - PrintMenuTable(1, 2, sMenuActions_Gender); + PrintMenuTable(1, ARRAY_COUNT(sMenuActions_Gender), sMenuActions_Gender); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); CopyWindowToVram(1, 3); |