ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc field_specials cleanup

Browse Source
This commit is contained in:
GriffinR 2023-02-01 11:43:21 -05:00
parent 43af7d46ca
commit 9003966fcc
9 changed files with 141 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -48,21 +48,24 @@ BirthIsland_Exterior_EventScript_Triangle::
special DoDeoxysRockInteraction special DoDeoxysRockInteraction
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, BirthIsland_Exterior_EventScript_NotSolved1 case DEOXYS_ROCK_FAILED, BirthIsland_Exterior_EventScript_Failed
case 1, BirthIsland_Exterior_EventScript_NotSolved2 case DEOXYS_ROCK_PROGRESSED, BirthIsland_Exterior_EventScript_Progressed
case 2, BirthIsland_Exterior_EventScript_Deoxys case DEOXYS_ROCK_SOLVED, BirthIsland_Exterior_EventScript_Deoxys
case 3, BirthIsland_Exterior_EventScript_NotSolved3 case DEOXYS_ROCK_COMPLETE, BirthIsland_Exterior_EventScript_Complete
end end
BirthIsland_Exterior_EventScript_NotSolved1:: @ The actual rock triangle movement is handled by DoDeoxysRockInteraction.
@ Unless the player has solved the puzzle and needs to encounter Deoxys,
@ there's nothing else the script needs to do.
BirthIsland_Exterior_EventScript_Failed::
release release
end end
BirthIsland_Exterior_EventScript_NotSolved2:: BirthIsland_Exterior_EventScript_Progressed::
release release
end end
BirthIsland_Exterior_EventScript_NotSolved3:: BirthIsland_Exterior_EventScript_Complete::
release release
end end

2
data/maps/PetalburgCity/scripts.inc
View File

@ -38,7 +38,7 @@ PetalburgCity_OnFrame:
PetalburgCity_EventScript_WallyTutorial:: PetalburgCity_EventScript_WallyTutorial::
lockall lockall
special SavePlayerParty special SavePlayerParty
special PutZigzagoonInPlayerParty special LoadWallyZigzagoon
applymovement LOCALID_WALLY, PetalburgCity_Movement_WallyTutorialWally applymovement LOCALID_WALLY, PetalburgCity_Movement_WallyTutorialWally
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer
waitmovement 0 waitmovement 0

2
data/specials.inc
View File

@ -311,7 +311,7 @@ gSpecials::
def_special TryUpdateRusturfTunnelState def_special TryUpdateRusturfTunnelState
def_special IsGrassTypeInParty def_special IsGrassTypeInParty
def_special DoContestHallWarp def_special DoContestHallWarp
def_special PutZigzagoonInPlayerParty def_special LoadWallyZigzagoon
def_special IsStarterInParty def_special IsStarterInParty
def_special CopyCurSecretBaseOwnerName_StrVar1 def_special CopyCurSecretBaseOwnerName_StrVar1
def_special ScriptCheckFreePokemonStorageSpace def_special ScriptCheckFreePokemonStorageSpace

2
include/constants/battle_pyramid.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CONSTANTS_BATTLE_PYRAMID_H #ifndef GUARD_CONSTANTS_BATTLE_PYRAMID_H
#define GUARD_CONSTANTS_BATTLE_PYRAMID_H #define GUARD_CONSTANTS_BATTLE_PYRAMID_H
#define TOTAL_ROUNDS 20 #define TOTAL_PYRAMID_ROUNDS 20
#define PICKUP_ITEMS_PER_ROUND 10 #define PICKUP_ITEMS_PER_ROUND 10
#define HINT_EXIT_DIRECTION 0 #define HINT_EXIT_DIRECTION 0

6
include/constants/field_specials.h
View File

@ -80,4 +80,10 @@
#define FANCOUNTER_FINISHED_CONTEST 2 #define FANCOUNTER_FINISHED_CONTEST 2
#define FANCOUNTER_USED_BATTLE_TOWER 3 #define FANCOUNTER_USED_BATTLE_TOWER 3
// Return values for DoDeoxysRockInteraction
#define DEOXYS_ROCK_FAILED 0
#define DEOXYS_ROCK_PROGRESSED 1
#define DEOXYS_ROCK_SOLVED 2
#define DEOXYS_ROCK_COMPLETE 3
#endif // GUARD_CONSTANTS_FIELD_SPECIALS_H #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H

20
src/battle_pyramid.c
View File

@ -284,7 +284,7 @@ static const u8 sFloorTemplateOffsets[FRONTIER_STAGES_PER_CHALLENGE] =
0, 4, 9, 14, 19, 24, 29 0, 4, 9, 14, 19, 24, 29
}; };
static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = static const u16 sPickupItemsLvl50[TOTAL_PYRAMID_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
{ {
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
@ -308,7 +308,7 @@ static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
{ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
}; };
static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] = static const u16 sPickupItemsLvlOpen[TOTAL_PYRAMID_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
{ {
{ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH}, {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
{ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR}, {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
@ -977,10 +977,10 @@ static void SetPickupItem(void)
u8 id; u8 id;
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 floor = gSaveBlock2Ptr->frontier.curChallengeBattleNum; u32 floor = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
u32 round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / FRONTIER_STAGES_PER_CHALLENGE) % TOTAL_ROUNDS; u32 round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / FRONTIER_STAGES_PER_CHALLENGE) % TOTAL_PYRAMID_ROUNDS;
if (round >= TOTAL_ROUNDS) if (round >= TOTAL_PYRAMID_ROUNDS)
round = TOTAL_ROUNDS - 1; round = TOTAL_PYRAMID_ROUNDS - 1;
id = GetPyramidFloorTemplateId(); id = GetPyramidFloorTemplateId();
itemIndex = (gSpecialVar_LastTalked - sPyramidFloorTemplates[id].numTrainers) - 1; itemIndex = (gSpecialVar_LastTalked - sPyramidFloorTemplates[id].numTrainers) - 1;
@ -1345,10 +1345,10 @@ void GenerateBattlePyramidWildMon(void)
const struct PyramidWildMon *wildMons; const struct PyramidWildMon *wildMons;
u32 id; u32 id;
u32 lvl = gSaveBlock2Ptr->frontier.lvlMode; u32 lvl = gSaveBlock2Ptr->frontier.lvlMode;
u16 round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] / FRONTIER_STAGES_PER_CHALLENGE) % TOTAL_ROUNDS; u16 round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] / FRONTIER_STAGES_PER_CHALLENGE) % TOTAL_PYRAMID_ROUNDS;
if (round >= TOTAL_ROUNDS) if (round >= TOTAL_PYRAMID_ROUNDS)
round = TOTAL_ROUNDS - 1; round = TOTAL_PYRAMID_ROUNDS - 1;
if (lvl != FRONTIER_LVL_50) if (lvl != FRONTIER_LVL_50)
wildMons = sOpenLevelWildMonPointers[round]; wildMons = sOpenLevelWildMonPointers[round];
@ -1961,8 +1961,8 @@ u16 GetBattlePyramidPickupItemId(void)
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
int round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / FRONTIER_STAGES_PER_CHALLENGE); int round = (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvlMode] / FRONTIER_STAGES_PER_CHALLENGE);
if (round >= TOTAL_ROUNDS) if (round >= TOTAL_PYRAMID_ROUNDS)
round = TOTAL_ROUNDS - 1; round = TOTAL_PYRAMID_ROUNDS - 1;
rand = Random() % 100; rand = Random() % 100;

2
src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h
View File

@ -1038,7 +1038,7 @@ static const struct PyramidWildMon sOpenLevelWildMons_Round20[] =
} }
}; };
static const struct PyramidWildMon *const sOpenLevelWildMonPointers[TOTAL_ROUNDS] = static const struct PyramidWildMon *const sOpenLevelWildMonPointers[TOTAL_PYRAMID_ROUNDS] =
{ {
sOpenLevelWildMons_Round1, sOpenLevelWildMons_Round1,
sOpenLevelWildMons_Round2, sOpenLevelWildMons_Round2,

71
src/field_effect.c
View File

@ -3831,26 +3831,38 @@ static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite)
DestroySprite(sprite); DestroySprite(sprite);
} }
// Task data for Task_MoveDeoxysRock
#define tState data[0]
#define tSpriteId data[1]
#define tTargetX data[2]
#define tTargetY data[3]
#define tCurX data[4]
#define tCurY data[5]
#define tVelocityX data[6]
#define tVelocityY data[7]
#define tMoveSteps data[8]
#define tObjEventId data[9]
bool8 FldEff_MoveDeoxysRock(struct Sprite *sprite) bool8 FldEff_MoveDeoxysRock(struct Sprite *sprite)
{ {
u8 objectEventIdBuffer; u8 objectEventId;
if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventId))
{ {
struct ObjectEvent *object; struct ObjectEvent *object;
int xPos, yPos; int xPos, yPos;
u8 taskId; u8 taskId;
object = &gObjectEvents[objectEventIdBuffer]; object = &gObjectEvents[objectEventId];
xPos = object->currentCoords.x - MAP_OFFSET; xPos = object->currentCoords.x - MAP_OFFSET;
yPos = object->currentCoords.y - MAP_OFFSET; yPos = object->currentCoords.y - MAP_OFFSET;
xPos = (gFieldEffectArguments[3] - xPos) * 16; xPos = (gFieldEffectArguments[3] - xPos) * 16;
yPos = (gFieldEffectArguments[4] - yPos) * 16; yPos = (gFieldEffectArguments[4] - yPos) * 16;
ShiftObjectEventCoords(object, gFieldEffectArguments[3] + MAP_OFFSET, gFieldEffectArguments[4] + MAP_OFFSET); ShiftObjectEventCoords(object, gFieldEffectArguments[3] + MAP_OFFSET, gFieldEffectArguments[4] + MAP_OFFSET);
taskId = CreateTask(Task_MoveDeoxysRock, 80); taskId = CreateTask(Task_MoveDeoxysRock, 80);
gTasks[taskId].data[1] = object->spriteId; gTasks[taskId].tSpriteId = object->spriteId;
gTasks[taskId].data[2] = gSprites[object->spriteId].x + xPos; gTasks[taskId].tTargetX = gSprites[object->spriteId].x + xPos;
gTasks[taskId].data[3] = gSprites[object->spriteId].y + yPos; gTasks[taskId].tTargetY = gSprites[object->spriteId].y + yPos;
gTasks[taskId].data[8] = gFieldEffectArguments[5]; gTasks[taskId].tMoveSteps = gFieldEffectArguments[5];
gTasks[taskId].data[9] = objectEventIdBuffer; gTasks[taskId].tObjEventId = objectEventId;
} }
return FALSE; return FALSE;
} }
@ -3858,29 +3870,30 @@ bool8 FldEff_MoveDeoxysRock(struct Sprite *sprite)
static void Task_MoveDeoxysRock(u8 taskId) static void Task_MoveDeoxysRock(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
struct Sprite *sprite = &gSprites[data[1]]; struct Sprite *sprite = &gSprites[tSpriteId];
switch (data[0]) switch (tState)
{ {
case 0: case 0:
data[4] = sprite->x << 4; tCurX = sprite->x << 4;
data[5] = sprite->y << 4; tCurY = sprite->y << 4;
data[6] = SAFE_DIV(data[2] * 16 - data[4], data[8]); tVelocityX = SAFE_DIV(tTargetX * 16 - tCurX, tMoveSteps);
data[7] = SAFE_DIV(data[3] * 16 - data[5], data[8]); tVelocityY = SAFE_DIV(tTargetY * 16 - tCurY, tMoveSteps);
data[0]++; tState++;
// fallthrough
case 1: case 1:
if (data[8] != 0) if (tMoveSteps != 0)
{ {
data[8]--; tMoveSteps--;
data[4] += data[6]; tCurX += tVelocityX;
data[5] += data[7]; tCurY += tVelocityY;
sprite->x = data[4] >> 4; sprite->x = tCurX >> 4;
sprite->y = data[5] >> 4; sprite->y = tCurY >> 4;
} }
else else
{ {
struct ObjectEvent *object = &gObjectEvents[data[9]]; struct ObjectEvent *object = &gObjectEvents[tObjEventId];
sprite->x = data[2]; sprite->x = tTargetX;
sprite->y = data[3]; sprite->y = tTargetY;
ShiftStillObjectEventCoords(object); ShiftStillObjectEventCoords(object);
object->triggerGroundEffectsOnStop = TRUE; object->triggerGroundEffectsOnStop = TRUE;
FieldEffectActiveListRemove(FLDEFF_MOVE_DEOXYS_ROCK); FieldEffectActiveListRemove(FLDEFF_MOVE_DEOXYS_ROCK);
@ -3890,3 +3903,13 @@ static void Task_MoveDeoxysRock(u8 taskId)
} }
} }
#undef tState
#undef tSpriteId
#undef tTargetX
#undef tTargetY
#undef tCurX
#undef tCurY
#undef tVelocityX
#undef tVelocityY
#undef tMoveSteps
#undef tObjEventId

119
src/field_specials.c
View File

@ -46,6 +46,7 @@
#include "wallclock.h" #include "wallclock.h"
#include "window.h" #include "window.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_pyramid.h"
#include "constants/battle_tower.h" #include "constants/battle_tower.h"
#include "constants/decorations.h" #include "constants/decorations.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
@ -66,6 +67,15 @@
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
#include "palette.h" #include "palette.h"
#define TAG_ITEM_ICON 5500
#define GFXTAG_MULTICHOICE_SCROLL_ARROWS 2000
#define PALTAG_MULTICHOICE_SCROLL_ARROWS 100
#define ELEVATOR_WINDOW_WIDTH 3
#define ELEVATOR_WINDOW_HEIGHT 3
#define ELEVATOR_LIGHT_STAGES 3
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
EWRAM_DATA u8 gBikeCollisions = 0; EWRAM_DATA u8 gBikeCollisions = 0;
static EWRAM_DATA u32 sBikeCyclingTimer = 0; static EWRAM_DATA u32 sBikeCyclingTimer = 0;
@ -1246,7 +1256,7 @@ void SpawnCameraObject(void)
OBJ_EVENT_ID_CAMERA, OBJ_EVENT_ID_CAMERA,
gSaveBlock1Ptr->pos.x + MAP_OFFSET, gSaveBlock1Ptr->pos.x + MAP_OFFSET,
gSaveBlock1Ptr->pos.y + MAP_OFFSET, gSaveBlock1Ptr->pos.y + MAP_OFFSET,
3); 3); // elevation
gObjectEvents[obj].invisible = TRUE; gObjectEvents[obj].invisible = TRUE;
CameraObjectSetFollowedSpriteId(gObjectEvents[obj].spriteId); CameraObjectSetFollowedSpriteId(gObjectEvents[obj].spriteId);
} }
@ -1411,7 +1421,7 @@ void SetShoalItemFlag(u16 unused)
FlagSet(FLAG_SYS_SHOAL_ITEM); FlagSet(FLAG_SYS_SHOAL_ITEM);
} }
void PutZigzagoonInPlayerParty(void) void LoadWallyZigzagoon(void)
{ {
u16 monData; u16 monData;
CreateMon(&gPlayerParty[0], SPECIES_ZIGZAGOON, 7, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0); CreateMon(&gPlayerParty[0], SPECIES_ZIGZAGOON, 7, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0);
@ -1451,20 +1461,21 @@ bool8 IsPokerusInParty(void)
return TRUE; return TRUE;
} }
#define horizontalPan data[0] // Task data for Task_ShakeCamera
#define delayCounter data[1] #define tHorizontalPan data[0]
#define numShakes data[2] #define tDelayCounter data[1]
#define delay data[3] #define tNumShakes data[2]
#define verticalPan data[4] #define tDelay data[3]
#define tVerticalPan data[4]
void ShakeCamera(void) void ShakeCamera(void)
{ {
u8 taskId = CreateTask(Task_ShakeCamera, 9); u8 taskId = CreateTask(Task_ShakeCamera, 9);
gTasks[taskId].horizontalPan = gSpecialVar_0x8005; gTasks[taskId].tHorizontalPan = gSpecialVar_0x8005;
gTasks[taskId].delayCounter = 0; gTasks[taskId].tDelayCounter = 0;
gTasks[taskId].numShakes = gSpecialVar_0x8006; gTasks[taskId].tNumShakes = gSpecialVar_0x8006;
gTasks[taskId].delay = gSpecialVar_0x8007; gTasks[taskId].tDelay = gSpecialVar_0x8007;
gTasks[taskId].verticalPan = gSpecialVar_0x8004; gTasks[taskId].tVerticalPan = gSpecialVar_0x8004;
SetCameraPanningCallback(NULL); SetCameraPanningCallback(NULL);
PlaySE(SE_M_STRENGTH); PlaySE(SE_M_STRENGTH);
} }
@ -1473,15 +1484,15 @@ static void Task_ShakeCamera(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
delayCounter++; tDelayCounter++;
if (delayCounter % delay == 0) if (tDelayCounter % tDelay == 0)
{ {
delayCounter = 0; tDelayCounter = 0;
numShakes--; tNumShakes--;
horizontalPan = -horizontalPan; tHorizontalPan = -tHorizontalPan;
verticalPan = -verticalPan; tVerticalPan = -tVerticalPan;
SetCameraPanning(horizontalPan, verticalPan); SetCameraPanning(tHorizontalPan, tVerticalPan);
if (numShakes == 0) if (tNumShakes == 0)
{ {
StopCameraShake(taskId); StopCameraShake(taskId);
InstallCameraPanAheadCallback(); InstallCameraPanAheadCallback();
@ -1495,11 +1506,11 @@ static void StopCameraShake(u8 taskId)
ScriptContext_Enable(); ScriptContext_Enable();
} }
#undef horizontalPan #undef tHorizontalPan
#undef delayCounter #undef tDelayCounter
#undef numShakes #undef tNumShakes
#undef delay #undef tDelay
#undef verticalPan #undef tVerticalPan
bool8 FoundBlackGlasses(void) bool8 FoundBlackGlasses(void)
{ {
@ -1524,7 +1535,8 @@ u8 GetLeadMonIndex(void)
u8 partyCount = CalculatePlayerPartyCount(); u8 partyCount = CalculatePlayerPartyCount();
for (i = 0; i < partyCount; i++) for (i = 0; i < partyCount; i++)
{ {
if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) != SPECIES_EGG && GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) != 0) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) != SPECIES_EGG
&& GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL) != SPECIES_NONE)
return i; return i;
} }
return 0; return 0;
@ -1695,10 +1707,6 @@ static const u8 *const sDeptStoreFloorNames[] =
[DEPT_STORE_FLOORNUM_ROOFTOP] = gText_Rooftop [DEPT_STORE_FLOORNUM_ROOFTOP] = gText_Rooftop
}; };
#define ELEVATOR_WINDOW_WIDTH 3
#define ELEVATOR_WINDOW_HEIGHT 3
#define ELEVATOR_LIGHT_STAGES 3
static const u16 sElevatorWindowTiles_Ascending[ELEVATOR_WINDOW_HEIGHT][ELEVATOR_LIGHT_STAGES] = static const u16 sElevatorWindowTiles_Ascending[ELEVATOR_WINDOW_HEIGHT][ELEVATOR_LIGHT_STAGES] =
{ {
{ {
@ -2020,13 +2028,13 @@ bool8 UsedPokemonCenterWarp(void)
MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
MAP_UNION_ROOM, MAP_UNION_ROOM,
0xFFFF MAP_UNDEFINED
}; };
int i; int i;
u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum;
for (i = 0; sPokemonCenters[i] != 0xFFFF; i++) for (i = 0; sPokemonCenters[i] != MAP_UNDEFINED; i++)
{ {
if (sPokemonCenters[i] == map) if (sPokemonCenters[i] == map)
return TRUE; return TRUE;
@ -2724,21 +2732,21 @@ static void ScrollableMultichoice_UpdateScrollArrows(u8 taskId)
.secondY = 0, .secondY = 0,
.fullyUpThreshold = 0, .fullyUpThreshold = 0,
.fullyDownThreshold = 0, .fullyDownThreshold = 0,
.tileTag = 2000, .tileTag = GFXTAG_MULTICHOICE_SCROLL_ARROWS,
.palTag = 100, .palTag = PALTAG_MULTICHOICE_SCROLL_ARROWS,
.palNum = 0 .palNum = 0
}; };
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
struct ScrollArrowsTemplate template = sScrollableMultichoice_ScrollArrowsTemplate; struct ScrollArrowsTemplate template = sScrollableMultichoice_ScrollArrowsTemplate;
if (task->tMaxItemsOnScreen != task->data[1]) if (task->tMaxItemsOnScreen != task->tNumItems)
{ {
template.firstX = (task->tWidth / 2) * 8 + 12 + (task->tLeft - 1) * 8; template.firstX = (task->tWidth / 2) * 8 + 12 + (task->tLeft - 1) * 8;
template.firstY = 8; template.firstY = 8;
template.secondX = (task->tWidth / 2) * 8 + 12 + (task->tLeft - 1) * 8; template.secondX = (task->tWidth / 2) * 8 + 12 + (task->tLeft - 1) * 8;
template.secondY = task->tHeight * 8 + 10; template.secondY = task->tHeight * 8 + 10;
template.fullyUpThreshold = 0; template.fullyUpThreshold = 0;
template.fullyDownThreshold = task->data[1] - task->tMaxItemsOnScreen; template.fullyDownThreshold = task->tNumItems - task->tMaxItemsOnScreen;
task->tScrollArrowId = AddScrollIndicatorArrowPair(&template, &sScrollableMultichoice_ScrollOffset); task->tScrollArrowId = AddScrollIndicatorArrowPair(&template, &sScrollableMultichoice_ScrollOffset);
} }
} }
@ -2746,10 +2754,8 @@ static void ScrollableMultichoice_UpdateScrollArrows(u8 taskId)
static void ScrollableMultichoice_RemoveScrollArrows(u8 taskId) static void ScrollableMultichoice_RemoveScrollArrows(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
if (task->tMaxItemsOnScreen != task->data[1]) if (task->tMaxItemsOnScreen != task->tNumItems)
{
RemoveScrollIndicatorArrowPair(task->tScrollArrowId); RemoveScrollIndicatorArrowPair(task->tScrollArrowId);
}
} }
// Removed for Emerald (replaced by ShowScrollableMultichoice) // Removed for Emerald (replaced by ShowScrollableMultichoice)
@ -2973,8 +2979,6 @@ void CloseFrontierExchangeCornerItemIconWindow(void)
RemoveWindow(sFrontierExchangeCorner_ItemIconWindowId); RemoveWindow(sFrontierExchangeCorner_ItemIconWindowId);
} }
#define TAG_ITEM_ICON 5500
static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection) static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
{ {
#include "data/battle_frontier/battle_frontier_exchange_corner.h" #include "data/battle_frontier/battle_frontier_exchange_corner.h"
@ -3255,12 +3259,14 @@ void ScrollableMultichoice_ClosePersistentMenu(void)
#undef tListTaskId #undef tListTaskId
#undef tTaskId #undef tTaskId
#define DEOXYS_ROCK_LEVELS 11
void DoDeoxysRockInteraction(void) void DoDeoxysRockInteraction(void)
{ {
CreateTask(Task_DeoxysRockInteraction, 8); CreateTask(Task_DeoxysRockInteraction, 8);
} }
static const u16 sDeoxysRockPalettes[][16] = { static const u16 sDeoxysRockPalettes[DEOXYS_ROCK_LEVELS][16] = {
INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_1.gbapal"), INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_1.gbapal"),
INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_2.gbapal"), INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_2.gbapal"),
INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_3.gbapal"), INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_3.gbapal"),
@ -3274,7 +3280,7 @@ static const u16 sDeoxysRockPalettes[][16] = {
INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_11.gbapal"), INCBIN_U16("graphics/field_effects/palettes/deoxys_rock_11.gbapal"),
}; };
static const u8 sDeoxysRockCoords[][2] = { static const u8 sDeoxysRockCoords[DEOXYS_ROCK_LEVELS][2] = {
{ 15, 12 }, { 15, 12 },
{ 11, 14 }, { 11, 14 },
{ 15, 8 }, { 15, 8 },
@ -3290,11 +3296,11 @@ static const u8 sDeoxysRockCoords[][2] = {
static void Task_DeoxysRockInteraction(u8 taskId) static void Task_DeoxysRockInteraction(u8 taskId)
{ {
static const u8 sStoneMaxStepCounts[] = { 4, 8, 8, 8, 4, 4, 4, 6, 3, 3 }; static const u8 sStoneMaxStepCounts[DEOXYS_ROCK_LEVELS - 1] = { 4, 8, 8, 8, 4, 4, 4, 6, 3, 3 };
if (FlagGet(FLAG_DEOXYS_ROCK_COMPLETE) == TRUE) if (FlagGet(FLAG_DEOXYS_ROCK_COMPLETE) == TRUE)
{ {
gSpecialVar_Result = 3; gSpecialVar_Result = DEOXYS_ROCK_COMPLETE;
ScriptContext_Enable(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -3309,13 +3315,13 @@ static void Task_DeoxysRockInteraction(u8 taskId)
// Player failed to take the shortest path to the stone, so it resets. // Player failed to take the shortest path to the stone, so it resets.
ChangeDeoxysRockLevel(0); ChangeDeoxysRockLevel(0);
VarSet(VAR_DEOXYS_ROCK_LEVEL, 0); VarSet(VAR_DEOXYS_ROCK_LEVEL, 0);
gSpecialVar_Result = 0; gSpecialVar_Result = DEOXYS_ROCK_FAILED;
DestroyTask(taskId); DestroyTask(taskId);
} }
else if (rockLevel == 10) else if (rockLevel == DEOXYS_ROCK_LEVELS - 1)
{ {
FlagSet(FLAG_DEOXYS_ROCK_COMPLETE); FlagSet(FLAG_DEOXYS_ROCK_COMPLETE);
gSpecialVar_Result = 2; gSpecialVar_Result = DEOXYS_ROCK_SOLVED;
ScriptContext_Enable(); ScriptContext_Enable();
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -3324,7 +3330,7 @@ static void Task_DeoxysRockInteraction(u8 taskId)
rockLevel++; rockLevel++;
ChangeDeoxysRockLevel(rockLevel); ChangeDeoxysRockLevel(rockLevel);
VarSet(VAR_DEOXYS_ROCK_LEVEL, rockLevel); VarSet(VAR_DEOXYS_ROCK_LEVEL, rockLevel);
gSpecialVar_Result = 1; gSpecialVar_Result = DEOXYS_ROCK_PROGRESSED;
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@ -3337,9 +3343,9 @@ static void ChangeDeoxysRockLevel(u8 rockLevel)
TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
if (rockLevel == 0) if (rockLevel == 0)
PlaySE(SE_M_CONFUSE_RAY); PlaySE(SE_M_CONFUSE_RAY); // Failure sound
else else
PlaySE(SE_RG_DEOXYS_MOVE); PlaySE(SE_RG_DEOXYS_MOVE); // Success sound
CreateTask(WaitForDeoxysRockMovement, 8); CreateTask(WaitForDeoxysRockMovement, 8);
gFieldEffectArguments[0] = LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK; gFieldEffectArguments[0] = LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK;
@ -3348,6 +3354,8 @@ static void ChangeDeoxysRockLevel(u8 rockLevel)
gFieldEffectArguments[3] = sDeoxysRockCoords[rockLevel][0]; gFieldEffectArguments[3] = sDeoxysRockCoords[rockLevel][0];
gFieldEffectArguments[4] = sDeoxysRockCoords[rockLevel][1]; gFieldEffectArguments[4] = sDeoxysRockCoords[rockLevel][1];
// Set number of movement steps.
// Resetting for failure is slow, successful movement is fast.
if (rockLevel == 0) if (rockLevel == 0)
gFieldEffectArguments[5] = 60; gFieldEffectArguments[5] = 60;
else else
@ -3865,8 +3873,9 @@ static void Task_CloseBattlePikeCurtain(u8 taskId)
void GetBattlePyramidHint(void) void GetBattlePyramidHint(void)
{ {
gSpecialVar_Result = gSpecialVar_0x8004 / 7; // gSpecialVar_0x8004 here is expected to be the current Battle Pyramid win streak.
gSpecialVar_Result -= (gSpecialVar_Result / 20) * 20; gSpecialVar_Result = gSpecialVar_0x8004 / FRONTIER_STAGES_PER_CHALLENGE;
gSpecialVar_Result -= (gSpecialVar_Result / TOTAL_PYRAMID_ROUNDS) * TOTAL_PYRAMID_ROUNDS;
} }
// Used to avoid a potential softlock if the player respawns on Dewford with no way off // Used to avoid a potential softlock if the player respawns on Dewford with no way off
@ -3901,13 +3910,13 @@ bool8 InPokemonCenter(void)
MAP_TRADE_CENTER, MAP_TRADE_CENTER,
MAP_RECORD_CORNER, MAP_RECORD_CORNER,
MAP_BATTLE_COLOSSEUM_4P, MAP_BATTLE_COLOSSEUM_4P,
0xFFFF MAP_UNDEFINED
}; };
int i; int i;
u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum; u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum;
for (i = 0; sPokemonCenters[i] != 0xFFFF; i++) for (i = 0; sPokemonCenters[i] != MAP_UNDEFINED; i++)
{ {
if (sPokemonCenters[i] == map) if (sPokemonCenters[i] == map)
return TRUE; return TRUE;