From 86a9d94ce1eb7930cb9a59ad8f968388a627c58a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 6 Apr 2021 16:05:43 -0400 Subject: Document fieldmap --- src/battle_pyramid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_pyramid.c') diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index ac6d95338..a41a80bbb 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -933,7 +933,7 @@ static void SavePyramidChallenge(void) gSaveBlock2Ptr->frontier.challengeStatus = gSpecialVar_0x8005; VarSet(VAR_TEMP_0, 0); gSaveBlock2Ptr->frontier.challengePaused = TRUE; - save_serialize_map(); + SaveMapView(); TrySavingData(SAVE_LINK); } -- cgit v1.2.3 From 361fa594b30005edaa8aef5f6b02ac8b15149cba Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Sat, 15 May 2021 15:56:17 -0500 Subject: Various BUGFIXes and UBFIXes --- src/battle_pyramid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/battle_pyramid.c') diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index a41a80bbb..8eb09bb8d 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1399,8 +1399,12 @@ void GenerateBattlePyramidWildMon(void) for (i = 0; i < MAX_MON_MOVES; i++) SetMonMoveSlot(&gEnemyParty[0], wildMons[id].moves[i], i); - // BUG: Reading outside the array as lvl was used for mon level instead of frontier lvl mode. + // UB: Reading outside the array as lvl was used for mon level instead of frontier lvl mode. + #ifndef UBFIX if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] >= 140) + #else + if (gSaveBlock2Ptr->frontier.pyramidWinStreas[gSaveBlock2Ptr->frontier.lvlMode] >= 140) + #endif { id = (Random() % 17) + 15; for (i = 0; i < NUM_STATS; i++) -- cgit v1.2.3 From a7e3da2301aa7913f2437fe2152efcec6e96faef Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Sat, 15 May 2021 15:59:54 -0500 Subject: pyramidWinStreas --- src/battle_pyramid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_pyramid.c') diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 8eb09bb8d..50efeecb4 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1403,7 +1403,7 @@ void GenerateBattlePyramidWildMon(void) #ifndef UBFIX if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] >= 140) #else - if (gSaveBlock2Ptr->frontier.pyramidWinStreas[gSaveBlock2Ptr->frontier.lvlMode] >= 140) + if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[gSaveBlock2Ptr->frontier.lvlMode] >= 140) #endif { id = (Random() % 17) + 15; -- cgit v1.2.3