diff options
Diffstat (limited to 'src')
88 files changed, 1306 insertions, 1378 deletions
diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c index e7387a52a..c60618a49 100644 --- a/src/battle/anim/evasion.c +++ b/src/battle/anim/evasion.c @@ -32,7 +32,7 @@ void sub_80CE7E0(u8 taskId) gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i]; } - BlendPalette(r3, 16, 11, 0); + BlendPalette(r3, 16, 11, RGB(0, 0, 0)); task->data[3] = 0; i = 0; while (i <= 1 && (obj = duplicate_obj_of_side_rel2move_in_transparent_mode(0)) >= 0) diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c index eaa38e5b7..2799046c8 100644 --- a/src/battle/anim/flash.c +++ b/src/battle/anim/flash.c @@ -39,7 +39,7 @@ void sub_80CE3EC(u8 taskId) sub_8079BF4(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c); b = b | (0x10000 << IndexOfSpritePaletteTag(0x27D2)); d = IndexOfSpritePaletteTag(0x27D3); - BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 0x10, 32699); + BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31)); gTasks[taskId].func = sub_80CE4D4; sub_80CE4D4(taskId); } diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 05859d31c..9f427a9c4 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -159,7 +159,7 @@ static void sub_80CD5A8(struct Sprite* sprite) sprite->data[1] = 0; } - BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], 0x7FFF); + BlendPalettes(sub_80791A8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB(31, 31, 31)); if (sprite->data[1] == 16) { int pal; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index da566628d..728a1bdf7 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1346,7 +1346,7 @@ void c2_081284E0(void) gBattleCommunication[1]--; if (gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleCommunication[0]++; } break; @@ -3280,7 +3280,7 @@ void oac_poke_opponent(struct Sprite *sprite) { sprite->callback = sub_8010278; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x00020000, 0, 10, 10, 0x3DEF); + BeginNormalPaletteFade(0x00020000, 0, 10, 10, RGB(15, 15, 15)); } void sub_8010278(struct Sprite *sprite) @@ -3304,7 +3304,7 @@ void sub_80102AC(struct Sprite *sprite) sub_8043DFC(gHealthboxIDs[sprite->data[0]]); sprite->callback = nullsub_37; StartSpriteAnimIfDifferent(sprite, 0); - BeginNormalPaletteFade(0x00020000, 0, 10, 0, 0x3DEF); + BeginNormalPaletteFade(0x00020000, 0, 10, 0, RGB(15, 15, 15)); } } diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 9dc9d62ec..bb36c3520 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -9766,7 +9766,7 @@ static void atk5A_yesnoboxlearnmove(void) if (gBattleCommunication[1] == 0) { sub_8023AD8(); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleStruct->atk5A_StateTracker++; return; } @@ -15845,7 +15845,7 @@ static void atkF2_displaydexinfo(void) switch (gBattleCommunication[0]) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleCommunication[0]++; break; case 1: @@ -15863,7 +15863,7 @@ static void atkF2_displaydexinfo(void) LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); REG_BG3CNT = 0x5a0b; gBattle_BG3_X = 0x100; - BeginNormalPaletteFade(0xfffc, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFC, 0, 16, 0, RGB(0, 0, 0)); gBattleCommunication[0]++; } break; diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 914ee245b..75afc2739 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -334,7 +334,7 @@ void BattleLoadOpponentMonSprite(struct Pokemon *pkmn, u8 b) } if (ewram17800[b].transformedSpecies != 0) { - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } } @@ -386,7 +386,7 @@ void BattleLoadPlayerMonSprite(struct Pokemon *pkmn, u8 b) } if (ewram17800[b].transformedSpecies != 0) { - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } } @@ -523,7 +523,7 @@ bool8 sub_8031C30(u8 a) return retVal; } -void load_gfxc_health_bar(void) +void load_gfxc_health_bar(u8 a) { LZDecompressWram(gUnknown_08D09C48, eVoidSharedArr); } @@ -646,7 +646,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) gBattleMonForms[a] = ewram17840.unk0; if (ewram17800[a].transformedSpecies != 0) { - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); } gSprites[gBankSpriteIds[a]].pos1.y = sub_8077F68(a); @@ -714,7 +714,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) LZDecompressWram(lzPaletteData, paletteSrc); LoadPalette(paletteSrc + gBattleMonForms[b] * 16, paletteOffset, 32); } - BlendPalette(paletteOffset, 16, 6, 0x7FFF); + BlendPalette(paletteOffset, 16, 6, RGB(31, 31, 31)); CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32); if (!IsContest()) { diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index e3810d856..12eb62a2b 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -65,7 +65,6 @@ extern void sub_8030E38(struct Sprite *); extern void StartBattleIntroAnim(); extern void sub_8047858(); extern void move_anim_start_t2_for_situation(); -extern void load_gfxc_health_bar(); extern void sub_8043D84(); extern void BufferStringBattle(); extern void sub_8031F24(void); diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 004963b70..d1dcf8bf4 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2655,7 +2655,7 @@ void PlayerHandlecmd10(void) void PlayerHandlecmd11(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0)); PlayerBufferExecCompleted(); } @@ -2835,7 +2835,7 @@ void PlayerHandleOpenBag(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_802E004; gBankInMenu = gActiveBattler; for (i = 0; i < 3; i++) @@ -2853,7 +2853,7 @@ void PlayerHandlecmd22(void) ewram160C0 = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; i++) gUnknown_02038470[i] = gBattleBufferA[gActiveBattler][4 + i]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_802DF30; gBankInMenu = gActiveBattler; } @@ -2861,7 +2861,7 @@ void PlayerHandlecmd22(void) void PlayerHandlecmd23(void) { BattleStopLowHpSound(); - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB(0, 0, 0)); PlayerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 53c4d71d7..6bc56c19b 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -514,7 +514,7 @@ void SafariHandlecmd20(void) void SafariHandleOpenBag(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_812B724; gBankInMenu = gActiveBattler; } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 451e02b40..3f88d4c72 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1312,7 +1312,7 @@ void WallyHandlecmd20(void) void WallyHandleOpenBag(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBattleBankFunc[gActiveBattler] = sub_81374C4; gBankInMenu = gActiveBattler; } diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 923cf05a4..e758b7957 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -515,7 +515,7 @@ void HandleBattlePartyMenu(u8 taskId) static void Task_809527C(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_80952B4; } @@ -535,7 +535,7 @@ static void Task_80952E4(u8 taskId) Task_809527C(taskId); else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_8095330; } } @@ -633,7 +633,7 @@ static void Task_BattlePartyMenuSummary(u8 taskId) { sub_806CA38(taskId); //an unused variable was probably set with this. gTasks[taskId].func = Task_ShowSummaryScreen; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void Task_BattlePartyMenuShift(u8 taskId) diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 10ac4f78c..9e03b5d2d 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -1045,7 +1045,7 @@ void sub_8082524(void) { struct MapObject *mapObject = &gMapObjects[gSelectedMapObject]; - npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18)); + npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->facingDirection)); } u8 ScrSpecial_GetTrainerBattleMode(void) diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index d5035a862..a0c94f713 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -643,7 +643,7 @@ static bool8 Phase2_Transition_Blur_Func2(struct Task* task) { task->data[1] = 4; if (++task->data[2] == 10) - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); REG_MOSAIC = (task->data[2] & 15) * 17; if (task->data[2] > 14) task->tState++; @@ -672,7 +672,7 @@ static bool8 Phase2_Transition_Swirl_Func1(struct Task* task) sub_811D658(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB(0, 0, 0)); sub_811D6E8(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_14, 0, 2, 0, 160); SetVBlankCallback(VBlankCB_Phase2_Transition_Swirl); @@ -733,7 +733,7 @@ static bool8 Phase2_Transition_Shuffle_Func1(struct Task* task) sub_811D658(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB(0, 0, 0)); memset(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_16, 0x140); SetVBlankCallback(VBlankCB_Phase2_Transition_Shuffle); @@ -1314,7 +1314,7 @@ static bool8 Phase2_Transition_Ripple_Func2(struct Task* task) if (++task->data[3] == 81) { task->data[4]++; - BeginNormalPaletteFade(-1, -2, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB(0, 0, 0)); } if (task->data[4] != 0 && !gPaletteFade.active) @@ -1664,7 +1664,7 @@ static bool8 Phase2_Mugshot_Func7(struct Task* task) static bool8 Phase2_Mugshot_Func8(struct Task* task) { TRANSITION_STRUCT.VBlank_DMA = 0; - BlendPalettes(-1, 0x10, 0x7FFF); + BlendPalettes(0xFFFFFFFF, 16, RGB(31, 31, 31)); TRANSITION_STRUCT.BLDCNT = 0xFF; task->data[3] = 0; @@ -1993,7 +1993,7 @@ static bool8 Phase2_Transition_WhiteFade_Func3(struct Task* task) TRANSITION_STRUCT.VBlank_DMA = 0; if (TRANSITION_STRUCT.field_20 > 7) { - BlendPalettes(-1, 0x10, 0x7FFF); + BlendPalettes(0xFFFFFFFF, 16, RGB(31, 31, 31)); task->tState++; } return FALSE; @@ -2302,7 +2302,7 @@ static bool8 Phase1_TransitionAll_Func1(struct Task* task) task->data[7] += task->data[4]; if (task->data[7] > 16) task->data[7] = 16; - BlendPalettes(-1, task->data[7], 0x2D6B); + BlendPalettes(0xFFFFFFFF, task->data[7], RGB(11, 11, 11)); } if (task->data[7] > 15) { @@ -2320,7 +2320,7 @@ static bool8 Phase1_TransitionAll_Func2(struct Task* task) task->data[7] -= task->data[5]; if (task->data[7] < 0) task->data[7] = 0; - BlendPalettes(-1, task->data[7], 0x2D6B); + BlendPalettes(0xFFFFFFFF, task->data[7], RGB(11, 11, 11)); } if (task->data[7] == 0) { @@ -2379,7 +2379,7 @@ static void sub_811D6A8(u16** a0, u16** a1) static void sub_811D6D4(void) { - BlendPalettes(-1, 0x10, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); } static void sub_811D6E8(s16* array, s16 sinAdd, s16 index, s16 indexIncrementer, s16 amplitude, s16 arrSize) diff --git a/src/berry.c b/src/berry.c index 349703299..8829407da 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1545,8 +1545,8 @@ void ResetBerryTreeSparkleFlags(void) { if (gMapObjects[i].active && gMapObjects[i].animPattern == 12) // is the object an active berry tree? { - cam_left = gMapObjects[i].coords2.x; - cam_top = gMapObjects[i].coords2.y; + cam_left = gMapObjects[i].currentCoords.x; + cam_top = gMapObjects[i].currentCoords.y; if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) ResetBerryTreeSparkleFlag(gMapObjects[i].trainerRange_berryTreeId); } diff --git a/src/berry_blender.c b/src/berry_blender.c index cde189738..b8df29ec6 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -945,7 +945,7 @@ static void sub_804E56C(void) } break; case 2: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sub_8051474(); gBerryBlenderData->field_0++; break; @@ -965,7 +965,7 @@ static void sub_804E56C(void) if (Menu_UpdateWindowText()) { gBerryBlenderData->field_0++; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } break; case 6: @@ -1137,7 +1137,7 @@ static void sub_804E9F8(void) gBerryBlenderData->field_0++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gBerryBlenderData->field_0++; break; case 4: @@ -1432,7 +1432,7 @@ static void sub_804F378(void) gBerryBlenderData->field_0++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gBerryBlenderData->field_0++; gBerryBlenderData->framesToWait = 0; break; @@ -2479,7 +2479,7 @@ static void sub_8050E30(void) case 9: if (IsLinkTaskFinished()) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gBerryBlenderData->field_6F++; } break; diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 9fbfd0681..77f80d728 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -157,7 +157,7 @@ static bool8 sub_8146058(void) gMain.state += 1; break; case 12: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; SetMainCallback2(sub_8146014); return TRUE; @@ -246,7 +246,7 @@ static void sub_814640C(u8 taskId) static void sub_8146440(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_814640C; } diff --git a/src/bike.c b/src/bike.c index 28439e6bb..25419c6cf 100644 --- a/src/bike.c +++ b/src/bike.c @@ -199,14 +199,14 @@ static void MachBikeTransition_TurnDirection(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E)) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior)) { PlayerTurnInPlace(direction); Bike_SetBikeStill(); } else { - MachBikeTransition_FaceDirection(playerMapObj->mapobj_unk_18); + MachBikeTransition_FaceDirection(playerMapObj->facingDirection); } } @@ -215,13 +215,13 @@ static void MachBikeTransition_TrySpeedUp(u8 direction) struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; u8 collision; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == FALSE) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == FALSE) { // we cannot go forward, so either slow down or, if we are stopped, idle face direction. if (gPlayerAvatar.bikeSpeed) - MachBikeTransition_TrySlowDown(playerMapObj->placeholder18); + MachBikeTransition_TrySlowDown(playerMapObj->movementDirection); else - MachBikeTransition_FaceDirection(playerMapObj->placeholder18); + MachBikeTransition_FaceDirection(playerMapObj->movementDirection); } else { @@ -393,7 +393,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 { // B button was released. gPlayerAvatar.bikeFrameCounter = 0; - if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) { // Go back to normal on flat ground *newDirection = direction; @@ -436,7 +436,7 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey { // B button was released Bike_SetBikeStill(); - if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) { // even though B was released, dont undo the wheelie on the bumpy slope. gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; @@ -483,7 +483,7 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he { // we were moving on a wheelie, but we let go while moving. reset bike still status Bike_SetBikeStill(); - if (!MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) { // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; @@ -531,8 +531,8 @@ static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - playerMapObj->mapobj_bit_9 = 0; - FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18); + playerMapObj->facingDirectionLocked = 0; + FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -552,8 +552,8 @@ static void AcroBikeTransition_TurnDirection(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerFaceDirection(direction); } @@ -562,9 +562,9 @@ static void AcroBikeTransition_Moving(u8 direction) u8 collision; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - AcroBikeTransition_FaceDirection(playerMapObj->placeholder18); + AcroBikeTransition_FaceDirection(playerMapObj->movementDirection); return; } collision = get_some_collision(direction); @@ -585,8 +585,8 @@ static void AcroBikeTransition_NormalToWheelie(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerStartWheelie(direction); } @@ -594,8 +594,8 @@ static void AcroBikeTransition_WheelieToNormal(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerEndWheelie(direction); } @@ -603,8 +603,8 @@ static void AcroBikeTransition_WheelieIdle(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerIdleWheelie(direction); } @@ -612,8 +612,8 @@ static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) - direction = playerMapObj->placeholder18; + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) + direction = playerMapObj->movementDirection; PlayerStandingHoppingWheelie(direction); } @@ -622,9 +622,9 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) u8 var; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - AcroBikeTransition_WheelieHoppingStanding(playerMapObj->placeholder18); + AcroBikeTransition_WheelieHoppingStanding(playerMapObj->movementDirection); return; } var = get_some_collision(direction); @@ -674,7 +674,7 @@ static void AcroBikeTransition_SideJump(u8 direction) } playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; PlaySE(SE_JITE_PYOKO); - playerMapObj->mapobj_bit_9 = 1; + playerMapObj->facingDirectionLocked = 1; PlayerSetAnimId(sub_80608A4(direction), 2); } @@ -688,9 +688,9 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) u8 var; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - PlayerIdleWheelie(playerMapObj->placeholder18); + PlayerIdleWheelie(playerMapObj->movementDirection); return; } var = get_some_collision(direction); @@ -706,7 +706,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (var <= 4) { - if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_80595DC(direction); //hit wall? @@ -722,9 +722,9 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) u8 var; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - PlayerStartWheelie(playerMapObj->placeholder18); + PlayerStartWheelie(playerMapObj->movementDirection); return; } var = get_some_collision(direction); @@ -740,7 +740,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (var <= 4) { - if (MetatileBehavior_IsBumpySlope(playerMapObj->mapobj_unk_1E)) + if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_80595DC(direction); //hit wall? @@ -756,9 +756,9 @@ static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) u8 var; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (CanBikeFaceDirOnMetatile(direction, playerMapObj->mapobj_unk_1E) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0) { - PlayerEndWheelie(playerMapObj->placeholder18); + PlayerEndWheelie(playerMapObj->movementDirection); return; } var = get_some_collision(direction); @@ -885,8 +885,8 @@ static u8 get_some_collision(u8 direction) u8 metatitleBehavior; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - x = playerMapObj->coords2.x; - y = playerMapObj->coords2.y; + x = playerMapObj->currentCoords.x; + y = playerMapObj->currentCoords.y; MoveCoords(direction, &x, &y); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); return Bike_CheckCollisionTryAdvanceCollisionCount(playerMapObj, x, y, direction, metatitleBehavior); @@ -970,7 +970,7 @@ bool8 IsBikingDisallowedByPlayer(void) s16 x, y; u8 tileBehavior; - if (!(gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_4))) + if (!(gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_UNDERWATER))) { PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); @@ -982,7 +982,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/cable_car.c b/src/cable_car.c index 8c3f9885d..38ea86096 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -275,7 +275,7 @@ void CableCar(void) { ScriptContext2_Enable(); CreateTask(CableCarTask1, 1); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } #if DEBUG @@ -385,7 +385,7 @@ static void CableCarMainCallback_Setup(void) gMain.state++; break; case 7: - BeginNormalPaletteFade(-1, 3, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0)); FadeInNewBGM(BGM_ROPEWAY, 1); sub_8123FBC(1); gMain.state++; @@ -497,7 +497,7 @@ static void sub_8123878(u8 taskId) if (sCableCarPtr->unk_0006 == 570) { sCableCarPtr->unk_0001 = 3; - BeginNormalPaletteFade(-1, 3, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 16, RGB(0, 0, 0)); FadeOutBGM(4); } break; diff --git a/src/choose_party.c b/src/choose_party.c index 698460547..5aed5b22e 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -305,7 +305,7 @@ void HandleBattleTowerPartyMenu(u8 taskId) case B_BUTTON: PlaySE(SE_SELECT); ClearPartySelection(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8122450; break; } @@ -386,7 +386,7 @@ static void sub_81224A8(u8 taskId) { if (gSelectedOrderFromParty[0] != 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8122450; } else @@ -441,7 +441,7 @@ static void sub_81225D4(u8 taskId) // Summary callback? static void BattleTowerEntryMenuCallback_Summary(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_81225D4; } @@ -700,7 +700,7 @@ static void sub_8122C18(u8 taskId) gTasks[taskId].data[0]++; if (gTasks[taskId].data[0] == 256) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8122450; } } @@ -919,7 +919,7 @@ static void sub_8123034(u8 taskId) static void DaycareStorageMenuCallback_Summary(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8123034; } @@ -934,7 +934,7 @@ static void DaycareStorageMenuCallback_Exit(u8 taskId) void sub_8123138(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_8123170; } diff --git a/src/clear_save_data_menu.c b/src/clear_save_data_menu.c index b6053715a..b7f648887 100644 --- a/src/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c @@ -135,7 +135,7 @@ static u8 InitClearSaveDataScreen(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); ime = REG_IME; REG_IME = 0; @@ -164,7 +164,7 @@ static void CB2_SoftReset(void) { case 0: default: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xffff); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); gMain.state = 1; break; case 1: diff --git a/src/contest.c b/src/contest.c index f7436c51c..d9c19f773 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2042,7 +2042,7 @@ void sub_80ADEEC(u8 taskId) } else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80ADFD8; } } @@ -2061,7 +2061,7 @@ void sub_80ADF4C(u8 taskId) void sub_80ADF98(u8 taskId) { DestroyTask(taskId); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[sContest.mainTaskId].func = sub_80ADFD8; } @@ -3638,7 +3638,7 @@ void sub_80B03D8(u8 taskId) { gTasks[sContest.unk19211].data[r4 * 4 + 0] = 0xFF; gTasks[sContest.unk19211].data[r4 * 4 + 1] = 0; - BlendPalette((sContest.unk19218[r4] + 5) * 16 + 6, 2, 0, 0x4BFF); + BlendPalette((sContest.unk19218[r4] + 5) * 16 + 6, 2, 0, RGB(31, 31, 18)); DestroyTask(taskId); } } @@ -3666,7 +3666,7 @@ void sub_80B0458(u8 taskId) (sContest.unk19218[i] + 5) * 16 + 6, 2, gTasks[taskId].data[r3 + 0], - 0x4BFF); + RGB(31, 31, 18)); } } } @@ -3746,8 +3746,8 @@ void sub_80B05FC(u8 taskId) || gTasks[taskId].data[r3 + 0] == 0) gTasks[taskId].data[r3 + 1] ^= 1; - BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[r3 + 0], 0x4BFF); - BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[r3 + 0], 0x4BFF); + BlendPalette((i + 5) * 16 + 10, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18)); + BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[r3 + 0], RGB(31, 31, 18)); } } } @@ -3798,7 +3798,7 @@ void sub_80B0748(u8 taskId) { //_080B07D2 r6 = 0; - BlendPalette((r4 + 5) * 16 + 1, 3, r5, 0x7FFF); + BlendPalette((r4 + 5) * 16 + 1, 3, r5, RGB(31, 31, 31)); if (r5 == 0 && r8 == 4) { gTasks[taskId].data[r1 + 0] = 0; @@ -3839,8 +3839,8 @@ void sub_80B0748(u8 taskId) r8++; if (r7 == 4 && r8 == 1) { - BlendPalette((r4 + 9) * 16 + 2, 1, 4, 0); - BlendPalette((r4 + 9) * 16 + 5, 1, 4, 0); + BlendPalette((r4 + 9) * 16 + 2, 1, 4, RGB(0, 0, 0)); + BlendPalette((r4 + 9) * 16 + 5, 1, 4, RGB(0, 0, 0)); } } } @@ -3854,7 +3854,7 @@ void sub_80B0748(u8 taskId) if (r6 == 12) { r6 = 0; - BlendPalette((r4 + 5) * 16 + 1, 3, r5, 0); + BlendPalette((r4 + 5) * 16 + 1, 3, r5, RGB(0, 0, 0)); r5 += 1; if (r5 == 5) { @@ -4834,13 +4834,13 @@ void c3_08130B10(u8 taskId) gTasks[taskId].data[4]++; else gTasks[taskId].data[4]--; - BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], 0x7FFF); + BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB(31, 31, 31)); if (gTasks[taskId].data[4] == 0 || gTasks[taskId].data[4] == 16) { gTasks[taskId].data[3] ^= 1; if (sContest.applauseLevel < 5) { - BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, 31); + BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, RGB(31, 0, 0)); DestroyTask(taskId); } } diff --git a/src/contest_painting.c b/src/contest_painting.c index 28dd3def7..03840215b 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -212,7 +212,7 @@ static void HoldContestPainting(void) u8 two = 2; //needed to make the asm match gUnknown_03000750 = two; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } if (gUnknown_03000756 != 0) gUnknown_03000754 = 0; diff --git a/src/credits.c b/src/credits.c index 9a85265e4..b99bc56bd 100644 --- a/src/credits.c +++ b/src/credits.c @@ -487,7 +487,7 @@ void sub_81439D0(void) gTasks[taskIdB].data[TDB_TASK_A_ID] = taskIdA; gTasks[taskIdA].data[TDA_TASK_B_ID] = taskIdB; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); savedIme = REG_IME; REG_IME = 0; @@ -541,14 +541,14 @@ static void task_a_8143B68(u8 taskIdA) { gTasks[taskIdA].data[TDA_13] = data1; gTasks[taskIdA].data[TDA_11] = 0; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8143BFC; } else if (gTasks[taskIdA].data[TDA_11] == 2) { gTasks[taskIdA].data[TDA_13] = data1; gTasks[taskIdA].data[TDA_11] = 0; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8143CC0; } } @@ -571,7 +571,7 @@ static void task_a_80C9BFC(u8 taskIdA) if (sub_8144ECC(gTasks[taskIdA].data[TDA_7], taskIdA)) { - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); backup = REG_IME; REG_IME = 0; @@ -634,7 +634,7 @@ void task_a_8143D04(u8 taskIdA) gTasks[gTasks[taskIdA].data[TDA_TASK_D_ID]].data[TDD_TASK_A_ID] = taskIdA; gTasks[gTasks[taskIdA].data[TDA_TASK_D_ID]].data[TDD_2] = gTasks[taskIdA].data[TDA_7]; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BG3HOFS = 0; REG_BG3VOFS = 32; REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; @@ -655,7 +655,7 @@ static void task_a_8143EBC(u8 taskIdA) return; } - BeginNormalPaletteFade(-1, 12, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 12, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8143F04; } @@ -677,7 +677,7 @@ static void task_a_8143F3C(u8 taskIdA) sub_8145128(0, 0x3800, 0); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(-1, 8, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 16, 0, RGB(0, 0, 0)); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; backup = REG_IME; @@ -699,7 +699,7 @@ static void task_a_8143FDC(u8 taskIdA) return; } - BeginNormalPaletteFade(-1, 6, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 6, 0, 16, RGB(0, 0, 0)); gTasks[taskIdA].func = task_a_8144024; } @@ -709,7 +709,7 @@ static void task_a_8144024(u8 taskIdA) { sub_81452D0(0x3800, 0); - BeginNormalPaletteFade(-1, 0, 0, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0, RGB(0, 0, 0)); gTasks[taskIdA].data[TDA_0] = 7200; gTasks[taskIdA].func = task_a_8144080; } @@ -722,7 +722,7 @@ static void task_a_8144080(u8 taskIdA) if (gTasks[taskIdA].data[TDA_0] == 0) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 8, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, FADE_COLOR_WHITE); gTasks[taskIdA].func = task_a_8144114; return; } @@ -730,7 +730,7 @@ static void task_a_8144080(u8 taskIdA) if (gMain.newKeys) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 8, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, FADE_COLOR_WHITE); gTasks[taskIdA].func = task_a_8144114; return; } diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 83736ba4d..7bb5cc1d6 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -74,7 +74,7 @@ u8 debug_sub_80B061C(void) u8 KagayaDebugMenu_TrainerCard(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_80B068C; return 0; } @@ -93,7 +93,7 @@ u8 debug_sub_80B068C(void) u8 KagayaDebugMenu_CardToExchange(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_80B06E0; return 0; } @@ -112,7 +112,7 @@ u8 debug_sub_80B06E0(void) u8 KagayaDebugMenu_SlotMachine(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = Kagaya_80B0734; return 0; } @@ -149,7 +149,7 @@ u8 debug_sub_80B0770(void) u8 debug_sub_80B07B0(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_80B07DC; return 0; } diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index c936af864..f914163b2 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -105,7 +105,7 @@ static bool8 sub_80A9B78(void) u8 MatsudaDebugMenu_ContestResults(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); CreateTask(sub_80A9BE4, 0xFF); return 1; } @@ -878,7 +878,7 @@ void sub_80AAD08(struct Sprite *sprite, s8 var2) { eMatsudaDebugVar = sprite->data[3]; SetMainCallback2(sub_80AACC4); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index f40d5556a..760b10d01 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -133,7 +133,7 @@ static bool8 SwitchToPkmnListMenu(void) Menu_EraseScreen(); gMain.savedCallback = c2_exit_to_overworld_1_sub_8080DEC; CreateTask(Task_SwitchToPkmnListMenu, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); return TRUE; } diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 05cbfc8f7..935f5cd67 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -134,7 +134,7 @@ void CB2_StartSoundCheckMenu(void) ResetSpriteData(); Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = WIN_RANGE(0, 0); REG_WIN0V = WIN_RANGE(0, 0); REG_WIN1H = WIN_RANGE(0, 0); @@ -267,7 +267,7 @@ bool8 Task_ProcessSoundCheckMenuInput(u8 taskId) else if (gMain.newKeys & B_BUTTON) { m4aSongNumStart(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80BA68C; } else if (gMain.newAndRepeatedKeys & DPAD_UP) @@ -1249,7 +1249,7 @@ void Task_InitCryTest(u8 taskId) Menu_DrawStdWindowFrame(0, 16, 5, 19); PrintCryNumber(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BG2HOFS = 0; REG_BG2VOFS = 0; REG_BG2CNT = 0xF01; diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 55212315c..c5f6fc0ec 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -424,7 +424,7 @@ bool8 TayaDebugMenu_TownFlags(void) bool8 TayaDebugMenu_AwardARibbon(void) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetMainCallback2(debug_sub_80915BC); CloseMenu(); return TRUE; @@ -979,7 +979,7 @@ void debug_sub_8091334(void) } else if (gMain.newKeys & B_BUTTON) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetMainCallback2(sub_80546F0); } break; diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 40df600fa..daaca570c 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -2365,7 +2365,7 @@ static bool8 CallScript_GiveShroomishEgg(void) static bool8 ContestGraphics_Show(void) { - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_808C280; return FALSE; } @@ -2385,7 +2385,7 @@ static bool8 debug_sub_808C280(void) static bool8 MuseumGraphics_Show(void) { - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_808C2E4; return FALSE; } @@ -3927,7 +3927,7 @@ static bool8 debug_sub_808EC5C(void) static bool8 PreviewGraphics_Show(void) { - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMenuCallback = debug_sub_808ECD0; return FALSE; } diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 1b13b2d4e..86b8f6b0b 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -392,7 +392,7 @@ void InitSizeComparison(void) REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; REG_IME = imeBak; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(debug_80C3758); SetMainCallback2(debug_80C370C); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_OBJ_ON; @@ -812,7 +812,7 @@ void debug_80C3D2C(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } @@ -1292,7 +1292,7 @@ void debug_80C4900(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); LoadPlayerParty(); gSaveBlock2.playerGender = gUnknown_Debug_2038A0C[13]; @@ -1835,7 +1835,7 @@ void InitCreatePokemon(void) u8 sp04[] = _("Create POKひMON LR:Shift START:Add"); debug_80C35DC(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BLDCNT = 0x0000; REG_BLDALPHA = 0x0000; REG_BLDY = 0x0000; @@ -1884,7 +1884,7 @@ void debug_80C53F0(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } @@ -2523,7 +2523,7 @@ void InitSeePokemonGraphics(void) LoadPalette(word_83F888C, 0x80, sizeof(word_83F888C)); pal = RGB(31, 31, 31); LoadPalette(&pal, 0, sizeof(pal)); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = 0; REG_WIN0V = 0; REG_WIN1H = 0; @@ -2707,7 +2707,7 @@ void debug_80C6FA8(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } @@ -3195,7 +3195,7 @@ void InitSeeTrainers(void) debug_80C35DC(); DmaCopy16Defvars(3, byte_83F88EC, VRAM + 0xe000, 0x800); LoadPalette(word_83F888C, 0x80, 0x60); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = 0; REG_WIN0V = 0; REG_WIN1H = 0; @@ -3315,7 +3315,7 @@ void debug_80C7B14(u8 taskId) if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(debug_80C370C); gTasks[taskId].func = debug_80C373C; } diff --git a/src/diploma.c b/src/diploma.c index b31fc7dec..a6026d423 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -71,7 +71,7 @@ void CB2_ShowDiploma(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); DisplayDiplomaText(); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); savedIme = REG_IME; REG_IME = 0; @@ -109,7 +109,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_DiplomaFadeOut; } } diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 4b64846f9..4f5c71518 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -328,7 +328,7 @@ void sub_80E62F8(void) SetVBlankCallback(sub_80E6A6C); break; case 7: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); break; case 8: REG_DISPCNT = 0x1F40; @@ -1227,7 +1227,7 @@ void sub_80E752C(void) switch (gEasyChatStruct->unk24) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gEasyChatStruct->unk24++; break; case 1: diff --git a/src/egg_hatch.c b/src/egg_hatch.c index eb66f299d..580ec6886 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -441,7 +441,7 @@ void EggHatch(void) { ScriptContext2_Enable(); CreateTask(Task_EggHatch, 10); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void Task_EggHatch(u8 taskID) @@ -554,7 +554,7 @@ static void CB2_EggHatch_1(void) switch (gEggHatchData->CB2_state) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_DISPCNT = 0x1740; gEggHatchData->CB2_state++; CreateTask(Task_EggHatchPlayBGM, 5); @@ -629,7 +629,7 @@ static void CB2_EggHatch_1(void) } break; case 10: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gEggHatchData->CB2_state++; break; case 11: @@ -730,7 +730,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, 16, FADE_COLOR_WHITE); if (sprite->data[0] < 4u) { for (i = 0; i <= 3; i++) @@ -754,7 +754,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) StartSpriteAffineAnim(&gSprites[gEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) - BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, FADE_COLOR_WHITE); if (sprite->data[0] <= 9) gSprites[gEggHatchData->pokeSpriteID].pos1.y -= 1; if (sprite->data[0] > 40) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 6883c82c1..78ed41d77 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1918,7 +1918,7 @@ void npc_clear_ids_and_state(struct MapObject *mapObj) mapObj->localId = 0xFF; mapObj->mapNum = 0xFF; mapObj->mapGroup = 0xFF; - mapObj->mapobj_unk_1C = 0xFF; + mapObj->animId = 0xFF; } void npcs_clear_ids_and_state(void) @@ -1994,7 +1994,7 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y) for (i = 0; i < 16; i++) { - if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) + if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y) break; } return i; @@ -2024,72 +2024,9 @@ u8 GetFieldObjectIdByLocalId(u8 localId) return 16; } -// The bitfield at 0x18 needs to be u16 for this function to match -struct MapObjectAlt -{ - /*0x00*/ u32 active:1; - u32 mapobj_bit_1:1; - u32 mapobj_bit_2:1; - u32 mapobj_bit_3:1; - u32 mapobj_bit_4:1; - u32 mapobj_bit_5:1; - u32 mapobj_bit_6:1; - u32 mapobj_bit_7:1; - /*0x01*/ u32 mapobj_bit_8:1; - u32 mapobj_bit_9:1; - u32 mapobj_bit_10:1; - u32 mapobj_bit_11:1; - u32 mapobj_bit_12:1; - u32 mapobj_bit_13:1; - u32 mapobj_bit_14:1; - u32 mapobj_bit_15:1; - /*0x02*/ u32 mapobj_bit_16:1; - u32 mapobj_bit_17:1; - u32 mapobj_bit_18:1; - u32 mapobj_bit_19:1; - u32 mapobj_bit_20:1; - u32 mapobj_bit_21:1; - u32 mapobj_bit_22:1; - u32 mapobj_bit_23:1; - /*0x03*/ u32 mapobj_bit_24:1; - u32 mapobj_bit_25:1; - u32 mapobj_bit_26:1; - u32 mapobj_bit_27:1; - u32 mapobj_bit_28:1; - u32 mapobj_bit_29:1; - u32 mapobj_bit_30:1; - u32 mapobj_bit_31:1; - /*0x04*/ u8 spriteId; - /*0x05*/ u8 graphicsId; - /*0x06*/ u8 animPattern; - /*0x07*/ u8 trainerType; - /*0x08*/ u8 localId; - /*0x09*/ u8 mapNum; - /*0x0A*/ u8 mapGroup; - /*0x0B*/ u8 mapobj_unk_0B_0:4; - u8 elevation:4; - /*0x0C*/ struct Coords16 coords1; - /*0x10*/ struct Coords16 coords2; - /*0x14*/ struct Coords16 coords3; - /*0x18*/ u16 mapobj_unk_18:4; //current direction? - /*0x18*/ u16 placeholder18:4; - /*0x19*/ u16 rangeX:4; - /*0x19*/ u16 rangeY:4; - /*0x1A*/ u8 mapobj_unk_1A; - /*0x1B*/ u8 mapobj_unk_1B; - /*0x1C*/ u8 mapobj_unk_1C; - /*0x1D*/ u8 trainerRange_berryTreeId; - /*0x1E*/ u8 mapobj_unk_1E; - /*0x1F*/ u8 mapobj_unk_1F; - /*0x20*/ u8 mapobj_unk_20; - /*0x21*/ u8 mapobj_unk_21; - /*0x22*/ u8 animId; - /*size = 0x24*/ -}; - u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 c) { - struct MapObjectAlt *mapObj; //TODO: resolve the mapobj_unk_19b weirdness + struct MapObject *mapObj; u8 var; s16 r3; s16 r2; @@ -2101,35 +2038,35 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 r3 = template->x + 7; r2 = template->y + 7; mapObj->active = TRUE; - mapObj->mapobj_bit_2 = TRUE; + mapObj->triggerGroundEffectsOnMove = TRUE; mapObj->graphicsId = template->graphicsId; mapObj->animPattern = template->movementType; mapObj->localId = template->localId; mapObj->mapNum = b; asm("":::"r6"); mapObj->mapGroup = c; - mapObj->coords1.x = r3; - mapObj->coords1.y = r2; - mapObj->coords2.x = r3; - mapObj->coords2.y = r2; - mapObj->coords3.x = r3; - mapObj->coords3.y = r2; - mapObj->mapobj_unk_0B_0 = template->elevation; - mapObj->elevation = template->elevation; - mapObj->rangeX = template->unkA_0; - mapObj->rangeY = template->unkA_4; + mapObj->initialCoords.x = r3; + mapObj->initialCoords.y = r2; + mapObj->currentCoords.x = r3; + mapObj->currentCoords.y = r2; + mapObj->previousCoords.x = r3; + mapObj->previousCoords.y = r2; + mapObj->currentElevation = template->elevation; + mapObj->previousElevation = template->elevation; + mapObj->range.as_nybbles.x = template->unkA_0; + mapObj->range.as_nybbles.y = template->unkA_4; mapObj->trainerType = template->unkC; mapObj->trainerRange_berryTreeId = template->unkE; - mapObj->mapobj_unk_20 = gUnknown_0836DC09[template->movementType]; - FieldObjectSetDirection((struct MapObject *)mapObj, mapObj->mapobj_unk_20); + mapObj->previousMovementDirection = gUnknown_0836DC09[template->movementType]; + FieldObjectSetDirection((struct MapObject *)mapObj, mapObj->previousMovementDirection); asm("":::"r5","r6"); FieldObjectHandleDynamicGraphicsId((struct MapObject *)mapObj); if (gUnknown_0836DBBC[mapObj->animPattern] != 0) { - if (mapObj->rangeX == 0) - mapObj->rangeX++; - if (mapObj->rangeY == 0) - mapObj->rangeY++; + if (mapObj->range.as_nybbles.x == 0) + mapObj->range.as_nybbles.x++; + if (mapObj->range.as_nybbles.y == 0) + mapObj->range.as_nybbles.y++; } #if DEBUG gUnknown_Debug_03004BC0++; @@ -2234,7 +2171,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * else if (gfxInfo->paletteSlot == 10) npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot); if (mapObject->animPattern == 0x4C) - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; #ifdef NONMATCHING sprTemplate->paletteTag = 0xFFFF; @@ -2251,7 +2188,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * return 16; } sprite = &gSprites[spriteId]; - sub_8060388(e + mapObject->coords2.x, f + mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(e + mapObject->currentCoords.x, f + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); sprite->pos1.x += 8; @@ -2260,10 +2197,10 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * sprite->coordOffsetEnabled = TRUE; sprite->data[0] = mapObjectId; mapObject->spriteId = spriteId; - mapObject->mapobj_bit_12 = gfxInfo->inanimate; - if (!mapObject->mapobj_bit_12) - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); - SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1); + mapObject->inanimate = gfxInfo->inanimate; + if (!mapObject->inanimate) + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); + SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); sub_80634D0(mapObject, sprite); return mapObjectId; } @@ -2465,8 +2402,8 @@ void RemoveFieldObjectsOutsideView(void) { struct MapObject *mapObject = &gMapObjects[i]; - if (mapObject->active && !mapObject->mapobj_bit_16) - RemoveFieldObjectIfOutsideView(mapObject); + if (mapObject->active && !mapObject->isPlayer) + RemoveFieldObjectIfOutsideView(mapObject); } } } @@ -2478,11 +2415,11 @@ void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) s16 r4 = gSaveBlock1.pos.y; s16 r6 = gSaveBlock1.pos.y + 16; - if (mapObject->coords2.x >= r7 && mapObject->coords2.x <= r5 - && mapObject->coords2.y >= r4 && mapObject->coords2.y <= r6) + if (mapObject->currentCoords.x >= r7 && mapObject->currentCoords.x <= r5 + && mapObject->currentCoords.y >= r4 && mapObject->currentCoords.y <= r6) return; - if (mapObject->coords1.x >= r7 && mapObject->coords1.x <= r5 - && mapObject->coords1.y >= r4 && mapObject->coords1.y <= r6) + if (mapObject->initialCoords.x >= r7 && mapObject->initialCoords.x <= r5 + && mapObject->initialCoords.y >= r4 && mapObject->initialCoords.y <= r6) return; RemoveFieldObject(mapObject); } @@ -2548,7 +2485,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) { struct Sprite *sprite = &gSprites[spriteId]; - sub_8060388(b + mapObject->coords2.x, c + mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(b + mapObject->currentCoords.x, c + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); sprite->pos1.x += 8; @@ -2557,7 +2494,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) if (mapObject->animPattern == 11) { SetPlayerAvatarFieldObjectIdAndObjectId(a, spriteId); - mapObject->mapobj_unk_1B = sub_8126B54(); + mapObject->warpArrowSpriteId = sub_8126B54(); } if (subspriteTables != NULL) SetSubspriteTables(sprite, subspriteTables); @@ -2565,23 +2502,23 @@ void sub_805B75C(u8 a, s16 b, s16 c) sprite->coordOffsetEnabled = TRUE; sprite->data[0] = a; mapObject->spriteId = spriteId; - if (!mapObject->mapobj_bit_12 && mapObject->animPattern != 11) - StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + if (!mapObject->inanimate && mapObject->animPattern != 11) + StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); sub_805B914(mapObject); - SetObjectSubpriorityByZCoord(mapObject->elevation, sprite, 1); + SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1); } } void sub_805B914(struct MapObject *mapObject) { - mapObject->mapobj_bit_1 = FALSE; - mapObject->mapobj_bit_2 = TRUE; - mapObject->mapobj_bit_22 = FALSE; - mapObject->mapobj_bit_17 = FALSE; - mapObject->mapobj_bit_18 = FALSE; - mapObject->mapobj_bit_19 = FALSE; - mapObject->mapobj_bit_20 = FALSE; - mapObject->mapobj_bit_21 = FALSE; + mapObject->regularAnimActive = FALSE; + mapObject->triggerGroundEffectsOnMove = TRUE; + mapObject->hasShadow = FALSE; + mapObject->hasReflection = FALSE; + mapObject->inShortGrass = FALSE; + mapObject->inShallowFlowingWater = FALSE; + mapObject->inSandPile = FALSE; + mapObject->inHotSprings = FALSE; FieldObjectClearAnim(mapObject); } @@ -2610,14 +2547,14 @@ void sub_805B980(struct MapObject *mapObject, u8 graphicsId) sprite->anims = gfxInfo->anims; sprite->subspriteTables = gfxInfo->subspriteTables; sprite->oam.paletteNum = gfxInfo->paletteSlot; - mapObject->mapobj_bit_12 = gfxInfo->inanimate; + mapObject->inanimate = gfxInfo->inanimate; mapObject->graphicsId = graphicsId; - sub_80603CC(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_80603CC(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (mapObject->mapobj_bit_15) + if (mapObject->trackedByCamera) CameraObjectReset1(); } @@ -2632,9 +2569,9 @@ void unref_sub_805BA80(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) void FieldObjectTurn(struct MapObject *mapObject, u8 direction) { FieldObjectSetDirection(mapObject, direction); - if (!mapObject->mapobj_bit_12) + if (!mapObject->inanimate) { - StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->mapobj_unk_18)); + StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->facingDirection)); SeekSpriteAnim(&gSprites[mapObject->spriteId], 0); } } @@ -2657,12 +2594,12 @@ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite) u8 treeStage; u8 treeId; - mapObject->mapobj_bit_13 = TRUE; + mapObject->invisible = TRUE; sprite->invisible = TRUE; treeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); if (treeStage != 0) { - mapObject->mapobj_bit_13 = FALSE; + mapObject->invisible = FALSE; sprite->invisible = FALSE; treeId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1; treeStage--; @@ -2695,7 +2632,7 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr u8 mapObjectId; if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) - gMapObjects[mapObjectId].mapobj_bit_13 = d; + gMapObjects[mapObjectId].invisible = d; } void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup) @@ -2714,7 +2651,7 @@ void sub_805BCC0(s16 x, s16 y) if (mapObjectId != 16) { mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_2 = TRUE; + mapObject->triggerGroundEffectsOnMove = TRUE; } } @@ -2728,7 +2665,7 @@ void sub_805BCF0(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { mapObject = &gMapObjects[mapObjectId]; sprite = &gSprites[mapObject->spriteId]; - mapObject->mapobj_bit_26 = TRUE; + mapObject->fixedPriority = TRUE; sprite->subpriority = subpriority; } } @@ -2741,8 +2678,8 @@ void sub_805BD48(u8 localId, u8 mapNum, u8 mapGroup) if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_26 = FALSE; - mapObject->mapobj_bit_2 = TRUE; + mapObject->fixedPriority = FALSE; + mapObject->triggerGroundEffectsOnMove = TRUE; } } @@ -2848,26 +2785,26 @@ void npc_load_two_palettes__and_record(u16 a, u8 b) void unref_sub_805C014(struct MapObject *mapObject, s16 x, s16 y) { - mapObject->coords3.x = mapObject->coords2.x; - mapObject->coords3.y = mapObject->coords2.y; - mapObject->coords2.x += x; - mapObject->coords2.y += y; + mapObject->previousCoords.x = mapObject->currentCoords.x; + mapObject->previousCoords.y = mapObject->currentCoords.y; + mapObject->currentCoords.x += x; + mapObject->currentCoords.y += y; } void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y) { - mapObject->coords3.x = mapObject->coords2.x; - mapObject->coords3.y = mapObject->coords2.y; - mapObject->coords2.x = x; - mapObject->coords2.y = y; + mapObject->previousCoords.x = mapObject->currentCoords.x; + mapObject->previousCoords.y = mapObject->currentCoords.y; + mapObject->currentCoords.x = x; + mapObject->currentCoords.y = y; } void npc_coords_set(struct MapObject *mapObject, s16 x, s16 y) { - mapObject->coords3.x = x; - mapObject->coords3.y = y; - mapObject->coords2.x = x; - mapObject->coords2.y = y; + mapObject->previousCoords.x = x; + mapObject->previousCoords.y = y; + mapObject->currentCoords.x = x; + mapObject->currentCoords.y = y; } void sub_805C058(struct MapObject *mapObject, s16 x, s16 y) @@ -2876,13 +2813,13 @@ void sub_805C058(struct MapObject *mapObject, s16 x, s16 y) const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); npc_coords_set(mapObject, x, y); - sub_80603CC(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); + sub_80603CC(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sub_805B914(mapObject); - if (mapObject->mapobj_bit_15) + if (mapObject->trackedByCamera) CameraObjectReset1(); } @@ -2900,7 +2837,7 @@ void sub_805C0F8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) void npc_coords_shift_still(struct MapObject *mapObject) { - npc_coords_shift(mapObject, mapObject->coords2.x, mapObject->coords2.y); + npc_coords_shift(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y); } void UpdateFieldObjectCoordsForCameraUpdate(void) @@ -2918,12 +2855,12 @@ void UpdateFieldObjectCoordsForCameraUpdate(void) if (gMapObjects[i].active) { - gMapObjects[i].coords1.x -= deltaX; - gMapObjects[i].coords1.y -= deltaY; - gMapObjects[i].coords2.x -= deltaX; - gMapObjects[i].coords2.y -= deltaY; - gMapObjects[i].coords3.x -= deltaX; - gMapObjects[i].coords3.y -= deltaY; + gMapObjects[i].initialCoords.x -= deltaX; + gMapObjects[i].initialCoords.y -= deltaY; + gMapObjects[i].currentCoords.x -= deltaX; + gMapObjects[i].currentCoords.y -= deltaY; + gMapObjects[i].previousCoords.x -= deltaX; + gMapObjects[i].previousCoords.y -= deltaY; } } } @@ -2937,7 +2874,7 @@ u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) for (i = 0; i < 16; i++) { - if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y + if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y && FieldObjectDoesZCoordMatch(&gMapObjects[i], z)) return i; } @@ -2946,8 +2883,8 @@ u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z) { - if (mapObject->mapobj_unk_0B_0 != 0 && z != 0 - && mapObject->mapobj_unk_0B_0 != z) + if (mapObject->currentElevation != 0 && z != 0 + && mapObject->currentElevation != z) return FALSE; else return TRUE; @@ -3093,13 +3030,13 @@ u8 obj_unfreeze(struct Sprite *src, s16 x, s16 y, u8 subpriority) void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) { - mapObject->mapobj_unk_20 = mapObject->mapobj_unk_18; - if (!mapObject->mapobj_bit_9) + mapObject->previousMovementDirection = mapObject->facingDirection; + if (!mapObject->facingDirectionLocked) { s8 _direction = direction; //needed for the asm to match - mapObject->mapobj_unk_18 = _direction; + mapObject->facingDirection = _direction; } - mapObject->placeholder18 = direction; + mapObject->movementDirection = direction; } u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) @@ -3204,8 +3141,8 @@ void sub_805C754(struct MapObject *mapObject) if (template != NULL) { - template->x = mapObject->coords2.x - 7; - template->y = mapObject->coords2.y - 7; + template->x = mapObject->currentCoords.x - 7; + template->y = mapObject->currentCoords.y - 7; } } @@ -3264,7 +3201,7 @@ extern void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8); u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -3314,8 +3251,8 @@ u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805C9D8(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = 1; + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->regularAnimActive = 1; sprite->data[1] = 6; return 1; } @@ -3324,7 +3261,7 @@ u8 sub_805CA08(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 1; } return 0; @@ -3349,8 +3286,8 @@ u8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject) return 0; } PlayerGetDestCoords(&x, &y); - objx = mapObject->coords2.x; - objy = mapObject->coords2.y; + objx = mapObject->currentCoords.x; + objy = mapObject->currentCoords.y; minx = objx - mapObject->trainerRange_berryTreeId; miny = objy - mapObject->trainerRange_berryTreeId; maxx = objx + mapObject->trainerRange_berryTreeId; @@ -3552,8 +3489,8 @@ u8 sub_805CD60(struct MapObject *mapObject, u8 a1) return 0; } PlayerGetDestCoords(&x, &y); - x -= mapObject->coords2.x; - y -= mapObject->coords2.y; + x -= mapObject->currentCoords.x; + y -= mapObject->currentCoords.y; x2 = x; y2 = y; if (x2 < 0) @@ -3578,7 +3515,7 @@ u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805CE40(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -3588,7 +3525,7 @@ u8 sub_805CE6C(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -3630,7 +3567,7 @@ u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805CF80(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -3673,8 +3610,8 @@ u8 sub_805D008(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D054(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = 1; + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->regularAnimActive = 1; sprite->data[1] = 6; return 1; } @@ -3683,7 +3620,7 @@ u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 1; } return 0; @@ -3700,7 +3637,7 @@ u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D104(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -3743,8 +3680,8 @@ u8 sub_805D18C(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D1D8(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->placeholder18)); - mapObject->mapobj_bit_1 = 1; + FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection)); + mapObject->regularAnimActive = 1; sprite->data[1] = 6; return 1; } @@ -3753,7 +3690,7 @@ u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite) != 0) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 1; } return 0; @@ -3764,7 +3701,7 @@ fieldmap_object_cb(sub_805D230, sub_805D254, gUnknown_083752C4); u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -3781,7 +3718,7 @@ u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D2C0(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; return 0; } @@ -3808,15 +3745,15 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp { u8 berryTreeStage; npc_reset(mapObject, sprite); - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; sprite->invisible = 1; berryTreeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); if (!berryTreeStage) { if (!(sprite->data[7] & 4) && sprite->animNum == 4) { - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -3824,7 +3761,7 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp } return 0; } - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; sprite->invisible = 0; berryTreeStage--; if (sprite->animNum != berryTreeStage) @@ -3850,12 +3787,12 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite) u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = 1; + mapObject->regularAnimActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 2; - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -3865,7 +3802,7 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite) { sprite->data[2]++; - mapObject->mapobj_bit_13 = ((sprite->data[2] & 0x2) >> 1); + mapObject->invisible = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = 1; if (sprite->data[2] > 64) { @@ -3880,7 +3817,7 @@ u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite) { sprite->data[2]++; - mapObject->mapobj_bit_13 = ((sprite->data[2] & 0x2) >> 1); + mapObject->invisible = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = 1; if (sprite->data[2] > 64) { @@ -3902,7 +3839,7 @@ u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D54C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -3912,7 +3849,7 @@ u8 sub_805D578(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -3954,7 +3891,7 @@ u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D68C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -3964,7 +3901,7 @@ u8 sub_805D6B8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837520C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4006,7 +3943,7 @@ u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D7CC(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4016,7 +3953,7 @@ u8 sub_805D7F8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4058,7 +3995,7 @@ u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805D90C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4068,7 +4005,7 @@ u8 sub_805D938(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4110,7 +4047,7 @@ u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DA4C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4120,7 +4057,7 @@ u8 sub_805DA78(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4162,7 +4099,7 @@ u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DB8C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4172,7 +4109,7 @@ u8 sub_805DBB8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4214,7 +4151,7 @@ u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DCCC(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4224,7 +4161,7 @@ u8 sub_805DCF8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4266,7 +4203,7 @@ u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DE0C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4276,7 +4213,7 @@ u8 sub_805DE38(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4318,7 +4255,7 @@ u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805DF4C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4328,7 +4265,7 @@ u8 sub_805DF78(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4370,7 +4307,7 @@ u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805E08C(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 2; return 1; } @@ -4380,7 +4317,7 @@ u8 sub_805E0B8(struct MapObject *mapObject, struct Sprite *sprite) if (FieldObjectExecRegularAnim(mapObject, sprite)) { sub_8064820(sprite, gUnknown_0837521C[Random() & 3]); - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 3; } return 0; @@ -4416,7 +4353,7 @@ fieldmap_object_cb(sub_805E174, sub_805E198, gUnknown_083753CC); u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -4448,7 +4385,7 @@ u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite) direction = sub_805CD60(mapObject, 0); if (direction == 0) { - direction = directions[mapObject->mapobj_unk_18]; + direction = directions[mapObject->facingDirection]; } FieldObjectSetDirection(mapObject, direction); sprite->data[1] = 0; @@ -4460,7 +4397,7 @@ fieldmap_object_cb(sub_805E278, sub_803E29C, gUnknown_083753E4); u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -4492,7 +4429,7 @@ u8 sub_805E338(struct MapObject *mapObject, struct Sprite *sprite) direction = sub_805CD60(mapObject, 0); if (direction == 0) { - direction = directions[mapObject->mapobj_unk_18]; + direction = directions[mapObject->facingDirection]; } FieldObjectSetDirection(mapObject, direction); sprite->data[1] = 0; @@ -4512,7 +4449,7 @@ u8 sub_805E3D4(struct MapObject *mapObject, struct Sprite *sprite) { u8 direction; direction = gUnknown_0836DC09[mapObject->animPattern]; - if (mapObject->mapobj_unk_21 != 0) + if (mapObject->directionSequenceIndex != 0) { direction = GetOppositeDirection(direction); } @@ -4525,26 +4462,26 @@ u8 sub_805E40C(struct MapObject *mapObject, struct Sprite *sprite) { u8 v0; u8 goSpeed0AnimId; - if (mapObject->mapobj_unk_21 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 0; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); + mapObject->directionSequenceIndex = 0; + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); } - v0 = sub_805FF20(mapObject, mapObject->placeholder18); - goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->placeholder18); + v0 = sub_805FF20(mapObject, mapObject->movementDirection); + goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection); if (v0 == 1) { - mapObject->mapobj_unk_21 ++; - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); - goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->placeholder18); - v0 = sub_805FF20(mapObject, mapObject->placeholder18); + mapObject->directionSequenceIndex ++; + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); + goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection); + v0 = sub_805FF20(mapObject, mapObject->movementDirection); } if (v0 != 0) { - goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); + goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); } FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId); - mapObject->mapobj_bit_1 = 1; + mapObject->regularAnimActive = 1; sprite->data[1] = 3; return 1; } @@ -4553,7 +4490,7 @@ u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 1; } return 0; @@ -4570,26 +4507,26 @@ u8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct { u8 v0; u8 goSpeed0AnimId; - if (mapObject->mapobj_unk_21 == 3 && mapObject->coords1.x == mapObject->coords2.x && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 3 && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 0; + mapObject->directionSequenceIndex = 0; } - FieldObjectSetDirection(mapObject, directionSequence[mapObject->mapobj_unk_21]); - goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->placeholder18); - v0 = sub_805FF20(mapObject, mapObject->placeholder18); + FieldObjectSetDirection(mapObject, directionSequence[mapObject->directionSequenceIndex]); + goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection); + v0 = sub_805FF20(mapObject, mapObject->movementDirection); if (v0 == 1) { - mapObject->mapobj_unk_21 ++; - FieldObjectSetDirection(mapObject, directionSequence[mapObject->mapobj_unk_21]); - goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->placeholder18); - v0 = sub_805FF20(mapObject, mapObject->placeholder18); + mapObject->directionSequenceIndex++; + FieldObjectSetDirection(mapObject, directionSequence[mapObject->directionSequenceIndex]); + goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection); + v0 = sub_805FF20(mapObject, mapObject->movementDirection); } if (v0 != 0) { - goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18); + goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection); } FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId); - mapObject->mapobj_bit_1 = 1; + mapObject->regularAnimActive = 1; sprite->data[1] = 2; return 1; } @@ -4598,7 +4535,7 @@ u8 sub_805E5B4(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 1; } return 0; @@ -4610,9 +4547,9 @@ u8 sub_805E620(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375418, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4623,9 +4560,9 @@ u8 sub_805E6AC(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375428, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4636,9 +4573,9 @@ u8 sub_805E738(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375438, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4649,9 +4586,9 @@ u8 sub_805E7C4(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375448, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4664,9 +4601,9 @@ u8 sub_805E850(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375458, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4677,9 +4614,9 @@ u8 sub_805E8DC(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375468, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4690,9 +4627,9 @@ u8 sub_805E968(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375240, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4703,9 +4640,9 @@ u8 sub_805E9F4(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375484, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4716,9 +4653,9 @@ u8 sub_805EA80(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375494, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4729,9 +4666,9 @@ u8 sub_805EB0C(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_083754A4, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4742,9 +4679,9 @@ u8 sub_805EB98(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_083754B4, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4755,9 +4692,9 @@ u8 sub_805EC24(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_083754C4, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4768,9 +4705,9 @@ u8 sub_805ECB0(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_083754D4, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4781,9 +4718,9 @@ u8 sub_805ED3C(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_083754E4, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4794,9 +4731,9 @@ u8 sub_805EDC8(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_083754F4, 4); - if (mapObject->mapobj_unk_21 == 1 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4807,9 +4744,9 @@ u8 sub_805EE54(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375504, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4820,9 +4757,9 @@ u8 sub_805EEE0(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375514, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4833,9 +4770,9 @@ u8 sub_805EF6C(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375524, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4846,9 +4783,9 @@ u8 sub_805EFF8(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375534, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4859,9 +4796,9 @@ u8 sub_805F084(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375544, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4872,9 +4809,9 @@ u8 sub_805F110(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375554, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4885,9 +4822,9 @@ u8 sub_805F19C(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375564, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.y == mapObject->coords2.y) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4898,9 +4835,9 @@ u8 sub_805F228(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375574, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); } @@ -4911,9 +4848,9 @@ u8 sub_805F2B4(struct MapObject *mapObject, struct Sprite *sprite) { u8 directions[4]; memcpy(directions, gUnknown_08375584, 4); - if (mapObject->mapobj_unk_21 == 2 && mapObject->coords1.x == mapObject->coords2.x) + if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x) { - mapObject->mapobj_unk_21 = 3; + mapObject->directionSequenceIndex = 3; } return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions); }; @@ -4923,9 +4860,9 @@ fieldmap_object_cb(sub_805F2FC, sub_805F320, gUnknown_08375588); u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - if (mapObject->mapobj_unk_21 == 0) + if (mapObject->directionSequenceIndex == 0) { - mapObject->mapobj_unk_21 = player_get_direction_lower_nybble(); + mapObject->directionSequenceIndex = player_get_direction_lower_nybble(); } sprite->data[1] = 1; return 1; @@ -4933,7 +4870,7 @@ u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite u8 sub_805F364(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gMapObjects[gPlayerAvatar.mapObjectId].animId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return 0; } @@ -4944,7 +4881,7 @@ u8 sub_805F3C4(struct MapObject *mapObject, struct Sprite *sprite) { if (FieldObjectExecRegularAnim(mapObject, sprite)) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; sprite->data[1] = 1; } return 0; @@ -4957,8 +4894,8 @@ bool8 sub_805F3EC(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo bool8 sub_805F3F0(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, bool8 a3(u8)) { - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, a2))); - mapObject->mapobj_bit_1 = 1; + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, a2))); + mapObject->regularAnimActive = 1; sprite->data[1] = 2; return 1; } @@ -4970,14 +4907,14 @@ bool8 sub_805F438(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, boo s16 y; direction = a2; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (a3 != NULL && !a3(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = 1; + mapObject->regularAnimActive = 1; sprite->data[1] = 2; return 1; } @@ -4989,14 +4926,14 @@ bool8 sub_805F4F0(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_8060744(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->regularAnimActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5008,14 +4945,14 @@ bool8 sub_805F5A8(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_806079C(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->regularAnimActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5027,14 +4964,14 @@ bool8 sub_805F660(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_80607C8(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->regularAnimActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5044,9 +4981,9 @@ bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 pl u32 direction; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); FieldObjectSetRegularAnim(mapObject, sprite, sub_806084C(direction)); - mapObject->mapobj_bit_1 = TRUE; + mapObject->regularAnimActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5058,14 +4995,14 @@ bool8 sub_805F760(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); FieldObjectMoveDestCoords(mapObject, direction, &x, &y); FieldObjectSetRegularAnim(mapObject, sprite, sub_80608A4(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->regularAnimActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5077,16 +5014,16 @@ bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerD s16 y; direction = playerDirection; - direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->mapobj_unk_21, direction); - x = mapObject->coords2.x; - y = mapObject->coords2.y; + direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction); + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; sub_8060320(direction, &x, &y, 2, 2); FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction)); if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y)))) { FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction)); } - mapObject->mapobj_bit_1 = TRUE; + mapObject->regularAnimActive = TRUE; sprite->data[1] = 2; return TRUE; } @@ -5095,7 +5032,7 @@ fieldmap_object_cb(sub_805F8E0, sub_805F904, gUnknown_083755C0); u8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite) { - if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gMapObjects[gPlayerAvatar.mapObjectId].animId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return 0; } @@ -5108,11 +5045,11 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite) { struct MapObject *mapObject; mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data[7] == 0)) + if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && sprite->data[7] == 0)) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); - mapObject->mapobj_unk_21 = 1; + mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + mapObject->directionSequenceIndex = 1; sprite->data[7] ++; } meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8); @@ -5128,11 +5065,11 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite) { struct MapObject *mapObject; mapObject = &gMapObjects[sprite->data[0]]; - if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data[7] == 0)) + if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && sprite->data[7] == 0)) { FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - mapObject->mapobj_unk_21 = 1; + mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + mapObject->directionSequenceIndex = 1; sprite->data[7] ++; } meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8); @@ -5144,7 +5081,7 @@ void FieldObjectCB_Hidden1(struct Sprite *sprite) { if (sprite->data[7] == 0) { - gMapObjects[sprite->data[0]].mapobj_bit_26 = 1; + gMapObjects[sprite->data[0]].fixedPriority = 1; sprite->subspriteMode = 2; sprite->oam.priority = 3; sprite->data[7] ++; @@ -5177,7 +5114,7 @@ fieldmap_object_cb(sub_805FB20, sub_805FB44, gUnknown_083755D0); u8 sub_805FB64(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -5187,7 +5124,7 @@ fieldmap_object_cb(sub_805FB90, sub_805FBB4, gUnknown_083755D8); u8 sub_805FBD4(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -5197,7 +5134,7 @@ fieldmap_object_cb(sub_805FC00, sub_805FC24, gUnknown_083755E0); u8 sub_805FC44(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); sprite->data[1] = 1; return 1; } @@ -5207,8 +5144,8 @@ fieldmap_object_cb(sub_805FC70, sub_805FC94, gUnknown_083755E8); u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite) { npc_reset(mapObject, sprite); - FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->mapobj_unk_18)); - mapObject->mapobj_bit_13 = 1; + FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection)); + mapObject->invisible = 1; sprite->data[1] = 1; return 1; } @@ -5225,7 +5162,7 @@ u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite) u8 sub_805FD08(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = 0; + mapObject->regularAnimActive = 0; return 0; } @@ -5233,10 +5170,10 @@ void sub_805FC70(struct Sprite *sprite); void npc_reset(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_1 = 0; - mapObject->mapobj_bit_6 = 0; - mapObject->mapobj_bit_7 = 0; - mapObject->mapobj_unk_1C = 0xff; + mapObject->regularAnimActive = 0; + mapObject->specialAnimActive = 0; + mapObject->specialAnimFinished = 0; + mapObject->animId = 0xff; sprite->data[1] = 0; } @@ -5317,7 +5254,7 @@ u8 get_run_image_anim_num(u8 direction) void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) { - if (!mapObject->mapobj_bit_12) + if (!mapObject->inanimate) { sprite->animNum = animNum; if (sprite->animCmdIndex == 1) @@ -5334,7 +5271,7 @@ void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) void sub_805FE64(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum) { u8 animCmdIndex; - if (!mapObject->mapobj_bit_12) + if (!mapObject->inanimate) { sprite->animNum = animNum; animCmdIndex = 3; @@ -5366,8 +5303,8 @@ u8 sub_805FE90(s16 a0, s16 a1, s16 a2, s16 a3) void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern) { mapObject->animPattern = animPattern; - mapObject->mapobj_unk_21 = 0; - mapObject->animId = 0; + mapObject->directionSequenceIndex = 0; + mapObject->playerAnimId = 0; gSprites[mapObject->spriteId].callback = gUnknown_0836DA88[animPattern]; gSprites[mapObject->spriteId].data[1] = 0; } @@ -5381,8 +5318,8 @@ u8 sub_805FF20(struct MapObject *mapObject, u8 direction) { s16 x; s16 y; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; MoveCoords(direction, &x, &y); return npc_block_way(mapObject, x, y, direction); } @@ -5399,9 +5336,9 @@ u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn) return 1; else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction)) return 2; - else if (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction)) + else if (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction)) return 2; - else if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) + else if (IsZCoordMismatchAt(mapObject->currentElevation, x, y)) return 3; else if (DoesObjectCollideWithObjectAt(mapObject, x, y)) return 4; @@ -5414,9 +5351,9 @@ u8 sub_8060024(struct MapObject *mapObject, s16 x, s16 y, u8 direction) if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y)) flags |= 1; - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->mapobj_bit_15 && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction))) flags |= 2; - if (IsZCoordMismatchAt(mapObject->mapobj_unk_0B_0, x, y)) + if (IsZCoordMismatchAt(mapObject->currentElevation, x, y)) flags |= 4; if (DoesObjectCollideWithObjectAt(mapObject, x, y)) flags |= 8; @@ -5430,15 +5367,15 @@ bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, if (mapObject->range.as_nybbles.x != 0) { - minv = mapObject->coords1.x - (mapObject->range.as_nybbles.x); - maxv = mapObject->coords1.x + (mapObject->range.as_nybbles.x); + minv = mapObject->initialCoords.x - (mapObject->range.as_nybbles.x); + maxv = mapObject->initialCoords.x + (mapObject->range.as_nybbles.x); if (minv > x || maxv < x) return TRUE; } if (mapObject->range.as_nybbles.y != 0) { - minv = mapObject->coords1.y - (mapObject->range.as_nybbles.y); - maxv = mapObject->coords1.y + (mapObject->range.as_nybbles.y); + minv = mapObject->initialCoords.y - (mapObject->range.as_nybbles.y); + maxv = mapObject->initialCoords.y + (mapObject->range.as_nybbles.y); if (minv > y || maxv < y) return TRUE; } @@ -5447,7 +5384,7 @@ bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction) { - if (gUnknown_08375684[direction - 1](mapObject->mapobj_unk_1E) || gUnknown_08375694[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) + if (gUnknown_08375684[direction - 1](mapObject->currentMetatileBehavior) || gUnknown_08375694[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return 1; } @@ -5464,8 +5401,8 @@ static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s if (mapObject2->active && mapObject2 != mapObject) { - if (((mapObject2->coords2.x == x && mapObject2->coords2.y == y) || (mapObject2->coords3.x == x && mapObject2->coords3.y == y)) - && AreZCoordsCompatible(mapObject->mapobj_unk_0B_0, mapObject2->mapobj_unk_0B_0)) + if (((mapObject2->currentCoords.x == x && mapObject2->currentCoords.y == y) || (mapObject2->previousCoords.x == x && mapObject2->previousCoords.y == y)) + && AreZCoordsCompatible(mapObject->currentElevation, mapObject2->currentElevation)) return TRUE; } } @@ -5594,14 +5531,14 @@ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y) void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 direction, s16 *x, s16 *y) { u8 newDirn = direction; - *x = mapObject->coords2.x; - *y = mapObject->coords2.y; + *x = mapObject->currentCoords.x; + *y = mapObject->currentCoords.y; MoveCoords(newDirn, x, y); } bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_1 || mapObject->mapobj_bit_6) + if (mapObject->regularAnimActive || mapObject->specialAnimActive) { return TRUE; } @@ -5610,7 +5547,7 @@ bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *ma bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6 && mapObject->mapobj_unk_1C != 0xff) + if (mapObject->specialAnimActive && mapObject->animId != 0xff) { return TRUE; } @@ -5624,9 +5561,9 @@ bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId) return TRUE; } UnfreezeMapObject(mapObject); - mapObject->mapobj_unk_1C = specialAnimId; - mapObject->mapobj_bit_6 = 1; - mapObject->mapobj_bit_7 = 0; + mapObject->animId = specialAnimId; + mapObject->specialAnimActive = 1; + mapObject->specialAnimFinished = 0; gSprites[mapObject->spriteId].data[2] = 0; return FALSE; } @@ -5639,7 +5576,7 @@ void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimI void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6) + if (mapObject->specialAnimActive) { FieldObjectClearAnim(mapObject); } @@ -5647,17 +5584,17 @@ void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject) void FieldObjectClearAnim(struct MapObject *mapObject) { - mapObject->mapobj_unk_1C = 0xFF; - mapObject->mapobj_bit_6 = 0; - mapObject->mapobj_bit_7 = 0; + mapObject->animId = 0xFF; + mapObject->specialAnimActive = 0; + mapObject->specialAnimFinished = 0; gSprites[mapObject->spriteId].data[1] = 0; gSprites[mapObject->spriteId].data[2] = 0; } bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6) - return mapObject->mapobj_bit_7; + if (mapObject->specialAnimActive) + return mapObject->specialAnimFinished; return 0x10; } @@ -5674,9 +5611,9 @@ bool8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject) u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6) + if (mapObject->specialAnimActive) { - return mapObject->mapobj_unk_1C; + return mapObject->animId; } return 0xFF; } @@ -5696,13 +5633,12 @@ void meta_step(struct MapObject *mapObject, struct Sprite *sprite, u8 (*callback if (FieldObjectIsSpecialAnimActive(mapObject)) { FieldObjectExecSpecialAnim(mapObject, sprite); - } else + } + else if (!mapObject->frozen) { - if (!mapObject->mapobj_bit_8) - { - while (callback(mapObject, sprite)); - } + while (callback(mapObject, sprite)); } + DoGroundEffects_OnBeginStep(mapObject, sprite); DoGroundEffects_OnFinishStep(mapObject, sprite); npc_obj_transfer_image_anim_pause_flag(mapObject, sprite); @@ -5885,17 +5821,17 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2) void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) + if (gUnknown_08375778[mapObject->animId][sprite->data[2]](mapObject, sprite)) { - mapObject->mapobj_bit_7 = 1; + mapObject->specialAnimFinished = 1; } } bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite) { - if (gUnknown_08375778[mapObject->mapobj_unk_1C][sprite->data[2]](mapObject, sprite)) + if (gUnknown_08375778[mapObject->animId][sprite->data[2]](mapObject, sprite)) { - mapObject->mapobj_unk_1C = 0xFF; + mapObject->animId = 0xFF; sprite->data[2] = 0; return 1; } @@ -5904,7 +5840,7 @@ bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *spr void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId) { - mapObject->mapobj_unk_1C = animId; + mapObject->animId = animId; sprite->data[2] = 0; } @@ -5912,7 +5848,7 @@ void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 directio { FieldObjectSetDirection(mapObject, direction); npc_coords_shift_still(mapObject); - sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); sprite->animPaused = 1; sprite->data[2] = 1; } @@ -5945,14 +5881,14 @@ void sub_8060D20(struct MapObject *mapObject, struct Sprite *sprite, u8 directio { s16 x; s16 y; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; FieldObjectSetDirection(mapObject, direction); MoveCoords(direction, &x, &y); npc_coords_shift(mapObject, x, y); oamt_npc_ministep_reset(sprite, direction, a3); sprite->animPaused = 0; - mapObject->mapobj_bit_2 = 1; + mapObject->triggerGroundEffectsOnMove = 1; sprite->data[2] = 1; } @@ -5963,13 +5899,13 @@ void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction u8 (*const functions[5])(u8); memcpy((void *)functions, gUnknown_083759C0, sizeof(gUnknown_083759C0)); sub_8060D20(mapObject, sprite, direction, a3); - sub_805FE28(mapObject, sprite, functions[a3](mapObject->mapobj_unk_18)); + sub_805FE28(mapObject, sprite, functions[a3](mapObject->facingDirection)); } void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) { sub_8060D20(mapObject, sprite, direction, 1); - sub_805FE28(mapObject, sprite, get_run_image_anim_num(mapObject->mapobj_unk_18)); + sub_805FE28(mapObject, sprite, get_run_image_anim_num(mapObject->facingDirection)); } bool8 obj_npc_ministep(struct Sprite *); @@ -5979,7 +5915,7 @@ bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprit if (obj_npc_ministep(sprite)) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = 1; + mapObject->triggerGroundEffectsOnStop = 1; sprite->animPaused = 1; return 1; } @@ -5990,21 +5926,21 @@ void sub_8060E68(struct MapObject *mapObject, struct Sprite *sprite, u8 directio { s16 x; s16 y; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; FieldObjectSetDirection(mapObject, direction); MoveCoords(direction, &x, &y); npc_coords_shift(mapObject, x, y); sub_806467C(sprite, direction); sprite->animPaused = 0; - mapObject->mapobj_bit_2 = 1; + mapObject->triggerGroundEffectsOnMove = 1; sprite->data[2] = 1; } void sub_8060ED8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction) { sub_8060E68(mapObject, sprite, direction); - sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); } bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite) @@ -6012,7 +5948,7 @@ bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite) if (sub_806468C(sprite)) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = 1; + mapObject->triggerGroundEffectsOnStop = 1; sprite->animPaused = 1; return TRUE; } @@ -6173,18 +6109,18 @@ void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio y = 0; FieldObjectSetDirection(mapObject, direction); sub_8060320(direction, &x, &y, vSPp4[a4], vSPp4[a4]); - npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y); + npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y); sub_80646E4(sprite, direction, a4, a5); sprite->data[2] = 1; sprite->animPaused = 0; - mapObject->mapobj_bit_2 = 1; - mapObject->mapobj_bit_4 = 1; + mapObject->triggerGroundEffectsOnMove = 1; + mapObject->disableCoveringGroundEffects = 1; } void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) { sub_806113C(mapObject, sprite, direction, a4, a5); - sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); DoShadowFieldEffect(mapObject); } @@ -6200,15 +6136,15 @@ u8 sub_806123C(struct MapObject *mapObject, struct Sprite *sprite, u8 (*const ca { x = 0; y = 0; - sub_8060320(mapObject->placeholder18, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); - npc_coords_shift(mapObject, mapObject->coords2.x + x, mapObject->coords2.y + y); - mapObject->mapobj_bit_2 = 1; - mapObject->mapobj_bit_4 = 1; + sub_8060320(mapObject->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); + npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y); + mapObject->triggerGroundEffectsOnMove = 1; + mapObject->disableCoveringGroundEffects = 1; } else if (retval == 0xff) { npc_coords_shift_still(mapObject); - mapObject->mapobj_bit_3 = 1; - mapObject->mapobj_bit_5 = 1; + mapObject->triggerGroundEffectsOnStop = 1; + mapObject->landingJump = 1; sprite->animPaused = 1; } return retval; @@ -6255,8 +6191,8 @@ bool8 sub_8061358(struct MapObject *mapObject, struct Sprite *sprite) } return FALSE; } - FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->placeholder18)); - sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->mapobj_unk_18)); + FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection)); + sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection)); return FALSE; } @@ -6275,7 +6211,7 @@ bool8 sub_80613D4(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -6292,7 +6228,7 @@ bool8 sub_806142C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -6309,7 +6245,7 @@ bool8 sub_8061484(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -6326,7 +6262,7 @@ bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -6876,7 +6812,7 @@ void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct bool8 sub_8061F24(struct MapObject *mapObject, struct Sprite *sprite) { - npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->placeholder18, sprite->animNum); + npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->movementDirection, sprite->animNum); return FALSE; } @@ -6911,7 +6847,7 @@ bool8 sub_8061FB0(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061340(mapObject, sprite)) { sprite->data[2] = 2; - mapObject->mapobj_bit_5 = 0; + mapObject->landingJump = 0; return TRUE; } return FALSE; @@ -6930,7 +6866,7 @@ bool8 sub_8061FF8(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061340(mapObject, sprite)) { sprite->data[2] = 2; - mapObject->mapobj_bit_5 = 0; + mapObject->landingJump = 0; return TRUE; } return FALSE; @@ -6949,7 +6885,7 @@ bool8 sub_8062040(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061340(mapObject, sprite)) { sprite->data[2] = 2; - mapObject->mapobj_bit_5 = 0; + mapObject->landingJump = 0; return TRUE; } return FALSE; @@ -6968,7 +6904,7 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite) if (sub_8061340(mapObject, sprite)) { sprite->data[2] = 2; - mapObject->mapobj_bit_5 = 0; + mapObject->landingJump = 0; return TRUE; } return FALSE; @@ -6979,7 +6915,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite) u8 objectId; if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId)) { - an_look_any(mapObject, sprite, sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y)); + an_look_any(mapObject, sprite, sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; @@ -6990,7 +6926,7 @@ bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite) u8 objectId; if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId)) { - an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y))); + an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; @@ -6998,14 +6934,14 @@ bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8062170(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_9 = 1; + mapObject->facingDirectionLocked = 1; sprite->data[2] = 1; return TRUE; } bool8 sub_8062180(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_9 = 0; + mapObject->facingDirectionLocked = 0; sprite->data[2] = 1; return TRUE; } @@ -7022,7 +6958,7 @@ bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7041,7 +6977,7 @@ bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7060,7 +6996,7 @@ bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7079,7 +7015,7 @@ bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7098,7 +7034,7 @@ bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7117,7 +7053,7 @@ bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7136,7 +7072,7 @@ bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7155,7 +7091,7 @@ bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7174,7 +7110,7 @@ bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061358(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7193,7 +7129,7 @@ bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061358(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7212,7 +7148,7 @@ bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061358(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7231,7 +7167,7 @@ bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061358(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7252,42 +7188,42 @@ bool8 sub_80625C8(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80625D8(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_25 = 0; + mapObject->disableJumpLandingGroundEffect = 0; sprite->data[2] = 1; return TRUE; } bool8 sub_80625E8(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_25 = 1; + mapObject->disableJumpLandingGroundEffect = 1; sprite->data[2] = 1; return TRUE; } bool8 sub_80625F8(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_12 = 1; + mapObject->inanimate = 1; sprite->data[2] = 1; return TRUE; } bool8 sub_8062608(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_12 = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; + mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } bool8 sub_8062634(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; sprite->data[2] = 1; return TRUE; } bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; sprite->data[2] = 1; return TRUE; } @@ -7367,10 +7303,10 @@ bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 ^= 1; + mapObject->invisible ^= 1; if (sub_8064824(sprite)) { - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; sprite->data[2] = 3; } return FALSE; @@ -7395,10 +7331,10 @@ bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_13 ^= 1; + mapObject->invisible ^= 1; if (sub_8064824(sprite)) { - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; sprite->data[2] = 3; } return FALSE; @@ -7406,14 +7342,14 @@ bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_806281C(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; sprite->data[2] = 1; return TRUE; } bool8 sub_806282C(struct MapObject *mapObject, struct Sprite *sprite) { - mapObject->mapobj_bit_26 = 0; + mapObject->fixedPriority = 0; sprite->data[2] = 1; return TRUE; } @@ -7601,7 +7537,7 @@ bool8 sub_8062BFC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7620,7 +7556,7 @@ bool8 sub_8062C54(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7639,7 +7575,7 @@ bool8 sub_8062CAC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7658,7 +7594,7 @@ bool8 sub_8062D04(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7677,7 +7613,7 @@ bool8 sub_8062D5C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7696,7 +7632,7 @@ bool8 sub_8062DB4(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7715,7 +7651,7 @@ bool8 sub_8062E0C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7734,7 +7670,7 @@ bool8 sub_8062E64(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7753,7 +7689,7 @@ bool8 sub_8062EBC(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7772,7 +7708,7 @@ bool8 sub_8062F14(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7791,7 +7727,7 @@ bool8 sub_8062F6C(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7810,7 +7746,7 @@ bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite) { if (sub_8061328(mapObject, sprite)) { - mapObject->mapobj_bit_22 = 0; + mapObject->hasShadow = 0; sprite->data[2] = 2; return TRUE; } @@ -7844,7 +7780,7 @@ bool8 sub_8063098(struct MapObject *mapObject, struct Sprite *sprite) void sub_80630D0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3) { sub_8060D20(mapObject, sprite, direction, a3); - StartSpriteAnim(sprite, sub_805FD98(mapObject->mapobj_unk_18)); + StartSpriteAnim(sprite, sub_805FD98(mapObject->facingDirection)); SeekSpriteAnim(sprite, 0); } @@ -7923,7 +7859,7 @@ bool8 sub_80631E8(struct MapObject *mapObject, struct Sprite *sprite) void sub_8063208(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3) { sub_8060D20(mapObject, sprite, direction, a3); - sub_805FE28(mapObject, sprite, sub_805FDD8(mapObject->mapobj_unk_18)); + sub_805FE28(mapObject, sprite, sub_805FDD8(mapObject->facingDirection)); } bool8 sub_8063258(struct MapObject *, struct Sprite *); @@ -8001,7 +7937,7 @@ bool8 sub_8063318(struct MapObject *mapObject, struct Sprite *sprite) void sub_8063338(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3) { sub_8060D20(mapObject, sprite, direction, a3); - StartSpriteAnim(sprite, sub_805FDB8(mapObject->mapobj_unk_18)); + StartSpriteAnim(sprite, sub_805FDB8(mapObject->facingDirection)); SeekSpriteAnim(sprite, 0); } @@ -8090,7 +8026,7 @@ bool8 sub_8063474(struct MapObject *mapObject, struct Sprite *sprite) void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite) { - if (mapObject->mapobj_bit_10) + if (mapObject->disableAnim) { sprite->animPaused = 1; } @@ -8098,11 +8034,11 @@ void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct void sub_80634A0(struct MapObject *mapObject, struct Sprite *sprite) { - if (mapObject->mapobj_bit_11) + if (mapObject->enableAnim) { sprite->animPaused = 0; - mapObject->mapobj_bit_10 = 0; - mapObject->mapobj_bit_11 = 0; + mapObject->disableAnim = 0; + mapObject->enableAnim = 0; } } @@ -8123,7 +8059,7 @@ void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite) s16 x2; s16 y2; const struct MapObjectGraphicsInfo *graphicsInfo; - mapObject->mapobj_bit_14 = 0; + mapObject->offScreen = 0; graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); if (sprite->coordOffsetEnabled) { @@ -8138,11 +8074,11 @@ void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite) y2 = graphicsInfo->height + y; // similarly offending line if ((s16)x >= 0x100 || x2 < -0x10) { - mapObject->mapobj_bit_14 = 1; + mapObject->offScreen = 1; } if ((s16)y >= 0xB0 || y2 < -0x10) { - mapObject->mapobj_bit_14 = 1; + mapObject->offScreen = 1; } } #else @@ -8271,7 +8207,7 @@ _080635C0:\n\ void UpdateMapObjSpriteVisibility(struct MapObject *mapObject, struct Sprite *sprite) { sprite->invisible = 0; - if (mapObject->mapobj_bit_13 || mapObject->mapobj_bit_14) + if (mapObject->invisible || mapObject->offScreen) { sprite->invisible = 1; } @@ -8282,14 +8218,14 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Spr static void DoTracksGroundEffect_BikeTireTracks( struct MapObject *mapObj, struct Sprite *sprite, u8); void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite); -void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite); -void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite); -void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite); +void GroundEffect_MoveOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite); +void GroundEffect_SpawnOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite); +void GroundEffect_MoveOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite); void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite); void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite); void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite); -void sub_8063FA0(struct MapObject *mapObj, struct Sprite *sprite); -void sub_8063FCC(struct MapObject *mapObj, struct Sprite *sprite); +void GroundEffect_SandTracks(struct MapObject *mapObj, struct Sprite *sprite); +void GroundEffect_DeepSandTracks(struct MapObject *mapObj, struct Sprite *sprite); void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite); void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite); void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite); @@ -8344,160 +8280,160 @@ static void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 * void FieldObjectUpdateMetatileBehaviors(struct MapObject *mapObj) { - mapObj->mapobj_unk_1F = MapGridGetMetatileBehaviorAt(mapObj->coords3.x, mapObj->coords3.y); - mapObj->mapobj_unk_1E = MapGridGetMetatileBehaviorAt(mapObj->coords2.x, mapObj->coords2.y); + mapObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(mapObj->previousCoords.x, mapObj->previousCoords.y); + mapObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(mapObj->currentCoords.x, mapObj->currentCoords.y); } void GetGroundEffectFlags_Reflection(struct MapObject *mapObj, u32 *flags) { - u32 reflectionFlags[2] = { 0x00000020, 0x00000010 }; + u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; u8 type = FieldObjectCheckForReflectiveSurface(mapObj); if (type) { - if (!mapObj->mapobj_bit_17) + if (!mapObj->hasReflection) { - mapObj->mapobj_bit_17 = 0; - mapObj->mapobj_bit_17 = 1; + mapObj->hasReflection = 0; + mapObj->hasReflection = 1; *flags |= reflectionFlags[type - 1]; } } else { - mapObj->mapobj_bit_17 = 0; + mapObj->hasReflection = 0; } } void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsTallGrass(mapObj->mapobj_unk_1E)) - *flags |= 0x1; + if (MetatileBehavior_IsTallGrass(mapObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsTallGrass(mapObj->mapobj_unk_1E)) - *flags |= 0x2; + if (MetatileBehavior_IsTallGrass(mapObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1E)) - *flags |= 0x4; + if (MetatileBehavior_IsLongGrass(mapObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1E)) - *flags |= 0x8; + if (MetatileBehavior_IsLongGrass(mapObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } void GetGroundEffectFlags_Tracks(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1F)) + if (MetatileBehavior_IsDeepSand(mapObj->previousMetatileBehavior)) { - *flags |= 0x100; + *flags |= GROUND_EFFECT_FLAG_DEEP_SAND; } - else if (MetatileBehavior_IsSandOrDeepSand(mapObj->mapobj_unk_1F) - || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->mapobj_unk_1F)) + else if (MetatileBehavior_IsSandOrDeepSand(mapObj->previousMetatileBehavior) + || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->previousMetatileBehavior)) { - *flags |= 0x80; + *flags |= GROUND_EFFECT_FLAG_SAND; } } void GetGroundEffectFlags_SandPile(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1E) - && MetatileBehavior_IsDeepSand(mapObj->mapobj_unk_1F)) + if (MetatileBehavior_IsDeepSand(mapObj->currentMetatileBehavior) + && MetatileBehavior_IsDeepSand(mapObj->previousMetatileBehavior)) { - if (!mapObj->mapobj_bit_20) + if (!mapObj->inSandPile) { - mapObj->mapobj_bit_20 = 0; - mapObj->mapobj_bit_20 = 1; - *flags |= 0x800; + mapObj->inSandPile = 0; + mapObj->inSandPile = 1; + *flags |= GROUND_EFFECT_FLAG_SAND_PILE; } } else { - mapObj->mapobj_bit_20 = 0; + mapObj->inSandPile = 0; } } void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *mapObj, u32 *flags) { - if ((MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1E) - && MetatileBehavior_IsShallowFlowingWater(mapObj->mapobj_unk_1F)) - || (MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1E) - && MetatileBehavior_IsPacifidlogLog(mapObj->mapobj_unk_1F))) + if ((MetatileBehavior_IsShallowFlowingWater(mapObj->currentMetatileBehavior) + && MetatileBehavior_IsShallowFlowingWater(mapObj->previousMetatileBehavior)) + || (MetatileBehavior_IsPacifidlogLog(mapObj->currentMetatileBehavior) + && MetatileBehavior_IsPacifidlogLog(mapObj->previousMetatileBehavior))) { - if (!mapObj->mapobj_bit_19) + if (!mapObj->inShallowFlowingWater) { - mapObj->mapobj_bit_19 = 0; - mapObj->mapobj_bit_19 = 1; - *flags |= 0x40; + mapObj->inShallowFlowingWater = 0; + mapObj->inShallowFlowingWater = 1; + *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER; } } else { - mapObj->mapobj_bit_19 = 0; + mapObj->inShallowFlowingWater = 0; } } void GetGroundEffectFlags_Puddle(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1E) - && MetatileBehavior_IsPuddle(mapObj->mapobj_unk_1F)) + if (MetatileBehavior_IsPuddle(mapObj->currentMetatileBehavior) + && MetatileBehavior_IsPuddle(mapObj->previousMetatileBehavior)) { - *flags |= 0x400; + *flags |= GROUND_EFFECT_FLAG_PUDDLE; } } void GetGroundEffectFlags_Ripple(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_HasRipples(mapObj->mapobj_unk_1E)) - *flags |= 0x200; + if (MetatileBehavior_HasRipples(mapObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_RIPPLES; } void GetGroundEffectFlags_ShortGrass(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1E) - && MetatileBehavior_IsShortGrass(mapObj->mapobj_unk_1F)) + if (MetatileBehavior_IsShortGrass(mapObj->currentMetatileBehavior) + && MetatileBehavior_IsShortGrass(mapObj->previousMetatileBehavior)) { - if (!mapObj->mapobj_bit_18) + if (!mapObj->inShortGrass) { - mapObj->mapobj_bit_18 = 0; - mapObj->mapobj_bit_18 = 1; - *flags |= 0x20000; + mapObj->inShortGrass = 0; + mapObj->inShortGrass = 1; + *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS; } } else { - mapObj->mapobj_bit_18 = 0; + mapObj->inShortGrass = 0; } } void GetGroundEffectFlags_HotSprings(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1E) - && MetatileBehavior_IsHotSprings(mapObj->mapobj_unk_1F)) + if (MetatileBehavior_IsHotSprings(mapObj->currentMetatileBehavior) + && MetatileBehavior_IsHotSprings(mapObj->previousMetatileBehavior)) { - if (!mapObj->mapobj_bit_21) + if (!mapObj->inHotSprings) { - mapObj->mapobj_bit_21 = 0; - mapObj->mapobj_bit_21 = 1; - *flags |= 0x40000; + mapObj->inHotSprings = 0; + mapObj->inHotSprings = 1; + *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS; } } else { - mapObj->mapobj_bit_21 = 0; + mapObj->inHotSprings = 0; } } void GetGroundEffectFlags_Seaweed(struct MapObject *mapObj, u32 *flags) { - if (MetatileBehavior_IsSeaweed(mapObj->mapobj_unk_1E)) - *flags |= 0x80000; + if (MetatileBehavior_IsSeaweed(mapObj->currentMetatileBehavior)) + *flags |= GROUND_EFFECT_FLAG_SEAWEED; } void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags) @@ -8514,21 +8450,21 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags) }; static const u32 jumpLandingFlags[] = { - 0x00001000, // Landing in tall grass - 0x00002000, // Landing in long grass - 0x00004000, // Landing on puddle - 0x00008000, // Landing on surfable water or underwater - 0x00004000, // Landing on shallow flowing water - 0x00010000, // Landing on any other type of ground + GROUND_EFFECT_FLAG_LAND_IN_TALL_GRASS, + GROUND_EFFECT_FLAG_LAND_IN_LONG_GRASS, + GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER, + GROUND_EFFECT_FLAG_LAND_IN_DEEP_WATER, + GROUND_EFFECT_FLAG_LAND_IN_SHALLOW_WATER, + GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND, }; - if (mapObj->mapobj_bit_5 && !mapObj->mapobj_bit_25) + if (mapObj->landingJump && !mapObj->disableJumpLandingGroundEffect) { u8 i; - for (i = 0; i < 6; i++) + for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++) { - if (metatileFuncs[i](mapObj->mapobj_unk_1E)) + if (metatileFuncs[i](mapObj->currentMetatileBehavior)) { *flags |= jumpLandingFlags[i]; return; @@ -8558,14 +8494,14 @@ u8 FieldObjectCheckForReflectiveSurface(struct MapObject *mapObj) for (i = 0, one = 1; i < height; i++) { - RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x, mapObj->coords2.y + one + i) - RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x, mapObj->coords3.y + one + i) + RETURN_REFLECTION_TYPE_AT(mapObj->currentCoords.x, mapObj->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(mapObj->previousCoords.x, mapObj->previousCoords.y + one + i) for (j = 1; j < width; j++) { - RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x + j, mapObj->coords2.y + one + i) - RETURN_REFLECTION_TYPE_AT(mapObj->coords2.x - j, mapObj->coords2.y + one + i) - RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x + j, mapObj->coords3.y + one + i) - RETURN_REFLECTION_TYPE_AT(mapObj->coords3.x - j, mapObj->coords3.y + one + i) + RETURN_REFLECTION_TYPE_AT(mapObj->currentCoords.x + j, mapObj->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(mapObj->currentCoords.x - j, mapObj->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(mapObj->previousCoords.x + j, mapObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(mapObj->previousCoords.x - j, mapObj->previousCoords.y + one + i) } } return 0; @@ -8611,18 +8547,18 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *mapObj, struct Sprite *sprite) { - if (mapObj->mapobj_bit_4) + if (mapObj->disableCoveringGroundEffects) return; - if (!MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1E)) + if (!MetatileBehavior_IsLongGrass(mapObj->currentMetatileBehavior)) return; - if (!MetatileBehavior_IsLongGrass(mapObj->mapobj_unk_1F)) + if (!MetatileBehavior_IsLongGrass(mapObj->previousMetatileBehavior)) return; sprite->subspriteTableNum = 4; - if (ZCoordToPriority(mapObj->elevation) == 1) + if (ZCoordToPriority(mapObj->previousElevation) == 1) sprite->subspriteTableNum = 5; } @@ -8664,13 +8600,13 @@ static const u8 sFieldObjectPriorities_08376070[] = { void FieldObjectUpdateZCoordAndPriority(struct MapObject *mapObj, struct Sprite *sprite) { - if (mapObj->mapobj_bit_26) + if (mapObj->fixedPriority) return; FieldObjectUpdateZCoord(mapObj); - sprite->subspriteTableNum = sFieldObjectPriorities_08376070[mapObj->elevation]; - sprite->oam.priority = sFieldObjectPriorities_08376060[mapObj->elevation]; + sprite->subspriteTableNum = sFieldObjectPriorities_08376070[mapObj->previousElevation]; + sprite->oam.priority = sFieldObjectPriorities_08376060[mapObj->previousElevation]; } void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z) @@ -8686,16 +8622,16 @@ u8 ZCoordToPriority(u8 z) void FieldObjectUpdateZCoord(struct MapObject *mapObj) { - u8 z = MapGridGetZCoordAt(mapObj->coords2.x, mapObj->coords2.y); - u8 z2 = MapGridGetZCoordAt(mapObj->coords3.x, mapObj->coords3.y); + u8 z = MapGridGetZCoordAt(mapObj->currentCoords.x, mapObj->currentCoords.y); + u8 z2 = MapGridGetZCoordAt(mapObj->previousCoords.x, mapObj->previousCoords.y); if (z == 0xF || z2 == 0xF) return; - mapObj->mapobj_unk_0B_0 = z; + mapObj->currentElevation = z; if (z != 0 && z != 0xF) - mapObj->elevation = z; + mapObj->previousElevation = z; } void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) @@ -8710,10 +8646,10 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) void FieldObjectUpdateSubpriority(struct MapObject *mapObj, struct Sprite *sprite) { - if (mapObj->mapobj_bit_26) + if (mapObj->fixedPriority) return; - SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1); + SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1); } bool8 AreZCoordsCompatible(u8 a, u8 b) @@ -8729,9 +8665,9 @@ bool8 AreZCoordsCompatible(u8 a, u8 b) void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = mapObj->localId << 8 | mapObj->mapNum; gFieldEffectArguments[5] = mapObj->mapGroup; @@ -8740,11 +8676,11 @@ void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *spri FieldEffectStart(FLDEFF_TALL_GRASS); } -void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite) +void GroundEffect_MoveOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = mapObj->localId << 8 | mapObj->mapNum; gFieldEffectArguments[5] = mapObj->mapGroup; @@ -8753,11 +8689,11 @@ void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite) FieldEffectStart(FLDEFF_TALL_GRASS); } -void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite) +void GroundEffect_SpawnOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = mapObj->localId << 8 | mapObj->mapNum; gFieldEffectArguments[5] = mapObj->mapGroup; @@ -8766,11 +8702,11 @@ void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite) FieldEffectStart(FLDEFF_LONG_GRASS); } -void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite) +void GroundEffect_MoveOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum; gFieldEffectArguments[5] = mapObj->mapGroup; @@ -8798,13 +8734,13 @@ static void (*const gUnknown_08376080[])(struct MapObject *mapObj, struct Sprite nullsub, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks, }; -void sub_8063FA0(struct MapObject *mapObj, struct Sprite *sprite) +void GroundEffect_SandTracks(struct MapObject *mapObj, struct Sprite *sprite) { const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId); gUnknown_08376080[info->tracks](mapObj, sprite, 0); } -void sub_8063FCC(struct MapObject *mapObj, struct Sprite *sprite) +void GroundEffect_DeepSandTracks(struct MapObject *mapObj, struct Sprite *sprite) { const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId); gUnknown_08376080[info->tracks](mapObj, sprite, 1); @@ -8822,11 +8758,11 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Spr FLDEFF_DEEP_SAND_FOOTPRINTS }; - gFieldEffectArguments[0] = mapObj->coords3.x; - gFieldEffectArguments[1] = mapObj->coords3.y; + gFieldEffectArguments[0] = mapObj->previousCoords.x; + gFieldEffectArguments[1] = mapObj->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = mapObj->mapobj_unk_18; + gFieldEffectArguments[4] = mapObj->facingDirection; FieldEffectStart(sandFootprints_FieldEffectData[a]); } @@ -8846,14 +8782,14 @@ static void DoTracksGroundEffect_BikeTireTracks( 6, 7, 3, 4, }; - if (mapObj->coords2.x != mapObj->coords3.x || mapObj->coords2.y != mapObj->coords3.y) + if (mapObj->currentCoords.x != mapObj->previousCoords.x || mapObj->currentCoords.y != mapObj->previousCoords.y) { - gFieldEffectArguments[0] = mapObj->coords3.x; - gFieldEffectArguments[1] = mapObj->coords3.y; + gFieldEffectArguments[0] = mapObj->previousCoords.x; + gFieldEffectArguments[1] = mapObj->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = - bikeTireTracks_Transitions[mapObj->mapobj_unk_20][mapObj->mapobj_unk_18 - 5]; + bikeTireTracks_Transitions[mapObj->previousMovementDirection][mapObj->facingDirection - 5]; FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS); } } @@ -8877,14 +8813,14 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprit { u8 spriteId; - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); spriteId = sub_8126FF0( - mapObj->localId, mapObj->mapNum, mapObj->mapGroup, mapObj->coords2.x, mapObj->coords2.y); + mapObj->localId, mapObj->mapNum, mapObj->mapGroup, mapObj->currentCoords.x, mapObj->currentCoords.y); if (spriteId == MAX_SPRITES) GroundEffect_SpawnOnTallGrass(mapObj, sprite); @@ -8892,36 +8828,36 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprit void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); } void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); } void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); } void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; - gFieldEffectArguments[2] = mapObj->elevation; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; + gFieldEffectArguments[2] = mapObj->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_DUST); } @@ -8938,21 +8874,21 @@ void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite) void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite) { - gFieldEffectArguments[0] = mapObj->coords2.x; - gFieldEffectArguments[1] = mapObj->coords2.y; + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; FieldEffectStart(FLDEFF_BUBBLES); } -static void (*const gUnknown_083760A0[])(struct MapObject *mapObj, struct Sprite *sprite) = { +static void (*const sGroundEffectFuncs[])(struct MapObject *mapObj, struct Sprite *sprite) = { GroundEffect_SpawnOnTallGrass, - sub_8063E94, - sub_8063EE0, - sub_8063F2C, + GroundEffect_MoveOnTallGrass, + GroundEffect_SpawnOnLongGrass, + GroundEffect_MoveOnLongGrass, GroundEffect_WaterReflection, GroundEffect_IceReflection, GroundEffect_FlowingWater, - sub_8063FA0, - sub_8063FCC, + GroundEffect_SandTracks, + GroundEffect_DeepSandTracks, GroundEffect_Ripple, GroundEffect_StepOnPuddle, GroundEffect_SandPile, @@ -8966,45 +8902,49 @@ static void (*const gUnknown_083760A0[])(struct MapObject *mapObj, struct Sprite GroundEffect_Seaweed }; -void sub_8064218(struct MapObject *mapObj, struct Sprite *sprite, u32 flags) +static void StartTriggeredGroundEffects(struct MapObject *mapObj, struct Sprite *sprite, u32 flags) { u8 i; - for (i = 0; i < ARRAY_COUNT(gUnknown_083760A0); i++, flags >>= 1) + for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) if (flags & 1) - gUnknown_083760A0[i](mapObj, sprite); + sGroundEffectFuncs[i](mapObj, sprite); } void filters_out_some_ground_effects(struct MapObject *mapObj, u32 *flags) { - if (mapObj->mapobj_bit_4) + if (mapObj->disableCoveringGroundEffects) { - mapObj->mapobj_bit_18 = 0; - mapObj->mapobj_bit_20 = 0; - mapObj->mapobj_bit_19 = 0; - mapObj->mapobj_bit_21 = 0; - *flags &= 0xFFF9F7BD; + mapObj->inShortGrass = 0; + mapObj->inSandPile = 0; + mapObj->inShallowFlowingWater = 0; + mapObj->inHotSprings = 0; + *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS + | GROUND_EFFECT_FLAG_SHORT_GRASS + | GROUND_EFFECT_FLAG_SAND_PILE + | GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER + | GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE); } } void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *mapObj, u32 *flags) { - if (mapObj->mapobj_bit_5) - *flags &= 0xFFFFFBFF; + if (mapObj->landingJump) + *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; } void DoGroundEffects_OnSpawn(struct MapObject *mapObj, struct Sprite *sprite) { u32 flags; - if (mapObj->mapobj_bit_2) + if (mapObj->triggerGroundEffectsOnMove) { flags = 0; FieldObjectUpdateZCoordAndPriority(mapObj, sprite); GetAllGroundEffectFlags_OnSpawn(mapObj, &flags); FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite); - sub_8064218(mapObj, sprite, flags); - mapObj->mapobj_bit_2 = 0; - mapObj->mapobj_bit_4 = 0; + StartTriggeredGroundEffects(mapObj, sprite, flags); + mapObj->triggerGroundEffectsOnMove = 0; + mapObj->disableCoveringGroundEffects = 0; } } @@ -9012,16 +8952,16 @@ void DoGroundEffects_OnBeginStep(struct MapObject *mapObj, struct Sprite *sprite { u32 flags; - if (mapObj->mapobj_bit_2) + if (mapObj->triggerGroundEffectsOnMove) { flags = 0; FieldObjectUpdateZCoordAndPriority(mapObj, sprite); GetAllGroundEffectFlags_OnBeginStep(mapObj, &flags); FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite); filters_out_some_ground_effects(mapObj, &flags); - sub_8064218(mapObj, sprite, flags); - mapObj->mapobj_bit_2 = 0; - mapObj->mapobj_bit_4 = 0; + StartTriggeredGroundEffects(mapObj, sprite, flags); + mapObj->triggerGroundEffectsOnMove = 0; + mapObj->disableCoveringGroundEffects = 0; } } @@ -9029,16 +8969,16 @@ void DoGroundEffects_OnFinishStep(struct MapObject *mapObj, struct Sprite *sprit { u32 flags; - if (mapObj->mapobj_bit_3) + if (mapObj->triggerGroundEffectsOnStop) { flags = 0; FieldObjectUpdateZCoordAndPriority(mapObj, sprite); GetAllGroundEffectFlags_OnFinishStep(mapObj, &flags); FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite); FilterOutStepOnPuddleGroundEffectIfJumping(mapObj, &flags); - sub_8064218(mapObj, sprite, flags); - mapObj->mapobj_bit_3 = 0; - mapObj->mapobj_bit_5 = 0; + StartTriggeredGroundEffects(mapObj, sprite, flags); + mapObj->triggerGroundEffectsOnStop = 0; + mapObj->landingJump = 0; } } @@ -9133,15 +9073,15 @@ const s8 *const gUnknown_083761D0[] = { bool8 FreezeMapObject(struct MapObject *mapObject) { - if (mapObject->mapobj_bit_6 || mapObject->mapobj_bit_8) + if (mapObject->specialAnimActive || mapObject->frozen) { return TRUE; } else { - mapObject->mapobj_bit_8 = 1; - mapObject->mapobj_bit_23 = gSprites[mapObject->spriteId].animPaused; - mapObject->mapobj_bit_24 = gSprites[mapObject->spriteId].affineAnimPaused; + mapObject->frozen = 1; + mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused; + mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused; gSprites[mapObject->spriteId].animPaused = 1; gSprites[mapObject->spriteId].affineAnimPaused = 1; return FALSE; @@ -9166,11 +9106,11 @@ void FreezeMapObjectsExceptOne(u8 a1) void UnfreezeMapObject(struct MapObject *mapObject) { - if (mapObject->active && mapObject->mapobj_bit_8) + if (mapObject->active && mapObject->frozen) { - mapObject->mapobj_bit_8 = 0; - gSprites[mapObject->spriteId].animPaused = mapObject->mapobj_bit_23; - gSprites[mapObject->spriteId].affineAnimPaused = mapObject->mapobj_bit_24; + mapObject->frozen = 0; + gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup; + gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup; } } @@ -9406,9 +9346,9 @@ u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject) void DoShadowFieldEffect(struct MapObject *mapObject) { - if (!mapObject->mapobj_bit_22) + if (!mapObject->hasShadow) { - mapObject->mapobj_bit_22 = 1; + mapObject->hasShadow = 1; oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject); } } diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index b9ef5b402..f585b2bee 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -271,7 +271,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID) { SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; - BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, 0x7FFF); + BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 10, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1; PlaySE(SE_W025); } @@ -389,7 +389,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); - BeginNormalPaletteFade(0xFFF9001C, 0, 0, 0x10, 0x7FFF); + BeginNormalPaletteFade(0xFFF9001C, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash; PlaySE(SE_W080); } @@ -410,7 +410,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID) CreatePostEvoSparkleSet2(i); break; case 32: - BeginNormalPaletteFade(0xFFFF001C, 0x10, 0x10, 0, 0x7FFF); + BeginNormalPaletteFade(0xFFFF001C, 16, 16, 0, RGB(31, 31, 31)); break; } gTasks[taskID].tFrameCounter++; @@ -437,7 +437,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID) SetEvoSparklesMatrices(); gTasks[taskID].tFrameCounter = 0; CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30); - BeginNormalPaletteFade(0xFFF90001, 0, 0, 0x10, 0x7FFF); + BeginNormalPaletteFade(0xFFF90001, 0, 0, 16, RGB(31, 31, 31)); gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade; PlaySE(SE_W080); } @@ -458,7 +458,7 @@ static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID) CreatePostEvoSparkleSet2(i); break; case 32: - BeginNormalPaletteFade(0xFFFF0001, 0x10, 0x10, 0, 0x7FFF); + BeginNormalPaletteFade(0xFFFF0001, 16, 16, 0, RGB(31, 31, 31)); break; } gTasks[taskID].tFrameCounter++; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 4fdbeb60f..48d5dd82c 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -143,7 +143,7 @@ static void Task_BeginEvolutionScene(u8 taskID) switch (gTasks[taskID].tState) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].tState++; break; case 1: @@ -344,7 +344,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) SetHBlankCallback(EvoDummyFunc); SetVBlankCallback(VBlankCB_EvolutionScene); SetMainCallback2(CB2_EvolutionSceneUpdate); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); } static void CB2_TradeEvolutionSceneLoadGraphics(void) @@ -419,7 +419,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) } break; case 6: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetMainCallback2(CB2_TradeEvolutionSceneUpdate); REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP; break; @@ -545,7 +545,7 @@ static void Task_EvolutionScene(u8 taskID) switch (gTasks[taskID].tState) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gSprites[sEvoInfo.preEvoSpriteID].invisible = 0; gTasks[taskID].tState++; break; @@ -576,7 +576,7 @@ static void Task_EvolutionScene(u8 taskID) { PlayNewMapMusic(BGM_SHINKA); gTasks[taskID].tState++; - BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0)); } break; case 5: // after screen fade, preapre evo sparkles @@ -633,7 +633,7 @@ static void Task_EvolutionScene(u8 taskID) m4aMPlayAllStop(); PlayCry1(gTasks[taskID].tPostEvoSpecies, 0); memcpy(&gPlttBufferUnfaded[0x20], ewram9000_hack, 0x60); - BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0x1C, 0, 16, 0, RGB(0, 0, 0)); gTasks[taskID].tState++; } break; @@ -675,7 +675,7 @@ static void Task_EvolutionScene(u8 taskID) } else // no move to learn { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].tState++; } } @@ -695,7 +695,7 @@ static void Task_EvolutionScene(u8 taskID) if (!gTasks[sEvoGraphicsTaskID].isActive) { m4aMPlayAllStop(); - BeginNormalPaletteFade(0x6001C, 0, 0x10, 0, 0x7FFF); + BeginNormalPaletteFade(0x6001C, 0, 16, 0, RGB(31, 31, 31)); gTasks[taskID].tState++; } break; @@ -797,7 +797,7 @@ static void Task_EvolutionScene(u8 taskID) { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; if (gTasks[taskID].tLearnMoveState == 5) - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } if (gMain.newKeys & B_BUTTON) @@ -918,7 +918,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { PlayBGM(BGM_SHINKA); gTasks[taskID].tState++; - BeginNormalPaletteFade(0x1C, 4, 0, 0x10, 0); + BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0)); } break; case 4: @@ -975,7 +975,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { PlayCry1(gTasks[taskID].tPostEvoSpecies, 0); memcpy(&gPlttBufferUnfaded[0x20], ewram9000_hack, 0x60); - BeginNormalPaletteFade(1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0x1, 0, 16, 0, RGB(0, 0, 0)); gTasks[taskID].tState++; } break; @@ -1116,7 +1116,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { gTasks[taskID].tLearnMoveState = gTasks[taskID].tData9; if (gTasks[taskID].tLearnMoveState == 5) - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } if (gMain.newKeys & B_BUTTON) diff --git a/src/field_effect.c b/src/field_effect.c index 876df601c..51d1a1a0a 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1118,7 +1118,7 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; if (gPlayerAvatar.flags & 0x08) { FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST); @@ -1178,11 +1178,11 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] playerObject = &gMapObjects[gPlayerAvatar.mapObjectId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; gPlayerAvatar.preventStep = TRUE; FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble())); task->data[4] = playerSprite->subspriteMode; - playerObject->mapobj_bit_26 = 1; + playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; playerSprite->subspriteMode = 2; task->data[0]++; @@ -1207,7 +1207,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1232,15 +1232,15 @@ bool8 sub_80868E4(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - mapObject->mapobj_bit_26 = 0; + mapObject->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - mapObject->mapobj_bit_2 = 1; + mapObject->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - mapObject->mapobj_bit_3 = 1; - mapObject->mapobj_bit_5 = 1; + mapObject->triggerGroundEffectsOnStop = 1; + mapObject->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1611,7 +1611,7 @@ bool8 sub_8087058(struct Task *task, struct MapObject *mapObject) { return FALSE; } - if (MetatileBehavior_IsWaterfall(mapObject->mapobj_unk_1E)) + if (MetatileBehavior_IsWaterfall(mapObject->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1663,7 +1663,7 @@ bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E); + dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1689,7 +1689,7 @@ bool8 sub_808722C(struct Task *task, struct MapObject *mapObject, struct Sprite CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; @@ -1712,8 +1712,8 @@ bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1754,7 +1754,7 @@ bool8 sub_80872E4(struct Task *task, struct MapObject *mapObject, struct Sprite if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -1806,7 +1806,7 @@ bool8 sub_80874CC(struct Task *task, struct MapObject *mapObject, struct Sprite CameraObjectReset2(); FreezeMapObjects(); gPlayerAvatar.preventStep = TRUE; - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; task->data[0]++; return FALSE; } @@ -1815,8 +1815,8 @@ bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1831,7 +1831,7 @@ bool8 sub_8087548(struct Task *task, struct MapObject *mapObject, struct Sprite if (sprite->animCmdIndex > 1) { task->data[0]++; - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); FieldObjectSetSpecialAnim(mapObject, sub_80608A4(DIR_EAST)); @@ -1889,7 +1889,7 @@ bool8 sub_80876C8(struct Task *task, struct MapObject *mapObject, struct Sprite FreezeMapObjects(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - mapObject->mapobj_bit_26 = 1; + mapObject->fixedPriority = 1; task->data[0]++; return FALSE; } @@ -1900,8 +1900,8 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite { if (task->data[1] > 3) { - gFieldEffectArguments[0] = mapObject->coords2.x; - gFieldEffectArguments[1] = mapObject->coords2.y; + gFieldEffectArguments[0] = mapObject->currentCoords.x; + gFieldEffectArguments[1] = mapObject->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1909,7 +1909,7 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite } else { task->data[1]++; - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18)); + FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } @@ -1920,7 +1920,7 @@ bool8 sub_8087774(struct Task *task, struct MapObject *mapObject, struct Sprite { if (gSprites[task->data[1]].animCmdIndex == 2) { - mapObject->mapobj_bit_13 = 1; + mapObject->invisible = 1; task->data[0]++; } return FALSE; @@ -2011,7 +2011,7 @@ void sub_8087914(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_80878C4)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->mapobj_unk_18])); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2035,7 +2035,7 @@ void mapldr_080859D4(void) ScriptContext2_Enable(); FreezeMapObjects(); gFieldCallback = NULL; - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; CreateTask(sub_8087A74, 0); } @@ -2065,20 +2065,20 @@ void sub_8087AC8(struct Task *task) } if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble()) { - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; ScriptContext2_Disable(); UnfreezeMapObjects(); DestroyTask(FindTaskIdByFunc(sub_8087A74)); return; } - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->mapobj_unk_18])); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - mapObject->mapobj_bit_13 ^= 1; + mapObject->invisible ^= 1; } static void ExecuteTeleportFieldEffectTask(u8); @@ -2120,11 +2120,11 @@ static void TeleportFieldEffectTask2(struct Task *task) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == mapObject->mapobj_unk_18) + if (task->data[2] > 7 && task->data[15] == mapObject->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2142,7 +2142,7 @@ static void TeleportFieldEffectTask3(struct Task *task) if ((--task->data[1]) <= 0) { task->data[1] = 4; - FieldObjectTurn(mapObject, spinDirections[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2183,7 +2183,7 @@ static void mapldr_08085D88(void) ScriptContext2_Enable(); FreezeMapObjects(); gFieldCallback = NULL; - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1; CameraObjectReset2(); CreateTask(sub_8087E1C, 0); } @@ -2208,7 +2208,7 @@ void sub_8087E4C(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2228,7 +2228,7 @@ void sub_8087ED8(struct Task *task) if (task->data[13] == 0) { task->data[13]++; - mapObject->mapobj_bit_2 = 1; + mapObject->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2246,7 +2246,7 @@ void sub_8087ED8(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, unknown_0839F380[mapObject->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2263,9 +2263,9 @@ void sub_8087FDC(struct Task *task) struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if ((--task->data[1]) == 0) { - FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]); + FieldObjectTurn(mapObject, unknown_0839F380[mapObject->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == mapObject->mapobj_unk_18) + if ((++task->data[2]) > 4 && task->data[14] == mapObject->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); @@ -2825,7 +2825,7 @@ void sub_8088984(struct Task *task) gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].placeholder18, &task->data[1], &task->data[2]); + MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } @@ -2859,13 +2859,13 @@ void sub_8088A78(struct Task *task) if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(3)); + sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); FieldObjectClearAnimIfSpecialAnimFinished(mapObject); - FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->placeholder18)); + FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; - mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB); + mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } @@ -2878,8 +2878,8 @@ void sub_8088AF4(struct Task *task) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->placeholder18)); - sub_8127ED0(mapObject->mapobj_unk_1A, 1); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection)); + sub_8127ED0(mapObject->fieldEffectSpriteId, 1); UnfreezeMapObjects(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); @@ -2993,8 +2993,8 @@ void sub_8088D3C(struct Task *task) mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; if (task->data[15] & 0x08) { - sub_8127ED0(mapObject->mapobj_unk_1A, 2); - sub_8127EFC(mapObject->mapobj_unk_1A, 0); + sub_8127ED0(mapObject->fieldEffectSpriteId, 2); + sub_8127EFC(mapObject->fieldEffectSpriteId, 0); } task->data[1] = sub_8088F60(); task->data[0]++; @@ -3030,13 +3030,13 @@ void sub_8088E2C(struct Task *task) if ((++task->data[2]) >= 8) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); + sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); - mapObject->mapobj_bit_12 = 1; + mapObject->inanimate = 1; FieldObjectSetSpecialAnim(mapObject, 0x48); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[mapObject->mapobj_unk_1A]); + DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3050,8 +3050,8 @@ void sub_8088EB4(struct Task *task) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; FieldObjectClearAnimIfSpecialAnimActive(mapObject); - mapObject->mapobj_bit_12 = 0; - mapObject->mapobj_bit_22 = 0; + mapObject->inanimate = 0; + mapObject->hasShadow = 0; sub_8088FFC(task->data[1], mapObject->spriteId); CameraObjectReset2(); task->data[0]++; @@ -3268,13 +3268,13 @@ void sub_80892A0(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_8127ED0(mapObject->mapobj_unk_1A, 0); + sub_8127ED0(mapObject->fieldEffectSpriteId, 0); } - sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); + sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); CameraObjectReset2(); FieldObjectTurn(mapObject, DIR_WEST); StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16); - mapObject->mapobj_bit_13 = 0; + mapObject->invisible = 0; task->data[1] = sub_8088F60(); sub_8088FC0(task->data[1]); sub_8088FFC(task->data[1], mapObject->spriteId); @@ -3337,8 +3337,8 @@ void sub_8089414(struct Task *task) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; sprite = &gSprites[mapObject->spriteId]; - mapObject->mapobj_bit_12 = 0; - sub_805C058(mapObject, mapObject->coords2.x, mapObject->coords2.y); + mapObject->inanimate = 0; + sub_805C058(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; @@ -3374,11 +3374,11 @@ void fishE(struct Task *task) if ((--task->data[1]) == 0) { mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - state = 0; + state = PLAYER_AVATAR_STATE_NORMAL; if (task->data[15] & 0x08) { - state = 3; - sub_8127ED0(mapObject->mapobj_unk_1A, 1); + state = PLAYER_AVATAR_STATE_SURFING; + sub_8127ED0(mapObject->fieldEffectSpriteId, 1); } sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(state)); FieldObjectTurn(mapObject, DIR_SOUTH); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index be7bcec27..ea3225564 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -62,7 +62,7 @@ static void npc_pal_op(struct MapObject *mapObject, struct Sprite *sprite) u8 whichElement; u16 unk_8041e2c[] = {0x0c, 0x1c, 0x2c}; sprite->data[2] = 0; - if (!GetFieldObjectGraphicsInfo(mapObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(mapObject->mapobj_unk_1F)) || (whichElement = sub_8057450(mapObject->mapobj_unk_1E)))) + if (!GetFieldObjectGraphicsInfo(mapObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(mapObject->previousMetatileBehavior)) || (whichElement = sub_8057450(mapObject->currentMetatileBehavior)))) { sprite->data[2] = unk_8041e2c[whichElement - 1]; npc_pal_op_A(mapObject, sprite->oam.paletteNum); @@ -115,7 +115,7 @@ static void sub_81269E0(struct Sprite *sprite) mapObject = &gMapObjects[sprite->data[0]]; oldSprite = &gSprites[mapObject->spriteId]; - if (!mapObject->active || !mapObject->mapobj_bit_17 || mapObject->localId != sprite->data[1]) + if (!mapObject->active || !mapObject->hasReflection || mapObject->localId != sprite->data[1]) { sprite->inUse = FALSE; } @@ -239,7 +239,7 @@ void oamc_shadow(struct Sprite *sprite) sprite->oam.priority = linkedSprite->oam.priority; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; - if (!mapObject->active || !mapObject->mapobj_bit_22 || MetatileBehavior_IsPokeGrass(mapObject->mapobj_unk_1E) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->mapobj_unk_1E) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->mapobj_unk_1F) || MetatileBehavior_IsReflective(mapObject->mapobj_unk_1E) || MetatileBehavior_IsReflective(mapObject->mapobj_unk_1F)) + if (!mapObject->active || !mapObject->hasShadow || MetatileBehavior_IsPokeGrass(mapObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->previousMetatileBehavior) || MetatileBehavior_IsReflective(mapObject->currentMetatileBehavior) || MetatileBehavior_IsReflective(mapObject->previousMetatileBehavior)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } @@ -304,7 +304,7 @@ void unc_grass_normal(struct Sprite *sprite) else { mapObject = &gMapObjects[mapObjectId]; - if ((mapObject->coords2.x != sprite->data[1] || mapObject->coords2.y != sprite->data[2]) && (mapObject->coords3.x != sprite->data[1] || mapObject->coords3.y != sprite->data[2])) + if ((mapObject->currentCoords.x != sprite->data[1] || mapObject->currentCoords.y != sprite->data[2]) && (mapObject->previousCoords.x != sprite->data[1] || mapObject->previousCoords.y != sprite->data[2])) { sprite->data[7] = TRUE; } @@ -413,7 +413,7 @@ void unc_grass_tall(struct Sprite *sprite) else { mapObject = &gMapObjects[mapObjectId]; - if ((mapObject->coords2.x != sprite->data[1] || mapObject->coords2.y != sprite->data[2]) && (mapObject->coords3.x != sprite->data[1] || mapObject->coords3.y != sprite->data[2])) + if ((mapObject->currentCoords.x != sprite->data[1] || mapObject->currentCoords.y != sprite->data[2]) && (mapObject->previousCoords.x != sprite->data[1] || mapObject->previousCoords.y != sprite->data[2])) { sprite->data[7] = TRUE; } @@ -472,7 +472,7 @@ void sub_8127334(struct Sprite *sprite) const struct MapObjectGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_18) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inShortGrass) { FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); } @@ -699,7 +699,7 @@ static void sub_81278D8(struct Sprite *sprite) struct Sprite *linkedSprite; struct MapObject *mapObject; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_19) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inShallowFlowingWater) { FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); } @@ -711,10 +711,10 @@ static void sub_81278D8(struct Sprite *sprite) sprite->pos1.y = linkedSprite->pos1.y; sprite->subpriority = linkedSprite->subpriority; sub_806487C(sprite, FALSE); - if (mapObject->coords2.x != sprite->data[3] || mapObject->coords2.y != sprite->data[4]) + if (mapObject->currentCoords.x != sprite->data[3] || mapObject->currentCoords.y != sprite->data[4]) { - sprite->data[3] = mapObject->coords2.x; - sprite->data[4] = mapObject->coords2.y; + sprite->data[3] = mapObject->currentCoords.x; + sprite->data[4] = mapObject->currentCoords.y; if (!sprite->invisible) { PlaySE(SE_MIZU); @@ -769,7 +769,7 @@ void sub_8127A7C(struct Sprite *sprite) const struct MapObjectGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_21) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inHotSprings) { FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); } @@ -914,7 +914,7 @@ static void sub_8127DD0(struct Sprite *sprite) sprite->animPaused = FALSE; MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_2 = TRUE; + gMapObjects[gPlayerAvatar.mapObjectId].triggerGroundEffectsOnMove = TRUE; sprite->data[0] = 2; } @@ -997,7 +997,7 @@ static void sub_8127FD4(struct MapObject *mapObject, struct Sprite *sprite) u8 unk_8041E54[] = {0, 0, 1, 2, 3}; if (sub_8127F64(sprite) == 0) { - StartSpriteAnimIfDifferent(sprite, unk_8041E54[mapObject->placeholder18]); + StartSpriteAnimIfDifferent(sprite, unk_8041E54[mapObject->movementDirection]); } } @@ -1008,8 +1008,8 @@ static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite) s16 y; u8 i; - x = mapObject->coords2.x; - y = mapObject->coords2.y; + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; if (sprite->pos2.y == 0 && (x != sprite->data[6] || y != sprite->data[7])) { sprite->data[5] = sprite->pos2.y; @@ -1217,7 +1217,7 @@ void sub_81282E0(struct Sprite *sprite) s16 x; s16 y; - if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].mapobj_bit_20) + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inSandPile) { FieldEffectStop(sprite, FLDEFF_SAND_PILE); } @@ -1338,7 +1338,7 @@ void sub_81285AC(struct Sprite *sprite) { FieldEffectStop(sprite, sprite->data[1]); } - // else { + graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId); linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId]; sprite->invisible = linkedSprite->invisible; @@ -1358,14 +1358,13 @@ void sub_81285AC(struct Sprite *sprite) { FieldEffectStop(sprite, sprite->data[1]); } - // } } void sub_812869C(struct MapObject *mapObject) { - if (mapObject->mapobj_unk_21 == 1) + if (mapObject->directionSequenceIndex == 1) { - gSprites[mapObject->mapobj_unk_1A].data[0] ++; + gSprites[mapObject->fieldEffectSpriteId].data[0] ++; } } @@ -1373,18 +1372,18 @@ bool8 sub_81286C4(struct MapObject *mapObject) { struct Sprite *sprite; - if (mapObject->mapobj_unk_21 == 2) + if (mapObject->directionSequenceIndex == 2) { return TRUE; } - if (mapObject->mapobj_unk_21 == 0) + if (mapObject->directionSequenceIndex == 0) { return TRUE; } - sprite = &gSprites[mapObject->mapobj_unk_1A]; + sprite = &gSprites[mapObject->fieldEffectSpriteId]; if (sprite->data[7]) { - mapObject->mapobj_unk_21 = 2; + mapObject->directionSequenceIndex = 2; sprite->data[0] ++; return TRUE; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 3970cb824..b17816f6d 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -123,7 +123,7 @@ static void (*const gUnknown_0830FC14[])(struct MapObject *) = nullsub_49, nullsub_49, }; -static bool8 (*const gUnknown_0830FC34[])(u8) = +static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) = { MetatileBehavior_IsSouthArrowWarp, MetatileBehavior_IsNorthArrowWarp, @@ -171,7 +171,7 @@ static const u8 gUnknown_0830FC64[2][5][2] = {MAP_OBJ_GFX_MAY_UNDERWATER, 16}, } }; -static bool8 (*const gUnknown_0830FC78[])(u8) = //Duplicate of gUnknown_0830FC34 +static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of sArrowWarpMetatileBehaviorChecks { MetatileBehavior_IsSouthArrowWarp, MetatileBehavior_IsNorthArrowWarp, @@ -226,7 +226,7 @@ static bool8 sub_8058854(struct MapObject *playerMapObj, u8 direction) { u8 specialAnim = FieldObjectGetSpecialAnim(playerMapObj); - if (specialAnim > 24 && specialAnim < 29 && direction != DIR_NONE && playerMapObj->placeholder18 != direction) + if (specialAnim > 24 && specialAnim < 29 && direction != DIR_NONE && playerMapObj->movementDirection != direction) { FieldObjectClearAnim(playerMapObj); return FALSE; @@ -239,11 +239,11 @@ static bool8 sub_8058854(struct MapObject *playerMapObj, u8 direction) return FALSE; } -static void npc_clear_strange_bits(struct MapObject *a) +static void npc_clear_strange_bits(struct MapObject *mapObj) { - a->mapobj_bit_12 = 0; - a->mapobj_bit_10 = 0; - a->mapobj_bit_9 = 0; + mapObj->inanimate = 0; + mapObj->disableAnim = 0; + mapObj->facingDirectionLocked = 0; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; } @@ -265,7 +265,7 @@ static void PlayerAllowForcedMovementIfMovingSameDirection(void) static bool8 TryDoMetatileBehaviorForcedMovement(void) { #if DEBUG - if (gUnknown_020297ED != 0 && (gMain.heldKeys & 0x100)) + if (gUnknown_020297ED != 0 && (gMain.heldKeys & R_BUTTON)) return 0; #endif return gUnknown_0830FBA0[GetForcedMovementByMetatileBehavior()](); @@ -277,7 +277,7 @@ static u8 GetForcedMovementByMetatileBehavior(void) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5)) { - u8 r5 = gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E; + u8 r5 = gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior; for (i = 0; i < 18; i++) { @@ -294,9 +294,9 @@ bool8 ForcedMovement_None(void) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - playerMapObj->mapobj_bit_9 = 0; - playerMapObj->mapobj_bit_11 = 1; - FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18); + playerMapObj->facingDirectionLocked = 0; + playerMapObj->enableAnim = 1; + FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection); gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; } return FALSE; @@ -336,8 +336,8 @@ static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - playerMapObj->mapobj_bit_10 = 1; - return DoForcedMovement(playerMapObj->placeholder18, a); + playerMapObj->disableAnim = 1; + return DoForcedMovement(playerMapObj->movementDirection, a); } bool8 ForcedMovement_Slip(void) @@ -347,71 +347,71 @@ bool8 ForcedMovement_Slip(void) bool8 sub_8058AAC(void) { - return DoForcedMovement(1, PlayerGoSpeed1); + return DoForcedMovement(DIR_SOUTH, PlayerGoSpeed1); } bool8 sub_8058AC4(void) { - return DoForcedMovement(2, PlayerGoSpeed1); + return DoForcedMovement(DIR_NORTH, PlayerGoSpeed1); } bool8 sub_8058ADC(void) { - return DoForcedMovement(3, PlayerGoSpeed1); + return DoForcedMovement(DIR_WEST, PlayerGoSpeed1); } bool8 sub_8058AF4(void) { - return DoForcedMovement(4, PlayerGoSpeed1); + return DoForcedMovement(DIR_EAST, PlayerGoSpeed1); } bool8 sub_8058B0C(void) { - return DoForcedMovement(1, npc_use_some_d2s); + return DoForcedMovement(DIR_SOUTH, npc_use_some_d2s); } bool8 sub_8058B24(void) { - return DoForcedMovement(2, npc_use_some_d2s); + return DoForcedMovement(DIR_NORTH, npc_use_some_d2s); } bool8 sub_8058B3C(void) { - return DoForcedMovement(3, npc_use_some_d2s); + return DoForcedMovement(DIR_WEST, npc_use_some_d2s); } bool8 sub_8058B54(void) { - return DoForcedMovement(4, npc_use_some_d2s); + return DoForcedMovement(DIR_EAST, npc_use_some_d2s); } static u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - playerMapObj->mapobj_bit_10 = 1; - playerMapObj->mapobj_bit_9 = 1; + playerMapObj->disableAnim = 1; + playerMapObj->facingDirectionLocked = 1; return DoForcedMovement(direction, b); } bool8 ForcedMovement_SlideSouth(void) { - return ForcedMovement_Slide(1, PlayerGoSpeed2); + return ForcedMovement_Slide(DIR_SOUTH, PlayerGoSpeed2); } bool8 ForcedMovement_SlideNorth(void) { - return ForcedMovement_Slide(2, PlayerGoSpeed2); + return ForcedMovement_Slide(DIR_NORTH, PlayerGoSpeed2); } bool8 ForcedMovement_SlideWest(void) { - return ForcedMovement_Slide(3, PlayerGoSpeed2); + return ForcedMovement_Slide(DIR_WEST, PlayerGoSpeed2); } bool8 ForcedMovement_SlideEast(void) { - return ForcedMovement_Slide(4, PlayerGoSpeed2); + return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2); } bool8 ForcedMovement_MatJump(void) @@ -430,10 +430,10 @@ bool8 ForcedMovement_MuddySlope(void) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (playerMapObj->placeholder18 != 2 || GetPlayerSpeed() <= 3) + if (playerMapObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) { Bike_UpdateBikeCounterSpeed(0); - playerMapObj->mapobj_bit_9 = 1; + playerMapObj->facingDirectionLocked = 1; return DoForcedMovement(1, PlayerGoSpeed2); } else @@ -500,8 +500,8 @@ void sub_8058D0C(u8 direction, u16 heldKeys) PlayerGoSpeed2(direction); return; } - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) - && IsRunningDisallowed(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) == 0) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) + && IsRunningDisallowed(gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior) == 0) { sub_805940C(direction); gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; @@ -518,8 +518,8 @@ static u8 CheckForPlayerAvatarCollision(u8 direction) s16 x, y; struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - x = playerMapObj->coords2.x; - y = playerMapObj->coords2.y; + x = playerMapObj->currentCoords.x; + y = playerMapObj->currentCoords.y; MoveCoords(direction, &x, &y); return CheckForFieldObjectCollision(playerMapObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } @@ -581,8 +581,8 @@ static u8 sub_8058F6C(s16 a, s16 b, u8 c) { if (gMapObjects[mapObjectId].graphicsId == 0x57) { - a = gMapObjects[mapObjectId].coords2.x; - b = gMapObjects[mapObjectId].coords2.y; + a = gMapObjects[mapObjectId].currentCoords.x; + b = gMapObjects[mapObjectId].currentCoords.y; MoveCoords(c, &a, &b); if (npc_block_way(&gMapObjects[mapObjectId], a, b, c) == 0 && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(a, b)) == 0) @@ -642,58 +642,58 @@ static void DoPlayerAvatarTransition(void) } } -void nullsub_49(struct MapObject *a) +void nullsub_49(struct MapObject *mapObj) { } -void PlayerAvatarTransition_Normal(struct MapObject *a) +void PlayerAvatarTransition_Normal(struct MapObject *mapObj) { - sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(0)); - FieldObjectTurn(a, a->placeholder18); - SetPlayerAvatarStateMask(1); + sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + FieldObjectTurn(mapObj, mapObj->movementDirection); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } -void PlayerAvatarTransition_MachBike(struct MapObject *a) +void PlayerAvatarTransition_MachBike(struct MapObject *mapObj) { - sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(1)); - FieldObjectTurn(a, a->placeholder18); - SetPlayerAvatarStateMask(2); + sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); + FieldObjectTurn(mapObj, mapObj->movementDirection); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); BikeClearState(0, 0); } -void PlayerAvatarTransition_AcroBike(struct MapObject *a) +void PlayerAvatarTransition_AcroBike(struct MapObject *mapObj) { - sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(2)); - FieldObjectTurn(a, a->placeholder18); - SetPlayerAvatarStateMask(4); + sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + FieldObjectTurn(mapObj, mapObj->movementDirection); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE); BikeClearState(0, 0); Bike_HandleBumpySlopeJump(); } -void PlayerAvatarTransition_Surfing(struct MapObject *a) +void PlayerAvatarTransition_Surfing(struct MapObject *mapObj) { u8 unk; - sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(3)); - FieldObjectTurn(a, a->placeholder18); - SetPlayerAvatarStateMask(8); - gFieldEffectArguments[0] = a->coords2.x; - gFieldEffectArguments[1] = a->coords2.y; + sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + FieldObjectTurn(mapObj, mapObj->movementDirection); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); + gFieldEffectArguments[0] = mapObj->currentCoords.x; + gFieldEffectArguments[1] = mapObj->currentCoords.y; gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId; unk = FieldEffectStart(FLDEFF_SURF_BLOB); - a->mapobj_unk_1A = unk; + mapObj->fieldEffectSpriteId = unk; sub_8127ED0(unk, 1); } -void PlayerAvatarTransition_Underwater(struct MapObject *a) +void PlayerAvatarTransition_Underwater(struct MapObject *mapObj) { - sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(4)); - FieldObjectTurn(a, a->placeholder18); - SetPlayerAvatarStateMask(16); - a->mapobj_unk_1A = sub_8128124(a->spriteId); + sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); + FieldObjectTurn(mapObj, mapObj->movementDirection); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER); + mapObj->fieldEffectSpriteId = sub_8128124(mapObj->spriteId); } -void sub_80591F4(struct MapObject *a) +void sub_80591F4(struct MapObject *mapObj) { gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; } @@ -718,7 +718,7 @@ void sub_8059204(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 unk = gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C; + u8 unk = gMapObjects[gPlayerAvatar.mapObjectId].animId; if (unk < 4 || (unk >= 16 && unk < 0x15) @@ -750,12 +750,12 @@ static bool8 PlayerCheckIfAnimFinishedOrInactive(void) static void player_set_x22(u8 a) { - gMapObjects[gPlayerAvatar.mapObjectId].animId = a; + gMapObjects[gPlayerAvatar.mapObjectId].playerAnimId = a; } u8 player_get_x22(void) { - return gMapObjects[gPlayerAvatar.mapObjectId].animId; + return gMapObjects[gPlayerAvatar.mapObjectId].playerAnimId; } static void sub_8059348(u8 a) @@ -833,7 +833,7 @@ void sub_80594C0(void) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { if (player_should_look_direction_be_enforced_upon_movement()) - sub_8059348(GetFaceDirectionAnimId(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_18)); + sub_8059348(GetFaceDirectionAnimId(gMapObjects[gPlayerAvatar.mapObjectId].facingDirection)); } } @@ -907,9 +907,9 @@ void sub_8059630(u8 a) static void PlayCollisionSoundIfNotFacingWarp(u8 a) { s16 x, y; - u8 unk = gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E; + u8 metatileBehavior = gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior; - if (!gUnknown_0830FC34[a - 1](unk)) + if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior)) { if (a == 2) { @@ -924,30 +924,30 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y) { - *x = gMapObjects[gPlayerAvatar.mapObjectId].coords2.x; - *y = gMapObjects[gPlayerAvatar.mapObjectId].coords2.y; + *x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x; + *y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y; MoveCoords(player_get_direction_lower_nybble(), x, y); } void PlayerGetDestCoords(s16 *x, s16 *y) { - *x = gMapObjects[gPlayerAvatar.mapObjectId].coords2.x; - *y = gMapObjects[gPlayerAvatar.mapObjectId].coords2.y; + *x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x; + *y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y; } u8 player_get_direction_lower_nybble(void) { - return gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_18; + return gMapObjects[gPlayerAvatar.mapObjectId].facingDirection; } u8 player_get_direction_upper_nybble(void) { - return gMapObjects[gPlayerAvatar.mapObjectId].placeholder18; + return gMapObjects[gPlayerAvatar.mapObjectId].movementDirection; } u8 PlayerGetZCoord(void) { - return gMapObjects[gPlayerAvatar.mapObjectId].elevation; + return gMapObjects[gPlayerAvatar.mapObjectId].previousElevation; } void unref_sub_8059790(s16 a, s16 b) @@ -980,7 +980,7 @@ void sub_80597F4(void) struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; npc_clear_strange_bits(playerMapObj); - FieldObjectSetDirection(playerMapObj, playerMapObj->mapobj_unk_18); + FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { Bike_HandleBumpySlopeJump(); @@ -1067,11 +1067,11 @@ bool8 IsPlayerSurfingNorth(void) bool8 IsPlayerFacingSurfableFishableWater(void) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - s16 x = playerMapObj->coords2.x; - s16 y = playerMapObj->coords2.y; + s16 x = playerMapObj->currentCoords.x; + s16 y = playerMapObj->currentCoords.y; - MoveCoords(playerMapObj->mapobj_unk_18, &x, &y); - if (npc_block_way(playerMapObj, x, y, playerMapObj->mapobj_unk_18) == 3 && PlayerGetZCoord() == 3 + MoveCoords(playerMapObj->facingDirection, &x, &y); + if (npc_block_way(playerMapObj, x, y, playerMapObj->facingDirection) == 3 && PlayerGetZCoord() == 3 && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y))) return TRUE; else @@ -1083,10 +1083,10 @@ void ClearPlayerAvatarInfo(void) memset(&gPlayerAvatar, 0, sizeof(struct PlayerAvatar)); } -void SetPlayerAvatarStateMask(u8 a) +void SetPlayerAvatarStateMask(u8 flags) { - gPlayerAvatar.flags &= 0xE0; - gPlayerAvatar.flags |= a; + gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_6 | PLAYER_AVATAR_FLAG_5); + gPlayerAvatar.flags |= flags; } static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 a, u8 gender) @@ -1129,7 +1129,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) struct MapObject *mapObject; playerMapObjTemplate.localId = 0xFF; - playerMapObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(0, gender); + playerMapObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); playerMapObjTemplate.x = x - 7; playerMapObjTemplate.y = y - 7; playerMapObjTemplate.elevation = 0; @@ -1142,8 +1142,8 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) playerMapObjTemplate.flagId = 0; mapObjectId = SpawnSpecialFieldObject(&playerMapObjTemplate); mapObject = &gMapObjects[mapObjectId]; - mapObject->mapobj_bit_16 = 1; - mapObject->mapobj_unk_1B = sub_8126B54(); + mapObject->isPlayer = 1; + mapObject->warpArrowSpriteId = sub_8126B54(); FieldObjectTurn(mapObject, direction); ClearPlayerAvatarInfo(); gPlayerAvatar.runningState = NOT_MOVING; @@ -1151,60 +1151,60 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) gPlayerAvatar.mapObjectId = mapObjectId; gPlayerAvatar.spriteId = mapObject->spriteId; gPlayerAvatar.gender = gender; - SetPlayerAvatarStateMask(0x21); + SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT); } void sub_8059B88(u8 a) { - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = a; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = a; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - gSprites[gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A].invisible = a; + gSprites[gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId].invisible = a; } void sub_8059BF4(void) { - sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(5)); + sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); } void sub_8059C3C(u8 a) { - sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(6)); + sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDE8(a)); } -void sub_8059C94(u8 a) +void sub_8059C94(u8 direction) { - sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(2)); - StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FD98(a)); + sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FD98(direction)); SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1); } -void sub_8059D08(u8 a) +void sub_8059D08(u8 direction) { - sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(7)); - StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], FieldObjectDirectionToImageAnimId(a)); + sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); + StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], FieldObjectDirectionToImageAnimId(direction)); } -static void sub_8059D60(struct MapObject *a) +static void sub_8059D60(struct MapObject *mapObject) { s16 x; s16 y; - u8 r6; - u8 r8 = a->mapobj_unk_1E; + u8 direction; + u8 metatileBehavior = mapObject->currentMetatileBehavior; - for (x = 0, r6 = 1; x < 4; x++, r6++) + for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++) { - if (gUnknown_0830FC78[x](r8) && r6 == a->placeholder18) + if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == mapObject->movementDirection) { - x = a->coords2.x; - y = a->coords2.y; - MoveCoords(r6, &x, &y); - sub_8126BC4(a->mapobj_unk_1B, r6, x, y); + x = mapObject->currentCoords.x; + y = mapObject->currentCoords.y; + MoveCoords(direction, &x, &y); + sub_8126BC4(mapObject->warpArrowSpriteId, direction, x, y); return; } } - objid_set_invisible(a->mapobj_unk_1B); + objid_set_invisible(mapObject->warpArrowSpriteId); } /* Strength */ @@ -1245,9 +1245,9 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) FieldObjectClearAnimIfSpecialAnimFinished(c); FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId((u8)task->data[2])); FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId((u8)task->data[2])); - gFieldEffectArguments[0] = c->coords2.x; - gFieldEffectArguments[1] = c->coords2.y; - gFieldEffectArguments[2] = c->elevation; + gFieldEffectArguments[0] = c->currentCoords.x; + gFieldEffectArguments[1] = c->currentCoords.y; + gFieldEffectArguments[2] = c->previousElevation; gFieldEffectArguments[3] = gSprites[c->spriteId].oam.priority; FieldEffectStart(FLDEFF_DUST); PlaySE(SE_W070); @@ -1292,7 +1292,7 @@ u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct MapObject *mapObje if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) { PlaySE(SE_DANSA); - FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->mapobj_unk_18)); + FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->facingDirection)); task->data[1]++; if (task->data[1] > 1) { @@ -1324,7 +1324,7 @@ static void sub_805A08C(u8 taskId) u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject) { task->data[0]++; - task->data[1] = mapObject->placeholder18; + task->data[1] = mapObject->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); @@ -1339,7 +1339,7 @@ u8 sub_805A100(struct Task *task, struct MapObject *mapObject) { u8 direction; - FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(direction = directions[mapObject->placeholder18 - 1])); + FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(direction = directions[mapObject->movementDirection - 1])); if (direction == (u8)task->data[1]) task->data[2]++; task->data[0]++; @@ -1402,7 +1402,7 @@ static void taskFF_0805D1D4(u8 taskId) if (!FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) return; } - sub_8127ED0(playerMapObj->mapobj_unk_1A, 2); + sub_8127ED0(playerMapObj->fieldEffectSpriteId, 2); FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0])); gTasks[taskId].func = sub_805A2D0; } @@ -1413,11 +1413,11 @@ static void sub_805A2D0(u8 taskId) if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) { - sub_805B980(playerMapObj, GetPlayerAvatarGraphicsIdByStateId(0)); - FieldObjectSetSpecialAnim(playerMapObj, GetFaceDirectionAnimId(playerMapObj->mapobj_unk_18)); + sub_805B980(playerMapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + FieldObjectSetSpecialAnim(playerMapObj, GetFaceDirectionAnimId(playerMapObj->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - DestroySprite(&gSprites[playerMapObj->mapobj_unk_1A]); + DestroySprite(&gSprites[playerMapObj->fieldEffectSpriteId]); DestroyTask(taskId); } } @@ -1496,8 +1496,8 @@ u8 Fishing2(struct Task *task) task->tPlayerGfxId = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId; playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; FieldObjectClearAnimIfSpecialAnimActive(playerMapObj); - playerMapObj->mapobj_bit_11 = 1; - sub_8059C3C(playerMapObj->mapobj_unk_18); + playerMapObj->enableAnim = 1; + sub_8059C3C(playerMapObj->facingDirection); task->tStep++; return 0; } @@ -1652,9 +1652,9 @@ u8 Fishing11(struct Task *task) struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_805B980(playerMapObj, task->tPlayerGfxId); - FieldObjectTurn(playerMapObj, playerMapObj->placeholder18); + FieldObjectTurn(playerMapObj, playerMapObj->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0); + sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; Menu_EraseScreen(); @@ -1711,9 +1711,9 @@ u8 Fishing15(struct Task *task) struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; sub_805B980(playerMapObj, task->tPlayerGfxId); - FieldObjectTurn(playerMapObj, playerMapObj->placeholder18); + FieldObjectTurn(playerMapObj, playerMapObj->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0); + sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; task->tStep++; @@ -1771,7 +1771,7 @@ static void sub_805A954(void) if (animType == 10 || animType == 11) playerSprite->pos2.y = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 1, playerSprite->pos2.y); + sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } #if DEBUG @@ -1787,8 +1787,8 @@ u8 debug_sub_805F2B0(u8 a) u8 debug_sub_805F2DC(u8 a) { if (a == 0) - PlayerFaceDirection(gMapObjects[gPlayerAvatar.mapObjectId].placeholder18); - else if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_15 && !CanCameraMoveInDirection(a)) + PlayerFaceDirection(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection); + else if (gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera && !CanCameraMoveInDirection(a)) PlayerOnBikeCollide(a); else PlayerGoSpeed4(a); diff --git a/src/field_region_map.c b/src/field_region_map.c index 54091459f..a90b8ed6a 100644 --- a/src/field_region_map.c +++ b/src/field_region_map.c @@ -60,7 +60,7 @@ void CB2_FieldInitRegionMap(void) sub_813F0C8(); SetMainCallback2(CB2_FieldRegionMap); SetVBlankCallback(VBlankCB_FieldRegionMap); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); } void VBlankCB_FieldRegionMap(void) @@ -102,7 +102,7 @@ void sub_813EFDC(void) } break; case 3: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_5.unk888++; break; case 4: diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 2010ebcf4..c710547d3 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -365,7 +365,7 @@ void sub_80C78A0(void) void sub_80C791C(void) { sub_80C78A0(); - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = TRUE; + gMapObjects[gPlayerAvatar.mapObjectId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/field_specials.c b/src/field_specials.c index a4b891dbe..4bb9ad801 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -356,7 +356,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void) { if (myLinkPlayerNumber != i) { - rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gLinkPlayers[i].gender); + rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gLinkPlayers[i].gender); SpawnSpecialFieldObjectParametrized(rivalAvatarGraphicsId, unknown_083F8358[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); j++; if (j == 4) @@ -1759,7 +1759,7 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { u8 mapObjectId = SpawnSpecialFieldObjectParametrized(7, 8, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gMapObjects[mapObjectId].mapobj_bit_13 = 1; + gMapObjects[mapObjectId].invisible = 1; CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId); } diff --git a/src/field_weather.c b/src/field_weather.c index 5857145ef..9a5a83737 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -782,7 +782,7 @@ void ApplyFogBlend(u8 blendCoeff, u16 blendColor) u8 bBlend; u16 curPalIndex; - BlendPalette(0, 0x100, blendCoeff, blendColor); + BlendPalette(0, 256, blendCoeff, blendColor); color = *(struct RGBColor *)&blendColor; rBlend = color.r; gBlend = color.g; @@ -970,7 +970,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) else { paletteIndex *= 16; - BlendPalette(paletteIndex, 16, 12, 0x73FC); + BlendPalette(paletteIndex, 16, 12, RGB(28, 31, 28)); } break; } diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c index 6b03e9952..fa4a7e76b 100644 --- a/src/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c @@ -15,26 +15,26 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) - || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj) + || FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) { sub_8059D08(player_get_direction_lower_nybble()); - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); + FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) { - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); + FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); } else { diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c index 467e7bca4..8295a2fe0 100644 --- a/src/fldeff_decoration.c +++ b/src/fldeff_decoration.c @@ -236,8 +236,8 @@ void SpriteCB_YellowCave4Sparkle(struct Sprite *sprite) void DoYellowCave4Sparkle(void) { - s16 x = gMapObjects[gPlayerAvatar.mapObjectId].coords2.x; - s16 y = gMapObjects[gPlayerAvatar.mapObjectId].coords2.y; + s16 x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x; + s16 y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y; u8 spriteId; sub_8060470(&x, &y, 8, 4); diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index c6e3211b8..88069f6e9 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -50,7 +50,7 @@ static void StartSweetScentFieldEffect(void) u8 taskId; PlaySE(SE_W230); - BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, 0x1F); + BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0)); taskId = CreateTask(TrySweetScentEncounter, 0); gTasks[taskId].data[0] = 0; FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT); @@ -70,7 +70,7 @@ static void TrySweetScentEncounter(u8 taskId) else { gTasks[taskId].func = FailSweetScentEncounter; - BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, 0x1F); + BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, RGB(31, 0, 0)); } } else diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2b790e97d..5bd0d229b 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -429,7 +429,7 @@ static bool8 sub_8141E64(void) { u16 saved_IME; - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB_HallOfFame); saved_IME = REG_IME; REG_IME = 0; @@ -645,7 +645,7 @@ static void sub_8142484(u8 taskID) if (gTasks[taskID].tDisplayedPoke <= 4 && currMon[1].species != 0) // there is another pokemon to display { gTasks[taskID].tDisplayedPoke++; - BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, 0x735F); + BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, RGB(31, 26, 28)); gSprites[gTasks[taskID].tMonSpriteID(currPokeID)].oam.priority = 1; gTasks[taskID].func = sub_8142320; } @@ -658,7 +658,7 @@ static void sub_8142570(u8 taskID) { u16 i; - BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, 0); + BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB(0, 0, 0)); for (i = 0; i < 6; i++) { if (gTasks[taskID].tMonSpriteID(i) != 0xFF) @@ -687,7 +687,7 @@ static void sub_8142618(u8 taskID) if (gTasks[taskID].tMonSpriteID(i) != 0xFF) gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 1; } - BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, 0x735F); + BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, RGB(31, 26, 28)); Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskID].tFrameCount = 7; gTasks[taskID].func = sub_81426F8; @@ -747,7 +747,7 @@ static void sub_8142818(u8 taskID) static void sub_8142850(u8 taskID) { CpuSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x200); - BeginNormalPaletteFade(-1, 8, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_81428A0; } @@ -906,7 +906,7 @@ static void sub_8142B04(u8 taskID) gTasks[taskID].tMonSpriteID(i) = 0xFF; } - BlendPalettes(0xFFFF0000, 0xC, 0x735F); + BlendPalettes(0xFFFF0000, 12, RGB(31, 26, 28)); stringPtr = gStringVar1; stringPtr = StringCopy(stringPtr, gMenuText_HOFNumber); @@ -944,7 +944,7 @@ static void sub_8142CC8(u8 taskID) currMonID = gTasks[taskID].tMonSpriteID(gTasks[taskID].tCurrPokeID); gSprites[currMonID].oam.priority = 0; sUnknown_0203931C = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000; - BlendPalettesUnfaded(sUnknown_0203931C, 0xC, 0x735F); + BlendPalettesUnfaded(sUnknown_0203931C, 12, RGB(31, 26, 28)); currMon = &savedTeams->mons[gTasks[taskID].tCurrPokeID]; if (currMon->species != SPECIES_EGG) diff --git a/src/hof_pc.c b/src/hof_pc.c index 267ed4274..3ff9eaaea 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -29,7 +29,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void) { ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ScrSpecial_CreatePCMenu(); ScriptMenu_DisplayPCStartupPrompt(); CreateTask(Task_WaitForPaletteFade, 10); diff --git a/src/intro.c b/src/intro.c index 5c0e7a67d..b444c518e 100644 --- a/src/intro.c +++ b/src/intro.c @@ -877,7 +877,7 @@ static u8 SetUpCopyrightScreen(void) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) @@ -901,7 +901,7 @@ static u8 SetUpCopyrightScreen(void) GameCubeMultiBoot_Main(&gMultibootProgramStruct); if (gMultibootProgramStruct.gcmb_field_2 != 1) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state++; } break; @@ -982,7 +982,7 @@ void Task_IntroLoadPart1Graphics(u8 taskId) static void Task_IntroFadeIn(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB_Intro); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; gTasks[taskId].func = Task_IntroWaterDrops; @@ -1054,7 +1054,7 @@ static void Task_IntroScrollDownAndShowEon(u8 taskId) //fade to white if (gIntroFrameCounter > 1007) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); gTasks[taskId].func = Task_IntroWaitToSetupPart2; } } @@ -1111,7 +1111,7 @@ static void Task_IntroStartBikeRide(u8 taskId) #endif gSprites[spriteId].callback = sub_813D880; gTasks[taskId].data[2] = spriteId; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); SetVBlankCallback(VBlankCB_Intro); #ifdef SAPPHIRE gTasks[taskId].data[0] = sub_8148EC0(0, 0x4000, 0x40, 0x10); @@ -1130,7 +1130,7 @@ static void Task_IntroHandleBikeAndEonMovement(u8 taskId) if (gIntroFrameCounter > 1823) { - BeginNormalPaletteFade(0xFFFFFFFF, 16, 0, 16, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 16, 0, 16, FADE_COLOR_WHITE); gTasks[taskId].func = Task_IntroWaitToSetupPart3; } if (gIntroFrameCounter == 1109) @@ -1181,7 +1181,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId) sub_813CE30(0x78, 0x50, 0, 0); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(8) | BGCNT_256COLOR | BGCNT_AFF256x256; REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; gTasks[taskId].func = Task_IntroSpinAndZoomPokeball; @@ -1203,7 +1203,7 @@ static void Task_IntroSpinAndZoomPokeball(u8 taskId) } sub_813CE30(0x78, 0x50, 0x10000 / gTasks[taskId].data[1], gTasks[taskId].data[0]); if (gIntroFrameCounter == 44) - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); } static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId) @@ -1341,7 +1341,7 @@ static void Task_IntroPokemonBattle(u8 taskId) } if (gIntroFrameCounter == 400) { - BeginNormalPaletteFade(0xFF0000, 0, 0x10, 0, 0x7EFF); + BeginNormalPaletteFade(0xFF0000, 0, 16, 0, RGB(31, 23, 31)); } if (gIntroFrameCounter == 432) { @@ -1408,7 +1408,7 @@ static void Task_IntroPokemonBattle(u8 taskId) if (gIntroFrameCounter == 800) PlaySE(SE_OP_BASYU); if (gIntroFrameCounter == 850) - BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, FADE_COLOR_WHITE); if (gIntroFrameCounter == 946) gTasks[taskId].func = task_intro_19; } @@ -1433,7 +1433,7 @@ static void task_intro_20(u8 taskId) gTasks[taskId].data[0] = 0xFF; break; case 2: - BeginNormalPaletteFade(1, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0x1, 0, 16, 0, FADE_COLOR_WHITE); REG_BG2CNT = BG2_FLAGS; REG_DISPCNT = DISPCNT_FLAGS; gTasks[taskId].data[1] = 0; @@ -1447,7 +1447,7 @@ static void task_intro_20(u8 taskId) gTasks[taskId].data[2] -= 8; break; case 3: - BeginNormalPaletteFade(1, 0, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0x1, 0, 16, 0, FADE_COLOR_WHITE); REG_BG2CNT = BG2_FLAGS; REG_DISPCNT = DISPCNT_FLAGS; gTasks[taskId].data[1] = 0; @@ -1461,7 +1461,7 @@ static void task_intro_20(u8 taskId) gTasks[taskId].data[2] += 8; break; case 4: - BeginNormalPaletteFade(1, 5, 0, 0x10, 0x37F7); + BeginNormalPaletteFade(0x1, 5, 0, 16, RGB(23, 31, 13)); REG_BG2CNT = BG2_FLAGS; REG_DISPCNT = DISPCNT_FLAGS; gTasks[taskId].data[1] = 0; diff --git a/src/item_menu.c b/src/item_menu.c index e31801384..fa2ac3a5d 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -478,7 +478,7 @@ static bool8 SetupBagMultistep(void) REG_IE |= INTR_FLAG_VBLANK; REG_IME = savedIme; REG_DISPSTAT |= DISPSTAT_VBLANK_INTR; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = FALSE; gMain.state++; break; @@ -2647,7 +2647,7 @@ static void OnItemSelect_Field05(u8 taskId) static void sub_80A5AAC(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = HandleItemMenuPaletteFade; } @@ -2926,7 +2926,7 @@ static void HandlePopupMenuAction_Give(u8 taskId) gTasks[taskId].data[9] = (u32)sub_808B020; gTasks[taskId].func = HandleItemMenuPaletteFade; gUnknown_02038561 = 1; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } } else @@ -3477,7 +3477,7 @@ void sub_80A7094(u8 taskId) gTasks[taskId].data[8] = (u32)sub_802E424 >> 16; gTasks[taskId].data[9] = (u32)sub_802E424; gTasks[taskId].func = HandleItemMenuPaletteFade; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void OnBagClose_Battle(u8 taskId) @@ -3578,7 +3578,7 @@ static void sub_80A7230(u8 taskId) taskData[8] = (u32)sub_802E424 >> 16; taskData[9] = (u32)sub_802E424; gTasks[taskId].func = HandleItemMenuPaletteFade; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); return; } taskData[15]++; diff --git a/src/item_use.c b/src/item_use.c index 19c298850..9638588fe 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -93,7 +93,7 @@ void ExecuteSwitchToOverworldFromItemUse(u8 taskId) void ItemMenu_ConfirmNormalFade(u8 var) { ExecuteSwitchToOverworldFromItemUse(var); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void ItemMenu_ConfirmComplexFade(u8 var) @@ -165,7 +165,7 @@ void ItemMenu_ReadMail(u8 taskId) void ItemUseOutOfBattle_Mail(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = ItemMenu_ReadMail; } @@ -220,7 +220,7 @@ bool32 CanFish(void) if (MetatileBehavior_IsWaterfall(tileBehavior)) return FALSE; - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4)) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER)) return FALSE; if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) @@ -787,7 +787,7 @@ void sub_80C9C7C(u8 taskId) gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16; gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch; gTasks[taskId].func = HandleItemMenuPaletteFade; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB(0, 0, 0)); } else { @@ -1072,7 +1072,7 @@ void sub_80CA394(u8 taskId) void sub_80CA3C0(u8 taskId) { gTasks[taskId].func = sub_80CA394; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void ItemUseInBattle_Medicine(u8 var) diff --git a/src/learn_move.c b/src/learn_move.c index 356a31b00..17cdbf54e 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -243,7 +243,7 @@ void TeachMoveTutorMove(void) { ScriptContext2_Enable(); CreateTask(sub_813269C, 10); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void sub_813269C(u8 taskId) @@ -368,7 +368,7 @@ void LearnMoveMain(void) sub_8133800(); gSprites[1].pos1.x = 0x48; sLearnMoveStruct->unk2C3 = TRUE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_DISPCNT = 0x1340; break; case 1: @@ -536,7 +536,7 @@ void LearnMoveMain(void) if (Menu_UpdateWindowText()) { sLearnMoveStruct->state = 20; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } break; case 20: @@ -551,10 +551,10 @@ void LearnMoveMain(void) sLearnMoveStruct->state = 14; break; case 22: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); break; case 14: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sLearnMoveStruct->state++; break; case 15: @@ -562,7 +562,7 @@ void LearnMoveMain(void) SetMainCallback2(c2_exit_to_overworld_2_switch); break; case 28: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sLearnMoveStruct->state++; DrawLearnMoveMenuWindow(); sub_8133800(); diff --git a/src/link.c b/src/link.c index 45807830a..8b168c0a2 100644 --- a/src/link.c +++ b/src/link.c @@ -408,7 +408,7 @@ static void LinkTestProcessKeyInput(void) if (gMain.heldKeys & B_BUTTON) InitBlockSend(ewram4000, 0x2004); if (gMain.newKeys & L_BUTTON) - BeginNormalPaletteFade(-1, 0, 0x10, 0, 2); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0)); if (gMain.newKeys & START_BUTTON) SetSuppressLinkErrorMessage(TRUE); if (gMain.newKeys & R_BUTTON) diff --git a/src/mail.c b/src/mail.c index 4497c98fb..ca698e23c 100644 --- a/src/mail.c +++ b/src/mail.c @@ -514,7 +514,7 @@ static u8 sub_80F8A28(void) REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(9) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_BLDCNT = 0; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; ewram0_4.varF0 = sub_80F8F58; return TRUE; @@ -639,7 +639,7 @@ static void sub_80F8F78(void) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_4.varF0 = sub_80F8FB4; } } @@ -701,7 +701,7 @@ void debug_sub_810C990(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = debug_sub_810C910; } else if (gMain.newKeys & B_BUTTON) @@ -1100,7 +1100,7 @@ void debug_sub_810D388(void) ScanlineEffect_Stop(); ResetPaletteFade(); SetVBlankCallback(sub_80F8F18); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } break; case 1: @@ -1139,7 +1139,7 @@ void debug_sub_810D388(void) REG_BLDCNT = 0; REG_DISPCNT = 0x0340; debug_sub_810D340(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_80F8F18); break; case 7: diff --git a/src/main_menu.c b/src/main_menu.c index 5a3f55b29..e574b7b0e 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -236,9 +236,9 @@ u32 InitMainMenu(u8 a1) InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); if (a1) - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); else - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xFFFF); // fade to white + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, FADE_COLOR_WHITE); REG_WIN0H = 0; REG_WIN0V = 0; @@ -452,13 +452,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_MainMenuPressedA; } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); REG_WIN0H = WIN_RANGE(0, 240); REG_WIN0V = WIN_RANGE(0, 160); gTasks[taskId].func = Task_MainMenuPressedB; @@ -765,7 +765,7 @@ static void Task_NewGameSpeech1(u8 taskId) ResetSpriteData(); FreeAllSpritePalettes(); AddBirchSpeechObjects(taskId); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_BG1CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(7) | BGCNT_16COLOR | BGCNT_TXT256x256; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP; gTasks[taskId].tBGhofs = 0; @@ -1094,7 +1094,7 @@ static void Task_NewGameSpeech21(u8 taskId) break; case 0: //NEW NAME PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_NewGameSpeech22; break; case -1: //B button @@ -1291,7 +1291,7 @@ static void Task_NewGameSpeech30(u8 taskId) InitSpriteAffineAnim(&gSprites[spriteId]); StartSpriteAffineAnim(&gSprites[spriteId], 0); gSprites[spriteId].callback = ShrinkPlayerSprite; - BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0x0000FFFF, 0, 0, 16, RGB(0, 0, 0)); FadeOutBGM(4); gTasks[taskId].func = Task_NewGameSpeech31; } @@ -1313,7 +1313,7 @@ static void Task_NewGameSpeech32(u8 taskId) u8 spriteId = gTasks[taskId].tTrainerSpriteId; gSprites[spriteId].callback = nullsub_34; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON; - BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFF0000, 0, 0, 16, FADE_COLOR_WHITE); gTasks[taskId].func = Task_NewGameSpeech33; } } @@ -1393,7 +1393,7 @@ void CB_ContinueNewGameSpeechPart2() REG_BG1HOFS = -60; - BeginNormalPaletteFade(0xFFFFFFFFu, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_WIN0H = 0; REG_WIN0V = 0; diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index 3bd25dbdf..bac306cd8 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -52,7 +52,7 @@ void sub_8064D38(u8 taskId) sub_80594C0(); task->data[0] = 1; } - if (!task->data[1] && !gMapObjects[gSelectedMapObject].mapobj_bit_1) + if (!task->data[1] && !gMapObjects[gSelectedMapObject].regularAnimActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); task->data[1] = 1; @@ -79,7 +79,7 @@ void LockSelectedMapObject(void) u8 taskId; FreezeMapObjectsExceptOne(gSelectedMapObject); taskId = CreateTask(sub_8064D38, 80); - if (!gMapObjects[gSelectedMapObject].mapobj_bit_1) + if (!gMapObjects[gSelectedMapObject].regularAnimActive) { FreezeMapObject(&gMapObjects[gSelectedMapObject]); gTasks[taskId].data[1] = 1; diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 1ea177f2e..53659bdb4 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -89,7 +89,7 @@ static void CB2_MysteryEventMenu(void) { case 0: Menu_DrawStdWindowFrame(0, 14, 29, 19); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 1: @@ -314,7 +314,7 @@ static void CB2_MysteryEventMenu(void) } break; case 15: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state++; break; case 16: @@ -416,7 +416,7 @@ void debug_sub_815D1D8(void) { case 0: Menu_DrawStdWindowFrame(3, 14, 27, 19); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 1: @@ -475,7 +475,7 @@ void debug_sub_815D1D8(void) case 10: if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state++; } break; diff --git a/src/naming_screen.c b/src/naming_screen.c index 59b9b4d84..60799bacb 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -26,8 +26,6 @@ #define COLUMN_COUNT 10 #endif -extern u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality); - const u8 gSpriteImage_83CE094[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp"); const u8 gSpriteImage_83CE154[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp"); @@ -130,9 +128,9 @@ static void sub_80B76E0(); static void nullsub_20(u8, u8); static void PrintKeyboardCharacters(u8); -void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 c, u16 d, u32 e, MainCallback returnCallback) +void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 speciesOrPlayerGender, u16 monGender, u32 monPersonality, MainCallback returnCallback) { - StoreNamingScreenParameters(templateNum, destBuffer, c, d, e, returnCallback); + StoreNamingScreenParameters(templateNum, destBuffer, speciesOrPlayerGender, monGender, monPersonality, returnCallback); SetMainCallback2(C2_NamingScreen); } @@ -194,22 +192,22 @@ static void VBlankCB_NamingScreen(void) REG_BG1VOFS = namingScreenDataPtr->bg1vOffset; REG_BG2VOFS = namingScreenDataPtr->bg2vOffset; REG_BG1CNT &= 0xFFFC; - REG_BG1CNT |= namingScreenDataPtr->unk8; + REG_BG1CNT |= namingScreenDataPtr->bg1Priority; REG_BG2CNT &= 0xFFFC; - REG_BG2CNT |= namingScreenDataPtr->unkA; + REG_BG2CNT |= namingScreenDataPtr->bg2Priority; } -static void StoreNamingScreenParameters(u8 templateNum, u8 *destBuffer, u16 c, u16 d, u32 e, MainCallback returnCallback) +static void StoreNamingScreenParameters(u8 templateNum, u8 *destBuffer, u16 speciesOrPlayerGender, u16 monGender, u32 monPersonality, MainCallback returnCallback) { struct Task *task; //Create a task that does nothing, and use it as a temporary space to store parameters task = &gTasks[CreateTask(Task_DoNothing, 0xFF)]; task->data[0] = templateNum; - task->data[1] = c; - task->data[2] = d; - task->data[3] = e >> 16; - task->data[4] = e; + task->data[1] = speciesOrPlayerGender; + task->data[2] = monGender; + task->data[3] = monPersonality >> 16; + task->data[4] = monPersonality; StoreWordInTwoHalfwords(&task->data[5], (u32)destBuffer); StoreWordInTwoHalfwords(&task->data[7], (u32)returnCallback); } @@ -222,9 +220,9 @@ static void GetNamingScreenParameters(void) taskId = FindTaskIdByFunc(Task_DoNothing); task = &gTasks[taskId]; namingScreenDataPtr->templateNum = task->data[0]; - namingScreenDataPtr->unk3E = task->data[1]; - namingScreenDataPtr->unk40 = task->data[2]; - namingScreenDataPtr->unk42 = (task->data[3] << 16) | (u16)task->data[4]; + namingScreenDataPtr->speciesOrPlayerGender = task->data[1]; + namingScreenDataPtr->monGender = task->data[2]; + namingScreenDataPtr->monPersonality = (task->data[3] << 16) | (u16)task->data[4]; LoadWordFromTwoHalfwords(&task->data[5], (u32 *)&namingScreenDataPtr->destBuffer); LoadWordFromTwoHalfwords(&task->data[7], (u32 *)&namingScreenDataPtr->returnCallback); DestroyTask(taskId); @@ -294,16 +292,16 @@ static void NamingScreen_Init(void) namingScreenDataPtr->state = 0; namingScreenDataPtr->bg1vOffset = 0; namingScreenDataPtr->bg2vOffset = 0; - namingScreenDataPtr->unk8 = 1; - namingScreenDataPtr->unkA = 2; - namingScreenDataPtr->unkC = 0; - namingScreenDataPtr->unkD = 1; + namingScreenDataPtr->bg1Priority = BGCNT_PRIORITY(1); + namingScreenDataPtr->bg2Priority = BGCNT_PRIORITY(2); + namingScreenDataPtr->bgToReveal = 0; + namingScreenDataPtr->bgToHide = 1; namingScreenDataPtr->template = sNamingScreenTemplates[namingScreenDataPtr->templateNum]; - namingScreenDataPtr->currentPage = namingScreenDataPtr->template->unk4; - namingScreenDataPtr->unk2 = 14 - namingScreenDataPtr->template->maxChars / 2; - namingScreenDataPtr->unk3C = gKeyRepeatStartDelay; + namingScreenDataPtr->currentPage = namingScreenDataPtr->template->initialPage; + namingScreenDataPtr->nameLeftOffset = 14 - namingScreenDataPtr->template->maxChars / 2; + namingScreenDataPtr->keyRepeatStartDelayCopy = gKeyRepeatStartDelay; memset(namingScreenDataPtr->textBuffer, 0xFF, sizeof(namingScreenDataPtr->textBuffer)); - if (namingScreenDataPtr->template->unk0 != 0) + if (namingScreenDataPtr->template->copyExistingString) StringCopy(namingScreenDataPtr->textBuffer, namingScreenDataPtr->destBuffer); gKeyRepeatStartDelay = 16; } @@ -394,7 +392,7 @@ static void Task_NamingScreenMain(u8 taskId) static bool8 MainState_BeginFadeIn(struct Task *task) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); namingScreenDataPtr->state++; return 0; } @@ -471,7 +469,7 @@ static bool8 MainState_6(struct Task *task) SetInputState(INPUT_STATE_DISABLED); sub_80B68D8(0); sub_80B6460(3, 0, 1); - gKeyRepeatStartDelay = namingScreenDataPtr->unk3C; + gKeyRepeatStartDelay = namingScreenDataPtr->keyRepeatStartDelayCopy; if (namingScreenDataPtr->templateNum == NAMING_SCREEN_TEMPLATE_MON_NAME && CalculatePlayerPartyCount() >= 6) { @@ -495,7 +493,7 @@ static bool8 MainState_UpdateSentToPCMessage(struct Task *task) static bool8 MainState_BeginFadeInOut(struct Task *task) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); namingScreenDataPtr->state++; return FALSE; } @@ -943,14 +941,13 @@ static bool8 PageSwapAnimState_1(struct Task *task) }; task->tFrameCount += 4; - *arr[namingScreenDataPtr->unkC] = Sin(task->tFrameCount, 40); - *arr[namingScreenDataPtr->unkD] = Sin((task->tFrameCount + 128) & 0xFF, 40); + *arr[namingScreenDataPtr->bgToReveal] = Sin(task->tFrameCount, 40); + *arr[namingScreenDataPtr->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40); if (task->tFrameCount >= 64) { - u8 temp = namingScreenDataPtr->unk8; //Why u8 and not u16? - - namingScreenDataPtr->unk8 = namingScreenDataPtr->unkA; - namingScreenDataPtr->unkA = temp; + u8 temp = namingScreenDataPtr->bg1Priority; + namingScreenDataPtr->bg1Priority = namingScreenDataPtr->bg2Priority; + namingScreenDataPtr->bg2Priority = temp; task->tState++; } return 0; @@ -961,14 +958,14 @@ static bool8 PageSwapAnimState_2(struct Task *task) u16 *const arr[] = {&namingScreenDataPtr->bg2vOffset, &namingScreenDataPtr->bg1vOffset}; task->tFrameCount += 4; - *arr[namingScreenDataPtr->unkC] = Sin(task->tFrameCount, 40); - *arr[namingScreenDataPtr->unkD] = Sin((task->tFrameCount + 128) & 0xFF, 40); + *arr[namingScreenDataPtr->bgToReveal] = Sin(task->tFrameCount, 40); + *arr[namingScreenDataPtr->bgToHide] = Sin((task->tFrameCount + 128) & 0xFF, 40); if (task->tFrameCount >= 128) { - u8 temp = namingScreenDataPtr->unkC; + u8 temp = namingScreenDataPtr->bgToReveal; - namingScreenDataPtr->unkC = namingScreenDataPtr->unkD; - namingScreenDataPtr->unkD = temp; + namingScreenDataPtr->bgToReveal = namingScreenDataPtr->bgToHide; + namingScreenDataPtr->bgToHide = temp; task->tState++; } return 0; @@ -1114,7 +1111,7 @@ static void sub_80B6A80(void) u8 spriteId3; spriteId1 = CreateSprite(&gSpriteTemplate_83CE5C8, 0xCC, 0x50, 0); - namingScreenDataPtr->unk10 = spriteId1; + namingScreenDataPtr->pageIndicatorSpriteId = spriteId1; SetSubspriteTables(&gSprites[spriteId1], gSubspriteTables_83CE558); spriteId2 = CreateSprite(&gSpriteTemplate_83CE5F8, 0xCC, 0x4C, 1); @@ -1128,7 +1125,7 @@ static void sub_80B6A80(void) static void sub_80B6B14(void) { - struct Sprite *sprite = &gSprites[namingScreenDataPtr->unk10]; + struct Sprite *sprite = &gSprites[namingScreenDataPtr->pageIndicatorSpriteId]; sprite->data[0] = 2; sprite->data[1] = namingScreenDataPtr->currentPage; @@ -1224,16 +1221,16 @@ static void sub_80B6CA8(void) static void sub_80B6D04(void) { u8 spriteId; - s16 r1; + s16 left; u8 i; - r1 = (namingScreenDataPtr->unk2 - 1) * 8 + 4; - spriteId = CreateSprite(&gSpriteTemplate_83CE658, r1, 0x28, 0); + left = (namingScreenDataPtr->nameLeftOffset - 1) * 8 + 4; + spriteId = CreateSprite(&gSpriteTemplate_83CE658, left, 0x28, 0); gSprites[spriteId].oam.priority = 3; - r1 = namingScreenDataPtr->unk2 * 8 + 4; - for (i = 0; i < namingScreenDataPtr->template->maxChars; i++, r1 += 8) + left = namingScreenDataPtr->nameLeftOffset * 8 + 4; + for (i = 0; i < namingScreenDataPtr->template->maxChars; i++, left += 8) { - spriteId = CreateSprite(&gSpriteTemplate_83CE670, r1, 0x2C, 0); + spriteId = CreateSprite(&gSpriteTemplate_83CE670, left, 0x2C, 0); gSprites[spriteId].oam.priority = 3; gSprites[spriteId].data[0] = i; } @@ -1292,7 +1289,7 @@ static void (*const gUnknown_083CE2E0[])(void) = static void sub_80B6E44(void) { - gUnknown_083CE2E0[namingScreenDataPtr->template->unk2](); + gUnknown_083CE2E0[namingScreenDataPtr->template->iconFunction](); } static void nullsub_40(void) @@ -1304,7 +1301,7 @@ static void sub_80B6E68(void) u8 rivalGfxId; u8 spriteId; - rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, namingScreenDataPtr->unk3E); + rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, namingScreenDataPtr->speciesOrPlayerGender); spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); @@ -1324,7 +1321,7 @@ static void sub_80B6EFC(void) u8 spriteId; sub_809D51C(); - spriteId = CreateMonIcon(namingScreenDataPtr->unk3E, SpriteCallbackDummy, 0x34, 0x18, 0, namingScreenDataPtr->unk42); + spriteId = CreateMonIcon(namingScreenDataPtr->speciesOrPlayerGender, SpriteCallbackDummy, 0x34, 0x18, 0, namingScreenDataPtr->monPersonality); gSprites[spriteId].oam.priority = 3; } @@ -1642,8 +1639,8 @@ static void sub_80B75C4(void) (u16 *)(VRAM + 0xE800), }; - gUnknown_083CE2F0[namingScreenDataPtr->currentPage][0](arr[namingScreenDataPtr->unkC]); - gUnknown_083CE2F0[namingScreenDataPtr->currentPage][1](arr[namingScreenDataPtr->unkD]); + gUnknown_083CE2F0[namingScreenDataPtr->currentPage][0](arr[namingScreenDataPtr->bgToReveal]); + gUnknown_083CE2F0[namingScreenDataPtr->currentPage][1](arr[namingScreenDataPtr->bgToHide]); } static void sub_80B7614(void) @@ -1654,7 +1651,7 @@ static void sub_80B7614(void) (u16 *)(VRAM + 0xE800), }; - gUnknown_083CE2F0[namingScreenDataPtr->currentPage][1](arr[namingScreenDataPtr->unkD]); + gUnknown_083CE2F0[namingScreenDataPtr->currentPage][1](arr[namingScreenDataPtr->bgToHide]); } static void sub_80B7650(u16 *vramBuffer) @@ -1708,12 +1705,12 @@ static void sub_80B76E0(u16 *vramBuffer, const u16 *src) static void sub_80B772C(void) { - nullsub_20(namingScreenDataPtr->currentPage, namingScreenDataPtr->unkC); + nullsub_20(namingScreenDataPtr->currentPage, namingScreenDataPtr->bgToReveal); } static void sub_80B7740(void) { - nullsub_20((namingScreenDataPtr->currentPage + 1) % 3, namingScreenDataPtr->unkD); + nullsub_20((namingScreenDataPtr->currentPage + 1) % 3, namingScreenDataPtr->bgToHide); } static void nullsub_20(u8 a, u8 b) @@ -1779,9 +1776,9 @@ static u8 GetCharAtKeyboardPos(s16 a, s16 b) static void sub_80B7794(void) { - BasicInitMenuWindow(gUnknown_083CE328[namingScreenDataPtr->currentPage][0][namingScreenDataPtr->unkC]); + BasicInitMenuWindow(gUnknown_083CE328[namingScreenDataPtr->currentPage][0][namingScreenDataPtr->bgToReveal]); gUnknown_083CE310[namingScreenDataPtr->currentPage][0](); - BasicInitMenuWindow(gUnknown_083CE328[namingScreenDataPtr->currentPage][1][namingScreenDataPtr->unkD]); + BasicInitMenuWindow(gUnknown_083CE328[namingScreenDataPtr->currentPage][1][namingScreenDataPtr->bgToHide]); gUnknown_083CE310[namingScreenDataPtr->currentPage][1](); sub_80B772C(); sub_80B7740(); @@ -1789,7 +1786,7 @@ static void sub_80B7794(void) static void sub_80B77F8(void) { - BasicInitMenuWindow(gUnknown_083CE328[namingScreenDataPtr->currentPage][1][namingScreenDataPtr->unkD]); + BasicInitMenuWindow(gUnknown_083CE328[namingScreenDataPtr->currentPage][1][namingScreenDataPtr->bgToHide]); gUnknown_083CE310[namingScreenDataPtr->currentPage][1](); sub_80B7740(); } @@ -1822,7 +1819,7 @@ static void sub_80B78A8(void) { BasicInitMenuWindow(&gWindowTemplate_81E6F4C); gUnknown_083CE358[namingScreenDataPtr->templateNum](); - gUnknown_083CE368[namingScreenDataPtr->template->unk3](); + gUnknown_083CE368[namingScreenDataPtr->template->addGenderIcon](); Menu_PrintText(namingScreenDataPtr->template->title, 9, 2); } @@ -1832,7 +1829,7 @@ static void nullsub_61(void) static void sub_80B78F8(void) { - StringCopy(gStringVar1, gSpeciesNames[(s16)namingScreenDataPtr->unk3E]); + StringCopy(gStringVar1, gSpeciesNames[(s16)namingScreenDataPtr->speciesOrPlayerGender]); } static void nullsub_62(void) @@ -1843,9 +1840,9 @@ static void sub_80B7924(void) { u8 genderSymbol[2] = _("♂"); - if ((s16)namingScreenDataPtr->unk40 != MON_GENDERLESS) + if ((s16)namingScreenDataPtr->monGender != MON_GENDERLESS) { - if ((s16)namingScreenDataPtr->unk40 == MON_FEMALE) + if ((s16)namingScreenDataPtr->monGender == MON_FEMALE) genderSymbol[0] = 0xB6; //female symbol Menu_PrintText(genderSymbol, 0x14, 4); } @@ -1864,7 +1861,7 @@ static void sub_80B7960(void) string += 6; StringCopy(string, namingScreenDataPtr->textBuffer); BasicInitMenuWindow(&gWindowTemplate_81E6F4C); - Menu_PrintText(gStringVar1, namingScreenDataPtr->unk2, 4); + Menu_PrintText(gStringVar1, namingScreenDataPtr->nameLeftOffset, 4); } //-------------------------------------------------- @@ -1873,40 +1870,31 @@ static void sub_80B7960(void) static const struct NamingScreenTemplate playerNamingScreenTemplate = { - .unk0 = 0, + .copyExistingString = 0, .maxChars = 7, - .unk2 = 1, - .unk3 = 0, - .unk4 = 0, - .unk5 = 0, - .unk6 = 0, - .unk7 = 0, + .iconFunction = 1, + .addGenderIcon = 0, + .initialPage = 0, .title = OtherText_YourName, }; static const struct NamingScreenTemplate pcBoxNamingTemplate = { - .unk0 = 0, + .copyExistingString = 0, .maxChars = 8, - .unk2 = 2, - .unk3 = 0, - .unk4 = 0, - .unk5 = 0, - .unk6 = 0, - .unk7 = 0, + .iconFunction = 2, + .addGenderIcon = 0, + .initialPage = 0, .title = OtherText_BoxName, }; static const struct NamingScreenTemplate monNamingScreenTemplate = { - .unk0 = 0, + .copyExistingString = 0, .maxChars = 10, - .unk2 = 3, - .unk3 = 1, - .unk4 = 0, - .unk5 = 0, - .unk6 = 0, - .unk7 = 0, + .iconFunction = 3, + .addGenderIcon = 1, + .initialPage = 0, .title = OtherText_PokeName, }; diff --git a/src/option_menu.c b/src/option_menu.c index 8a46e48d9..2a5b0e534 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -116,7 +116,7 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 6: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 7: @@ -262,7 +262,7 @@ static void Task_OptionMenuSave(u8 taskId) gSaveBlock2.optionsButtonMode = gTasks[taskId].tOptButtonMode; gSaveBlock2.optionsWindowFrameType = gTasks[taskId].tOptFrameType; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_OptionMenuFadeOut; } diff --git a/src/overworld.c b/src/overworld.c index e98e5a6a1..98bb43add 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -671,7 +671,7 @@ void walkrun_find_lowest_active_bit_in_bitfield(void) gUnknown_02029810.player_field_0 = 4; else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) gUnknown_02029810.player_field_0 = 8; - else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_4)) + else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER)) gUnknown_02029810.player_field_0 = 16; else gUnknown_02029810.player_field_0 = 1; @@ -1127,7 +1127,7 @@ void CB2_InitTestMenu(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); debug_sub_8076B68(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); REG_IE |= 1; REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP; m4aSoundVSyncOn(); @@ -1854,7 +1854,7 @@ void sub_8054E20(void) void sub_8054E34(void) { - gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_15 = 1; + gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -2505,7 +2505,7 @@ void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) linkPlayerMapObj->mode = 0; mapObj->active = 1; - mapObj->mapobj_bit_1 = a4; + mapObj->regularAnimActive = a4; mapObj->range.as_byte = 2; mapObj->spriteId = 64; @@ -2514,12 +2514,12 @@ void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y) { - mapObj->coords2.x = x; - mapObj->coords2.y = y; - mapObj->coords3.x = x; - mapObj->coords3.y = y; - sub_80603CC(x, y, &mapObj->coords1.x, &mapObj->coords1.y); - mapObj->coords1.x += 8; + mapObj->currentCoords.x = x; + mapObj->currentCoords.y = y; + mapObj->previousCoords.x = x; + mapObj->previousCoords.y = y; + sub_80603CC(x, y, &mapObj->initialCoords.x, &mapObj->initialCoords.y); + mapObj->initialCoords.x += 8; FieldObjectUpdateZCoord(mapObj); } @@ -2555,8 +2555,8 @@ void sub_8055B08(u8 linkPlayerId, u16 *x, u16 *y) { u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; struct MapObject *mapObj = &gMapObjects[mapObjId]; - *x = mapObj->coords2.x; - *y = mapObj->coords2.y; + *x = mapObj->currentCoords.x; + *y = mapObj->currentCoords.y; } u8 sub_8055B30(u8 linkPlayerId) @@ -2570,14 +2570,14 @@ u8 sub_8055B50(u8 linkPlayerId) { u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; struct MapObject *mapObj = &gMapObjects[mapObjId]; - return mapObj->mapobj_unk_0B_0; + return mapObj->currentElevation; } s32 unref_sub_8055B74(u8 linkPlayerId) { u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId; struct MapObject *mapObj = &gMapObjects[mapObjId]; - return 16 - (s8)mapObj->mapobj_unk_21; + return 16 - (s8)mapObj->directionSequenceIndex; } u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -2589,7 +2589,7 @@ u8 GetLinkPlayerIdAt(s16 x, s16 y) && (gLinkPlayerMapObjects[i].mode == 0 || gLinkPlayerMapObjects[i].mode == 2)) { struct MapObject *mapObj = &gMapObjects[gLinkPlayerMapObjects[i].mapObjId]; - if (mapObj->coords2.x == x && mapObj->coords2.y == y) + if (mapObj->currentCoords.x == x && mapObj->currentCoords.y == y) return i; } } @@ -2605,7 +2605,7 @@ void sub_8055BFC(u8 linkPlayerId, u8 a2) if (linkPlayerMapObj->active) { if (a2 > 10) - mapObj->mapobj_bit_2 = 1; + mapObj->triggerGroundEffectsOnMove = 1; else gUnknown_082166D8[gUnknown_082166A0[linkPlayerMapObj->mode](linkPlayerMapObj, mapObj, a2)](linkPlayerMapObj, mapObj); } @@ -2644,7 +2644,7 @@ static u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapOb } else { - mapObj->mapobj_unk_21 = 16; + mapObj->directionSequenceIndex = 16; npc_coords_shift(mapObj, x, y); FieldObjectUpdateZCoord(mapObj); return 1; @@ -2664,10 +2664,10 @@ static void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct Map static void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj) { - mapObj->mapobj_unk_21--; + mapObj->directionSequenceIndex--; linkPlayerMapObj->mode = 1; - MoveCoords(mapObj->range.as_byte, &mapObj->coords1.x, &mapObj->coords1.y); - if (!mapObj->mapobj_unk_21) + MoveCoords(mapObj->range.as_byte, &mapObj->initialCoords.x, &mapObj->initialCoords.y); + if (!mapObj->directionSequenceIndex) { npc_coords_shift_still(mapObj); linkPlayerMapObj->mode = 2; @@ -2701,8 +2701,8 @@ u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y) { if (i != selfMapObjId) { - if ((gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) - || (gMapObjects[i].coords3.x == x && gMapObjects[i].coords3.y == y)) + if ((gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y) + || (gMapObjects[i].previousCoords.x == x && gMapObjects[i].previousCoords.y == y)) { return 1; } @@ -2720,12 +2720,12 @@ void CreateLinkPlayerSprite(u8 linkPlayerId) if (linkPlayerMapObj->active) { - u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(0, mapObj->mapobj_bit_1); + u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, mapObj->regularAnimActive); mapObj->spriteId = AddPseudoFieldObject(val, SpriteCB_LinkPlayer, 0, 0, 0); sprite = &gSprites[mapObj->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - mapObj->mapobj_bit_2 = 0; + mapObj->triggerGroundEffectsOnMove = 0; } } @@ -2733,16 +2733,16 @@ void SpriteCB_LinkPlayer(struct Sprite *sprite) { struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]]; struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId]; - sprite->pos1.x = mapObj->coords1.x; - sprite->pos1.y = mapObj->coords1.y; - SetObjectSubpriorityByZCoord(mapObj->elevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(mapObj->elevation); + sprite->pos1.x = mapObj->initialCoords.x; + sprite->pos1.y = mapObj->initialCoords.y; + SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(mapObj->previousElevation); if (!linkPlayerMapObj->mode) StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->range.as_byte)); else StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte)); sub_806487C(sprite, 0); - if (mapObj->mapobj_bit_2) + if (mapObj->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/palette.c b/src/palette.c index 2a6602503..6bbcea73c 100644 --- a/src/palette.c +++ b/src/palette.c @@ -192,10 +192,10 @@ bool8 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targe } } -bool8 unref_sub_8073D3C(u32 a1, u8 a2, u8 a3, u8 a4, u16 a5) +bool8 unref_sub_8073D3C(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u16 blendColor) { ReadPlttIntoBuffers(); - return BeginNormalPaletteFade(a1, a2, a3, a4, a5); + return BeginNormalPaletteFade(selectedPalettes, delay, startY, targetY, blendColor); } void unref_sub_8073D84(u8 a1, u32 *a2) diff --git a/src/party_menu.c b/src/party_menu.c index 0fc362791..8887bb554 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -718,7 +718,7 @@ bool8 InitPartyMenu(void) gMain.state++; break; case 16: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -4059,7 +4059,7 @@ void sub_806F44C(u8 taskId) { if (gUnknown_0202E8F6 == 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_806F3FC; } } diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c index 0e417b5f4..1bd87ea24 100644 --- a/src/pc_screen_effect.c +++ b/src/pc_screen_effect.c @@ -84,7 +84,7 @@ bool8 sub_80C5DCC(void) { if (gUnknown_020387EC->unk08 == 0) { - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0x10, 0xFFFF); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 16, FADE_COLOR_WHITE); HBlankIntrOn(sub_80C603C); gUnknown_020387EC->unk08++; } @@ -180,7 +180,7 @@ bool8 sub_80C5F98(void) gUnknown_020387EC->unk0C -= gUnknown_020387EC->unk06; if (gUnknown_020387EC->unk0C < 2) { - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0x10, 0xFFFF); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 16, FADE_COLOR_WHITE); SetHBlankCallback(sub_80C603C); gUnknown_020387EC->unk0C = 1; gUnknown_020387EC->unk08++; @@ -189,7 +189,7 @@ bool8 sub_80C5F98(void) case 1: if (gUnknown_020387EC->unk0A == 8) { - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gUnknown_020387EC->unk08++; } break; @@ -236,7 +236,7 @@ static void sub_80C60CC(struct Sprite *sprite) { FreeSpriteTilesByTag(gUnknown_020387EC->tileTag); FreeSpritePaletteByTag(gUnknown_020387EC->paletteTag); - BlendPalettes(gUnknown_020387EC->selectedPalettes, 0, 0xffff); + BlendPalettes(gUnknown_020387EC->selectedPalettes, 0, FADE_COLOR_WHITE); SetHBlankCallback(sub_80C6078); } } diff --git a/src/pokeblock.c b/src/pokeblock.c index 228d563cf..4087cbbb0 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -365,7 +365,7 @@ static bool8 sub_810B6C0(void) } break; case 18: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = FALSE; SetMainCallback2(sub_810B674); return TRUE; @@ -813,7 +813,7 @@ static void sub_810C2C8(u8 taskId) static void sub_810C31C(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); if (gUnknown_02039244 > 1) { gSpecialVar_ItemId = ITEM_NONE; @@ -878,7 +878,7 @@ static void sub_810C4C4(u8 taskId) static void sub_810C508(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_810C4C4; } @@ -971,7 +971,7 @@ static void sub_810C788(u8 taskId) { gSpecialVar_ItemId += 3; } - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_810C2C8; } @@ -981,7 +981,7 @@ static void sub_810C854(u8 taskId) StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gSpecialVar_ItemId].color]); gSpecialVar_Result = gSpecialVar_ItemId; PokeblockClearIfExists(gSpecialVar_ItemId); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_810C2C8; } diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 2f2ce2f8f..588bc85c0 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -579,7 +579,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; } case 13: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; SetMainCallback2(CB2_PokeblockFeed); return TRUE; @@ -751,7 +751,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskID) static void Task_PaletteFadeToReturn(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = Task_ReturnAfterPaletteFade; } diff --git a/src/pokedex.c b/src/pokedex.c index 30b4d414c..729f72a7c 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1510,7 +1510,7 @@ void Task_PokedexMainScreen(u8 taskId) sub_808E6BC(); BeginNormalPaletteFade( ~(1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)), - 0, 0, 0x10, 0); + 0, 0, 16, RGB(0, 0, 0)); gSprites[gPokedexView->selectedMonSpriteId].callback = sub_808EDB8; gTasks[taskId].func = sub_808CA64; PlaySE(SE_PIN); @@ -1527,7 +1527,7 @@ void Task_PokedexMainScreen(u8 taskId) else if (gMain.newKeys & SELECT_BUTTON) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gPokedexView->unk62A = gPokedexView->unk62C; @@ -1539,7 +1539,7 @@ void Task_PokedexMainScreen(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); } @@ -1592,7 +1592,7 @@ static void Task_PokedexMainScreenMenu(u8 taskId) gMain.newKeys |= START_BUTTON; //Exit menu break; case 3: //CLOSE POKEDEX - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ClosePokedex; PlaySE(SE_PC_OFF); break; @@ -1703,12 +1703,12 @@ static void Task_PokedexResultsScreen(u8 taskId) { if ((gMain.newKeys & A_BUTTON) && gPokedexView->unk0[gPokedexView->selectedPokemon].seen) { - u32 a; + u32 excludedPalettes; sub_808E6BC(); - a = (1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)); + excludedPalettes = (1 << (gSprites[gPokedexView->selectedMonSpriteId].oam.paletteNum + 16)); gSprites[gPokedexView->selectedMonSpriteId].callback = sub_808EDB8; - BeginNormalPaletteFade(~a, 0, 0, 0x10, 0); + BeginNormalPaletteFade(~excludedPalettes, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_808D118; PlaySE(SE_PIN); } @@ -1722,7 +1722,7 @@ static void Task_PokedexResultsScreen(u8 taskId) } else if (gMain.newKeys & SELECT_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].data[0] = sub_8091E3C(); gPokedexView->unk64F = 0; gTasks[taskId].func = sub_808CB8C; @@ -1730,7 +1730,7 @@ static void Task_PokedexResultsScreen(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; PlaySE(SE_PC_OFF); } @@ -1783,12 +1783,12 @@ static void Task_PokedexResultsScreenMenu(u8 taskId) gMain.newKeys |= START_BUTTON; break; case 3: //BACK TO POKEDEX - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen; PlaySE(SE_TRACK_DOOR); break; case 4: //CLOSE POKEDEX - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_PokedexResultsScreenExitPokedex; PlaySE(SE_PC_OFF); break; @@ -1919,7 +1919,7 @@ static bool8 sub_808D344(u8 a) gMain.state++; break; case 4: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_808C0B8); gMain.state++; break; @@ -2957,13 +2957,13 @@ static void Task_InitPageScreenMultistep(u8 taskId) break; case 6: { - u32 r3 = 0; + u32 excludedPalettes = 0; if (gTasks[taskId].data[2] != 0) - r3 = 0x14; + excludedPalettes = 0x14; if (gTasks[taskId].data[1] != 0) - r3 |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16)); - BeginNormalPaletteFade(~r3, 0, 16, 0, 0); + excludedPalettes |= (1 << (gSprites[gTasks[taskId].data[4]].oam.paletteNum + 16)); + BeginNormalPaletteFade(~excludedPalettes, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gMain.state++; } @@ -3011,14 +3011,14 @@ static void Task_PageScreenProcessInput(u8 taskId) { if (gTasks[taskId].data[0] != 0) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_808F888; PlaySE(SE_Z_SCROLL); return; } if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ClosePageScreen; PlaySE(SE_PC_OFF); return; @@ -3031,12 +3031,12 @@ static void Task_PageScreenProcessInput(u8 taskId) sub_8090C68(); break; case AREA_SCREEN: - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_InitAreaScreenMultistep; PlaySE(SE_PIN); break; case CRY_SCREEN: - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_InitCryScreenMultistep; PlaySE(SE_PIN); break; @@ -3047,7 +3047,7 @@ static void Task_PageScreenProcessInput(u8 taskId) } else { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_InitSizeScreenMultistep; PlaySE(SE_PIN); } @@ -3219,7 +3219,7 @@ static void Task_InitCryScreenMultistep(u8 taskId) } break; case 8: - BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gMain.state++; break; @@ -3260,7 +3260,7 @@ static void Task_CryScreenProcessInput(u8 taskId) { if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_808FFBC; @@ -3270,7 +3270,7 @@ static void Task_CryScreenProcessInput(u8 taskId) if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_808FFBC; @@ -3286,7 +3286,7 @@ static void Task_CryScreenProcessInput(u8 taskId) } else { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); m4aMPlayContinue(&gMPlay_BGM); gPokedexView->unk64F = 3; gTasks[taskId].func = sub_808FFBC; @@ -3396,7 +3396,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId) gMain.state++; break; case 7: - BeginNormalPaletteFade(-0x15, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gMain.state++; break; @@ -3423,7 +3423,7 @@ static void Task_SizeScreenProcessInput(u8 taskId) { if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexView->unk64F = 1; gTasks[taskId].func = sub_8090498; PlaySE(SE_PC_OFF); @@ -3431,7 +3431,7 @@ static void Task_SizeScreenProcessInput(u8 taskId) else if ((gMain.newKeys & DPAD_LEFT) || ((gMain.newKeys & L_BUTTON) && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR)) { - BeginNormalPaletteFade(-0x15, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexView->unk64F = 2; gTasks[taskId].func = sub_8090498; PlaySE(SE_Z_PAGE); @@ -3834,7 +3834,7 @@ static void sub_8090750(u8 taskId) case 4: spriteId = sub_80918EC(dexNum, 0x30, 0x38, 0); gSprites[spriteId].oam.priority = 0; - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(gUnknown_03005CEC); gTasks[taskId].data[3] = spriteId; gTasks[taskId].data[0]++; @@ -3863,7 +3863,7 @@ static void sub_8090A3C(u8 taskId) { if (gMain.newKeys & B_BUTTON) { - BeginNormalPaletteFade(0x0000FFFC, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFC, 0, 0, 16, RGB(0, 0, 0)); gSprites[gTasks[taskId].data[3]].callback = sub_8090C28; gTasks[taskId].func = sub_8090B8C; return; @@ -3883,7 +3883,7 @@ static void sub_8090A3C(u8 taskId) } else { - BeginNormalPaletteFade(0x0000FFFC, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFC, 0, 0, 16, RGB(0, 0, 0)); gSprites[gTasks[taskId].data[3]].callback = sub_8090C28; gTasks[taskId].func = sub_8090B8C; return; @@ -4760,7 +4760,7 @@ static void sub_8091E54(u8 taskId) gMain.state++; break; case 2: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state++; break; case 3: @@ -5080,7 +5080,7 @@ static void sub_8092644(u8 taskId) static void sub_80927B8(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80927F0; } diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index fd60581b9..76efdf08d 100644 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -149,7 +149,7 @@ static void CB2_UnusedPokedexAreaScreen(void) SetVBlankCallback(VBlankCB_AreaScren); break; case 5: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); break; case 6: REG_BLDCNT = BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD; @@ -1159,7 +1159,7 @@ static void DebugCB_GoBack(void) switch (gPokedexAreaScreenPtr->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexAreaScreenPtr->state++; break; case 1: @@ -1177,7 +1177,7 @@ static void DebugCB_GoNext(void) switch (gPokedexAreaScreenPtr->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); gPokedexAreaScreenPtr->state++; break; case 1: @@ -1250,7 +1250,7 @@ static void Task_PokedexAreaScreen_0(u8 taskId) CreateAreaUnknownSprites(); break; case 9: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 16, 0, RGB(0, 0, 0)); break; case 10: REG_BLDCNT = BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD; @@ -1291,7 +1291,7 @@ static void Task_PokedexAreaScreen_1(u8 taskId) return; break; case 2: - BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0)); break; case 3: if (gPaletteFade.active) diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c index 46909435a..441dc0842 100644 --- a/src/pokemon_menu.c +++ b/src/pokemon_menu.c @@ -268,7 +268,7 @@ void HandleDefaultPartyMenu(u8 taskID) break; case B_BUTTON: PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_8089E4C; break; } @@ -359,7 +359,7 @@ static void sub_8089F44(u8 taskID) static void PokemonMenu_Summary(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_8089F44; } @@ -440,7 +440,7 @@ static void sub_808A228(u8 taskID) { if (ItemIsMail(gSpecialVar_ItemId) && gUnknown_0202E8F4 != 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808A180; } else @@ -592,7 +592,7 @@ static void sub_808A604(u8 taskID) static void PokemonMenu_GiveItem(u8 taskID) { gUnknown_0202E8F5 = sub_806CA38(taskID); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808A604; } @@ -658,7 +658,7 @@ static void sub_808A73C(u8 taskID) static void PokemonMenu_ReadMail(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808A848; } @@ -741,7 +741,7 @@ static void PokemonMenu_FieldMove(u8 taskID) if (!IS_SOFTBOILED_MILKDRINK(tFieldMoveId)) { gTasks[taskID].func = sub_808AB34; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } else sub_8133D28(taskID); @@ -1051,7 +1051,7 @@ void sub_808B0C0(u8 taskID) case B_BUTTON: gLastFieldPokeMenuOpened = sub_806CA38(taskID); PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); if (gUnknown_02038561 == 0 || gUnknown_02038561 == 1) gTasks[taskID].func = sub_808B25C; if (gUnknown_02038561 == 3) @@ -1069,7 +1069,7 @@ static void sub_808B1EC(u8 taskID) static void sub_808B224(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808B25C; } @@ -1093,7 +1093,7 @@ static void sub_808B288(u8 taskID) static void sub_808B2B4(u8 taskID) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808B288; } @@ -1101,7 +1101,7 @@ static void sub_808B2EC(u8 taskID) { if (gUnknown_0202E8F4 == 2) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskID].func = sub_808B338; } else diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 762850e06..2cd1a59c6 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -310,7 +310,7 @@ void sub_80969A0(void) gMain.state++; break; case 9: - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_8096AFC); gMain.state++; break; @@ -352,7 +352,7 @@ void debug_sub_80A435C(void) { case 0: debug_sub_809CB94(unk_2038798); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: @@ -408,7 +408,7 @@ void sub_8096BF0(void) switch (gPokemonStorageSystemPtr->unk_0004) { case 0: - BlendPalettes(0xffffffff, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: @@ -418,7 +418,7 @@ void sub_8096BF0(void) gPokemonStorageSystemPtr->unk_000c.unk04 = 0; gPokemonStorageSystemPtr->unk_000c.unk06 = 0; sub_80C5CD4(&gPokemonStorageSystemPtr->unk_000c); - BlendPalettes(0xffffffff, 0, 0); + BlendPalettes(0xFFFFFFFF, 0, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 2: @@ -1083,7 +1083,7 @@ void sub_8097788(void) { case 0: sub_809BC18(); - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: @@ -1284,7 +1284,7 @@ void sub_8097B44(void) { case 0: sub_809BB90(); - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; case 1: diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 2383ac46c..00e7c10d2 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -400,7 +400,7 @@ bool8 sub_8099E08(void) switch (gPokemonStorageSystemPtr->unk_1032) { case 0: - BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 0x10, 0xffff); + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 16, FADE_COLOR_WHITE); gPokemonStorageSystemPtr->unk_1032++; break; case 1: @@ -409,7 +409,7 @@ bool8 sub_8099E08(void) u8 curBox = get_preferred_box(); sub_8099EB0(curBox, 0); sub_809A654(); - BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0x10, 0, 0xffff); + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 16, 0, FADE_COLOR_WHITE); gPokemonStorageSystemPtr->unk_1032++; } break; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 6ad5c507c..d369347fc 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -936,7 +936,7 @@ static void sub_809E044(void) static void SummaryScreenExit(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_809E13C; } diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 8684f2155..61baea929 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -524,7 +524,7 @@ void sub_80EBDD8() ewram0_10.var304++; break; case 11: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ewram0_10.var304++; break; case 12: @@ -597,7 +597,7 @@ void sub_80EC00C() ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -784,7 +784,7 @@ void sub_80EC4A0() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -830,7 +830,7 @@ void sub_80EC4A0() ewram0_10.var304++; break; case 0xC: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); ewram0_10.var304++; break; case 0xD: @@ -905,7 +905,7 @@ void sub_80EC67C() } break; case 4: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 5: @@ -1051,7 +1051,7 @@ void sub_80ECA10() ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1152,7 +1152,7 @@ void sub_80ECD80() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -1206,7 +1206,7 @@ void sub_80ECD80() ewram0_10.var304++; break; case 12: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1278,7 +1278,7 @@ void sub_80ED01C() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -1330,7 +1330,7 @@ void sub_80ED01C() ewram0_10.var304++; break; case 13: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1454,7 +1454,7 @@ void sub_80ED3D0() break; case 6: sub_80F3008(0); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -1478,7 +1478,7 @@ void sub_80ED4D8() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -1509,7 +1509,7 @@ void sub_80ED4D8() case 6: sub_80F35B4(); sub_80EEFBC(0x2); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_80EBD4C); ewram0_10.var304++; break; @@ -1547,7 +1547,7 @@ void sub_80ED620() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -1588,7 +1588,7 @@ void sub_80ED620() break; case 10: sub_80F33A8(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD4C); ewram0_10.var304++; break; @@ -2610,7 +2610,7 @@ void sub_80EDB88() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -2667,7 +2667,7 @@ void sub_80EDB88() ewram0_10.var304++; break; case 15: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -2741,7 +2741,7 @@ void sub_80EDE70() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -2764,7 +2764,7 @@ void sub_80EDEE4() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -2798,7 +2798,7 @@ void sub_80EDEE4() ewram0_10.var304++; break; case 7: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD18); ewram0_10.var304++; break; @@ -2916,7 +2916,7 @@ void sub_80EE294() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -2948,7 +2948,7 @@ void sub_80EE294() ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); ewram0_10.var304++; break; case 7: @@ -2985,7 +2985,7 @@ void sub_80EE3D8() case 2: if (!sub_80EEF34()) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } break; @@ -3027,7 +3027,7 @@ void sub_80EE3D8() break; case 11: sub_80F6F10(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(&sub_80EBD68); ewram0_10.var304++; break; @@ -3208,7 +3208,7 @@ void sub_80EE8F4() switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; break; case 1: @@ -3231,7 +3231,7 @@ void sub_80EE96C() if (!ewram0_10.var304) { PlaySE(0x6F); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_10.var304++; } else diff --git a/src/region_map.c b/src/region_map.c index 190cc6576..81ecd7c1b 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1475,7 +1475,7 @@ void CB2_InitFlyRegionMap(void) CreateFlyTargetGraphics(); break; case 8: - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB_FlyRegionMap); break; case 9: @@ -1659,7 +1659,7 @@ static void sub_80FC5B4(void) switch (sFlyDataPtr->unk4) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; case 1: @@ -1705,7 +1705,7 @@ void sub_80FC69C(void) switch (sFlyDataPtr->unk4) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; case 1: @@ -1783,7 +1783,7 @@ void debug_sub_8110D84(void) switch (sFlyDataPtr->unk4) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; case 1: @@ -1808,7 +1808,7 @@ void debug_sub_8110D84(void) break; case 5: m4aSongNumStart(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sFlyDataPtr->unk4++; break; } diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 8c2c23569..d8c07f2bb 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -504,7 +504,7 @@ void Task_ResetRtcScreen(u8 taskId) switch (data[0]) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 16, 0, FADE_COLOR_WHITE); data[0] = 1; break; case 1: @@ -574,7 +574,7 @@ void Task_ResetRtcScreen(u8 taskId) case 5: if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 16, FADE_COLOR_WHITE); data[0] = 6; } else diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index a10fd45b8..9c4cc2217 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -2252,7 +2252,7 @@ void sub_807A69C(u8 taskId) else task->data[6] = 3; CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20); - BlendPalette(dest, 0x10, gBattleAnimArgs[1], gBattleAnimArgs[0]); + BlendPalette(dest, 16, gBattleAnimArgs[1], gBattleAnimArgs[0]); task->func = sub_807A784; } diff --git a/src/roulette.c b/src/roulette.c index b278521b1..49627dade 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1547,7 +1547,7 @@ void sub_811755C(u8 taskid) { Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); Menu_EraseScreen(); - BeginNormalPaletteFade(-0x1, 0x0, 0x0, 0x10, 0x0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPaletteFade.delayCounter = gPaletteFade.multipurpose2; UpdatePaletteFade(); gTasks[taskid].func = &sub_8117528; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index f57315d09..d73c90fb3 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -126,7 +126,7 @@ static void CB2_SaveFailedScreen(void) Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ime = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; @@ -224,7 +224,7 @@ static void CB2_FadeAndReturnToTitleScreen(void) if (gMain.newKeys & A_BUTTON) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_ReturnToTitleScreen); } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index df83d3e2d..7612c44e1 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -36,7 +36,7 @@ void sub_80F99CC(void) ScriptContext2_Enable(); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); gTasks[taskId].data[0] = PARTY_MENU_TYPE_CONTEST; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void SelectMonForNPCTrade(void) @@ -46,7 +46,7 @@ void SelectMonForNPCTrade(void) ScriptContext2_Enable(); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); gTasks[taskId].data[0] = PARTY_MENU_TYPE_IN_GAME_TRADE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void SelectMoveTutorMon(void) @@ -56,7 +56,7 @@ void SelectMoveTutorMon(void) ScriptContext2_Enable(); taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA); gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_TUTOR; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } void OpenPartyMenuFromScriptContext(u8 taskId) diff --git a/src/shop.c b/src/shop.c index 96b417b68..62c8c9a87 100644 --- a/src/shop.c +++ b/src/shop.c @@ -299,7 +299,7 @@ static void BuyMenuDrawGraphics(void) DrawFirstMartScrollIndicators(); CreateTask(Shop_DoCursorAction, 0x8); sub_80B3240(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gPaletteFade.bufferTransferDisabled = 0; SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); @@ -459,13 +459,13 @@ static void Shop_LoadViewportObjects(void) gMartViewportObjects[r8][MAP_OBJ_ID] = mapObjId; gMartViewportObjects[r8][X_COORD] = x; gMartViewportObjects[r8][Y_COORD] = y; - if (gMapObjects[mapObjId].mapobj_unk_18 == 1) + if (gMapObjects[mapObjId].facingDirection == DIR_SOUTH) gMartViewportObjects[r8][ANIM_NUM] = 0; - if (gMapObjects[mapObjId].mapobj_unk_18 == 2) + if (gMapObjects[mapObjId].facingDirection == DIR_NORTH) gMartViewportObjects[r8][ANIM_NUM] = 1; - if (gMapObjects[mapObjId].mapobj_unk_18 == 3) + if (gMapObjects[mapObjId].facingDirection == DIR_WEST) gMartViewportObjects[r8][ANIM_NUM] = 2; - if (gMapObjects[mapObjId].mapobj_unk_18 == 4) + if (gMapObjects[mapObjId].facingDirection == DIR_EAST) gMartViewportObjects[r8][ANIM_NUM] = 3; r8++; } @@ -1168,7 +1168,7 @@ static void Task_ReturnToBuyMenu(u8 taskId) static void Task_ExitBuyMenu(u8 taskId) { gFieldCallback = Shop_FadeReturnToMartMenu; - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ExitBuyMenuDoFade; } diff --git a/src/slot_machine.c b/src/slot_machine.c index 8075f24e4..ccd7e4353 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -611,7 +611,7 @@ static void sub_8101D24(u8 taskId) static bool8 sub_8101D5C(struct Task *task) { - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); sub_810423C(eSlotMachine->pikaPower); eSlotMachine->state++; return FALSE; @@ -1119,7 +1119,7 @@ static bool8 sub_8102424(struct Task *task) #else gSaveBlock1.coins = eSlotMachine->coins; #endif - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); eSlotMachine->state++; return FALSE; } @@ -3011,7 +3011,7 @@ static void sub_8104B0C(u8 taskId) static void sub_8104B3C(struct Task *task) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); task->data[0]++; } @@ -3027,7 +3027,7 @@ static void sub_8104B80(struct Task *task) sub_81065DC(); BasicInitMenuWindow(&gWindowTemplate_81E7144); Menu_PrintTextPixelCoords(gOtherText_ReelTime, 10, 32, 1); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } @@ -3035,7 +3035,7 @@ static void sub_8104BC8(struct Task *task) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); task->data[0]++; } } @@ -3047,7 +3047,7 @@ static void sub_8104BFC(struct Task *task) sub_81064B8(); sub_8104CAC(task->data[1]); sub_810423C(eSlotMachine->pikaPower); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); task->data[0]++; } diff --git a/src/start_menu.c b/src/start_menu.c index f63408689..4a9a0f0dd 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -873,7 +873,7 @@ static bool32 sub_80719FC(u8 *step) { u32 savedIme; - BlendPalettes(-1, 0x10, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); SetVBlankCallback(sub_80719F0); savedIme = REG_IME; REG_IME = 0; @@ -914,7 +914,7 @@ static void Task_8071B64(u8 taskId) case 0: Menu_DisplayDialogueFrame(); Menu_PrintText(gSystemText_Saving, 2, 15); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); (*step)++; break; case 1: @@ -929,7 +929,7 @@ static void Task_8071B64(u8 taskId) (*step)++; break; case 3: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); (*step)++; break; case 4: diff --git a/src/starter_choose.c b/src/starter_choose.c index ff8c706b8..836925e77 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -296,7 +296,7 @@ void CB2_ChooseStarter(void) LoadSpritePalettes(gUnknown_083F77B4); Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); savedIme = REG_IME; REG_IME = 0; diff --git a/src/title_screen.c b/src/title_screen.c index 30ba7191e..df737fd06 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -673,7 +673,7 @@ void CB2_InitTitleScreen(void) break; } case 3: - BeginNormalPaletteFade(-1, 1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 1, 16, 0, FADE_COLOR_WHITE); SetVBlankCallback(VBlankCB); gMain.state = 4; break; @@ -819,7 +819,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, 16, FADE_COLOR_WHITE); SetMainCallback2(CB2_GoToMainMenu); } else @@ -830,13 +830,13 @@ static void Task_TitleScreenPhase3(u8 taskId) && CanResetRTC() == 1) { FadeOutBGM(4); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(CB2_GoToResetRtcScreen); } #if DEBUG else if (gMain.heldKeys == SELECT_BUTTON) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); SetMainCallback2(CB2_GoToTestMenu); } #endif @@ -853,7 +853,7 @@ static void Task_TitleScreenPhase3(u8 taskId) UpdateLegendaryMarkingColor(gTasks[taskId].tCounter); if ((gMPlay_BGM.status & 0xFFFF) == 0) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, FADE_COLOR_WHITE); SetMainCallback2(CB2_GoToCopyrightScreen); } } diff --git a/src/trade.c b/src/trade.c index 50c69bc6d..4bed5d92b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1224,7 +1224,7 @@ static void sub_8047EC0(void) gMain.state ++; break; case 17: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 18: @@ -1369,7 +1369,7 @@ static void sub_80484F4(void) gMain.state ++; break; case 17: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 18: @@ -1409,7 +1409,7 @@ static void sub_80489F4(void) { if (++gUnknown_03004824->unk_00b4 >= 16) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 10; } } @@ -1889,7 +1889,7 @@ static void sub_80491E4(u8 mpId, u8 status) switch (gBlockRecvBuffer[0][0]) { case 0xeebb: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); sub_804AA0C(4); gUnknown_03004824->unk_007b = 11; break; @@ -1904,7 +1904,7 @@ static void sub_80491E4(u8 mpId, u8 status) gUnknown_03004824->unk_007b = 7; break; case 0xccdd: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 10; break; case 0xddee: @@ -1957,7 +1957,7 @@ static void sub_80492D8(void) gUnknown_03004824->linkData[0] = 0xeebb; gUnknown_03004824->linkData[1] = 0; sub_804AADC(5, 0); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_0084 = gUnknown_03004824->unk_0085 = 0; gUnknown_03004824->unk_007b = 11; } @@ -2086,7 +2086,7 @@ static void sub_8049680(void) } else if (gUnknown_03004824->tradeMenuCursorPosition < 2 * PARTY_SIZE) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 2; } else if (gUnknown_03004824->tradeMenuCursorPosition == 2 * PARTY_SIZE) @@ -2133,7 +2133,7 @@ static void sub_8049860(void) PlaySE(SE_SELECT); if (Menu_GetCursorPos() == 0) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004824->unk_007b = 2; } else if (sub_80499F0(gUnknown_03004824->unk_0051[0], gUnknown_03004824->partyCounts[0], gUnknown_03004824->tradeMenuCursorPosition) == 0) @@ -4097,7 +4097,7 @@ static void sub_804B41C(void) sub_804BBE8(5); sub_804BBE8(0); SetTradeSceneStrings(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 12: @@ -4564,7 +4564,7 @@ void sub_804B790(void) sub_804BBE8(5); sub_804BBE8(0); SetTradeSceneStrings(); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gMain.state ++; break; case 12: @@ -4857,7 +4857,7 @@ static bool8 sub_804C29C(void) // The game waits here for the sprite to finish its animation sequence. break; case 14: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 = 20; break; @@ -4869,7 +4869,7 @@ static bool8 sub_804C29C(void) } break; case 21: - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 22: @@ -4944,7 +4944,7 @@ static bool8 sub_804C29C(void) } break; case 29: - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 = 30; break; case 30: @@ -4957,7 +4957,7 @@ static bool8 sub_804C29C(void) } break; case 31: - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00ba = CreateSprite(&gSpriteTemplate_82159FC, 0x6f, 0xaa, 0); gUnknown_03004828->unk_00bb = CreateSprite(&gSpriteTemplate_82159FC, 0x81, -0xa, 0); gUnknown_03004828->unk_00c4 ++; @@ -4982,15 +4982,15 @@ static bool8 sub_804C29C(void) } break; case 34: - BlendPalettes(1, 16, 0xffff); + BlendPalettes(0x1, 16, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 35: - BlendPalettes(1, 0, 0xffff); + BlendPalettes(0x1, 0, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 36: - BlendPalettes(1, 16, 0xffff); + BlendPalettes(0x1, 16, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 37: @@ -5028,7 +5028,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_00c4 ++; gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].invisible = TRUE; gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].invisible = TRUE; - BlendPalettes(1, 0, 0xffff); + BlendPalettes(0x1, 0, FADE_COLOR_WHITE); } break; case 39: @@ -5036,7 +5036,7 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->unk_00bb].pos2.y += 3; if (gSprites[gUnknown_03004828->unk_00ba].pos2.y <= -0xde) { - BeginNormalPaletteFade(-1, -1, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; DestroySprite(&gSprites[gUnknown_03004828->unk_00ba]); DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]); @@ -5054,7 +5054,7 @@ static bool8 sub_804C29C(void) } break; case 41: - BeginNormalPaletteFade(-1, -1, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 42: @@ -5131,7 +5131,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_0118 = 0x8000 / gUnknown_03004828->unk_011a; break; case 52: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 = 60; break; @@ -5144,7 +5144,7 @@ static bool8 sub_804C29C(void) } break; case 61: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 62: @@ -5160,12 +5160,12 @@ static bool8 sub_804C29C(void) gSprites[gUnknown_03004828->unk_0103].callback = sub_804D80C; StartSpriteAnim(&gSprites[gUnknown_03004828->unk_0103], 1); StartSpriteAffineAnim(&gSprites[gUnknown_03004828->unk_0103], 2); - BlendPalettes(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 16, 0xffff); + BlendPalettes(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 16, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_00c0 = 0; break; case 64: - BeginNormalPaletteFade(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 1, 16, 0, 0xffff); + BeginNormalPaletteFade(1 << (16 + gSprites[gUnknown_03004828->unk_0103].oam.paletteNum), 1, 16, 0, FADE_COLOR_WHITE); gUnknown_03004828->unk_00c4 ++; break; case 65: @@ -5235,7 +5235,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_00c4 ++; break; case 73: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_03004828->unk_00c4 ++; break; case 74: @@ -5334,7 +5334,7 @@ static void sub_804D738(struct Sprite *sprite) PlaySE(SE_W025); sprite->callback = sub_804D7AC; sprite->data[0] = 0; - BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, -1); + BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, FADE_COLOR_WHITE); } } @@ -5613,7 +5613,7 @@ static void sub_804DC88(void) case 6: if (IsLinkTaskFinished()) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gMain.state ++; } break; @@ -5661,7 +5661,7 @@ void DoInGameTradeScene(void) { ScriptContext2_Enable(); CreateTask(sub_804E1A0, 10); - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); } static void sub_804E1A0(u8 taskId) diff --git a/src/trainer_card.c b/src/trainer_card.c index 599479f16..7c7eb23e2 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -673,7 +673,7 @@ bool8 TrainerCard_Init(struct Task *task) ewram0_2.showColon = gSaveBlock2.playTimeSeconds & 1; ewram0_2.frameCounter = gSaveBlock2.playTimeVBlanks; TrainerCard_CreatePrintPlayTimeTask(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ewram0_2.current_state++; /* Advance state machine */ return FALSE; } @@ -740,7 +740,7 @@ bool8 TrainerCard_WaitForFlipToFinish(struct Task *task) bool8 TrainerCard_FadeOut(struct Task *task) { TrainerCard_DestoryPlayTimeTask(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_2.current_state++; /* Advance state machine */ return FALSE; } diff --git a/src/trainer_see.c b/src/trainer_see.c index f79d6b9e4..2501d2c7f 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -84,8 +84,8 @@ static bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj) PlayerGetDestCoords(&x, &y); if (trainerObj->trainerType == 1) // can only see in one direction { - approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); - return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18); + approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->facingDirection - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); + return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->facingDirection); } else // can see in all directions { @@ -102,10 +102,10 @@ static bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj) // Returns how far south the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.x == x - && y > trainerObj->coords2.y - && y <= trainerObj->coords2.y + range) - return (y - trainerObj->coords2.y); + if (trainerObj->currentCoords.x == x + && y > trainerObj->currentCoords.y + && y <= trainerObj->currentCoords.y + range) + return (y - trainerObj->currentCoords.y); else return 0; } @@ -113,10 +113,10 @@ static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 rang // Returns how far north the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.x == x - && y < trainerObj->coords2.y - && y >= trainerObj->coords2.y - range) - return (trainerObj->coords2.y - y); + if (trainerObj->currentCoords.x == x + && y < trainerObj->currentCoords.y + && y >= trainerObj->currentCoords.y - range) + return (trainerObj->currentCoords.y - y); else return 0; } @@ -124,10 +124,10 @@ static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 rang // Returns how far west the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.y == y - && x < trainerObj->coords2.x - && x >= trainerObj->coords2.x - range) - return (trainerObj->coords2.x - x); + if (trainerObj->currentCoords.y == y + && x < trainerObj->currentCoords.x + && x >= trainerObj->currentCoords.x - range) + return (trainerObj->currentCoords.x - x); else return 0; } @@ -135,10 +135,10 @@ static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range // Returns how far east the player is from trainer. 0 if out of trainer's sight. static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y) { - if (trainerObj->coords2.y == y - && x > trainerObj->coords2.x - && x <= trainerObj->coords2.x + range) - return (x - trainerObj->coords2.x); + if (trainerObj->currentCoords.y == y + && x > trainerObj->currentCoords.x + && x <= trainerObj->currentCoords.x + range) + return (x - trainerObj->currentCoords.x); else return 0; } @@ -160,8 +160,8 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 a if (approachDistance == 0) return FALSE; - x = trainerObj->coords2.x; - y = trainerObj->coords2.y; + x = trainerObj->currentCoords.x; + y = trainerObj->currentCoords.y; for (i = 0; i <= approachDistance - 1; i++, MoveCoords(direction, &x, &y)) { @@ -265,7 +265,7 @@ static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainer FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); - direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18); + direction = GetFaceDirectionAnimId(trainerObj->facingDirection); FieldObjectSetSpecialAnim(trainerObj, direction); task->data[0]++; return TRUE; @@ -294,7 +294,7 @@ static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainer { if (task->data[3]) { - FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18)); + FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection)); task->data[3]--; } else @@ -313,8 +313,8 @@ static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainer if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) return FALSE; - npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18)); - sub_805C774(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18)); + npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); + sub_805C774(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection)); sub_805C754(trainerObj); playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; @@ -322,7 +322,7 @@ static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainer return FALSE; sub_80597E8(); - FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18))); + FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection))); task->data[0]++; return FALSE; } @@ -371,8 +371,8 @@ static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainer { if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) { - gFieldEffectArguments[0] = trainerObj->coords2.x; - gFieldEffectArguments[1] = trainerObj->coords2.y; + gFieldEffectArguments[0] = trainerObj->currentCoords.x; + gFieldEffectArguments[1] = trainerObj->currentCoords.y; gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1; gFieldEffectArguments[3] = 2; task->data[4] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -387,13 +387,13 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainer if (gSprites[task->data[4]].animCmdIndex == 2) { - trainerObj->mapobj_bit_26 = 0; - trainerObj->mapobj_bit_2 = 1; + trainerObj->fixedPriority = 0; + trainerObj->triggerGroundEffectsOnMove = 1; sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; FieldObjectClearAnimIfSpecialAnimFinished(trainerObj); - FieldObjectSetSpecialAnim(trainerObj, sub_806084C(trainerObj->mapobj_unk_18)); + FieldObjectSetSpecialAnim(trainerObj, sub_806084C(trainerObj->facingDirection)); task->data[0]++; } return FALSE; @@ -430,12 +430,14 @@ void sub_80846E4(u8 taskId) gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj); if (task->data[0] == 3 && !FieldEffectActiveListContains(49)) { - npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); - sub_805C774(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); + npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection)); + sub_805C774(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection)); DestroyTask(taskId); } else - mapObj->mapobj_bit_7 = 0; + { + mapObj->specialAnimFinished = 0; + } } void sub_8084794(struct MapObject *var) diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 8205f4f70..bdf6f4a44 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -354,7 +354,7 @@ static void sub_81365C8(void) switch (gUnknown_02039304->unk50) { case 0: - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); SetVBlankCallback(sub_8136264); gUnknown_02039304->unk50++; break; @@ -467,7 +467,7 @@ static void sub_8136808(void) gPokeblockMonID = sub_81370A4(gUnknown_083DFEC4->unk87DC); gUnknown_02039308 = gUnknown_02039304->callback; gUnknown_0203930C = gUnknown_02039304->pokeblock; - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 1: @@ -509,7 +509,7 @@ static void sub_81368A4(void) } break; case 3: - BlendPalettes(-1, 16, 0); + BlendPalettes(0xFFFFFFFF, 16, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 4: @@ -518,7 +518,7 @@ static void sub_81368A4(void) break; case 5: SetVBlankCallback(sub_8136264); - BeginNormalPaletteFade(-1, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 6: @@ -585,7 +585,7 @@ static void sub_8136B44(void) switch (gUnknown_02039304->unk50) { case 0: - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gUnknown_02039304->unk50++; break; case 1: diff --git a/src/wallclock.c b/src/wallclock.c index 1f743a61a..e500a3777 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -229,7 +229,7 @@ static void WallClockInit(void) { u16 ime; - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ime = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; @@ -430,7 +430,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, RGB(0, 0, 0)); gTasks[taskId].func = Task_SetClock6; } @@ -456,7 +456,7 @@ static void Task_ViewClock2(u8 taskId) static void Task_ViewClock3(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gTasks[taskId].func = Task_ViewClock4; } |