dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
DizzyEggg
2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_bg.c
+3 -2
View File
@@ -18,6 +18,7 @@
#include "text_window.h"
#include "menu.h"
#include "battle_setup.h"
#include "constants/map_types.h"
struct BattleBackground
{
@@ -75,8 +76,8 @@ void sub_80356D0(void)
void LoadBattleMenuWindowGfx(void)
{
LoadSav2WindowGfx(2, 0x12, 0x10);
LoadSav2WindowGfx(2, 0x22, 0x10);
LoadUserWindowBorderGfx(2, 0x12, 0x10);
LoadUserWindowBorderGfx(2, 0x22, 0x10);
LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20);
if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
src/battle_controller_player.c
+4 -4
View File
@@ -2420,7 +2420,7 @@ static void PlayerHandleFaintAnimation(void)
static void PlayerHandlePaletteFade(void)
{
BeginNormalPaletteFade(-1, 2, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
PlayerBufferExecCompleted();
}
@@ -2640,7 +2640,7 @@ static void PlayerHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
@@ -2667,7 +2667,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->battlerPreventingSwitchout) = gBattleBufferA[gActiveBattler][1] >> 4;
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;
}
@@ -2676,7 +2676,7 @@ static void PlayerHandleChoosePokemon(void)
static void PlayerHandleCmd23(void)
{
BattleStopLowHpSound();
BeginNormalPaletteFade(-1, 2, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0);
PlayerBufferExecCompleted();
}
src/battle_controller_safari.c
+1 -1
View File
@@ -478,7 +478,7 @@ static void SafariHandleChooseItem(void)
{
s32 i;
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase;
gBattlerInMenuId = gActiveBattler;
}
src/battle_controller_wally.c
+1 -1
View File
@@ -1251,7 +1251,7 @@ static void WallyHandleChooseMove(void)
static void WallyHandleChooseItem(void)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattlerControllerFuncs[gActiveBattler] = OpenBagAfterPaletteFade;
gBattlerInMenuId = gActiveBattler;
}
src/battle_main.c
+6 -6
View File
@@ -1826,7 +1826,7 @@ void BattleMainCB2(void)
{
gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED;
ResetPaletteFadeControl();
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
SetMainCallback2(CB2_QuitRecordedBattle);
}
}
@@ -2262,7 +2262,7 @@ static void sub_8038F34(void)
case 1:
if (--gBattleCommunication[1] == 0)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleCommunication[MULTIUSE_STATE]++;
}
break;
@@ -2319,7 +2319,7 @@ static void sub_8038F34(void)
for (i = 0; i < 2; i++)
LoadChosenBattleElement(i);
BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gBattleCommunication[MULTIUSE_STATE]++;
break;
case 4:
@@ -2424,7 +2424,7 @@ static void sub_80392A8(void)
gReservedSpritePaletteCount = 4;
SetVBlankCallback(VBlankCB_Battle);
SetMainCallback2(sub_803937C);
BeginNormalPaletteFade(-1, 0, 0x10, 0, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
gBattleCommunication[MULTIUSE_STATE] = 0;
}
@@ -2584,7 +2584,7 @@ static void sub_803939C(void)
{
if (sub_800A520() == TRUE)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleCommunication[1] = 0x20;
gBattleCommunication[MULTIUSE_STATE] = 8;
}
@@ -2592,7 +2592,7 @@ static void sub_803939C(void)
}
else
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleCommunication[1] = 0x20;
gBattleCommunication[MULTIUSE_STATE] = 8;
}
src/battle_records.c
+2 -2
View File
@@ -348,7 +348,7 @@ static void Task_CloseTrainerHillRecordsOnButton(u8 taskId)
static void Task_BeginPaletteFade(u8 taskId)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_ExitTrainerHillRecords;
}
@@ -495,7 +495,7 @@ static void CB2_ShowTrainerHillRecords(void)
gMain.state++;
break;
case 6:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gMain.state++;
break;
case 7:
src/battle_script_commands.c
+3 -2
View File
@@ -19,6 +19,7 @@
#include "constants/songs.h"
#include "constants/trainers.h"
#include "constants/battle_anim.h"
#include "constants/map_types.h"
#include "text.h"
#include "sound.h"
#include "pokedex.h"
@@ -5713,7 +5714,7 @@ static void atk5A_yesnoboxlearnmove(void)
if (gBattleCommunication[1] == 0)
{
HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, WINDOW_CLEAR);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattleScripting.learnMoveState++;
}
else
@@ -10288,7 +10289,7 @@ static void atkF2_displaydexinfo(void)
switch (gBattleCommunication[0])
{
case 0:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gBattleCommunication[0]++;
break;
case 1:
src/battle_setup.c
+1
View File
@@ -32,6 +32,7 @@
#include "overworld.h"
#include "field_weather.h"
#include "gym_leader_rematch.h"
#include "constants/map_types.h"
enum
{
src/battle_transition.c
+5 -5
View File
@@ -1080,7 +1080,7 @@ static bool8 Phase2_Blur_Func2(struct Task *task)
{
task->tData1 = 4;
if (++task->tData2 == 10)
BeginNormalPaletteFade(-1, -1, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0);
SetGpuReg(REG_OFFSET_MOSAIC, (task->tData2 & 15) * 17);
if (task->tData2 > 14)
task->tState++;
@@ -1107,7 +1107,7 @@ static bool8 Phase2_Swirl_Func1(struct Task *task)
{
sub_8149F08();
ScanlineEffect_Clear();
BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0);
sub_8149F98(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_14, 0, 2, 0, 160);
SetVBlankCallback(VBlankCB_Phase2_Swirl);
@@ -1162,7 +1162,7 @@ static bool8 Phase2_Shuffle_Func1(struct Task *task)
sub_8149F08();
ScanlineEffect_Clear();
BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0);
memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->field_16, 0x140);
SetVBlankCallback(VBlankCB_Phase2_Shuffle);
@@ -1973,7 +1973,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task)
if (++task->tData3 == 81)
{
task->tData4++;
BeginNormalPaletteFade(-1, -2, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 0x10, 0);
}
if (task->tData4 != 0 && !gPaletteFade.active)
@@ -3982,7 +3982,7 @@ static bool8 Phase2_30_Func4(struct Task *task)
if (++task->tData3 == 101)
{
task->tData4++;
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
}
if (task->tData4 != 0 && !gPaletteFade.active)
src/berry_blender.c
+8 -10
View File
@@ -15,6 +15,7 @@
#include "malloc.h"
#include "gpu_regs.h"
#include "text.h"
#include "text_window.h"
#include "event_data.h"
#include "main.h"
#include "link.h"
@@ -153,8 +154,6 @@ extern const u8 gText_234Players[];
extern void sub_800A418(void);
extern u8 sub_800A9D8(void);
extern void LoadSav2WindowGfx(u8, u16, u8);
extern void LoadMessageBoxGfx(u8, u16, u8);
extern void sub_81AABF0(void (*callback)(void));
extern void sub_800B4C0(void);
extern void ClearLinkCallback(void);
@@ -927,7 +926,7 @@ static void sub_807FAC8(void)
InitBgsFromTemplates(1, sBerryBlenderBgTemplates, ARRAY_COUNT(sBerryBlenderBgTemplates));
SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]);
SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]);
LoadSav2WindowGfx(0, 1, 0xD0);
LoadUserWindowBorderGfx(0, 1, 0xD0);
LoadMessageBoxGfx(0, 0x14, 0xF0);
InitBerryBlenderWindows();
@@ -959,7 +958,7 @@ static void sub_807FAC8(void)
}
break;
case 2:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
sub_8082D28();
sBerryBlenderData->mainState++;
break;
@@ -973,7 +972,7 @@ static void sub_807FAC8(void)
sBerryBlenderData->mainState++;
break;
case 5:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
sBerryBlenderData->mainState++;
break;
case 6:
@@ -1163,7 +1162,7 @@ static void sub_8080018(void)
sBerryBlenderData->mainState++;
break;
case 3:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
sBerryBlenderData->mainState++;
break;
case 4:
@@ -1330,8 +1329,7 @@ static void sub_8080588(void)
SetBgTilemapBuffer(1, sBerryBlenderData->tilemapBuffers[0]);
SetBgTilemapBuffer(2, sBerryBlenderData->tilemapBuffers[1]);
LoadSav2WindowGfx(0, 1, 0xD0);
LoadUserWindowBorderGfx(0, 1, 0xD0);
LoadMessageBoxGfx(0, 0x14, 0xF0);
InitBerryBlenderWindows();
@@ -1490,7 +1488,7 @@ static void sub_80808D4(void)
sBerryBlenderData->mainState++;
break;
case 3:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
sBerryBlenderData->mainState++;
sBerryBlenderData->framesToWait = 0;
break;
@@ -2656,7 +2654,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
case 9:
if (sub_800A520())
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
sBerryBlenderData->gameEndState++;
}
break;
src/berry_tag_screen.c
+2 -2
View File
@@ -247,7 +247,7 @@ static bool8 InitBerryTagScreen(void)
gMain.state++;
break;
case 15:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gPaletteFade.bufferTransferDisabled = 0;
gMain.state++;
break;
@@ -481,7 +481,7 @@ static void DestroyFlavorCircleSprites(void)
static void PrepareToCloseBerryTagScreen(u8 taskId)
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_CloseBerryTagScreen;
}
src/bike.c
+1
View File
@@ -9,6 +9,7 @@
#include "overworld.h"
#include "constants/songs.h"
#include "sound.h"
#include "constants/map_types.h"
extern bool8 gBikeCyclingChallenge;
extern u8 gBikeCollisions;
src/daycare.c
+5 -5
View File
@@ -73,20 +73,20 @@ static const struct ListMenuItem sLevelMenuItems[] =
static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
{
.items = sLevelMenuItems,
.moveCursorFunc = sub_81AF078,
.unk_08 = DaycarePrintMonInfo,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = DaycarePrintMonInfo,
.totalItems = 3,
.maxShowed = 3,
.windowId = 0,
.unk_11 = 0,
.unk_12 = 8,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 1,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 1,
.unk_16_3 = 0,
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = 1,
.cursorKind = 0
src/decoration.c
+1 -1
View File
@@ -838,7 +838,7 @@ void sub_8127500(void)
{
if (sDecorPCBuffer->unk_522 == 0xFF)
{
sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParametrized(0x02, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo);
sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo);
}
}
src/diploma.c
+2 -2
View File
@@ -89,7 +89,7 @@ void CB2_ShowDiploma(void)
CopyBgTilemapBufferToVram(1);
DisplayDiplomaText();
BlendPalettes(-1, 16, 0);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
EnableInterrupts(1);
SetVBlankCallback(VBlankCB);
SetMainCallback2(MainCB2);
@@ -114,7 +114,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_DiplomaFadeOut;
}
}
src/egg_hatch.c
+5 -5
View File
@@ -591,7 +591,7 @@ static void CB2_EggHatch_1(void)
switch (sEggHatchData->CB2_state)
{
case 0:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5);
ShowBg(0);
ShowBg(1);
@@ -653,7 +653,7 @@ static void CB2_EggHatch_1(void)
case 9:
if (!IsTextPrinterActive(sEggHatchData->windowId))
{
LoadSav2WindowGfx(sEggHatchData->windowId, 0x140, 0xE0);
LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, 0xE0);
CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0);
sEggHatchData->CB2_state++;
}
@@ -674,7 +674,7 @@ static void CB2_EggHatch_1(void)
}
break;
case 11:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
sEggHatchData->CB2_state++;
break;
case 12:
@@ -784,7 +784,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
{
s16 i;
if (sprite->data[0] == 0)
BeginNormalPaletteFade(-1, -1, 0, 0x10, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF);
if (sprite->data[0] < 4u)
{
for (i = 0; i <= 3; i++)
@@ -808,7 +808,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite)
StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1);
}
if (sprite->data[0] == 8)
BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF);
if (sprite->data[0] <= 9)
gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1;
if (sprite->data[0] > 40)
src/event_object_movement.c
+2 -1
View File
@@ -21,6 +21,7 @@
#include "sprite.h"
#include "trainer_see.h"
#include "util.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_objects.h"
// this file was known as evobjmv.c in Game Freak's original source
@@ -1537,7 +1538,7 @@ u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate)
return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY);
}
u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z)
{
struct EventObjectTemplate eventObjectTemplate;
src/evolution_scene.c
+8 -8
View File
@@ -188,7 +188,7 @@ static void Task_BeginEvolutionScene(u8 taskID)
switch (gTasks[taskID].tState)
{
case 0:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskID].tState++;
break;
case 1:
@@ -385,7 +385,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
SetVBlankCallback(VBlankCB_EvolutionScene);
SetMainCallback2(CB2_EvolutionSceneUpdate);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
ShowBg(0);
ShowBg(1);
@@ -469,7 +469,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
gMain.state++;
break;
case 7:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
sub_807B140();
ShowBg(0);
ShowBg(1);
@@ -622,7 +622,7 @@ static void Task_EvolutionScene(u8 taskID)
switch (gTasks[taskID].tState)
{
case 0:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gSprites[sEvoStructPtr->preEvoSpriteID].invisible = 0;
gTasks[taskID].tState++;
ShowBg(0);
@@ -770,7 +770,7 @@ static void Task_EvolutionScene(u8 taskID)
}
else // no move to learn
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskID].tState++;
}
}
@@ -904,7 +904,7 @@ static void Task_EvolutionScene(u8 taskID)
{
gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
if (gTasks[taskID].tLearnMoveState == 5)
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
}
}
if (gMain.newKeys & B_BUTTON)
@@ -1214,7 +1214,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
case 3:
if (!IsTextPrinterActive(0) && !IsSEPlaying())
{
LoadSav2WindowGfx(0, 0xA8, 0xE0);
LoadUserWindowBorderGfx(0, 0xA8, 0xE0);
CreateYesNoMenu(&gUnknown_0833900C, 0xA8, 0xE, 0);
sEvoCursorPos = 0;
gTasks[taskID].tLearnMoveState++;
@@ -1230,7 +1230,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
sub_807F1A8(0, gDisplayedStringBattle, 1);
gTasks[taskID].tLearnMoveState = gTasks[taskID].tData7;
if (gTasks[taskID].tLearnMoveState == 5)
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
break;
case 1:
case -1:
src/field_region_map.c
+3 -3
View File
@@ -89,7 +89,7 @@ static void MCB2_InitRegionMapRegisters(void)
InitBgsFromTemplates(1, gUnknown_085E5068, 2);
InitWindows(gUnknown_085E5070);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 0x27, 0xd0);
LoadUserWindowBorderGfx(0, 0x27, 0xd0);
clear_scheduled_bg_copies_to_vram();
SetMainCallback2(MCB2_FieldUpdateRegionMap);
SetVBlankCallback(VBCB_FieldUpdateRegionMap);
@@ -130,7 +130,7 @@ static void FieldUpdateRegionMap(void)
schedule_bg_copy_tilemap_to_vram(0);
SetWindowBorderStyle(0, 0, 0x27, 0xd);
PrintRegionMapSecName();
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
sFieldRegionMapHandler->state++;
break;
case 2:
@@ -158,7 +158,7 @@ static void FieldUpdateRegionMap(void)
}
break;
case 5:
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
sFieldRegionMapHandler->state++;
break;
case 6:
src/hall_of_fame.c
+2 -2
View File
@@ -414,7 +414,7 @@ static bool8 InitHallOfFameScreen(void)
if (!sub_8175024())
{
SetVBlankCallback(VBlankCB_HallOfFame);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gMain.state++;
}
break;
@@ -764,7 +764,7 @@ static void Task_Hof_ExitOnKeyPressed(u8 taskId)
static void Task_Hof_HandlePaletteOnExit(u8 taskId)
{
CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
BeginNormalPaletteFade(-1, 8, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 0x10, 0);
gTasks[taskId].func = Task_Hof_HandleExit;
}
src/item_menu.c
+10 -10
View File
@@ -209,7 +209,7 @@ const struct YesNoFuncTable gUnknown_08614084 = {BagMenuActuallyToss, BagMenuCan
const struct YesNoFuncTable gUnknown_0861408C = {sub_81AD84C, sub_81AD6FC};
const struct ArrowStruct gUnknown_08614094 = {0, 0x1C, 16, 1, 100, 16, -1, -1, 0x6F, 0x6F, 0};
const struct ScrollArrowsTemplate gUnknown_08614094 = {SCROLL_ARROW_LEFT, 0x1C, 16, SCROLL_ARROW_RIGHT, 100, 16, -1, -1, 0x6F, 0x6F, 0};
const u8 gUnknown_086140A4[] = INCBIN_U8("graphics/interface/select_button.4bpp");
@@ -488,7 +488,7 @@ bool8 setup_bag_menu(void)
gMain.state++;
break;
case 20:
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gPaletteFade.bufferTransferDisabled = FALSE;
gMain.state++;
break;
@@ -733,7 +733,7 @@ void bag_menu_print_cursor(u8 a, u8 b)
void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void)
{
if (gUnknown_0203CE54->unk81E == 0xFF)
gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParametrized(2, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]);
gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]);
}
void sub_81AB824(void)
@@ -771,7 +771,7 @@ void free_bag_item_list_buffers(void)
void unknown_ItemMenu_Confirm(u8 taskId)
{
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = task_close_bag_menu_2;
}
@@ -1114,7 +1114,7 @@ void bag_menu_swap_items(u8 taskId)
{
s16* data = gTasks[taskId].data;
sub_81AF15C(data[0], 16, 1);
ListMenuSetUnkIndicatorsStructField(data[0], 16, 1);
data[1] = gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket] + gUnknown_0203CE58.cursorPosition[gUnknown_0203CE58.pocket];
gUnknown_0203CE54->unk81A = data[1];
CopyItemName(BagGetItemIdByPocketPosition(gUnknown_0203CE58.pocket + 1, data[1]), gStringVar1);
@@ -2078,7 +2078,7 @@ void bag_menu_print_pocket_names(u8 *pocketName1, u8 *pocketName2)
offset = GetStringCenterAlignXOffset(1, pocketName2, 0x40);
bag_menu_print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, -1, 1);
}
CpuCopy32((u8*)GetWindowAttribute(windowId, 7), gUnknown_0203CE54->unk844, 0x400);
CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gUnknown_0203CE54->unk844, 0x400);
RemoveWindow(windowId);
}
@@ -2090,7 +2090,7 @@ void bag_menu_copy_pocket_name_to_window(u32 a)
if (a > 8)
a = 8;
r4 = &gUnknown_0203CE54->unk844;
windowAttribute = (u8*)GetWindowAttribute(2, 7);
windowAttribute = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA);
CpuCopy32(r4[0][a], windowAttribute, 0x100);
b = a + 16;
CpuCopy32(r4[0][b], windowAttribute + 0x100, 0x100);
@@ -2103,7 +2103,7 @@ void setup_bag_menu_textboxes(void)
InitWindows(gUnknown_08614174);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 1, -32);
LoadUserWindowBorderGfx(0, 1, -32);
LoadMessageBoxGfx(0, 10, -48);
sub_819A2BC(-64, 1);
LoadPalette(&gUnknown_0860F074, 0xF0, 0x20);
@@ -2116,9 +2116,9 @@ void setup_bag_menu_textboxes(void)
schedule_bg_copy_tilemap_to_vram(1);
}
void bag_menu_print(u8 a, u8 b, const u8 *str, u8 c, u8 d, u8 e, u8 f, u8 g, u8 h)
void bag_menu_print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 h)
{
AddTextPrinterParameterized2(a, b, c, d, e, f, gUnknown_08614164[h], g, str);
AddTextPrinterParameterized2(windowId, fontId, left, top, letterSpacing, lineSpacing, gUnknown_08614164[h], speed, str);
}
u8 sub_81AE124(u8 a)
src/item_use.c
+3 -2
View File
@@ -5,6 +5,7 @@
#include "berry.h"
#include "bike.h"
#include "coins.h"
#include "constants/bg_event_constants.h"
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/songs.h"
@@ -371,7 +372,7 @@ bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId)
gTasks[taskId].data[2] = FALSE;
for (i = 0; i < events->bgEventCount; i++)
{
if (events->bgEvents[i].kind == 7 && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
if (events->bgEvents[i].kind == BG_EVENT_HIDDEN_ITEM && !FlagGet(events->bgEvents[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
{
distanceX = (u16)events->bgEvents[i].x + 7;
newDistanceX = distanceX - x;
@@ -398,7 +399,7 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
for (i = 0; i < bgEventCount; i++)
{
if (bgEvent[i].kind == 7 && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
if (bgEvent[i].kind == BG_EVENT_HIDDEN_ITEM && x == (u16)bgEvent[i].x && y == (u16)bgEvent[i].y) // hidden item and coordinates matches x and y passed?
{
if (!FlagGet(bgEvent[i].bgUnion.hiddenItem.hiddenItemId + 0x1F4))
return TRUE;
src/link.c
+2 -2
View File
@@ -219,7 +219,7 @@ const u8 gUnknown_082ED224[] = {
// .text
bool8 sub_80093CC(void)
bool8 IsWirelessAdapterConnected(void)
{
sub_800B488();
sub_800E700();
@@ -444,7 +444,7 @@ static void LinkTestProcessKeyInput(void)
}
if (gMain.newKeys & L_BUTTON)
{
BeginNormalPaletteFade(-1, 0, 16, 0, 2);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 2);
}
if (gMain.newKeys & START_BUTTON)
{
src/list_menu.c
+309 -302
View File
File diff suppressed because it is too large Load Diff
src/mail.c
+2 -2
View File
@@ -417,7 +417,7 @@ static bool8 MailReadBuildGraphics(void)
ShowBg(0);
ShowBg(1);
ShowBg(2);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gPaletteFade.bufferTransferDisabled = FALSE;
sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress;
return TRUE;
@@ -526,7 +526,7 @@ static void CB2_ExitOnKeyPress(void)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
sMailRead->callback2 = CB2_ExitMailReadFreeVars;
}
}
src/main_menu.c
+204 -176
View File
@@ -44,10 +44,10 @@
// Static RAM declarations
EWRAM_DATA u8 gUnknown_02022D04 = 0;
EWRAM_DATA u16 gUnknown_02022D06 = 0;
static EWRAM_DATA u8 gUnknown_02022D04 = 0;
static EWRAM_DATA u16 sCurrItemAndOptionMenuCheck = 0;
IWRAM_DATA u8 gUnknown_03000DD0;
static IWRAM_DATA u8 gUnknown_03000DD0;
// Static ROM declarations
@@ -56,7 +56,7 @@ void Task_MainMenuCheckSaveFile(u8);
void Task_MainMenuCheckBattery(u8);
void Task_WaitForSaveFileErrorWindow(u8);
void CreateMainMenuErrorWindow(const u8*);
void sub_8032250(const struct WindowTemplate*);
static void ClearMainMenuWindowTilemap(const struct WindowTemplate*);
void Task_DisplayMainMenu(u8);
void Task_WaitForBatteryDryErrorWindow(u8);
void fmt_savegame(void);
@@ -133,12 +133,12 @@ const u8 gUnknown_082FEEF0[] = INCBIN_U8("graphics/birch_speech/map.bin.lz");
const u16 gUnknown_082FF018[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal");
const u16 gUnknown_082FF028[] = {0, 0, 0, 0, 0, 0, 0, 0};
const struct WindowTemplate gUnknown_082FF038[] = {
const struct WindowTemplate sWindowTemplates_NoSavedGame[] = {
{0, 2, 1, 26, 2, 15, 1},
{0, 2, 5, 26, 2, 15, 0x35}
};
const struct WindowTemplate gUnknown_082FF048[] = {
const struct WindowTemplate sWindowTemplates_HasSavedGame[] = {
{0, 2, 1, 26, 6, 15, 1},
{0, 2, 9, 26, 2, 15, 0x9D},
{0, 2, 13, 26, 2, 15, 0xD1},
@@ -146,7 +146,7 @@ const struct WindowTemplate gUnknown_082FF048[] = {
{0, 2, 21, 26, 2, 15, 0x139}
};
const struct WindowTemplate gUnknown_082FF070[] = {
const struct WindowTemplate sWindowTemplate_ErrorWindow[] = {
{0, 2, 15, 26, 4, 15, 0x16D},
{0xFF, 0, 0, 0, 0, 0, 0}
};
@@ -161,7 +161,7 @@ const struct WindowTemplate gUnknown_082FF080[] = {
const u16 gMainMenuBgPal[] = INCBIN_U16("graphics/misc/main_menu_bg.gbapal");
const u16 gMainMenuTextPal[] = INCBIN_U16("graphics/misc/main_menu_text.gbapal");
const u8 gUnknown_082FF0E0[] = {10, 11, 12};
const u8 gTextColor_Headers[] = {10, 11, 12};
const u8 gUnknown_082FF0E3[] = {10, 1, 12};
const struct BgTemplate gUnknown_082FF0E8[] = {
@@ -195,7 +195,7 @@ const struct BgTemplate gUnknown_082FF0F0 = {
.baseTile = 0
};
const struct ArrowStruct gUnknown_082FF0F4 = {2, 0x78, 8, 3, 0x78, 0x98, 3, 4, 1, 1, 0};
const struct ScrollArrowsTemplate sScrollArrowsTemplate_MainMenu = {2, 0x78, 8, 3, 0x78, 0x98, 3, 4, 1, 1, 0};
const union AffineAnimCmd gUnknown_082FF104[] = {
AFFINEANIMCMD_FRAME(-2, -2, 0, 0x30),
@@ -265,6 +265,16 @@ enum
HAS_MYSTERY_EVENTS,
};
enum {
ACTION_NEW_GAME,
ACTION_CONTINUE,
ACTION_OPTIONS,
ACTION_MYSTERY_GIFT,
ACTION_MYSTERY_EVENTS,
ACTION_UNKNOWN, // TODO: change when rom_8011DC0 decompiled
ACTION_INVALID
};
#define MAIN_MENU_BORDER_TILE 0x1D5
void CB2_MainMenu(void)
@@ -319,16 +329,16 @@ u32 InitMainMenu(bool8 returningFromOptionsMenu)
ResetSpriteData();
FreeAllSpritePalettes();
if (returningFromOptionsMenu)
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0x0000); // fade to black
else
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xFFFF); // fade to white
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); // fade to white
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, gUnknown_082FF0E8, 2);
ChangeBgX(0, 0, 0);
ChangeBgY(0, 0, 0);
ChangeBgX(1, 0, 0);
ChangeBgY(1, 0, 0);
InitWindows(gUnknown_082FF038);
InitWindows(sWindowTemplates_NoSavedGame);
DeactivateAllTextPrinters();
LoadMainMenuWindowFrameTiles(0, MAIN_MENU_BORDER_TILE);
@@ -351,6 +361,15 @@ u32 InitMainMenu(bool8 returningFromOptionsMenu)
return 0;
}
#define tMenuType data[0]
#define tCurrItem data[1]
#define tItemCount data[12]
#define tScrollArrowTaskId data[13]
#define tIsScrolled data[14]
#define tWirelessAdapterConnected data[15]
#define tArrowTaskIsScrolled data[15] // For scroll indicator arrow task
void Task_MainMenuCheckSaveFile(u8 taskId)
{
s16* data = gTasks[taskId].data;
@@ -359,64 +378,64 @@ void Task_MainMenuCheckSaveFile(u8 taskId)
{
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WININ, 17);
SetGpuReg(REG_OFFSET_WINOUT, 0x31);
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_OBJ);
SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BG0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
SetGpuReg(REG_OFFSET_BLDY, 7);
if (sub_80093CC())
data[15] = 1;
if (IsWirelessAdapterConnected())
tWirelessAdapterConnected = TRUE;
switch (gSaveFileStatus)
{
case 1:
data[0] = HAS_SAVED_GAME;
tMenuType = HAS_SAVED_GAME;
if (IsMysteryGiftEnabled())
data[0]++;
tMenuType++;
gTasks[taskId].func = Task_MainMenuCheckBattery;
break;
case 2:
CreateMainMenuErrorWindow(gText_SaveFileErased);
data[0] = 0;
tMenuType = HAS_NO_SAVED_GAME;
gTasks[taskId].func = Task_WaitForSaveFileErrorWindow;
break;
case 0xFF:
CreateMainMenuErrorWindow(gText_SaveFileCorrupted);
gTasks[taskId].func = Task_WaitForSaveFileErrorWindow;
data[0] = HAS_SAVED_GAME;
tMenuType = HAS_SAVED_GAME;
if (IsMysteryGiftEnabled() == TRUE)
data[0]++;
tMenuType++;
break;
case 0:
default:
data[0] = HAS_NO_SAVED_GAME;
tMenuType = HAS_NO_SAVED_GAME;
gTasks[taskId].func = Task_MainMenuCheckBattery;
break;
case 4:
CreateMainMenuErrorWindow(gJPText_No1MSubCircuit);
gTasks[taskId].data[0] = HAS_NO_SAVED_GAME;
gTasks[taskId].tMenuType = HAS_NO_SAVED_GAME;
gTasks[taskId].func = Task_WaitForSaveFileErrorWindow;
break;
}
if (gUnknown_02022D06 & 0x8000)
if (sCurrItemAndOptionMenuCheck & 0x8000) // are we returning from the options menu?
{
switch (data[0])
switch (tMenuType) // if so, highlight the OPTIONS item
{
case HAS_NO_SAVED_GAME:
case HAS_SAVED_GAME:
gUnknown_02022D06 = data[0] + 1;
sCurrItemAndOptionMenuCheck = tMenuType + 1;
break;
case HAS_MYSTERY_GIFT:
gUnknown_02022D06 = 3;
sCurrItemAndOptionMenuCheck = 3;
break;
case 3:
gUnknown_02022D06 = 4;
case HAS_MYSTERY_EVENTS:
sCurrItemAndOptionMenuCheck = 4;
break;
}
}
gUnknown_02022D06 &= 0x7FFF;
data[1] = gUnknown_02022D06;
data[12] = data[0] + 2;
sCurrItemAndOptionMenuCheck &= 0x7FFF; // turn off the "returning from options menu" flag
tCurrItem = sCurrItemAndOptionMenuCheck;
tItemCount = tMenuType + 2;
}
}
@@ -426,7 +445,7 @@ void Task_WaitForSaveFileErrorWindow(u8 taskId)
if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON))
{
ClearWindowTilemap(7);
sub_8032250(gUnknown_082FF070);
ClearMainMenuWindowTilemap(sWindowTemplate_ErrorWindow);
gTasks[taskId].func = Task_MainMenuCheckBattery;
}
}
@@ -437,8 +456,8 @@ void Task_MainMenuCheckBattery(u8 taskId)
{
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WININ, 17);
SetGpuReg(REG_OFFSET_WINOUT, 0x31);
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_OBJ);
SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BG0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
SetGpuReg(REG_OFFSET_BLDY, 7);
@@ -461,7 +480,7 @@ void Task_WaitForBatteryDryErrorWindow(u8 taskId)
if (!IsTextPrinterActive(7) && (gMain.newKeys & A_BUTTON))
{
ClearWindowTilemap(7);
sub_8032250(gUnknown_082FF070);
ClearMainMenuWindowTilemap(sWindowTemplate_ErrorWindow);
gTasks[taskId].func = Task_DisplayMainMenu;
}
}
@@ -475,8 +494,8 @@ void Task_DisplayMainMenu(u8 taskId)
{
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WININ, 17);
SetGpuReg(REG_OFFSET_WINOUT, 0x31);
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0 | WININ_WIN0_OBJ);
SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_OBJ | WINOUT_WIN01_CLR);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_DARKEN | BLDCNT_TGT1_BG0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
SetGpuReg(REG_OFFSET_BLDY, 7);
@@ -504,28 +523,28 @@ void Task_DisplayMainMenu(u8 taskId)
LoadPalette(&palette, 241, 2);
}
switch (gTasks[taskId].data[0])
switch (gTasks[taskId].tMenuType)
{
case HAS_NO_SAVED_GAME:
default:
FillWindowPixelBuffer(0, 0xAA);
FillWindowPixelBuffer(1, 0xAA);
box_print(0, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame);
box_print(1, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption);
box_print(0, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
box_print(1, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
PutWindowTilemap(0);
PutWindowTilemap(1);
CopyWindowToVram(0, 2);
CopyWindowToVram(1, 2);
DrawMainMenuWindowBorder(gUnknown_082FF038, MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF038[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_NoSavedGame[0], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_NoSavedGame[1], MAIN_MENU_BORDER_TILE);
break;
case HAS_SAVED_GAME:
FillWindowPixelBuffer(2, 0xAA);
FillWindowPixelBuffer(3, 0xAA);
FillWindowPixelBuffer(4, 0xAA);
box_print(2, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuContinue);
box_print(3, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame);
box_print(4, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption);
box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
fmt_savegame();
PutWindowTilemap(2);
PutWindowTilemap(3);
@@ -533,19 +552,19 @@ void Task_DisplayMainMenu(u8 taskId)
CopyWindowToVram(2, 2);
CopyWindowToVram(3, 2);
CopyWindowToVram(4, 2);
DrawMainMenuWindowBorder(gUnknown_082FF048, MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[2], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[0], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE);
break;
case HAS_MYSTERY_GIFT:
FillWindowPixelBuffer(2, 0xAA);
FillWindowPixelBuffer(3, 0xAA);
FillWindowPixelBuffer(4, 0xAA);
FillWindowPixelBuffer(5, 0xAA);
box_print(2, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuContinue);
box_print(3, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame);
box_print(4, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuMysteryGift);
box_print(5, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption);
box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift);
box_print(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
fmt_savegame();
PutWindowTilemap(2);
PutWindowTilemap(3);
@@ -555,10 +574,10 @@ void Task_DisplayMainMenu(u8 taskId)
CopyWindowToVram(3, 2);
CopyWindowToVram(4, 2);
CopyWindowToVram(5, 2);
DrawMainMenuWindowBorder(gUnknown_082FF048, MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[2], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[3], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(sWindowTemplates_HasSavedGame, MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[3], MAIN_MENU_BORDER_TILE);
break;
case HAS_MYSTERY_EVENTS:
FillWindowPixelBuffer(2, 0xAA);
@@ -566,11 +585,11 @@ void Task_DisplayMainMenu(u8 taskId)
FillWindowPixelBuffer(4, 0xAA);
FillWindowPixelBuffer(5, 0xAA);
FillWindowPixelBuffer(6, 0xAA);
box_print(2, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuContinue);
box_print(3, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuNewGame);
box_print(4, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuMysteryGift2);
box_print(5, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuMysteryEvents);
box_print(6, 1, 0, 1, gUnknown_082FF0E0, -1, gText_MainMenuOption);
box_print(2, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuContinue);
box_print(3, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuNewGame);
box_print(4, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryGift2);
box_print(5, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuMysteryEvents);
box_print(6, 1, 0, 1, gTextColor_Headers, -1, gText_MainMenuOption);
fmt_savegame();
PutWindowTilemap(2);
PutWindowTilemap(3);
@@ -582,19 +601,19 @@ void Task_DisplayMainMenu(u8 taskId)
CopyWindowToVram(4, 2);
CopyWindowToVram(5, 2);
CopyWindowToVram(6, 2);
DrawMainMenuWindowBorder(gUnknown_082FF048, MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[2], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[3], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&gUnknown_082FF048[4], MAIN_MENU_BORDER_TILE);
data[13] = AddScrollIndicatorArrowPair(&gUnknown_082FF0F4, &gUnknown_02022D06);
gTasks[data[13]].func = Task_ScrollIndicatorArrowPairOnMainMenu;
if (gUnknown_02022D06 == 4)
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[0], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[1], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[2], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[3], MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(&sWindowTemplates_HasSavedGame[4], MAIN_MENU_BORDER_TILE);
tScrollArrowTaskId = AddScrollIndicatorArrowPair(&sScrollArrowsTemplate_MainMenu, &sCurrItemAndOptionMenuCheck);
gTasks[tScrollArrowTaskId].func = Task_ScrollIndicatorArrowPairOnMainMenu;
if (sCurrItemAndOptionMenuCheck == 4)
{
ChangeBgY(0, 0x2000, 1);
ChangeBgY(1, 0x2000, 1);
data[14] = 1;
gTasks[data[13]].data[15] = 1;
tIsScrolled = TRUE;
gTasks[tScrollArrowTaskId].tArrowTaskIsScrolled = TRUE;
}
break;
}
@@ -604,7 +623,7 @@ void Task_DisplayMainMenu(u8 taskId)
void Task_HighlightSelectedMainMenuItem(u8 taskId)
{
HighlightSelectedMainMenuItem(gTasks[taskId].data[0], gTasks[taskId].data[1], gTasks[taskId].data[14]);
HighlightSelectedMainMenuItem(gTasks[taskId].tMenuType, gTasks[taskId].tCurrItem, gTasks[taskId].tIsScrolled);
gTasks[taskId].func = Task_HandleMainMenuInput;
}
@@ -615,40 +634,40 @@ bool8 HandleMainMenuInput(u8 taskId)
if (gMain.newKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
sub_80093CC();
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_BLACK);
IsWirelessAdapterConnected(); // why bother calling this here? debug? Task_HandleMainMenuAPressed will check too
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gTasks[taskId].func = Task_HandleMainMenuAPressed;
}
else if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(-1, 0, 0, 0x10, RGB_WHITEALPHA);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITEALPHA);
SetGpuReg(REG_OFFSET_WIN0H, 0xF0);
SetGpuReg(REG_OFFSET_WIN0V, 0xA0);
gTasks[taskId].func = Task_HandleMainMenuBPressed;
}
else if ((gMain.newKeys & DPAD_UP) && data[1] > 0)
else if ((gMain.newKeys & DPAD_UP) && tCurrItem > 0)
{
if (data[0] == 3 && data[14] == 1 && data[1] == 1)
if (tMenuType == HAS_MYSTERY_EVENTS && tIsScrolled == TRUE && tCurrItem == 1)
{
ChangeBgY(0, 0x2000, 2);
ChangeBgY(1, 0x2000, 2);
gTasks[data[13]].data[15] = data[14] = 0;
gTasks[tScrollArrowTaskId].tArrowTaskIsScrolled = tIsScrolled = FALSE;
}
data[1]--;
gUnknown_02022D06 = data[1];
tCurrItem--;
sCurrItemAndOptionMenuCheck = tCurrItem;
return TRUE;
}
else if ((gMain.newKeys & DPAD_DOWN) && data[1] < data[12] - 1)
else if ((gMain.newKeys & DPAD_DOWN) && tCurrItem < tItemCount - 1)
{
if (data[0] == 3 && data[1] == 3 && data[14] == 0)
if (tMenuType == HAS_MYSTERY_EVENTS && tCurrItem == 3 && tIsScrolled == FALSE)
{
ChangeBgY(0, 0x2000, 1);
ChangeBgY(1, 0x2000, 1);
gTasks[data[13]].data[15] = data[14] = 1;
gTasks[tScrollArrowTaskId].tArrowTaskIsScrolled = tIsScrolled = TRUE;
}
data[1]++;
gUnknown_02022D06 = data[1];
tCurrItem++;
sCurrItemAndOptionMenuCheck = tCurrItem;
return TRUE;
}
return FALSE;
@@ -662,13 +681,13 @@ void Task_HandleMainMenuInput(u8 taskId)
void Task_HandleMainMenuAPressed(u8 taskId)
{
bool8 r2;
bool8 wirelessAdapterConnected;
u8 action;
if (!gPaletteFade.active)
{
if (gTasks[taskId].data[0] == 3)
RemoveScrollIndicatorArrowPair(gTasks[taskId].data[13]);
if (gTasks[taskId].tMenuType == HAS_MYSTERY_EVENTS)
RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId);
sub_819746C(0, 1);
sub_819746C(1, 1);
sub_819746C(2, 1);
@@ -677,103 +696,103 @@ void Task_HandleMainMenuAPressed(u8 taskId)
sub_819746C(5, 1);
sub_819746C(6, 1);
sub_819746C(7, 1);
r2 = sub_80093CC();
switch (gTasks[taskId].data[0])
wirelessAdapterConnected = IsWirelessAdapterConnected();
switch (gTasks[taskId].tMenuType)
{
case HAS_NO_SAVED_GAME:
default:
switch (gTasks[taskId].data[1])
switch (gTasks[taskId].tCurrItem)
{
case 0:
default:
action = 0;
action = ACTION_NEW_GAME;
break;
case 1:
action = 2;
action = ACTION_OPTIONS;
break;
}
break;
case HAS_SAVED_GAME:
switch (gTasks[taskId].data[1])
switch (gTasks[taskId].tCurrItem)
{
case 0:
default:
action = 1;
action = ACTION_CONTINUE;
break;
case 1:
action = 0;
action = ACTION_NEW_GAME;
break;
case 2:
action = 2;
action = ACTION_OPTIONS;
break;
}
break;
case HAS_MYSTERY_GIFT:
switch (gTasks[taskId].data[1])
switch (gTasks[taskId].tCurrItem)
{
case 0:
default:
action = 1;
action = ACTION_CONTINUE;
break;
case 1:
action = 0;
action = ACTION_NEW_GAME;
break;
case 2:
action = 3;
if (r2 == FALSE)
action = ACTION_MYSTERY_GIFT;
if (!wirelessAdapterConnected)
{
action = 6;
gTasks[taskId].data[0] = 0;
action = ACTION_INVALID;
gTasks[taskId].tMenuType = 0;
}
break;
case 3:
action = 2;
action = ACTION_OPTIONS;
break;
}
break;
case HAS_MYSTERY_EVENTS:
switch (gTasks[taskId].data[1])
switch (gTasks[taskId].tCurrItem)
{
case 0:
default:
action = 1;
action = ACTION_CONTINUE;
break;
case 1:
action = 0;
action = ACTION_NEW_GAME;
break;
case 2:
if (gTasks[taskId].data[15])
if (gTasks[taskId].tWirelessAdapterConnected)
{
action = 3;
if (r2 == FALSE)
action = ACTION_MYSTERY_GIFT;
if (!wirelessAdapterConnected)
{
action = 6;
gTasks[taskId].data[0] = 0;
action = ACTION_INVALID;
gTasks[taskId].tMenuType = 0;
}
}
else if (r2)
else if (wirelessAdapterConnected)
{
action = 6;
gTasks[taskId].data[0] = 1;
action = ACTION_INVALID;
gTasks[taskId].tMenuType = 1;
}
else
{
action = 5;
action = ACTION_UNKNOWN;
}
break;
case 3:
if (r2)
if (wirelessAdapterConnected)
{
action = 6;
gTasks[taskId].data[0] = 2;
action = ACTION_INVALID;
gTasks[taskId].tMenuType = 2;
}
else
{
action = 4;
action = ACTION_MYSTERY_EVENTS;
}
break;
case 4:
action = 2;
action = ACTION_OPTIONS;
break;
}
break;
@@ -782,37 +801,37 @@ void Task_HandleMainMenuAPressed(u8 taskId)
ChangeBgY(1, 0, 0);
switch (action)
{
case 0:
case ACTION_NEW_GAME:
default:
gPlttBufferUnfaded[0] = RGB_BLACK;
gPlttBufferFaded[0] = RGB_BLACK;
gTasks[taskId].func = task_new_game_prof_birch_speech_1;
break;
case 1:
case ACTION_CONTINUE:
gPlttBufferUnfaded[0] = RGB_BLACK;
gPlttBufferFaded[0] = RGB_BLACK;
SetMainCallback2(CB2_ContinueSavedGame);
DestroyTask(taskId);
break;
case 2:
case ACTION_OPTIONS:
gMain.savedCallback = CB2_ReinitMainMenu;
SetMainCallback2(CB2_InitOptionMenu);
DestroyTask(taskId);
break;
case 3:
case ACTION_MYSTERY_GIFT:
SetMainCallback2(c2_mystery_gift);
DestroyTask(taskId);
break;
case 4:
case ACTION_MYSTERY_EVENTS:
SetMainCallback2(CB2_InitMysteryEventMenu);
DestroyTask(taskId);
break;
case 5:
case ACTION_UNKNOWN:
SetMainCallback2(sub_801867C);
DestroyTask(taskId);
break;
case 6:
gTasks[taskId].data[1] = 0;
case ACTION_INVALID:
gTasks[taskId].tCurrItem = 0;
gTasks[taskId].func = Task_DisplayMainMenuInvalidActionError;
gPlttBufferUnfaded[0xF1] = RGB_WHITE;
gPlttBufferFaded[0xF1] = RGB_WHITE;
@@ -822,14 +841,14 @@ void Task_HandleMainMenuAPressed(u8 taskId)
SetGpuReg(REG_OFFSET_BG1VOFS, 0);
SetGpuReg(REG_OFFSET_BG0HOFS, 0);
SetGpuReg(REG_OFFSET_BG0VOFS, 0);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
return;
}
FreeAllWindowBuffers();
if (action != 2)
gUnknown_02022D06 = 0;
if (action != ACTION_OPTIONS)
sCurrItemAndOptionMenuCheck = 0;
else
gUnknown_02022D06 |= 0x8000;
sCurrItemAndOptionMenuCheck |= 0x8000; // entering the options menu
}
}
@@ -837,9 +856,9 @@ void Task_HandleMainMenuBPressed(u8 taskId)
{
if (!gPaletteFade.active)
{
if (gTasks[taskId].data[0] == 3)
RemoveScrollIndicatorArrowPair(gTasks[taskId].data[13]);
gUnknown_02022D06 = 0;
if (gTasks[taskId].tMenuType == 3)
RemoveScrollIndicatorArrowPair(gTasks[taskId].tScrollArrowTaskId);
sCurrItemAndOptionMenuCheck = 0;
FreeAllWindowBuffers();
SetMainCallback2(CB2_InitTitleScreen);
DestroyTask(taskId);
@@ -848,11 +867,11 @@ void Task_HandleMainMenuBPressed(u8 taskId)
void Task_DisplayMainMenuInvalidActionError(u8 taskId)
{
switch (gTasks[taskId].data[1])
switch (gTasks[taskId].tCurrItem)
{
case 0:
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
switch (gTasks[taskId].data[0])
switch (gTasks[taskId].tMenuType)
{
case 0:
CreateMainMenuErrorWindow(gText_WirelessNotConnected);
@@ -864,30 +883,39 @@ void Task_DisplayMainMenuInvalidActionError(u8 taskId)
CreateMainMenuErrorWindow(gText_MysteryEventsCantUse);
break;
}
gTasks[taskId].data[1]++;
gTasks[taskId].tCurrItem++;
break;
case 1:
if (!gPaletteFade.active)
gTasks[taskId].data[1]++;
gTasks[taskId].tCurrItem++;
break;
case 2:
RunTextPrinters();
if (!IsTextPrinterActive(7))
gTasks[taskId].data[1]++;
gTasks[taskId].tCurrItem++;
break;
case 3:
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(-1, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = Task_HandleMainMenuBPressed;
}
}
}
void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a)
#undef tMenuType
#undef tCurrItem
#undef tItemCount
#undef tScrollArrowTaskId
#undef tIsScrolled
#undef tWirelessAdapterConnected
#undef tArrowTaskIsScrolled
void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 isScrolled)
{
SetGpuReg(REG_OFFSET_WIN0H, 0x9E7);
SetGpuReg(REG_OFFSET_WIN0H, WINHV_COORDS(9, 231));
switch (menuType)
{
@@ -897,10 +925,10 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a)
{
case 0:
default:
SetGpuReg(REG_OFFSET_WIN0V, 0x11F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 31));
break;
case 1:
SetGpuReg(REG_OFFSET_WIN0V, 0x213F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(33, 63));
break;
}
break;
@@ -909,13 +937,13 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a)
{
case 0:
default:
SetGpuReg(REG_OFFSET_WIN0V, 0x13F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63));
break;
case 1:
SetGpuReg(REG_OFFSET_WIN0V, 0x415F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
break;
case 2:
SetGpuReg(REG_OFFSET_WIN0V, 0x617F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
break;
}
break;
@@ -924,16 +952,16 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a)
{
case 0:
default:
SetGpuReg(REG_OFFSET_WIN0V, 0x13F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63));
break;
case 1:
SetGpuReg(REG_OFFSET_WIN0V, 0x415F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
break;
case 2:
SetGpuReg(REG_OFFSET_WIN0V, 0x617F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
break;
case 3:
SetGpuReg(REG_OFFSET_WIN0V, 0x819F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159));
break;
}
break;
@@ -942,28 +970,28 @@ void HighlightSelectedMainMenuItem(u8 menuType, u8 selectedMenuItem, s16 a)
{
case 0:
default:
SetGpuReg(REG_OFFSET_WIN0V, 0x13F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(1, 63));
break;
case 1:
if (a)
SetGpuReg(REG_OFFSET_WIN0V, 0x213F);
if (isScrolled)
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(33, 63));
else
SetGpuReg(REG_OFFSET_WIN0V, 0x415F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
break;
case 2:
if (a)
SetGpuReg(REG_OFFSET_WIN0V, 0x415F);
if (isScrolled)
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(65, 95));
else
SetGpuReg(REG_OFFSET_WIN0V, 0x617F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
break;
case 3:
if (a)
SetGpuReg(REG_OFFSET_WIN0V, 0x617F);
if (isScrolled)
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(97, 127));
else
SetGpuReg(REG_OFFSET_WIN0V, 0x819F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159));
break;
case 4:
SetGpuReg(REG_OFFSET_WIN0V, 0x819F);
SetGpuReg(REG_OFFSET_WIN0V, WINHV_COORDS(129, 159));
break;
}
break;
@@ -992,7 +1020,7 @@ void task_new_game_prof_birch_speech_1(u8 taskId)
FreeAllSpritePalettes();
dp13_810BB8C();
AddBirchSpeechObjects(taskId);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gTasks[taskId].data[4] = 0;
gTasks[taskId].func = task_new_game_prof_birch_speech_2;
gTasks[taskId].data[2] = 0xFF;
@@ -1298,7 +1326,7 @@ void task_new_game_prof_birch_speech_16(u8 taskId)
{
if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
{
BeginNormalPaletteFade(-1, 0, 0, 16, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
gTasks[taskId].func = task_new_game_prof_birch_speech_17;
}
}
@@ -1547,7 +1575,7 @@ void new_game_prof_birch_speech_part2_start(void)
gSprites[spriteId].invisible = 0;
gTasks[taskId].data[2] = spriteId;
SetGpuReg(REG_OFFSET_BG1HOFS, -60);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WININ, 0);
@@ -1797,7 +1825,7 @@ void CreateMainMenuErrorWindow(const u8* str)
PrintTextOnWindow(7, 1, str, 0, 1, 2, 0);
PutWindowTilemap(7);
CopyWindowToVram(7, 2);
DrawMainMenuWindowBorder(gUnknown_082FF070, MAIN_MENU_BORDER_TILE);
DrawMainMenuWindowBorder(sWindowTemplate_ErrorWindow, MAIN_MENU_BORDER_TILE);
SetGpuReg(REG_OFFSET_WIN0H, 0x9E7);
SetGpuReg(REG_OFFSET_WIN0V, 0x719F);
}
@@ -1892,7 +1920,7 @@ void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 baseTil
CopyBgTilemapBufferToVram(template->priority);
}
void sub_8032250(const struct WindowTemplate *template)
static void ClearMainMenuWindowTilemap(const struct WindowTemplate *template)
{
FillBgTilemapBufferRect(template->priority, 0, template->tilemapLeft - 1, template->tilemapTop - 1, template->tilemapLeft + template->width + 1, template->tilemapTop + template->height + 1, 2);
CopyBgTilemapBufferToVram(template->priority);
@@ -1914,11 +1942,11 @@ void sub_80322E0(u8 windowId, u8 a)
void sub_8032318(u8 a)
{
u8 fontAttribute = GetFontAttribute(1, 6);
u8 fontAttribute2 = GetFontAttribute(1, 0);
u8 fontAttribute3 = GetFontAttribute(1, 1);
u8 windowAttribute = GetWindowAttribute(a, 3);
u8 windowAttribute2 = GetWindowAttribute(a, 4);
u8 fontAttribute = GetFontAttribute(1, FONTATTR_COLOR_BACKGROUND);
u8 fontAttribute2 = GetFontAttribute(1, FONTATTR_MAX_LETTER_WIDTH);
u8 fontAttribute3 = GetFontAttribute(1, FONTATTR_MAX_LETTER_HEIGHT);
u8 windowAttribute = GetWindowAttribute(a, WINDOW_WIDTH);
u8 windowAttribute2 = GetWindowAttribute(a, WINDOW_HEIGHT);
FillWindowPixelRect(a, fontAttribute, 0, 0, fontAttribute2 * windowAttribute, fontAttribute3 * windowAttribute2);
CopyWindowToVram(a, 2);
src/map_name_popup.c
+1 -1
View File
@@ -463,7 +463,7 @@ static void LoadMapNamePopUpWindowBg(void)
}
popUpThemeId = gRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId];
LoadBgTiles(GetWindowAttribute(popupWindowId, 0), &(gMapPopUp_Outline_Table[popUpThemeId][0]), 0x400, 0x21D);
LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_PRIORITY), &(gMapPopUp_Outline_Table[popUpThemeId][0]), 0x400, 0x21D);
CallWindowFunction(popupWindowId, sub_80D4A78);
PutWindowTilemap(popupWindowId);
if(gMapHeader.weather == WEATHER_BUBBLES)
src/menu.c
+15 -15
View File
@@ -194,7 +194,7 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
void sub_81973A4(void)
{
LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10);
LoadSav2WindowGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10);
LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10);
}
void NewMenuHelpers_DrawDialogueFrame(u8 windowId, bool8 copyToVram)
@@ -1107,12 +1107,12 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
printer.windowId = windowId;
printer.fontId = fontId;
printer.fgColor = GetFontAttribute(fontId, 5);
printer.bgColor = GetFontAttribute(fontId, 6);
printer.shadowColor = GetFontAttribute(fontId, 7);
printer.fontColor_l = GetFontAttribute(fontId, 4);
printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND);
printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND);
printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW);
printer.fontColor_l = GetFontAttribute(fontId, FONTATTR_COLOR_LOWNIBBLE);
printer.letterSpacing = letterSpacing;
printer.lineSpacing = GetFontAttribute(fontId, 3);
printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING);
printer.x = left;
printer.currentX = left;
@@ -1129,7 +1129,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
void sub_81989B8(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a5)
{
AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, 0), 1, GetFontAttribute(fontId, 2), lineHeight, itemCount, strs, a5);
AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 1, GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), lineHeight, itemCount, strs, a5);
}
void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
@@ -1167,20 +1167,20 @@ void sub_8198AF8(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top
printer.current_text_offset = gText_YesNo;
printer.windowId = gUnknown_0203CD9F;
printer.fontId = fontId;
printer.x = GetFontAttribute(fontId, 0) + left;
printer.x = GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + left;
printer.y = top;
printer.currentX = printer.x;
printer.currentY = printer.y;
printer.fgColor = GetFontAttribute(fontId, 5);
printer.bgColor = GetFontAttribute(fontId, 6);
printer.shadowColor = GetFontAttribute(fontId, 7);
printer.fontColor_l = GetFontAttribute(fontId, 4);
printer.letterSpacing = GetFontAttribute(fontId, 2);
printer.lineSpacing = GetFontAttribute(fontId, 3);
printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND);
printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND);
printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW);
printer.fontColor_l = GetFontAttribute(fontId, FONTATTR_COLOR_LOWNIBBLE);
printer.letterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING);
printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING);
AddTextPrinter(&printer, 0xFF, NULL);
sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, 1), 2, initialCursorPos);
sub_81983AC(gUnknown_0203CD9F, fontId, left, top, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_HEIGHT), 2, initialCursorPos);
}
void sub_8198C34(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 paletteNum)
src/mystery_event_menu.c
+3 -3
View File
@@ -77,7 +77,7 @@ void CB2_InitMysteryEventMenu(void)
FillWindowPixelBuffer(i, 0);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
LoadSav2WindowGfx(0, 1u, 0xD0u);
LoadUserWindowBorderGfx(0, 1u, 0xD0u);
sub_81978B0(0xE0);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON);
SetGpuReg(REG_OFFSET_BLDCNT, 0);
@@ -121,7 +121,7 @@ static void CB2_MysteryEventMenu(void)
PutWindowTilemap(0);
CopyWindowToVram(0, 3);
ShowBg(0);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gMain.state++;
break;
case 1:
@@ -264,7 +264,7 @@ static void CB2_MysteryEventMenu(void)
}
break;
case 15:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gMain.state++;
break;
case 16:
src/option_menu.c
+2 -2
View File
@@ -235,7 +235,7 @@ void CB2_InitOptionMenu(void)
break;
}
case 11:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
SetVBlankCallback(VBlankCB);
SetMainCallback2(MainCB2);
return;
@@ -344,7 +344,7 @@ static void Task_OptionMenuSave(u8 taskId)
gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE];
gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE];
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_OptionMenuFadeOut;
}
src/overworld.c
+1
View File
@@ -57,6 +57,7 @@
#include "malloc.h"
#include "gpu_regs.h"
#include "link_rfu.h"
#include "constants/map_types.h"
// event scripts
extern const u8 EventScript_WhiteOut[];
src/player_pc.c
+2 -2
View File
@@ -903,7 +903,7 @@ static void sub_816BEF0(s32 id)
static void ItemStorage_StartScrollIndicator(void)
{
if(playerPCItemPageInfo.scrollIndicatorId == 0xFF)
playerPCItemPageInfo.scrollIndicatorId = AddScrollIndicatorArrowPairParametrized(0x2, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove));
playerPCItemPageInfo.scrollIndicatorId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove));
}
static void ItemStorage_RemoveScrollIndicator(void)
@@ -1116,7 +1116,7 @@ static void ItemStorage_ItemSwapChoosePrompt(u8 taskId)
s16 *data;
data = gTasks[taskId].data;
sub_81AF15C(data[5], 16, 1);
ListMenuSetUnkIndicatorsStructField(data[5], 16, 1);
gUnknown_0203BCC4->unk666 = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos);
sub_816BFB8(data[5], 0, 0);
sub_816C690(gUnknown_0203BCC4->unk666);
src/pokeblock.c
+9 -10
View File
@@ -3,6 +3,7 @@
#include "bg.h"
#include "strings.h"
#include "text.h"
#include "text_window.h"
#include "menu.h"
#include "task.h"
#include "menu_helpers.h"
@@ -75,8 +76,6 @@ extern const u16 gUnknown_0860F074[];
extern void CB2_ReturnToField(void);
extern bool8 sub_81221EC(void);
extern void LoadSav2WindowGfx(u8, u16, u8);
extern void LoadMessageBoxGfx(u8, u16, u8);
extern void sub_80AF168(void);
// this file's functions
@@ -315,19 +314,19 @@ static const struct ListMenuTemplate sPokeblockListMenuTemplate =
{
.items = NULL,
.moveCursorFunc = MovePokeblockMenuCursor,
.unk_08 = NULL,
.itemPrintFunc = NULL,
.totalItems = 0,
.maxShowed = 0,
.windowId = 1,
.unk_11 = 0,
.unk_12 = 1,
.header_X = 0,
.item_X = 1,
.cursor_X = 0,
.upText_Y = 1,
.cursorPal = 2,
.fillValue = 0,
.cursorShadowPal = 3,
.lettersSpacing = 0,
.unk_16_3 = 0,
.itemVerticalPadding = 0,
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = 1,
.cursorKind = 1
@@ -492,7 +491,7 @@ static bool8 InitPokeblockMenu(void)
gMain.state++;
break;
case 18:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gPaletteFade.bufferTransferDisabled = 0;
gMain.state++;
break;
@@ -566,7 +565,7 @@ static void HandleInitWindows(void)
InitWindows(sWindowTemplatesForPokeblockMenu);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 1, 0xE0);
LoadUserWindowBorderGfx(0, 1, 0xE0);
LoadMessageBoxGfx(0, 0xA, 0xD0);
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
@@ -807,7 +806,7 @@ static void sub_81363BC(void)
{
if (sPokeblockMenu->unkTaskId == 0xFF)
{
sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParametrized(2, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed,
sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed,
0x456, 0x456, &sSavedPokeblockData.lastItemPage);
}
}
@@ -855,7 +854,7 @@ static void sub_8136470(struct Sprite *sprite)
static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase;
}
src/pokeblock_feed.c
+4 -4
View File
@@ -21,6 +21,7 @@
#include "sound.h"
#include "trig.h"
#include "graphics.h"
#include "text_window.h"
#include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere
struct PokeblockFeedStruct
@@ -58,7 +59,6 @@ extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const u16 gUnknown_0860F074[];
extern bool8 sub_81221EC(void);
extern void LoadSav2WindowGfx(u8, u16, u8);
// this file's functions
static void HandleInitBackgrounds(void);
@@ -596,7 +596,7 @@ static bool8 TransitionToPokeblockFeedScene(void)
gMain.state++;
break;
case 13:
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
gPaletteFade.bufferTransferDisabled = 0;
gMain.state++;
break;
@@ -705,7 +705,7 @@ static void HandleInitWindows(void)
{
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 1, 0xE0);
LoadUserWindowBorderGfx(0, 1, 0xE0);
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
FillWindowPixelBuffer(0, 0);
PutWindowTilemap(0);
@@ -810,7 +810,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId)
static void Task_PaletteFadeToReturn(u8 taskId)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_ReturnAfterPaletteFade;
}
src/pokedex.c
+66 -66
View File
@@ -1630,14 +1630,14 @@ void sub_80BC8D4(u8 dexMode, u8 sortMode)
}
}
void sub_80BCE2C(u8 a, u8 b, const u8* str, u8 c, u8 d)
void sub_80BCE2C(u8 windowId, u8 fontId, const u8* str, u8 left, u8 top)
{
u8 sp14[3];
u8 color[3];
sp14[0] = 0;
sp14[1] = 15;
sp14[2] = 3;
AddTextPrinterParameterized2(a, b, c * 8, (d * 8) + 1, 0, 0, sp14, -1, str);
color[0] = 0;
color[1] = 15;
color[2] = 3;
AddTextPrinterParameterized2(windowId, fontId, left * 8, (top * 8) + 1, 0, 0, color, -1, str);
}
void sub_80BCE84(u8 a, u16 b, u16 c)
@@ -1727,7 +1727,7 @@ void sub_80BCE84(u8 a, u16 b, u16 c)
CopyWindowToVram(0, 2);
}
void sub_80BD154(u16 a, u8 b, u8 c, u16 unused)
void sub_80BD154(u16 a, u8 left, u8 top, u16 unused)
{
u8 text[6];
u16 r6;
@@ -1739,18 +1739,18 @@ void sub_80BD154(u16 a, u8 b, u8 c, u16 unused)
text[2] = CHAR_0 + r6 / 100;
text[3] = CHAR_0 + (r6 % 100) / 10;
text[4] = CHAR_0 + (r6 % 100) % 10;
sub_80BCE2C(0, 7, text, b, c);
sub_80BCE2C(0, 7, text, left, top);
}
void sub_80BD1F4(u16 a, u8 b, u8 c, u16 unused)
void sub_80BD1F4(u16 a, u8 x, u8 y, u16 unused)
{
if (a)
BlitBitmapToWindow(0, gUnknown_0855D2BE, b * 8, c * 8, 8, 16);
BlitBitmapToWindow(0, gUnknown_0855D2BE, x * 8, y * 8, 8, 16);
else
FillWindowPixelRect(0, 0, b * 8, c * 8, 8, 16);
FillWindowPixelRect(0, 0, x * 8, y * 8, 8, 16);
}
u8 sub_80BD23C(u16 num, u8 b, u8 c)
u8 sub_80BD23C(u16 num, u8 left, u8 top)
{
const u8* str;
@@ -1759,13 +1759,13 @@ u8 sub_80BD23C(u16 num, u8 b, u8 c)
str = gSpeciesNames[num];
else
str = sText_TenDashes;
sub_80BCE2C(0, 7, str, b, c);
sub_80BCE2C(0, 7, str, left, top);
return StringLength(str);
}
void sub_80BD28C(u8 a, u8 b, u16 unused)
void sub_80BD28C(u8 x, u8 y, u16 unused)
{
FillWindowPixelRect(0, 0, a * 8, b * 8, 0x60, 16);
FillWindowPixelRect(0, 0, x * 8, y * 8, 0x60, 16);
}
void sub_80BD2B4(u16 a, u16 b)
@@ -1803,7 +1803,7 @@ void sub_80BD2B4(u16 a, u16 b)
gSprites[spriteId].callback = sub_80BE4E0;
gSprites[spriteId].data[5] = 32;
}
sub_80BCE84(0, a, b);
SetGpuReg(REG_OFFSET_BG2VOFS, gUnknown_02039B4C->unk62D);
@@ -2047,7 +2047,7 @@ u16 sub_80BDA8C(u16 a1)
return 0;
}
u32 sub_80BDACC(u16 a, s16 b, s16 c)
u32 sub_80BDACC(u16 num, s16 x, s16 y)
{
u8 i;
@@ -2055,13 +2055,13 @@ u32 sub_80BDACC(u16 a, s16 b, s16 c)
{
if (gUnknown_02039B4C->unk61E[i] == 0xFFFF)
{
u8 spriteId = sub_80C0E9C(a, b, c, i);
u8 spriteId = sub_80C0E9C(num, x, y, i);
gSprites[spriteId].oam.affineMode = 1;
gSprites[spriteId].oam.priority = 3;
gSprites[spriteId].data[0] = 0;
gSprites[spriteId].data[1] = i;
gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(a);
gSprites[spriteId].data[2] = NationalPokedexNumToSpecies(num);
gUnknown_02039B4C->unk61E[i] = spriteId;
return spriteId;
}
@@ -2443,14 +2443,14 @@ void sub_80BE834(struct Sprite *sprite)
}
}
void sub_80BE8DC(const u8* a, u8 b, u8 c)
void sub_80BE8DC(const u8* str, u8 left, u8 top)
{
u8 sp14[3];
sp14[0] = 0;
sp14[1] = 15;
sp14[2] = 3;
u8 color[3];
color[0] = 0;
color[1] = 15;
color[2] = 3;
AddTextPrinterParameterized2(0, 1, b, c, 0, 0, sp14, -1, a);
AddTextPrinterParameterized2(0, 1, left, top, 0, 0, color, -1, str);
}
u8 sub_80BE91C(struct PokedexListItem* item, u8 b)
@@ -3464,7 +3464,7 @@ void sub_80C01CC(struct Sprite *sprite)
sprite->pos1.y -= 1;
}
void sub_80C020C(u32 num, u32 b, u32 c, u32 d)
void sub_80C020C(u32 num, u32 value, u32 c, u32 d)
{
u8 str[0x10];
u8 str2[0x20];
@@ -3475,11 +3475,11 @@ void sub_80C020C(u32 num, u32 b, u32 c, u32 d)
if (d)
sub_80BE8DC(gText_PokedexRegistration, GetStringCenterAlignXOffset(1, gText_PokedexRegistration, 0xF0), 0);
if (b == 0)
b = NationalToHoennOrder(num);
if (value == 0)
value = NationalToHoennOrder(num);
else
b = num;
ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), b, 2, 3);
value = num;
ConvertIntToDecimalStringN(StringCopy(str, gText_UnkCtrlF908Clear01), value, 2, 3);
sub_80BE8DC(str, 0x60, 0x19);
natNum = NationalPokedexNumToSpecies(num);
if (natNum)
@@ -4058,17 +4058,17 @@ void sub_80C09B0(u16 a)
}
}
void sub_80C0A88(u8 a, const u8 *b, u8 c, u8 d)
void sub_80C0A88(u8 windowId, const u8 *str, u8 left, u8 top)
{
u8 sp14[3];
sp14[0] = 0;
sp14[1] = 15;
sp14[2] = 3;
u8 color[3];
color[0] = 0;
color[1] = 15;
color[2] = 3;
AddTextPrinterParameterized2(a, 1, c, d, 0, 0, sp14, -1, b);
AddTextPrinterParameterized2(windowId, 1, left, top, 0, 0, color, -1, str);
}
void sub_80C0AC4(u8 a, u16 order, u8 b, u8 c)
void sub_80C0AC4(u8 windowId, u16 order, u8 left, u8 top)
{
u8 str[4];
@@ -4076,10 +4076,10 @@ void sub_80C0AC4(u8 a, u16 order, u8 b, u8 c)
str[1] = CHAR_0 + (order % 100) / 10;
str[2] = CHAR_0 + (order % 100) % 10;
str[3] = EOS;
sub_80C0A88(a, str, b, c);
sub_80C0A88(windowId, str, left, top);
}
u8 sub_80C0B44(u8 a, u16 num, u8 b, u8 c)
u8 sub_80C0B44(u8 windowId, u16 num, u8 left, u8 top)
{
u8 str[11];
u8 i;
@@ -4098,11 +4098,11 @@ u8 sub_80C0B44(u8 a, u16 num, u8 b, u8 c)
str[i] = CHAR_HYPHEN;
break;
}
sub_80C0A88(a, str, b, c);
sub_80C0A88(windowId, str, left, top);
return i;
}
void sub_80C0BF0(u8 a, const u8* str, u8 b, u8 c)
void sub_80C0BF0(u8 windowId, const u8* str, u8 left, u8 top)
{
u8 str2[11];
u8 i;
@@ -4115,10 +4115,10 @@ void sub_80C0BF0(u8 a, const u8* str, u8 b, u8 c)
for (i = 0; i < count; i++)
str2[11 - count + i] = str[i];
str2[11] = EOS;
sub_80C0A88(a, str2, b, c);
sub_80C0A88(windowId, str2, left, top);
}
void sub_80C0C6C(u8 a, u16 b, u8 left, u8 top)
void sub_80C0C6C(u8 windowId, u16 b, u8 left, u8 top)
{
u8 str[6];
bool8 outputted = FALSE;
@@ -4152,10 +4152,10 @@ void sub_80C0C6C(u8 a, u16 b, u8 left, u8 top)
str[3] = CHAR_PERIOD;
str[4] = CHAR_0 + ((b % 1000) % 100) % 10;
str[5] = EOS;
sub_80C0A88(a, str, left, top);
sub_80C0A88(windowId, str, left, top);
}
void sub_80C0D30(u8 a0, u16 a1)
void sub_80C0D30(u8 windowId, u16 a1)
{
u8 image[32 * 4];
const u8 * r12 = gMonFootprintTable[NationalPokedexNumToSpecies(a1)];
@@ -4175,7 +4175,7 @@ void sub_80C0D30(u8 a0, u16 a1)
r5++;
}
}
CopyToWindowPixelBuffer(a0, image, sizeof(image), 0);
CopyToWindowPixelBuffer(windowId, image, sizeof(image), 0);
}
void sub_80C0DC0(u16 a, u16 b)
@@ -4229,25 +4229,25 @@ u32 sub_80C0E68(u16 a)
}
}
u16 sub_80C0E9C(u16 num, s16 a, s16 b, u16 c)
u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot)
{
num = NationalPokedexNumToSpecies(num);
return sub_818D7D8(num, 8, sub_80C0E68(num), 1, a, b, c, -1);
return sub_818D7D8(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF);
}
u16 sub_80C0EF8(u16 a, s16 b, s16 c, s8 d)
u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot)
{
return sub_818D8AC(a, 1, b, c, d, -1);
return sub_818D8AC(species, TRUE, x, y, paletteSlot, 0xFFFF);
}
int sub_80C0F30(u8 a, u8 b, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2)
int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2)
{
u16 species;
u16 i;
u16 resultsCount;
u8 types[2];
sub_80BC8D4(a, b);
sub_80BC8D4(dexMode, sortMode);
for (i = 0, resultsCount = 0; i < NATIONAL_DEX_COUNT; i++)
{
@@ -4361,19 +4361,19 @@ u8 sub_80C1258(void)
return CreateTask(sub_80C12E0, 0);
}
void sub_80C1270(const u8 *str, u32 a, u32 b)
void sub_80C1270(const u8 *str, u32 left, u32 top)
{
u8 sp14[3];
u8 color[3];
sp14[0] = 0;
sp14[1] = 15;
sp14[2] = 2;
AddTextPrinterParameterized2(0, 1, a, b, 0, 0, sp14, -1, str);
color[0] = 0;
color[1] = 15;
color[2] = 2;
AddTextPrinterParameterized2(0, 1, left, top, 0, 0, color, -1, str);
}
void sub_80C12B0(u32 a, u32 b, u32 c, u32 d)
void sub_80C12B0(u32 x, u32 y, u32 width, u32 height)
{
FillWindowPixelRect(0, 0, a, b, c, d);
FillWindowPixelRect(0, 0, x, y, width, height);
}
void sub_80C12E0(u8 taskId)
@@ -5211,19 +5211,19 @@ void sub_80C2618(const u8* str)
sub_80C1270(str, 8, 0x79);
}
void sub_80C2638(u32 a)
void sub_80C2638(u32 y)
{
sub_80C12B0(0x90, a * 16 + 8, 8, 16);
sub_80C12B0(0x90, y * 16 + 8, 8, 16);
}
void sub_80C2650(u32 a)
void sub_80C2650(u32 left)
{
sub_80C1270(gText_SelectorArrow, 0x90, a * 16 + 9);
sub_80C1270(gText_SelectorArrow, 0x90, left * 16 + 9);
}
void sub_80C2668(u32 a, const u8* str)
void sub_80C2668(u32 left, const u8* str)
{
sub_80C1270(str, 0x98, a * 16 + 9);
sub_80C1270(str, 0x98, left * 16 + 9);
}
void sub_80C267C(void)
src/pokemon_summary_screen.c
+2 -2
View File
@@ -541,7 +541,7 @@ bool8 sub_81BFB10(void)
gMain.state++;
break;
case 24:
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gPaletteFade.bufferTransferDisabled = 0;
gMain.state++;
break;
@@ -761,7 +761,7 @@ void sub_81C0434()
void sub_81C044C(u8 taskId)
{
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = sub_81C0484;
}
src/rayquaza_scene.c
+10 -10
View File
@@ -1563,7 +1563,7 @@ static void Task_DuoFightAnim(u8 taskId)
}
BlendPalettes(-1, 0x10, 0);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
SetVBlankCallback(VBlankCB_DuoFight);
PlaySE(SE_T_OOAME);
}
@@ -1715,7 +1715,7 @@ static void sub_81D752C(u8 taskId)
static void DuoFightEnd(u8 taskId, s8 palDelay)
{
PlaySE(SE_T_OOAME_E);
BeginNormalPaletteFade(-1, palDelay, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, palDelay, 0, 0x10, 0);
gTasks[taskId].func = Task_DuoFightEnd;
}
@@ -1971,7 +1971,7 @@ static void Task_HandleRayTakesFlight(u8 taskId)
case 0:
if (data[1] == 8)
{
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
data[2] = 0;
data[3] = 30;
data[4] = 0;
@@ -2012,7 +2012,7 @@ static void Task_HandleRayTakesFlight(u8 taskId)
if (data[1] > 295)
{
data[0]++;
BeginNormalPaletteFade(-1, 6, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 0x10, 0);
}
}
break;
@@ -2174,7 +2174,7 @@ static void Task_HandleRayDescends(u8 taskId)
case 0:
if (data[1] == 8)
{
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
data[1] = 0;
data[0]++;
}
@@ -2219,7 +2219,7 @@ static void Task_HandleRayDescends(u8 taskId)
}
break;
case 4:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_RayDescendsEnd;
break;
}
@@ -2366,7 +2366,7 @@ static void Task_HandleRayCharges(u8 taskId)
case 0:
if (data[1] == 8)
{
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
data[1] = 0;
data[0]++;
}
@@ -2399,7 +2399,7 @@ static void Task_HandleRayCharges(u8 taskId)
}
break;
case 3:
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
gTasks[taskId].func = Task_RayChargesEnd;
break;
}
@@ -2532,7 +2532,7 @@ static void Task_HandleRayChasesAway(u8 taskId)
if (data[1] == 8)
{
sub_81D90A8(taskId);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
data[1] = 0;
data[0]++;
}
@@ -2574,7 +2574,7 @@ static void Task_HandleRayChasesAway(u8 taskId)
}
break;
case 3:
BeginNormalPaletteFade(-1, 4, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0);
gTasks[taskId].func = Task_RayChasesAwayEnd;
break;
}
src/recorded_battle.c
+1 -1
View File
@@ -219,7 +219,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId)
{
gSpecialVar_Result = gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; // hah
ResetPaletteFadeControl();
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
SetMainCallback2(CB2_QuitRecordedBattle);
return -1;
}
src/region_map.c
+3 -3
View File
@@ -1603,7 +1603,7 @@ void MCB2_FlyMap(void)
gMain.state++;
break;
case 3:
LoadSav2WindowGfx(0, 0x65, 0xd0);
LoadUserWindowBorderGfx(0, 0x65, 0xd0);
clear_scheduled_bg_copies_to_vram();
gMain.state++;
break;
@@ -1849,7 +1849,7 @@ static void sub_8124D14(void)
switch (gUnknown_0203A148->unk_004)
{
case 0:
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gUnknown_0203A148->unk_004++;
break;
case 1:
@@ -1896,7 +1896,7 @@ static void sub_8124E0C(void)
switch (gUnknown_0203A148->unk_004)
{
case 0:
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gUnknown_0203A148->unk_004++;
break;
case 1:
src/reset_rtc_screen.c
+2 -2
View File
@@ -552,7 +552,7 @@ static void Task_ResetRtcScreen(u8 taskId)
switch (data[0])
{
case 0:
BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF);
data[0] = 1;
break;
case 1:
@@ -621,7 +621,7 @@ static void Task_ResetRtcScreen(u8 taskId)
case 5:
if (gMain.newKeys & A_BUTTON)
{
BeginNormalPaletteFade(-1, 1, 0, 0x10, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, 0xFFFF);
data[0] = 6;
}
else
src/rom6.c
+1
View File
@@ -15,6 +15,7 @@
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "constants/map_types.h"
// static functions
static void task08_080C9820(u8 taskId);
src/scrcmd.c
+1 -1
View File
@@ -1517,7 +1517,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
winTemplate = sub_8198A50(0, xWindow, yWindow + 1, width, height, 0xF, 0x1);
gUnknown_03000F30 = AddWindow(&winTemplate);
LoadSav2WindowGfx(gUnknown_03000F30, 0x214, 0xE0);
LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0);
NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0);
PutWindowTilemap(gUnknown_03000F30);
FillWindowPixelBuffer(gUnknown_03000F30, 0x11);
src/secret_base.c
+6 -4
View File
@@ -1,6 +1,7 @@
// Includes
#include "global.h"
#include "constants/bg_event_constants.h"
#include "constants/decorations.h"
#include "malloc.h"
#include "main.h"
@@ -38,6 +39,7 @@
#include "link.h"
#include "tv.h"
#include "secret_base.h"
#include "constants/map_types.h"
extern void mapldr_default(void);
@@ -335,7 +337,7 @@ void sub_80E8EE0(struct MapEvents const *events)
for (bgEventIndex = 0; bgEventIndex < events->bgEventCount; bgEventIndex ++)
{
if (events->bgEvents[bgEventIndex].kind == 8)
if (events->bgEvents[bgEventIndex].kind == BG_EVENT_SECRET_BASE)
{
for (j = 0; j < 20; j ++)
{
@@ -600,7 +602,7 @@ void sub_80E9608(struct Coords16 *coords, struct MapEvents *events)
for (bgEventIdx = 0; bgEventIdx < events->bgEventCount; bgEventIdx ++)
{
if (events->bgEvents[bgEventIdx].kind == 8 && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7)
if (events->bgEvents[bgEventIdx].kind == BG_EVENT_SECRET_BASE && coords->x == events->bgEvents[bgEventIdx].x + 7 && coords->y == events->bgEvents[bgEventIdx].y + 7)
{
sCurSecretBaseId = events->bgEvents[bgEventIdx].bgUnion.secretBaseId;
break;
@@ -780,7 +782,7 @@ void sub_80E9AD0(void)
events = gMapHeader.events;
for (i = 0; i < events->bgEventCount; i ++)
{
if (events->bgEvents[i].kind == 8 && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId)
if (events->bgEvents[i].kind == BG_EVENT_SECRET_BASE && gSaveBlock1Ptr->secretBases[0].secretBaseId == events->bgEvents[i].bgUnion.secretBaseId)
{
tile = MapGridGetMetatileIdAt(events->bgEvents[i].x + 7, events->bgEvents[i].y + 7);
for (j = 0; j < 7; j ++)
@@ -940,7 +942,7 @@ void sub_80E9E44(u8 taskId)
s16 *data;
data = gTasks[taskId].data;
data[8] = AddScrollIndicatorArrowPairParametrized(0x02, 0xbc, 0x0c, 0x94, data[0] - data[3], 0x13f8, 0x13f8, &data[2]);
data[8] = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xbc, 0x0c, 0x94, data[0] - data[3], 0x13f8, 0x13f8, &data[2]);
}
void sub_80E9E90(u8 taskId)
src/start_menu.c
+3 -3
View File
@@ -1208,7 +1208,7 @@ static bool32 sub_80A03E4(u8 *par1)
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sUnknown_085105A8, ARRAY_COUNT(sUnknown_085105A8));
InitWindows(sUnknown_085105AC);
LoadSav2WindowGfx_(0, 8, 224);
LoadUserWindowBorderGfx_(0, 8, 224);
sub_81978B0(240);
break;
case 3:
@@ -1261,7 +1261,7 @@ static void sub_80A0550(u8 taskId)
sub_8098858(0, 8, 14);
PutWindowTilemap(0);
CopyWindowToVram(0, 3);
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
if (gWirelessCommType != 0 && InUnionRoom())
{
@@ -1294,7 +1294,7 @@ static void sub_80A0550(u8 taskId)
}
break;
case 3:
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
*step = 4;
break;
case 4:
src/starter_choose.c
+4 -5
View File
@@ -9,6 +9,7 @@
#include "main.h"
#include "window.h"
#include "text.h"
#include "text_window.h"
#include "decompress.h"
#include "menu.h"
#include "sound.h"
@@ -18,6 +19,7 @@
#include "data2.h"
#include "international_string_util.h"
#include "trig.h"
#include "scanline_effect.h"
#define STARTER_MON_COUNT 3
@@ -46,13 +48,10 @@ extern const u8 gStarterChoose_LabelCoords[][2];
extern const u8 gUnknown_085B1E0C[];
extern const u8 gUnknown_085B1E28[][2];
extern void LoadSav2WindowGfx(u8, u16, u8);
extern void ScanlineEffect_Stop(void);
extern void clear_scheduled_bg_copies_to_vram(void);
extern void dp13_810BB8C(void);
extern void do_scheduled_bg_tilemap_copies_to_vram(void);
extern u16 sub_818D820(u16);
extern const u16 *GetOverworldTextboxPalettePtr(void);
extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);
// this file's functions
@@ -126,7 +125,7 @@ void CB2_ChooseStarter(void)
InitWindows(gUnknown_085B1DCC);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 0x2A8, 0xD0);
LoadUserWindowBorderGfx(0, 0x2A8, 0xD0);
clear_scheduled_bg_copies_to_vram();
ScanlineEffect_Stop();
ResetTasks();
@@ -140,7 +139,7 @@ void CB2_ChooseStarter(void)
LoadCompressedObjectPic(&gUnknown_085B1ED8[0]);
LoadCompressedObjectPic(&gUnknown_085B1EE8[0]);
LoadSpritePalettes(gUnknown_085B1EF8);
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
EnableInterrupts(DISPSTAT_VBLANK);
SetVBlankCallback(VblankCB_StarterChoose);
src/text.c
+11 -11
View File
@@ -3157,7 +3157,7 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing)
width = lineWidths[strPos];
}
return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width;
return (u8)(GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + letterSpacing) * width;
}
u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32)
@@ -3193,7 +3193,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
return 0;
if (letterSpacing == -1)
localLetterSpacing = GetFontAttribute(fontId, 2);
localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING);
else
localLetterSpacing = letterSpacing;
@@ -3269,7 +3269,7 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
if (func == NULL)
return 0;
if (letterSpacing == -1)
localLetterSpacing = GetFontAttribute(*str, 2);
localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING);
break;
case 0x11:
glyphWidth = *++str;
@@ -3497,28 +3497,28 @@ u8 GetFontAttribute(u8 fontId, u8 attributeId)
int result = 0;
switch (attributeId)
{
case 0:
case FONTATTR_MAX_LETTER_WIDTH:
result = gFontInfos[fontId].maxLetterWidth;
break;
case 1:
case FONTATTR_MAX_LETTER_HEIGHT:
result = gFontInfos[fontId].maxLetterHeight;
break;
case 2:
case FONTATTR_LETTER_SPACING:
result = gFontInfos[fontId].letterSpacing;
break;
case 3:
case FONTATTR_LINE_SPACING:
result = gFontInfos[fontId].lineSpacing;
break;
case 4:
case FONTATTR_COLOR_LOWNIBBLE:
result = gFontInfos[fontId].fontColor_l;
break;
case 5:
case FONTATTR_COLOR_FOREGROUND:
result = gFontInfos[fontId].fgColor;
break;
case 6:
case FONTATTR_COLOR_BACKGROUND:
result = gFontInfos[fontId].bgColor;
break;
case 7:
case FONTATTR_COLOR_SHADOW:
result = gFontInfos[fontId].shadowColor;
break;
}
src/text_window.c
+3 -3
View File
@@ -97,9 +97,9 @@ void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset)
LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20);
}
void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset)
void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset)
{
LoadSav2WindowGfx(windowId, destOffset, palOffset);
LoadUserWindowBorderGfx(windowId, destOffset, palOffset);
}
void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset)
@@ -108,7 +108,7 @@ void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset)
LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20);
}
void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset)
void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset)
{
LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset);
}
src/title_screen.c
+5 -5
View File
@@ -546,7 +546,7 @@ void CB2_InitTitleScreen(void)
break;
}
case 3:
BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF);
SetVBlankCallback(VBlankCB);
gMain.state = 4;
break;
@@ -696,7 +696,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & START_BUTTON))
{
FadeOutBGM(4);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF);
SetMainCallback2(CB2_GoToMainMenu);
}
else if ((gMain.heldKeys & CLEAR_SAVE_BUTTON_COMBO) == CLEAR_SAVE_BUTTON_COMBO)
@@ -707,13 +707,13 @@ static void Task_TitleScreenPhase3(u8 taskId)
&& CanResetRTC() == TRUE)
{
FadeOutBGM(4);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
SetMainCallback2(CB2_GoToResetRtcScreen);
}
else if ((gMain.heldKeys & BERRY_UPDATE_BUTTON_COMBO) == BERRY_UPDATE_BUTTON_COMBO)
{
FadeOutBGM(4);
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
SetMainCallback2(CB2_GoToBerryFixScreen);
}
else
@@ -730,7 +730,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
UpdateLegendaryMarkingColor(gTasks[taskId].tCounter);
if ((gMPlayInfo_BGM.status & 0xFFFF) == 0)
{
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF);
SetMainCallback2(CB2_GoToCopyrightScreen);
}
}
src/unk_transition.c
+1 -1
View File
@@ -356,7 +356,7 @@ static bool8 sub_81DAB4C(struct Task *task)
{
if (task->data[3] == 31)
{
BeginNormalPaletteFade(-1, -1, 0, 0x10, 0);
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0);
task->tState++;
}
else
src/use_pokeblock.c
+1 -1
View File
@@ -164,7 +164,7 @@ void sub_8166380(void)
InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC));
InitWindows(gUnknown_085DFCDC);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 0x97, 0xE0);
LoadUserWindowBorderGfx(0, 0x97, 0xE0);
gUnknown_0203BC90->field_50++;
break;
case 4:
src/wallclock.c
+4 -4
View File
@@ -576,7 +576,7 @@ static void LoadWallClockGraphics(void)
InitBgsFromTemplates(0, gUnknown_085B21FC, 3);
InitWindows(gUnknown_085B21DC);
DeactivateAllTextPrinters();
LoadSav2WindowGfx(0, 0x250, 0xd0);
LoadUserWindowBorderGfx(0, 0x250, 0xd0);
clear_scheduled_bg_copies_to_vram();
ScanlineEffect_Stop();
ResetTasks();
@@ -589,7 +589,7 @@ static void LoadWallClockGraphics(void)
static void WallClockInit(void)
{
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
EnableInterrupts(INTR_FLAG_VBLANK);
SetVBlankCallback(WallClockVblankCallback);
SetMainCallback2(WallClockMainCallback);
@@ -782,7 +782,7 @@ static void Task_SetClock4(u8 taskId)
static void Task_SetClock5(u8 taskId)
{
RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes);
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_SetClock6;
}
@@ -814,7 +814,7 @@ static void Task_ViewClock2(u8 taskId)
static void Task_ViewClock3(u8 taskId)
{
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_ViewClock4;
}