diff --git a/src/applications/pc_boxes/ov19_021DA270.c b/src/applications/pc_boxes/ov19_021DA270.c
index 4eafc2ea45..2b53038127 100644
--- a/src/applications/pc_boxes/ov19_021DA270.c
+++ b/src/applications/pc_boxes/ov19_021DA270.c
@@ -138,7 +138,7 @@ void ov19_021DA428(UnkStruct_ov19_021DA384 *param0, BoxPokemon *boxMon, s32 para
     NARC_ReadFromMember(param0->unk_48, param7->unk_28, 0, ((4 * 4) * 0x20 + 0x80), param0->unk_4C);
     NNS_G2dGetUnpackedCharacterData(param0->unk_4C, &v0);
 
-    v0->mapingType = GX_GetOBJVRamModeChar();
+    v0->mappingType = GX_GetOBJVRamModeChar();
     v0->szByte = (4 * 4) * 0x20;
 
     NNS_G2dLoadImage1DMapping(v0, param6 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param7->unk_04));
@@ -172,7 +172,7 @@ void ov19_021DA548(UnkStruct_ov19_021DA384 *param0, BoxPokemon *boxMon, u32 para
     NNS_G2dInitImageProxy(&(param10->unk_04));
     NNS_G2dGetUnpackedCharacterData(param4, &v0);
 
-    v0->mapingType = GX_GetOBJVRamModeChar();
+    v0->mappingType = GX_GetOBJVRamModeChar();
     v0->szByte = (4 * 4) * 0x20;
 
     NNS_G2dLoadImage1DMapping(v0, param9 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param10->unk_04));
@@ -257,7 +257,7 @@ void ov19_021DA754(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *par
 
         NARC_ReadFromMember(param0->unk_48, param1->unk_28, 0, ((4 * 4) * 0x20 + 0x80), param0->unk_4C);
         NNS_G2dGetUnpackedCharacterData(param0->unk_4C, &v0);
-        v0->mapingType = GX_GetOBJVRamModeChar();
+        v0->mappingType = GX_GetOBJVRamModeChar();
         v0->szByte = (4 * 4) * 0x20;
 
         NNS_G2dLoadImage1DMapping(v0, param2 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param1->unk_04));
diff --git a/src/applications/pc_boxes/ov19_021DB8E4.c b/src/applications/pc_boxes/ov19_021DB8E4.c
index 347c6090cb..877bcb516a 100644
--- a/src/applications/pc_boxes/ov19_021DB8E4.c
+++ b/src/applications/pc_boxes/ov19_021DB8E4.c
@@ -286,10 +286,10 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_
     if (param4) {
         switch (param3) {
         case NNS_G2D_VRAM_TYPE_2DMAIN:
-            param0->unk_18->mapingType = GX_GetOBJVRamModeChar();
+            param0->unk_18->mappingType = GX_GetOBJVRamModeChar();
             break;
         case NNS_G2D_VRAM_TYPE_2DSUB:
-            param0->unk_18->mapingType = GXS_GetOBJVRamModeChar();
+            param0->unk_18->mappingType = GXS_GetOBJVRamModeChar();
             break;
         }
 
@@ -719,7 +719,7 @@ static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C *param0, u32 param1)
         NNS_G2dInitImageProxy(&v2);
 
         v4 = Graphics_GetCharData(NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON, Item_FileID(param1, 1), 0, &v3, HEAP_ID_BOX_GRAPHICS);
-        v3->mapingType = GX_GetOBJVRamModeChar();
+        v3->mappingType = GX_GetOBJVRamModeChar();
         NNS_G2dLoadImage1DMapping(v3, 1520 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v2);
 
         Graphics_LoadPalette(NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON, Item_FileID(param1, 2), 1, 6 * 0x20, 0x20, HEAP_ID_BOX_GRAPHICS);
diff --git a/src/applications/pc_boxes/ov19_021DE3E8.c b/src/applications/pc_boxes/ov19_021DE3E8.c
index 507de84c4b..cc6bd80399 100644
--- a/src/applications/pc_boxes/ov19_021DE3E8.c
+++ b/src/applications/pc_boxes/ov19_021DE3E8.c
@@ -114,7 +114,7 @@ static void ov19_021DE450(UnkStruct_ov19_021DE3E8 *param0)
         if (v3) {
             int v5;
 
-            v2->mapingType = GX_GetOBJVRamModeChar();
+            v2->mappingType = GX_GetOBJVRamModeChar();
 
             for (v5 = 0; v5 < 3; v5++) {
                 NNS_G2dInitImageProxy(&v1);
diff --git a/src/char_transfer.c b/src/char_transfer.c
index 07bdceba27..1faef4df4b 100644
--- a/src/char_transfer.c
+++ b/src/char_transfer.c
@@ -567,12 +567,12 @@ static CharTransferTask *FindTransferTaskByResourceID(int resourceID)
 static GXOBJVRamModeChar UpdateMappingTypeFromHardware(CharTransferTask *task, NNS_G2D_VRAM_TYPE vramType)
 {
     if (vramType == NNS_G2D_VRAM_TYPE_2DMAIN) {
-        task->data->mapingType = GX_GetOBJVRamModeChar();
+        task->data->mappingType = GX_GetOBJVRamModeChar();
     } else {
-        task->data->mapingType = GXS_GetOBJVRamModeChar();
+        task->data->mappingType = GXS_GetOBJVRamModeChar();
     }
 
-    return task->data->mapingType;
+    return task->data->mappingType;
 }
 
 static void SetBaseAddresses(CharTransferTask *task, u32 baseAddrMain, u32 baseAddrSub)
@@ -647,7 +647,7 @@ static void LoadImageMapping(CharTransferTask *task)
 {
     NNS_G2dInitImageProxy(&task->imageProxy);
 
-    if (task->vramType != NNS_G2D_VRAM_TYPE_MAX) {
+    if (task->vramType != NNS_G2D_VRAM_TYPE_2DBOTH) {
         LoadImageMappingForScreen(task, task->vramType);
     } else {
         LoadImageMappingForScreen(task, NNS_G2D_VRAM_TYPE_2DMAIN);
@@ -679,7 +679,7 @@ static void LoadImageVramTransfer(CharTransferTask *task)
 {
     NNS_G2dInitImageProxy(&task->imageProxy);
 
-    if (task->vramType != NNS_G2D_VRAM_TYPE_MAX) {
+    if (task->vramType != NNS_G2D_VRAM_TYPE_2DBOTH) {
         LoadImageVramTransferForScreen(task, task->vramType);
     } else {
         LoadImageVramTransferForScreen(task, NNS_G2D_VRAM_TYPE_2DMAIN);
diff --git a/src/game_opening/ov77_021D6670.c b/src/game_opening/ov77_021D6670.c
index 146ca9c6a5..30751524c1 100644
--- a/src/game_opening/ov77_021D6670.c
+++ b/src/game_opening/ov77_021D6670.c
@@ -198,8 +198,8 @@ static void ov77_021D6800(UnkStruct_ov77_021D6800 *param0)
         param0->unk_190[i] = SpriteResourceCollection_New(Unk_ov77_021D7930[i], i, heapID);
     }
 
-    param0->unk_1A0[0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 4, 0, 0, NNS_G2D_VRAM_TYPE_MAX, heapID);
-    param0->unk_1A0[1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 3, 0, 0, NNS_G2D_VRAM_TYPE_MAX, 1, heapID);
+    param0->unk_1A0[0] = SpriteResourceCollection_AddTiles(param0->unk_190[0], 128, 4, 0, 0, NNS_G2D_VRAM_TYPE_2DBOTH, heapID);
+    param0->unk_1A0[1] = SpriteResourceCollection_AddPalette(param0->unk_190[1], 128, 3, 0, 0, NNS_G2D_VRAM_TYPE_2DBOTH, 1, heapID);
     param0->unk_1A0[2] = SpriteResourceCollection_Add(param0->unk_190[2], 128, 5, 0, 0, 2, heapID);
     param0->unk_1A0[3] = SpriteResourceCollection_Add(param0->unk_190[3], 128, 6, 0, 0, 3, heapID);
 
diff --git a/src/graphics.c b/src/graphics.c
index c95b5b4151..18e444f9c0 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -468,10 +468,10 @@ static void LoadImageMappingAndSetVramMode(void *ncgrBuffer, enum ImageMappingLa
 
             switch (vramType) {
             case NNS_G2D_VRAM_TYPE_2DMAIN:
-                tiles->mapingType = GX_GetOBJVRamModeChar();
+                tiles->mappingType = GX_GetOBJVRamModeChar();
                 break;
             case NNS_G2D_VRAM_TYPE_2DSUB:
-                tiles->mapingType = GXS_GetOBJVRamModeChar();
+                tiles->mappingType = GXS_GetOBJVRamModeChar();
                 break;
             }
 
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 0251df3495..b1b1a90834 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -448,7 +448,7 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un
     v1.priority = param1->unk_04;
     v1.heapID = heapID;
 
-    if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
+    if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DBOTH) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     } else {
         v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -481,7 +481,7 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un
         v1.priority = param0->unk_227C;
         v1.heapID = heapID;
 
-        if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
+        if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DBOTH) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
             v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c
index 51434f29b2..33d5d82544 100644
--- a/src/overlay101/ov101_021D0D80.c
+++ b/src/overlay101/ov101_021D0D80.c
@@ -516,7 +516,7 @@ static void ov101_021D15BC(UnkStruct_ov101_021D13C8 *param0)
     ov101_021D80E4(param0->unk_450, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_438, 64, 8);
     ov101_021D80E4(param0->unk_450, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_438, 60, 9);
 
-    ov101_021D81B4(param0->unk_450, NNS_G2D_VRAM_TYPE_MAX, param0->unk_438, 10, 0);
+    ov101_021D81B4(param0->unk_450, NNS_G2D_VRAM_TYPE_2DBOTH, param0->unk_438, 10, 0);
     ov101_021D81B4(param0->unk_450, NNS_G2D_VRAM_TYPE_2DMAIN, param0->unk_438, 20, 1);
     ov101_021D81B4(param0->unk_450, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_438, 67, 6);
     ov101_021D81B4(param0->unk_450, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_438, 63, 7);
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index 44f70ee41c..c8afdf99f2 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -2351,7 +2351,7 @@ static void ov101_021D7BB4(OverworldAnimManager *param0, void *param1)
 
         for (v0 = 0; v0 < 3; v0++) {
             v2 = Unk_ov101_021D9424[v3->unk_1C][v0];
-            ov101_021D84A4(v3->unk_44->unk_450, &v3->unk_20[v0], &v2, (NNS_G2D_VRAM_TYPE_MAX), 0, 10, 0, 10, 10, 1, 0);
+            ov101_021D84A4(v3->unk_44->unk_450, &v3->unk_20[v0], &v2, (NNS_G2D_VRAM_TYPE_2DBOTH), 0, 10, 0, 10, 10, 1, 0);
             Sprite_SetAnimateFlag(v3->unk_20[v0].unk_04, 1);
         }
 
@@ -2463,11 +2463,11 @@ static void ov101_021D7D94(UnkStruct_ov101_021D7D94 *param0)
     UnkStruct_ov101_021D13C8 *v1 = param0->unk_44;
 
     if (param0->unk_18 == 0) {
-        ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_MAX), v1->unk_438, 14, 10);
+        ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DBOTH), v1->unk_438, 14, 10);
         ov101_021D8288(v1->unk_450, v1->unk_438, 15, 10);
         ov101_021D82F0(v1->unk_450, v1->unk_438, 16, 10);
     } else {
-        ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_MAX), v1->unk_438, 17, 10);
+        ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DBOTH), v1->unk_438, 17, 10);
         ov101_021D8288(v1->unk_450, v1->unk_438, 18, 10);
         ov101_021D82F0(v1->unk_450, v1->unk_438, 19, 10);
     }
diff --git a/src/pokemon_sprite.c b/src/pokemon_sprite.c
index a08da15392..dadef37d83 100644
--- a/src/pokemon_sprite.c
+++ b/src/pokemon_sprite.c
@@ -429,7 +429,7 @@ void *PokemonSpriteManager_New(enum HeapID heapID)
     NNS_G2dGetUnpackedCharacterData(shadowsNCGR, &charData);
 
     monSpriteMan->charData.pixelFmt = charData->pixelFmt;
-    monSpriteMan->charData.mapingType = charData->mapingType;
+    monSpriteMan->charData.mappingType = charData->mappingType;
     monSpriteMan->charData.characterFmt = charData->characterFmt;
     rawCharData = charData->pRawData;
 
@@ -1328,7 +1328,7 @@ static void BufferPokemonSpriteCharData(PokemonSpriteManager *monSpriteMan)
             NNS_G2dGetUnpackedCharacterData(ncgrFile, &charData);
 
             monSpriteMan->charData.pixelFmt = charData->pixelFmt;
-            monSpriteMan->charData.mapingType = charData->mapingType;
+            monSpriteMan->charData.mappingType = charData->mappingType;
             monSpriteMan->charData.characterFmt = charData->characterFmt;
 
             rawCharData = charData->pRawData;
diff --git a/src/software_sprite.c b/src/software_sprite.c
index 82d7ce3525..f4ef0f8480 100644
--- a/src/software_sprite.c
+++ b/src/software_sprite.c
@@ -118,7 +118,7 @@ SoftwareSpriteChars *SoftwareSprite_LoadChars(const SoftwareSpriteCharsTemplate
 {
     SoftwareSpriteChars *chars = FindAvailableChars(template->softSpriteMan);
     GF_ASSERT(chars);
-    GF_ASSERT(template->charsData->mapingType == GX_OBJVRAMMODE_CHAR_2D);
+    GF_ASSERT(template->charsData->mappingType == GX_OBJVRAMMODE_CHAR_2D);
 
     chars->vramKey = AllocateVRAM_Chars(template->charsData);
     GF_ASSERT(chars->vramKey);
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index 47272cf979..cc0f692538 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -108,8 +108,8 @@ const static u8 Unk_020ED8B4[2][2] = {
 
 const static u8 Unk_020ED8B0[4] = {
     NNS_G2D_VRAM_TYPE_2DMAIN,
-    NNS_G2D_VRAM_TYPE_MAX,
-    NNS_G2D_VRAM_TYPE_MAX,
+    NNS_G2D_VRAM_TYPE_2DBOTH,
+    NNS_G2D_VRAM_TYPE_2DBOTH,
     NNS_G2D_VRAM_TYPE_2DMAIN
 };
 
diff --git a/subprojects/NitroSystem.wrap b/subprojects/NitroSystem.wrap
index 7af4a04734..0ce433ba91 100644
--- a/subprojects/NitroSystem.wrap
+++ b/subprojects/NitroSystem.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/ntrtwl/NitroSystem.git
-revision = 7a089c4aa15184380dfea76e8b28663f5c779613
+revision = 21c8fd078fdda34f3c2622ef0751d00adaacf890
 depth = 1
 directory = NitroSystem-071126.1