From 314b96af46db86b74203f67f7bdf2d68ff4d4e68 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 17 Dec 2017 23:45:27 +0100
Subject: static names given s prefix

---
 src/wallclock.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/wallclock.c')

diff --git a/src/wallclock.c b/src/wallclock.c
index 892ef3f05..cd85de230 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -57,8 +57,8 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite);
 
 // rodata
 
-static const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
-static const u16 gUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
+static const u8 sUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
+static const u16 sUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
 static const struct WindowTemplate gUnknown_085B21DC[] = {
     { 0x00, 0x03, 0x11, 0x18, 0x02, 0x0e, 0x200 },
     { 0x02, 0x18, 0x10, 0x06, 0x02, 0x0c, 0x230 },
@@ -88,7 +88,7 @@ static const struct BgTemplate gUnknown_085B21FC[] = {
     }
 };
 static const struct CompressedSpriteSheet gUnknown_085B2208 = {
-    gUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
+    sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
 };
 static const u32 filler_85B2210[2] = {};
 static const struct SpritePalette gUnknown_085B2218[] = {
@@ -571,7 +571,7 @@ static void LoadWallClockGraphics(void)
         LoadPalette(gUnknown_08DCC03C, 0x00, 0x20);
     }
     LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20);
-    LoadPalette(gUnknown_085B21D4, 0xc0, 0x08);
+    LoadPalette(sUnknown_085B21D4, 0xc0, 0x08);
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, gUnknown_085B21FC, 3);
     InitWindows(gUnknown_085B21DC);
@@ -666,27 +666,27 @@ void Cb2_ViewWallClock(void)
         angle1 = 90;
         angle2 = 135;
     }
-    
+
     spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 0;
-    
+
     spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
     gSprites[spriteId].oam.matrixNum = 1;
-    
+
     spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = angle1;
-    
+
     spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
     gSprites[spriteId].data[0] = taskId;
     gSprites[spriteId].data[1] = angle2;
-    
+
     WallClockInit();
-    
+
     PrintTextOnWindow(1, 1, gText_Cancel4, 0, 1, 0, NULL);
     PutWindowTilemap(1);
     schedule_bg_copy_tilemap_to_vram(2);
-- 
cgit v1.2.3


From 96511dc214b9f343864b125816751040edccd010 Mon Sep 17 00:00:00 2001
From: sceptillion <33798691+sceptillion@users.noreply.github.com>
Date: Thu, 21 Dec 2017 23:46:19 -0800
Subject: use internal song names

---
 src/wallclock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/wallclock.c')

diff --git a/src/wallclock.c b/src/wallclock.c
index cd85de230..897576719 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -16,7 +16,7 @@
 #include "task.h"
 #include "strings.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "trig.h"
 #include "decompress.h"
 
-- 
cgit v1.2.3


From 06aa07306e36e5674eeb0114120829e9ae114c25 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Fri, 29 Dec 2017 20:25:32 -0500
Subject: sixteenth wave of graphics.s dumps

---
 src/wallclock.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/wallclock.c')

diff --git a/src/wallclock.c b/src/wallclock.c
index 897576719..ea6137c5d 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -92,8 +92,8 @@ static const struct CompressedSpriteSheet gUnknown_085B2208 = {
 };
 static const u32 filler_85B2210[2] = {};
 static const struct SpritePalette gUnknown_085B2218[] = {
-    { gUnknown_08DCC01C, TAG_PAL_WALL_CLOCK_HAND },
-    { gUnknown_08DCC03C, 0x1001 },
+    { gWallclockMale_Pal, TAG_PAL_WALL_CLOCK_HAND },
+    { gWallclockFemale_Pal, 0x1001 },
     {}
 };
 static const struct OamData Unknown_085B2230 = {
@@ -561,14 +561,14 @@ static void LoadWallClockGraphics(void)
     DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
     DmaClear32(3, (void *)OAM, OAM_SIZE);
     DmaClear16(3, (void *)PLTT, PLTT_SIZE);
-    LZ77UnCompVram(gUnknown_08DCC05C, (void *)VRAM);
+    LZ77UnCompVram(gWallclock_Gfx, (void *)VRAM);
     if (gSpecialVar_0x8004 == 0)
     {
-        LoadPalette(gUnknown_08DCC01C, 0x00, 0x20);
+        LoadPalette(gWallclockMale_Pal, 0x00, 0x20);
     }
     else
     {
-        LoadPalette(gUnknown_08DCC03C, 0x00, 0x20);
+        LoadPalette(gWallclockFemale_Pal, 0x00, 0x20);
     }
     LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20);
     LoadPalette(sUnknown_085B21D4, 0xc0, 0x08);
-- 
cgit v1.2.3