finish refactoring ewram defines into ewram.h.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c
index b0b710803..5f218a6f6 100644
--- a/src/pokemon/pokeblock_feed.c
+++ b/src/pokemon/pokeblock_feed.c
@@ -540,7 +540,7 @@ static bool8 TransitionToPokeblockFeedScene(void)
     case 6:
         if (MultistepInitMenuWindowContinue())
         {
-            ewram[0x1FFFF] = 0;
+            ewram1FFFF = 0;
             gMain.state++;
         }
         break;
@@ -551,11 +551,11 @@ static bool8 TransitionToPokeblockFeedScene(void)
         }
         break;
     case 8:
-        ewram[0x1FFFD] = sub_81480B4();
+        ewram1FFFD = sub_81480B4();
         gMain.state++;
         break;
     case 9:
-        ewram[0x1FFFE] = PokeblockFeed_CreatePokeSprite(&gPlayerParty[gPokeblockMonID]);
+        ewram1FFFE = PokeblockFeed_CreatePokeSprite(&gPlayerParty[gPokeblockMonID]);
         gMain.state++;
         break;
     case 10:
@@ -611,13 +611,13 @@ static bool8 sub_8147B20(struct Pokemon* mon)
 {
     u16 species;
     u32 PiD, TiD;
-    switch (ewram[0x1FFFF])
+    switch (ewram1FFFF)
     {
     case 0:
         species = GetMonData(mon, MON_DATA_SPECIES2);
         PiD = GetMonData(mon, MON_DATA_PERSONALITY);
         HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, 0x2000000, gUnknown_081FAF4C[1], species, PiD);
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 1:
         {
@@ -629,37 +629,37 @@ static bool8 sub_8147B20(struct Pokemon* mon)
             palette = GetMonSpritePalStructFromOtIdPersonality(species, TiD, PiD);
             LoadCompressedObjectPalette(palette);
             GetMonSpriteTemplate_803C56C(palette->tag, 1);
-            ewram[0x1FFFF]++;
+            ewram1FFFF++;
         }
         break;
     case 2:
         LoadCompressedObjectPic(&gUnknown_083F7F74);
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 3:
         LoadCompressedObjectPalette(&gUnknown_083F7F7C);
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 4:
         LoadCompressedObjectPic(&sUnknown_084121DC);
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 5:
         SetPokeblockFeedSpritePal(gScriptItemId);
         LoadCompressedObjectPalette(&sPokeblockFeedSpritePal);
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 6:
         LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM));
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 7:
         LZDecompressVram(gUnknown_08E782FC, (void*)(VRAM + 0xE800));
-        ewram[0x1FFFF]++;
+        ewram1FFFF++;
         break;
     case 8:
         LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60);
-        ewram[0x1FFFF] = 0;
+        ewram1FFFF = 0;
         return TRUE;
     }
     return FALSE;
@@ -684,13 +684,13 @@ static void sub_8147CC8(u8 taskID)
             sub_81481DC();
             break;
         case 255:
-            sub_8148108(ewram[0x1FFFD], gTasks[taskID].data[1]);
+            sub_8148108(ewram1FFFD, gTasks[taskID].data[1]);
             break;
         case 269:
-            ewram[0x1FFFC] = CreatePokeblockSprite();
+            ewram1FFFC = CreatePokeblockSprite();
             break;
         case 281:
-            sub_8148044(ewram[0x1FFFE]);
+            sub_8148044(ewram1FFFE);
             break;
         case 297:
             gTasks[taskID].func = Task_PrintAtePokeblockText;