Merge pull request #721 from BlueAnthem37510/master

CT075 · web-flow · commit fca5f90afc47 · 2025-08-23T08:22:49.000-07:00
0x6000000 -&gt; VRAM
diff --git a/src/banim-efxop.c b/src/banim-efxop.c
@@ -158,7 +158,7 @@ void CRSpell_RegisterBgGfx(struct Anim * anim, void * src)
 {
     struct AnimMagicFxBuffer * magicFx = GetMagicEffectBufferFor(anim);
 
-    void * dst = (void *)(0x6000000 + magicFx->bgChr * CHR_SIZE);
+    void * dst = (void *)(VRAM + magicFx->bgChr * CHR_SIZE);
 
     LZ77UnCompWram(src, magicFx->bgImgBuf);
     RegisterDataMove(magicFx->bgImgBuf, dst, 0x2000);
diff --git a/src/banim-ekrmainmini.c b/src/banim-ekrmainmini.c
@@ -713,9 +713,9 @@ void sub_805AA68(struct BanimUnkStructComm * buf)
         {
             if (buf->unk0E < 4)
             {
-                int vram = ((buf->chr_l + 0x40) * 0x20 + 0x6000000);
+                int vram = ((buf->chr_l + 0x40) * 0x20 + VRAM);
                 RegisterDataMove(vramA, (void *)(buf->unk1C + vram), 0x800);
-                vram = (buf->chr_r * 0x20 + 0x6000000);
+                vram = (buf->chr_r * 0x20 + VRAM);
                 RegisterDataMove(vramB, (void *)(buf->unk1C + vram), 0x800);
 
                 CpuFastCopy(palA, gPaletteBuffer + buf->pal_l * 0x10, 0x20);
diff --git a/src/chapter_title.c b/src/chapter_title.c
@@ -49,7 +49,7 @@ void PutChapterTitleGfx(int chr, u32 titleId)
         titleId = 0x54;
 
     gChapterTitleFxSt.chr_str = chr & 0x3FF;
-    Decompress(chap_title_data[titleId].save, (void*)((chr * TILE_SIZE_4BPP) + 0x6000000));
+    Decompress(chap_title_data[titleId].save, (void*)((chr * TILE_SIZE_4BPP) + VRAM));
 }
 
 void _PutChapterTitleGfx(int chr, int titleId)
@@ -60,15 +60,15 @@ void _PutChapterTitleGfx(int chr, int titleId)
 void PutChapterTitleBG(int chr)
 {
     gChapterTitleFxSt.chr_bg = chr & 0x3FF;
-    Decompress(gGfx_08A09E4C, (void*)((chr * TILE_SIZE_4BPP) + 0x6000000));
+    Decompress(gGfx_08A09E4C, (void*)((chr * TILE_SIZE_4BPP) + VRAM));
 }
 
 extern u8 gUnknown_08A0A4E8[];
 
 void sub_80896A8(int chr)
 {
     gChapterTitleFxSt.chr_bg = chr & 0x3FF;
-    Decompress(gUnknown_08A0A4E8, (void*)((chr * TILE_SIZE_4BPP) + 0x6000000));
+    Decompress(gUnknown_08A0A4E8, (void*)((chr * TILE_SIZE_4BPP) + VRAM));
 }
 
 void sub_80896D8(u16 * tm, int pal)
diff --git a/src/ending_credits.c b/src/ending_credits.c
@@ -257,14 +257,14 @@ void sub_80C4238(struct CreditsMainProc * proc)
         something = (proc->unk_35 + 1) & 1;
         if (ptr->entry != NULL)
         {
-            Decompress(ptr->entry->img, (void *)(0x6000000 + gUnknown_08206FDC[something]));
+            Decompress(ptr->entry->img, (void *)(VRAM + gUnknown_08206FDC[something]));
             Decompress(ptr->entry->tsa, gGenericBuffer);
             CallARM_FillTileRect(
                 gUnknown_0201C5D4, gGenericBuffer, (u16)((gUnknown_08206FDC[something] / CHR_SIZE) + 0x7000));
         }
         else
         {
-            CpuFastFill(-1, (void *)(0x6000000 + gUnknown_08206FDC[something]), 0x20);
+            CpuFastFill(-1, (void *)(VRAM + gUnknown_08206FDC[something]), 0x20);
             for (i = 0; i < 0x400; i++)
             {
                 gUnknown_0201C5D4[i] = (gUnknown_08206FDC[something] / CHR_SIZE) + 0x7000;
@@ -334,7 +334,7 @@ void EndingCredits_Init(struct CreditsMainProc * proc)
 
     ApplyPalette(Pal_StaffReelEnt_08A40FC8, 7);
 
-    CpuFastFill(-1, (void *)(0x6000000 + (chr = gUnknown_08206FDC[0])), 0x20);
+    CpuFastFill(-1, (void *)(VRAM + (chr = gUnknown_08206FDC[0])), 0x20);
 
     chr = chr >> 5;
 
@@ -456,7 +456,7 @@ void EndingCredits_ShowCopyright(struct CreditsMainProc * proc)
     u32 chr;
     const struct StaffReelEnt * ptr = (&gUnknown_08206E24[20])->entry;
 
-    Decompress(ptr->img, (void *)(0x6000000 + (chr = gUnknown_08206FDC[0])));
+    Decompress(ptr->img, (void *)(VRAM + (chr = gUnknown_08206FDC[0])));
     Decompress(ptr->tsa, gGenericBuffer);
 
     CallARM_FillTileRect(gBG0TilemapBuffer, gGenericBuffer, (u16)((chr >> 5) + 0x7000));
@@ -496,7 +496,7 @@ void EndingCredits_OnEnd(void)
     BG_Fill(gBG1TilemapBuffer, 0);
     BG_Fill(gBG2TilemapBuffer, 0);
 
-    CpuFastFill(0, (void *)0x6000000, VRAM_SIZE);
+    CpuFastFill(0, (void *)VRAM, VRAM_SIZE);
     SetDispEnable(0, 0, 0, 0, 0);
     SetBlendAlpha(0, 0);
 
diff --git a/src/eventscr_utils.c b/src/eventscr_utils.c
@@ -14,8 +14,8 @@
 void CopyBgImage(u8 bg1, u8 bg2, u8 c)
 {
     CpuFastCopy(
-        (void *)(0x6000000 + GetBackgroundTileDataOffset(bg1)),
-        (void *)(0x6000000 + GetBackgroundTileDataOffset(bg2)), c * 0x800);
+        (void *)(VRAM + GetBackgroundTileDataOffset(bg1)),
+        (void *)(VRAM + GetBackgroundTileDataOffset(bg2)), c * 0x800);
 }
 
 //! FE8U = 0x0800B954
diff --git a/src/mapanim_eventcall.c b/src/mapanim_eventcall.c
@@ -1199,7 +1199,7 @@ const u8 gUnknown_082058DC[] =
 //! FE8U = 0x08080498
 void sub_8080498(int frame, int unk44)
 {
-    Decompress(gUnknown_089A44A4[frame].img, (void *)(0x6000000 + gUnknown_082058D4[unk44] * 0x20));
+    Decompress(gUnknown_089A44A4[frame].img, (void *)(VRAM + gUnknown_082058D4[unk44] * 0x20));
     Decompress(gUnknown_089A44A4[frame].tsa, gGenericBuffer);
     AddAttr2dBitMap(
         gBG2TilemapBuffer, (u16 *)gGenericBuffer, 0, 0, gUnknown_082058D4[unk44] | gUnknown_082058DC[unk44] << 12);
@@ -1215,7 +1215,7 @@ void sub_8080498(int frame, int unk44)
 //! FE8U = 0x08080530
 void sub_8080530(int frame, int unk44)
 {
-    Decompress(gUnknown_089A44A4[frame].img, (void *)(0x6000000 + gUnknown_082058D4[unk44] * 0x20));
+    Decompress(gUnknown_089A44A4[frame].img, (void *)(VRAM + gUnknown_082058D4[unk44] * 0x20));
     Decompress(gUnknown_089A44A4[frame].tsa, gGenericBuffer);
     AddAttr2dBitMap(
         gBG2TilemapBuffer, (u16 *)gGenericBuffer, 0, 0, gUnknown_082058D4[unk44] | gUnknown_082058DC[unk44] << 12);
diff --git a/src/opanim-main.c b/src/opanim-main.c
@@ -1024,7 +1024,7 @@ void OpAnimPreparefxEirika(struct ProcOpAnim * proc)
             break;
 
         case 1:
-            Decompress(Img_OpAnimEirikaClose1, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimEirikaClose1, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimEirikaClose, gGenericBuffer);
 
             break;
@@ -1036,7 +1036,7 @@ void OpAnimPreparefxEirika(struct ProcOpAnim * proc)
             break;
 
         case 3:
-            Decompress(Img_OpAnimEirika, (void *)(0x6000000 + GetBackgroundTileDataOffset(2)));
+            Decompress(Img_OpAnimEirika, (void *)(VRAM + GetBackgroundTileDataOffset(2)));
             Decompress(Tsa_OpAnimEirika, gGenericBuffer + 0x1000);
             CopyToPalOpAnim(Pal_OpAnimEirikaBlur, 0, 0x160);
 
@@ -1519,7 +1519,7 @@ void sub_80C8690(struct ProcOpAnim * proc)
             break;
 
         case 2:
-            Decompress(Img_OpAnimJoshua, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimJoshua, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimJoshua2, gGenericBuffer);
 
             break;
@@ -1582,7 +1582,7 @@ void sub_80C883C(struct ProcOpAnim * proc)
     switch (proc->timer)
     {
         case 1:
-            Decompress(Img_OpAnimLArachel, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimLArachel, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimLArachel, gGenericBuffer);
 
             break;
@@ -1628,7 +1628,7 @@ void sub_80C8934(struct ProcOpAnim * proc)
     switch (proc->timer)
     {
         case 1:
-            Decompress(Img_OpAnimCharacterSeth, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimCharacterSeth, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimCharacterSeth, gGenericBuffer);
 
             break;
@@ -1673,7 +1673,7 @@ void sub_80C8A20(struct ProcOpAnim * proc)
     switch (proc->timer)
     {
         case 1:
-            Decompress(Img_OpAnimMyrrh, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimMyrrh, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimMyrrh2, gGenericBuffer);
 
             break;
@@ -1718,7 +1718,7 @@ void sub_80C8B0C(struct ProcOpAnim * proc)
     switch (proc->timer)
     {
         case 1:
-            Decompress(Img_OpAnimSaleh, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimSaleh, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimSaleh2, gGenericBuffer);
 
             break;
@@ -1763,7 +1763,7 @@ void sub_80C8BF8(struct ProcOpAnim * proc)
     switch (proc->timer)
     {
         case 1:
-            Decompress(Img_OpAnimTethys, (void *)(0x6000000 + GetBackgroundTileDataOffset(0)));
+            Decompress(Img_OpAnimTethys, (void *)(VRAM + GetBackgroundTileDataOffset(0)));
             Decompress(Tsa_OpAnimTethys, gGenericBuffer);
 
             break;
diff --git a/src/opinfo.c b/src/opinfo.c
@@ -334,7 +334,7 @@ void ClassIntro_Init(struct OpInfoEnterProc* proc) {
 
     *proc->letterProcsPtr = StartClassNameIntroLetter(proc, 0);
 
-    Decompress(gUnknown_08A360E8, (void *)0x6000000);
+    Decompress(gUnknown_08A360E8, (void *)VRAM);
 
     Decompress(gUnknown_08A36284, gGenericBuffer);
     CallARM_FillTileRect(TILEMAP_LOCATED(gBG0TilemapBuffer, 0, 0x7), gGenericBuffer, 0x4000);
@@ -1047,12 +1047,12 @@ void ClassInfoDisplay_Init(struct OpInfoClassDisplayProc* proc) {
     BG_SetPosition(2, 0, 0);
     BG_SetPosition(3, 0, 0);
 
-    Decompress(gUnknown_08A30E2C, (void *)(GetBackgroundTileDataOffset(3) + 0x6000000));
+    Decompress(gUnknown_08A30E2C, (void *)(GetBackgroundTileDataOffset(3) + VRAM));
     ApplyPalettes(gUnknown_08A3593C, 7, 8);
 
     CallARM_FillTileRect(gBG3TilemapBuffer, gUnknown_08A35488, 0x7000);
 
-    Decompress(gUnknown_08A30800, (void *)(GetBackgroundTileDataOffset(2) + 0x6000000));
+    Decompress(gUnknown_08A30800, (void *)(GetBackgroundTileDataOffset(2) + VRAM));
     ApplyPalette(gUiFramePaletteA, 6);
 
     CallARM_FillTileRect(gBG2TilemapBuffer, gUnknown_08A30978, 0x6000);
diff --git a/src/opsubtitle.c b/src/opsubtitle.c
@@ -108,7 +108,7 @@ const struct OpSubtitleEnt gOpSubtitleGfxLut[] = {
 void sub_80C488C(int bg) {
     int offset = GetBackgroundTileDataOffset(bg);
 
-    Decompress(Img_CommGameBgScreen, (void*)(offset + 0x6000000));
+    Decompress(Img_CommGameBgScreen, (void*)(offset + VRAM));
 
     CpuFastFill(0, (void*)(offset + 0x06005000), 0x20);
 
@@ -185,7 +185,7 @@ void OpSubtitle_Init(struct OpSubtitleProc* proc) {
     SetBlendTargetA(0, 0, 1, 0, 0);
     SetBlendTargetB(1, 1, 0, 0, 1);
 
-    Decompress(Img_ChapterIntro_LensFlare, (void*)(GetBackgroundTileDataOffset(2) + 0x6000000));
+    Decompress(Img_ChapterIntro_LensFlare, (void*)(GetBackgroundTileDataOffset(2) + VRAM));
     ApplyPalettes(Pal_ChapterIntro_LensFlare, 0, 3);
 
     BG_Fill(gBG2TilemapBuffer, 0);
@@ -695,7 +695,7 @@ void sub_80C5218(struct OpSubtitleProc* proc) {
 
 //! FE8U = 0x080C5328
 void sub_80C5328(void) {
-    CpuFastFill(0, (void*)0x6000000, 0x20);
+    CpuFastFill(0, (void*)VRAM, 0x20);
 
     BG_EnableSyncByMask(BG1_SYNC_BIT);
 
diff --git a/src/prep_itemscreen.c b/src/prep_itemscreen.c
@@ -516,7 +516,7 @@ void PutImg_PrepItemUseUnk(int vram, int pal) {
         Pal_08A1D8B0,
     };
 
-    Decompress(Img_PrepWindow, (void *)(0x6000000 + vram));
+    Decompress(Img_PrepWindow, (void *)(VRAM + vram));
     ApplyPalette(Pals_PrepWindow[gPlaySt.config.windowColor], pal);
     return;
 }
diff --git a/src/prep_itemsupply.c b/src/prep_itemsupply.c
@@ -64,7 +64,7 @@ void sub_809D278(int idx, ProcPtr proc)
 //! FE8U = 0x0809D2C4
 void StoreConvoyWeaponIconGraphics(int vramOffset, int pal) {
     ApplyPalette(gUnknown_08A1A3FC, pal);
-    Decompress(gUnknown_08A1A0A4, (void*)(0x6000000 + vramOffset));
+    Decompress(gUnknown_08A1A0A4, (void*)(VRAM + vramOffset));
     Decompress(gUnknown_08A1A23C, (void*)(0x6000200 + vramOffset));
     return;
 }
diff --git a/src/prepscreen.c b/src/prepscreen.c
@@ -146,7 +146,7 @@ void sub_80950E8(int vram, int palId)
         Pal_08A1D8B0,
     };
 
-    Decompress(Img_PrepWindow, (void *)(vram + 0x6000000));
+    Decompress(Img_PrepWindow, (void *)(vram + VRAM));
     ApplyPalette(palettes[gPlaySt.config.windowColor], palId);
 
     return;
diff --git a/src/savemenu.c b/src/savemenu.c
@@ -1470,7 +1470,7 @@ void SaveMenu_ReloadScreenFormDifficulty(struct SaveMenuProc * proc)
 
     ApplyPalettes(Pal_SaveMenuBG, 8, 8);
 
-    Decompress(Img_SaveMenuBG, (void*)(GetBackgroundTileDataOffset(3) + 0x6000000));
+    Decompress(Img_SaveMenuBG, (void*)(GetBackgroundTileDataOffset(3) + VRAM));
     CallARM_FillTileRect(gBG3TilemapBuffer, Tsa_SaveMenuBG, 0x8000);
     ApplyPalette(Pal_MainMenuBgFog, 7);
 
diff --git a/src/scene.c b/src/scene.c
@@ -310,7 +310,7 @@ void ClearTalkFaceRefs(void) {
 void InitTalk(int chr, int lines, s8 unpackBubble) {
     int i;
 
-    InitTextFont(&sTalkFont, (void*)(0x6000000 + GetBackgroundTileDataOffset(0) + (0x3FF & chr) * 0x20), chr, 2);
+    InitTextFont(&sTalkFont, (void*)(VRAM + GetBackgroundTileDataOffset(0) + (0x3FF & chr) * 0x20), chr, 2);
     SetInitTalkTextFont();
 
     sTalkState->lines = lines;
diff --git a/src/sio_postbattle.c b/src/sio_postbattle.c
@@ -247,7 +247,7 @@ void SioPostBattle_Init(struct SioPostBattleProc * proc)
     Decompress(Img_LinkArenaActiveBannerFx, (void *)(0x06000F00));
     ApplyPalette(Pal_LinkArenaActiveBannerFx, 2);
 
-    Decompress(Img_LinkArenaPostBattleBg, (void *)(0x6000000 + GetBackgroundTileDataOffset(3)));
+    Decompress(Img_LinkArenaPostBattleBg, (void *)(VRAM + GetBackgroundTileDataOffset(3)));
     ApplyPalettes(Pal_LinkArenaPostBattleBg, 10, 4);
     Decompress(Tsa_LinkArenaPostBattleBg, gGenericBuffer);
     CallARM_FillTileRect(gBG3TilemapBuffer, gGenericBuffer, 0xa000);
diff --git a/src/sio_uiutils.c b/src/sio_uiutils.c
@@ -90,7 +90,7 @@ void LATitleBanner_Init(struct LinkArenaTitleBannerProc * proc)
     int a = (proc->unk_58 % 3) * 0x140;
     int b = (proc->unk_58 / 3) * 0x800;
 
-    Decompress(gUnknown_085B0DE8, (void *)(0x6000000 + proc->chr));
+    Decompress(gUnknown_085B0DE8, (void *)(VRAM + proc->chr));
     Decompress(gUnknown_085AAE0C, gGenericBuffer);
 
     sub_804C3AC(gGenericBuffer + (a + b), (void *)(0x06014000), 10, 2);
diff --git a/src/statbar.c b/src/statbar.c
@@ -80,7 +80,7 @@ void DrawStatBar(
     for (i = 0; i < cappedLength; i++)
         DrawStatBarCappedCol(buf, 8 * bufWidth, i + progressLength + padding + 2);
 
-    ApplyBitmap(buf, (void*)(32 * tile + 0x6000000), bufWidth, 1);
+    ApplyBitmap(buf, (void*)(32 * tile + VRAM), bufWidth, 1);
 }
 
 // bufWidth: The width of the allocated buffer canvas
diff --git a/src/sysutil.c b/src/sysutil.c
@@ -1394,7 +1394,7 @@ void BmBgfx_Loop(struct ProcBmBgfx * proc)
             case BMFX_CONFT_IMG:
                 CpuFastCopy(
                     conf->data,
-                    (void *)(0x6000000 + proc->vram_base + proc->vram_base_offset + proc->vram_free_space + proc->flip * proc->size_per_fx),
+                    (void *)(VRAM + proc->vram_base + proc->vram_base_offset + proc->vram_free_space + proc->flip * proc->size_per_fx),
                     conf->size);
 
                 proc->vram_free_space = proc->vram_free_space + conf->size;
@@ -1403,7 +1403,7 @@ void BmBgfx_Loop(struct ProcBmBgfx * proc)
             case BMFX_CONFT_ZIMG:
                 Decompress(
                     conf->data,
-                    (void *)(0x6000000 + proc->vram_base + proc->vram_base_offset + proc->vram_free_space + proc->flip * proc->size_per_fx));
+                    (void *)(VRAM + proc->vram_base + proc->vram_base_offset + proc->vram_free_space + proc->flip * proc->size_per_fx));
 
                 proc->vram_free_space = proc->vram_free_space + conf->size;
 
diff --git a/src/titlescreen.c b/src/titlescreen.c
@@ -200,7 +200,7 @@ void Title_SetupMainGraphics(struct TitleScreenProc * proc)
 
     switch (proc->timer) {
     case 0:
-        Decompress(gGfx_TitleMainBackground_1, (void*)0x6000000);
+        Decompress(gGfx_TitleMainBackground_1, (void*)VRAM);
 
         break;
 
diff --git a/src/uiarena.c b/src/uiarena.c
@@ -116,7 +116,7 @@ void ArenaUi_Init(ProcPtr proc) {
     SetBlendTargetA(0, 0, 0, 1, 0);
     SetBlendTargetB(0, 0, 0, 0, 0);
 
-    Decompress(gGfx_ArenaBuildingFront, (void*)(GetBackgroundTileDataOffset(3) + 0x6000000));
+    Decompress(gGfx_ArenaBuildingFront, (void*)(GetBackgroundTileDataOffset(3) + VRAM));
     CallARM_FillTileRect(gBG3TilemapBuffer, gTsa_ArenaBuildingFront, 0xc000);
     ApplyPalettes(gPal_ArenaBuildingFront, 0xC, 4);
 

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void CRSpell_RegisterBgGfx(struct Anim * anim, void * src)`
`158`	`158`	`{`
`159`	`159`	`struct AnimMagicFxBuffer * magicFx = GetMagicEffectBufferFor(anim);`
`160`	`160`
`161`		`- void * dst = (void )(0x6000000 + magicFx->bgChr CHR_SIZE);`
	`161`	`+ void * dst = (void )(VRAM + magicFx->bgChr CHR_SIZE);`
`162`	`162`
`163`	`163`	`LZ77UnCompWram(src, magicFx->bgImgBuf);`
`164`	`164`	`RegisterDataMove(magicFx->bgImgBuf, dst, 0x2000);`
Original file line number	Diff line number	Diff line change
`@@ -713,9 +713,9 @@ void sub_805AA68(struct BanimUnkStructComm * buf)`
`713`	`713`	`{`
`714`	`714`	`if (buf->unk0E < 4)`
`715`	`715`	`{`
`716`		`- int vram = ((buf->chr_l + 0x40) * 0x20 + 0x6000000);`
	`716`	`+ int vram = ((buf->chr_l + 0x40) * 0x20 + VRAM);`
`717`	`717`	`RegisterDataMove(vramA, (void *)(buf->unk1C + vram), 0x800);`
`718`		`- vram = (buf->chr_r * 0x20 + 0x6000000);`
	`718`	`+ vram = (buf->chr_r * 0x20 + VRAM);`
`719`	`719`	`RegisterDataMove(vramB, (void *)(buf->unk1C + vram), 0x800);`
`720`	`720`
`721`	`721`	`CpuFastCopy(palA, gPaletteBuffer + buf->pal_l * 0x10, 0x20);`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void PutChapterTitleGfx(int chr, u32 titleId)`
`49`	`49`	`titleId = 0x54;`
`50`	`50`
`51`	`51`	`gChapterTitleFxSt.chr_str = chr & 0x3FF;`
`52`		`- Decompress(chap_title_data[titleId].save, (void)((chr TILE_SIZE_4BPP) + 0x6000000));`
	`52`	`+ Decompress(chap_title_data[titleId].save, (void)((chr TILE_SIZE_4BPP) + VRAM));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`void _PutChapterTitleGfx(int chr, int titleId)`
`@@ -60,15 +60,15 @@ void _PutChapterTitleGfx(int chr, int titleId)`
`60`	`60`	`void PutChapterTitleBG(int chr)`
`61`	`61`	`{`
`62`	`62`	`gChapterTitleFxSt.chr_bg = chr & 0x3FF;`
`63`		`- Decompress(gGfx_08A09E4C, (void)((chr TILE_SIZE_4BPP) + 0x6000000));`
	`63`	`+ Decompress(gGfx_08A09E4C, (void)((chr TILE_SIZE_4BPP) + VRAM));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`extern u8 gUnknown_08A0A4E8[];`
`67`	`67`
`68`	`68`	`void sub_80896A8(int chr)`
`69`	`69`	`{`
`70`	`70`	`gChapterTitleFxSt.chr_bg = chr & 0x3FF;`
`71`		`- Decompress(gUnknown_08A0A4E8, (void)((chr TILE_SIZE_4BPP) + 0x6000000));`
	`71`	`+ Decompress(gUnknown_08A0A4E8, (void)((chr TILE_SIZE_4BPP) + VRAM));`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void sub_80896D8(u16 * tm, int pal)`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`void CopyBgImage(u8 bg1, u8 bg2, u8 c)`
`15`	`15`	`{`
`16`	`16`	`CpuFastCopy(`
`17`		`- (void *)(0x6000000 + GetBackgroundTileDataOffset(bg1)),`
`18`		`- (void )(0x6000000 + GetBackgroundTileDataOffset(bg2)), c 0x800);`
	`17`	`+ (void *)(VRAM + GetBackgroundTileDataOffset(bg1)),`
	`18`	`+ (void )(VRAM + GetBackgroundTileDataOffset(bg2)), c 0x800);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`//! FE8U = 0x0800B954`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ void PutImg_PrepItemUseUnk(int vram, int pal) {`
`516`	`516`	`Pal_08A1D8B0,`
`517`	`517`	`};`
`518`	`518`
`519`		`- Decompress(Img_PrepWindow, (void *)(0x6000000 + vram));`
	`519`	`+ Decompress(Img_PrepWindow, (void *)(VRAM + vram));`
`520`	`520`	`ApplyPalette(Pals_PrepWindow[gPlaySt.config.windowColor], pal);`
`521`	`521`	`return;`
`522`	`522`	`}`