From 2dd706ca5410d98ad214ceff7026d6db276f4d5a Mon Sep 17 00:00:00 2001
From: melthelesbian <44884535+melthelesbian@users.noreply.github.com>
Date: Tue, 25 Dec 2018 12:50:15 -0500
Subject: use max mon moves constant where able (#480)

* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
---
 src/battle_pyramid.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/battle_pyramid.c')

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 244e61d17..c9d904287 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1177,14 +1177,14 @@ static void sub_81A9834(void)
         {
             if (GetMonData(&gSaveBlock1Ptr->playerParty[id], MON_DATA_SPECIES, NULL) == GetMonData(&gPlayerParty[j], MON_DATA_SPECIES, NULL))
             {
-                for (k = 0; k < 4; k++)
+                for (k = 0; k < MAX_MON_MOVES; k++)
                 {
-                    for (l = 0; l < 4; l++)
+                    for (l = 0; l < MAX_MON_MOVES; l++)
                     {
                         if (GetMonData(&gSaveBlock1Ptr->playerParty[id], MON_DATA_MOVE1 + l, NULL) == GetMonData(&gPlayerParty[j], MON_DATA_MOVE1 + k, NULL))
                             break;
                     }
-                    if (l == 4)
+                    if (l == MAX_MON_MOVES)
                         SetMonMoveSlot(&gPlayerParty[j], MOVE_SKETCH, k);
                 }
                 gSaveBlock1Ptr->playerParty[id] = gPlayerParty[j];
@@ -1360,7 +1360,7 @@ void GenerateBattlePyramidWildMon(void)
         break;
     }
 
-    for (i = 0; i < 4; i++)
+    for (i = 0; i < MAX_MON_MOVES; i++)
         SetMonMoveSlot(&gEnemyParty[0], wildMons[id].moves[i], i);
 
     if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[lvl] >= 140) // BUG: Reading outside the array as lvl was used for mon level instead of frontier lvl mode.
-- 
cgit v1.2.3


From 95dcff581bdc8be8b02e007ad01f758abba274c0 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Fri, 28 Dec 2018 11:18:23 -0600
Subject: Document some fieldmap stuff

---
 src/battle_pyramid.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/battle_pyramid.c')

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index c9d904287..2f0d35feb 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1202,8 +1202,8 @@ static u8 sub_81A9998(s32 *arg0, u8 arg1, u8 arg2)
 {
     s32 i, j;
     u8 ret = 0;
-    u16 *map = gUnknown_03005DC0.map;
-    map += gUnknown_03005DC0.width * 7 + 7;
+    u16 *map = gBackupMapLayout.map;
+    map += gBackupMapLayout.width * 7 + 7;
 
     for (i = 0; i < 32; map += 47, i++)
     {
@@ -1493,11 +1493,11 @@ void sub_81AA078(u16 *mapArg, u8 arg1)
         const struct MapLayout *mapLayout = gMapLayouts[allocated[i] + 0x169];
         const u16 *layoutMap = mapLayout->map;
 
-        gUnknown_03005DC0.map = mapArg;
-        gUnknown_03005DC0.width = mapLayout->width * 4 + 15;
-        gUnknown_03005DC0.height = mapLayout->height * 4 + 14;
+        gBackupMapLayout.map = mapArg;
+        gBackupMapLayout.width = mapLayout->width * 4 + 15;
+        gBackupMapLayout.height = mapLayout->height * 4 + 14;
         map = mapArg;
-        heightAdd = (((i / 4 * mapLayout->height) + 7) * (gUnknown_03005DC0.width));
+        heightAdd = (((i / 4 * mapLayout->height) + 7) * (gBackupMapLayout.width));
         widthAdd = ((i % 4 * mapLayout->width) + 7);
         map += heightAdd + widthAdd;
         for (j = 0; j < mapLayout->height; j++)
-- 
cgit v1.2.3