summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/cable_car.s24
-rw-r--r--asm/field_weather.s184
2 files changed, 104 insertions, 104 deletions
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 8283a58aa..abafe5500 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -206,7 +206,7 @@ _08123384:
bl ResetPaletteFade
bl sub_807C828
movs r4, 0
- ldr r0, _081233D4 @ =gUnknown_08396FC4
+ ldr r0, _081233D4 @ =gWeatherPtr
ldr r0, [r0]
adds r1, r0, 0
adds r1, 0xF0
@@ -234,7 +234,7 @@ _081233A4:
adds r0, 0x1
b _0812370C
.align 2, 0
-_081233D4: .4byte gUnknown_08396FC4
+_081233D4: .4byte gWeatherPtr
_081233D8: .4byte gSpriteCoordOffsetX
_081233DC: .4byte gSpriteCoordOffsetY
_081233E0: .4byte gMain
@@ -326,7 +326,7 @@ _081234A0:
_081234B4: .4byte gUnknown_02039274
_081234B8: .4byte 0x0000043c
_081234BC:
- ldr r0, _081234FC @ =gUnknown_08396FC4
+ ldr r0, _081234FC @ =gWeatherPtr
ldr r0, [r0]
adds r1, r0, 0
adds r1, 0xF0
@@ -361,7 +361,7 @@ _081234E6:
adds r0, 0x1
b _0812370C
.align 2, 0
-_081234FC: .4byte gUnknown_08396FC4
+_081234FC: .4byte gWeatherPtr
_08123500: .4byte 0x0000043c
_08123504:
ldr r0, _08123578 @ =0x0600e800
@@ -630,7 +630,7 @@ sub_8123740: @ 8123740
movs r0, 0
bl sub_807C9B4
add r7, sp, 0x4
- ldr r0, _08123858 @ =gUnknown_08396FC4
+ ldr r0, _08123858 @ =gWeatherPtr
ldr r0, [r0]
adds r1, r0, 0
adds r1, 0xF0
@@ -754,7 +754,7 @@ _081237E0:
bx r0
.align 2, 0
_08123854: .4byte gSpriteCoordOffsetX
-_08123858: .4byte gUnknown_08396FC4
+_08123858: .4byte gWeatherPtr
_0812385C: .4byte gSharedMem
_08123860: .4byte 0x040000d4
_08123864: .4byte 0x85000400
@@ -821,7 +821,7 @@ _081238D0:
beq _081238DC
b _081239D6
_081238DC:
- ldr r0, _08123920 @ =gUnknown_08396FC4
+ ldr r0, _08123920 @ =gWeatherPtr
ldr r0, [r0]
adds r2, r0, 0
adds r2, 0xF0
@@ -857,9 +857,9 @@ _0812390C:
strb r0, [r1, 0x1]
b _081239D6
.align 2, 0
-_08123920: .4byte gUnknown_08396FC4
+_08123920: .4byte gWeatherPtr
_08123924:
- ldr r0, _08123938 @ =gUnknown_08396FC4
+ ldr r0, _08123938 @ =gWeatherPtr
ldr r2, [r0]
movs r1, 0xDA
lsls r1, 3
@@ -870,7 +870,7 @@ _08123924:
strb r0, [r3, 0x1]
b _081239D6
.align 2, 0
-_08123938: .4byte gUnknown_08396FC4
+_08123938: .4byte gWeatherPtr
_0812393C:
ldrh r1, [r3, 0x6]
ldrh r0, [r3, 0x4]
@@ -1239,7 +1239,7 @@ _08123C10: .4byte 0x00000944
_08123C14: .4byte gUnknown_02039274
_08123C18: .4byte gSpriteCoordOffsetX
_08123C1C:
- ldr r0, _08123C38 @ =gUnknown_08396FC4
+ ldr r0, _08123C38 @ =gWeatherPtr
ldr r4, [r0]
ldr r2, _08123C3C @ =0x000006fc
adds r4, r2
@@ -1254,7 +1254,7 @@ _08123C26:
pop {r0}
bx r0
.align 2, 0
-_08123C38: .4byte gUnknown_08396FC4
+_08123C38: .4byte gWeatherPtr
_08123C3C: .4byte 0x000006fc
thumb_func_end sub_8123AF8
diff --git a/asm/field_weather.s b/asm/field_weather.s
index d42926db8..507b67fd8 100644
--- a/asm/field_weather.s
+++ b/asm/field_weather.s
@@ -9,14 +9,14 @@
sub_807F6E8: @ 807F6E8
push {r4,r5,lr}
sub sp, 0x8
- ldr r0, _0807F75C @ =gUnknown_08396FC4
+ ldr r0, _0807F75C @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807F760 @ =0x000006fb
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _0807F792
- ldr r0, _0807F764 @ =gUnknown_0839ABA8
+ ldr r0, _0807F764 @ =gWeatherFog1SpriteSheet
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp]
@@ -54,7 +54,7 @@ _0807F70C:
lsrs r0, 10
adds r0, 0x20
strh r0, [r4, 0x22]
- ldr r2, _0807F75C @ =gUnknown_08396FC4
+ ldr r2, _0807F75C @ =gWeatherPtr
ldr r0, [r2]
lsls r1, r5, 2
adds r0, 0xA0
@@ -62,13 +62,13 @@ _0807F70C:
str r4, [r0]
b _0807F77E
.align 2, 0
-_0807F75C: .4byte gUnknown_08396FC4
+_0807F75C: .4byte gWeatherPtr
_0807F760: .4byte 0x000006fb
-_0807F764: .4byte gUnknown_0839ABA8
+_0807F764: .4byte gWeatherFog1SpriteSheet
_0807F768: .4byte gSpriteTemplate_839AB90
_0807F76C: .4byte gSprites
_0807F770:
- ldr r2, _0807F79C @ =gUnknown_08396FC4
+ ldr r2, _0807F79C @ =gWeatherPtr
ldr r1, [r2]
lsls r0, r5, 2
adds r1, 0xA0
@@ -92,14 +92,14 @@ _0807F792:
pop {r0}
bx r0
.align 2, 0
-_0807F79C: .4byte gUnknown_08396FC4
+_0807F79C: .4byte gWeatherPtr
_0807F7A0: .4byte 0x000006fb
thumb_func_end sub_807F6E8
thumb_func_start sub_807F7A4
sub_807F7A4: @ 807F7A4
push {r4,r5,lr}
- ldr r0, _0807F7EC @ =gUnknown_08396FC4
+ ldr r0, _0807F7EC @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0807F7F0 @ =0x000006fb
adds r0, r1, r2
@@ -124,7 +124,7 @@ _0807F7C8:
bls _0807F7BA
ldr r0, _0807F7F4 @ =0x00001201
bl FreeSpriteTilesByTag
- ldr r0, _0807F7EC @ =gUnknown_08396FC4
+ ldr r0, _0807F7EC @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807F7F0 @ =0x000006fb
adds r0, r1
@@ -135,7 +135,7 @@ _0807F7E4:
pop {r0}
bx r0
.align 2, 0
-_0807F7EC: .4byte gUnknown_08396FC4
+_0807F7EC: .4byte gWeatherPtr
_0807F7F0: .4byte 0x000006fb
_0807F7F4: .4byte 0x00001201
thumb_func_end sub_807F7A4
@@ -143,7 +143,7 @@ _0807F7F4: .4byte 0x00001201
thumb_func_start sub_807F7F8
sub_807F7F8: @ 807F7F8
push {lr}
- ldr r0, _0807F844 @ =gUnknown_08396FC4
+ ldr r0, _0807F844 @ =gWeatherPtr
ldr r1, [r0]
ldr r0, _0807F848 @ =0x000006cc
adds r2, r1, r0
@@ -181,7 +181,7 @@ _0807F840:
pop {r0}
bx r0
.align 2, 0
-_0807F844: .4byte gUnknown_08396FC4
+_0807F844: .4byte gWeatherPtr
_0807F848: .4byte 0x000006cc
_0807F84C: .4byte 0x000006d2
_0807F850: .4byte 0x000006c2
@@ -192,7 +192,7 @@ _0807F854: .4byte REG_BLDALPHA
sub_807F858: @ 807F858
push {r4,lr}
bl sub_807F7F8
- ldr r0, _0807F880 @ =gUnknown_08396FC4
+ ldr r0, _0807F880 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0807F884 @ =0x000006d2
adds r0, r1, r2
@@ -210,14 +210,14 @@ _0807F878:
pop {r0}
bx r0
.align 2, 0
-_0807F880: .4byte gUnknown_08396FC4
+_0807F880: .4byte gWeatherPtr
_0807F884: .4byte 0x000006d2
thumb_func_end sub_807F858
thumb_func_start sub_807F888
sub_807F888: @ 807F888
push {r4,r5,lr}
- ldr r2, _0807F8CC @ =gUnknown_08396FC4
+ ldr r2, _0807F8CC @ =gWeatherPtr
ldr r1, [r2]
ldr r0, _0807F8D0 @ =gSpriteCoordOffsetX
ldrh r0, [r0]
@@ -252,7 +252,7 @@ _0807F8B4:
beq _0807F8E6
b _0807F928
.align 2, 0
-_0807F8CC: .4byte gUnknown_08396FC4
+_0807F8CC: .4byte gWeatherPtr
_0807F8D0: .4byte gSpriteCoordOffsetX
_0807F8D4: .4byte 0x000001ff
_0807F8D8: .4byte 0x000006fc
@@ -305,7 +305,7 @@ _0807F92C:
thumb_func_start sub_807F934
sub_807F934: @ 807F934
push {r4,lr}
- ldr r0, _0807F950 @ =gUnknown_08396FC4
+ ldr r0, _0807F950 @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807F954 @ =0x000006ce
adds r4, r0, r1
@@ -318,7 +318,7 @@ sub_807F934: @ 807F934
beq _0807F95E
b _0807F98C
.align 2, 0
-_0807F950: .4byte gUnknown_08396FC4
+_0807F950: .4byte gWeatherPtr
_0807F954: .4byte 0x000006ce
_0807F958:
cmp r0, 0x2
@@ -364,18 +364,18 @@ _0807F996:
thumb_func_start sub_807F99C
sub_807F99C: @ 807F99C
push {lr}
- ldr r0, _0807F9A8 @ =gUnknown_0839ABB0
+ ldr r0, _0807F9A8 @ =gWeatherAshSpriteSheet
bl LoadSpriteSheet
pop {r0}
bx r0
.align 2, 0
-_0807F9A8: .4byte gUnknown_0839ABB0
+_0807F9A8: .4byte gWeatherAshSpriteSheet
thumb_func_end sub_807F99C
thumb_func_start sub_807F9AC
sub_807F9AC: @ 807F9AC
push {r4,r5,lr}
- ldr r0, _0807FA18 @ =gUnknown_08396FC4
+ ldr r0, _0807FA18 @ =gWeatherPtr
ldr r0, [r0]
movs r1, 0xE0
lsls r1, 3
@@ -418,7 +418,7 @@ _0807F9C0:
lsls r0, 6
adds r0, 0x20
strh r0, [r4, 0x2E]
- ldr r2, _0807FA18 @ =gUnknown_08396FC4
+ ldr r2, _0807FA18 @ =gWeatherPtr
ldr r0, [r2]
lsls r1, r5, 2
adds r0, 0xF0
@@ -426,11 +426,11 @@ _0807F9C0:
str r4, [r0]
b _0807FA32
.align 2, 0
-_0807FA18: .4byte gUnknown_08396FC4
+_0807FA18: .4byte gWeatherPtr
_0807FA1C: .4byte gSpriteTemplate_839ABD0
_0807FA20: .4byte gSprites
_0807FA24:
- ldr r2, _0807FA50 @ =gUnknown_08396FC4
+ ldr r2, _0807FA50 @ =gWeatherPtr
ldr r1, [r2]
lsls r0, r5, 2
adds r1, 0xF0
@@ -454,13 +454,13 @@ _0807FA48:
pop {r0}
bx r0
.align 2, 0
-_0807FA50: .4byte gUnknown_08396FC4
+_0807FA50: .4byte gWeatherPtr
thumb_func_end sub_807F9AC
thumb_func_start sub_807FA54
sub_807FA54: @ 807FA54
push {r4,r5,lr}
- ldr r0, _0807FAA0 @ =gUnknown_08396FC4
+ ldr r0, _0807FAA0 @ =gWeatherPtr
ldr r1, [r0]
movs r2, 0xE0
lsls r2, 3
@@ -486,7 +486,7 @@ _0807FA7A:
bls _0807FA6C
ldr r0, _0807FAA4 @ =0x00001202
bl FreeSpriteTilesByTag
- ldr r0, _0807FAA0 @ =gUnknown_08396FC4
+ ldr r0, _0807FAA0 @ =gWeatherPtr
ldr r0, [r0]
movs r1, 0xE0
lsls r1, 3
@@ -498,7 +498,7 @@ _0807FA98:
pop {r0}
bx r0
.align 2, 0
-_0807FAA0: .4byte gUnknown_08396FC4
+_0807FAA0: .4byte gWeatherPtr
_0807FAA4: .4byte 0x00001202
thumb_func_end sub_807FA54
@@ -524,7 +524,7 @@ _0807FAC4:
ldrh r1, [r1]
adds r0, r1
strh r0, [r3, 0x22]
- ldr r0, _0807FB14 @ =gUnknown_08396FC4
+ ldr r0, _0807FB14 @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807FB18 @ =0x000006fc
adds r2, r0, r1
@@ -559,7 +559,7 @@ _0807FB08:
bx r0
.align 2, 0
_0807FB10: .4byte gSpriteCoordOffsetY
-_0807FB14: .4byte gUnknown_08396FC4
+_0807FB14: .4byte gWeatherPtr
_0807FB18: .4byte 0x000006fc
_0807FB1C: .4byte 0x010f0000
_0807FB20: .4byte 0x000001ff
@@ -568,7 +568,7 @@ _0807FB20: .4byte 0x000001ff
thumb_func_start sub_807FB24
sub_807FB24: @ 807FB24
push {r4,lr}
- ldr r0, _0807FB94 @ =gUnknown_08396FC4
+ ldr r0, _0807FB94 @ =gWeatherPtr
ldr r3, [r0]
ldr r1, _0807FB98 @ =0x000006cc
adds r0, r3, r1
@@ -624,7 +624,7 @@ _0807FB8E:
pop {r0}
bx r0
.align 2, 0
-_0807FB94: .4byte gUnknown_08396FC4
+_0807FB94: .4byte gWeatherPtr
_0807FB98: .4byte 0x000006cc
_0807FB9C: .4byte 0x000006d2
_0807FBA0: .4byte 0x000006c2
@@ -635,7 +635,7 @@ _0807FBA4: .4byte 0x00000724
sub_807FBA8: @ 807FBA8
push {r4,lr}
bl sub_807FB24
- ldr r0, _0807FBD0 @ =gUnknown_08396FC4
+ ldr r0, _0807FBD0 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0807FBD4 @ =0x000006d2
adds r0, r1, r2
@@ -653,7 +653,7 @@ _0807FBC8:
pop {r0}
bx r0
.align 2, 0
-_0807FBD0: .4byte gUnknown_08396FC4
+_0807FBD0: .4byte gWeatherPtr
_0807FBD4: .4byte 0x000006d2
thumb_func_end sub_807FBA8
@@ -661,7 +661,7 @@ _0807FBD4: .4byte 0x000006d2
sub_807FBD8: @ 807FBD8
push {r4,r5,lr}
bl sub_807FC9C
- ldr r0, _0807FBF8 @ =gUnknown_08396FC4
+ ldr r0, _0807FBF8 @ =gWeatherPtr
ldr r5, [r0]
ldr r0, _0807FBFC @ =0x000006cc
adds r4, r5, r0
@@ -674,7 +674,7 @@ sub_807FBD8: @ 807FBD8
beq _0807FC06
b _0807FC30
.align 2, 0
-_0807FBF8: .4byte gUnknown_08396FC4
+_0807FBF8: .4byte gWeatherPtr
_0807FBFC: .4byte 0x000006cc
_0807FC00:
cmp r0, 0x2
@@ -714,7 +714,7 @@ _0807FC38: .4byte 0x000006d2
sub_807FC3C: @ 807FC3C
push {r4,lr}
bl sub_807FC9C
- ldr r0, _0807FC5C @ =gUnknown_08396FC4
+ ldr r0, _0807FC5C @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807FC60 @ =0x000006ce
adds r4, r0, r1
@@ -727,7 +727,7 @@ sub_807FC3C: @ 807FC3C
beq _0807FC6A
b _0807FC8E
.align 2, 0
-_0807FC5C: .4byte gUnknown_08396FC4
+_0807FC5C: .4byte gWeatherPtr
_0807FC60: .4byte 0x000006ce
_0807FC64:
cmp r0, 0x2
@@ -766,7 +766,7 @@ _0807FC94:
thumb_func_start sub_807FC9C
sub_807FC9C: @ 807FC9C
push {r4,r5,lr}
- ldr r0, _0807FD14 @ =gUnknown_08396FC4
+ ldr r0, _0807FD14 @ =gWeatherPtr
ldr r3, [r0]
ldr r0, _0807FD18 @ =0x0000071c
adds r2, r3, r0
@@ -828,7 +828,7 @@ _0807FCE4:
pop {r0}
bx r0
.align 2, 0
-_0807FD14: .4byte gUnknown_08396FC4
+_0807FD14: .4byte gWeatherPtr
_0807FD18: .4byte 0x0000071c
_0807FD1C: .4byte 0x0000ffff
_0807FD20: .4byte 0x0000071e
@@ -841,14 +841,14 @@ _0807FD2C: .4byte gSpriteCoordOffsetY
sub_807FD30: @ 807FD30
push {r4-r6,lr}
sub sp, 0x8
- ldr r0, _0807FD9C @ =gUnknown_08396FC4
+ ldr r0, _0807FD9C @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807FDA0 @ =0x00000724
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _0807FDD6
- ldr r0, _0807FDA4 @ =gUnknown_0839ABE8
+ ldr r0, _0807FDA4 @ =gWeatherFog0SpriteSheet
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp]
@@ -881,7 +881,7 @@ _0807FD54:
bl __umodsi3
strh r0, [r4, 0x2E]
strh r5, [r4, 0x30]
- ldr r2, _0807FD9C @ =gUnknown_08396FC4
+ ldr r2, _0807FD9C @ =gWeatherPtr
ldr r0, [r2]
lsls r1, r6, 2
movs r3, 0xA0
@@ -891,13 +891,13 @@ _0807FD54:
str r4, [r0]
b _0807FDC2
.align 2, 0
-_0807FD9C: .4byte gUnknown_08396FC4
+_0807FD9C: .4byte gWeatherPtr
_0807FDA0: .4byte 0x00000724
-_0807FDA4: .4byte gUnknown_0839ABE8
+_0807FDA4: .4byte gWeatherFog0SpriteSheet
_0807FDA8: .4byte gSpriteTemplate_839AC04
_0807FDAC: .4byte gSprites
_0807FDB0:
- ldr r2, _0807FDE0 @ =gUnknown_08396FC4
+ ldr r2, _0807FDE0 @ =gWeatherPtr
ldr r1, [r2]
lsls r0, r6, 2
movs r3, 0xA0
@@ -923,14 +923,14 @@ _0807FDD6:
pop {r0}
bx r0
.align 2, 0
-_0807FDE0: .4byte gUnknown_08396FC4
+_0807FDE0: .4byte gWeatherPtr
_0807FDE4: .4byte 0x00000724
thumb_func_end sub_807FD30
thumb_func_start sub_807FDE8
sub_807FDE8: @ 807FDE8
push {r4,r5,lr}
- ldr r0, _0807FE30 @ =gUnknown_08396FC4
+ ldr r0, _0807FE30 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0807FE34 @ =0x00000724
adds r0, r1, r2
@@ -956,7 +956,7 @@ _0807FE0E:
bls _0807FE00
ldr r0, _0807FE38 @ =0x00001203
bl FreeSpriteTilesByTag
- ldr r0, _0807FE30 @ =gUnknown_08396FC4
+ ldr r0, _0807FE30 @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807FE34 @ =0x00000724
adds r0, r1
@@ -967,7 +967,7 @@ _0807FE2A:
pop {r0}
bx r0
.align 2, 0
-_0807FE30: .4byte gUnknown_08396FC4
+_0807FE30: .4byte gWeatherPtr
_0807FE34: .4byte 0x00000724
_0807FE38: .4byte 0x00001203
thumb_func_end sub_807FDE8
@@ -976,7 +976,7 @@ _0807FE38: .4byte 0x00001203
sub_807FE3C: @ 807FE3C
push {r4,lr}
adds r3, r0, 0
- ldr r0, _0807FE8C @ =gUnknown_08396FC4
+ ldr r0, _0807FE8C @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0807FE90 @ =0x0000071a
adds r0, r1, r2
@@ -1015,7 +1015,7 @@ _0807FE84:
pop {r0}
bx r0
.align 2, 0
-_0807FE8C: .4byte gUnknown_08396FC4
+_0807FE8C: .4byte gWeatherPtr
_0807FE90: .4byte 0x0000071a
_0807FE94: .4byte 0x010f0000
_0807FE98: .4byte 0x000001ff
@@ -1024,7 +1024,7 @@ _0807FE98: .4byte 0x000001ff
thumb_func_start sub_807FE9C
sub_807FE9C: @ 807FE9C
push {r4,lr}
- ldr r0, _0807FF00 @ =gUnknown_08396FC4
+ ldr r0, _0807FF00 @ =gWeatherPtr
ldr r3, [r0]
ldr r0, _0807FF04 @ =0x000006cc
adds r1, r3, r0
@@ -1074,7 +1074,7 @@ _0807FEF8:
pop {r0}
bx r0
.align 2, 0
-_0807FF00: .4byte gUnknown_08396FC4
+_0807FF00: .4byte gWeatherPtr
_0807FF04: .4byte 0x000006cc
_0807FF08: .4byte 0x000006d2
_0807FF0C: .4byte 0x000006c1
@@ -1087,7 +1087,7 @@ _0807FF18: .4byte 0x00000712
sub_807FF1C: @ 807FF1C
push {r4,lr}
bl sub_807FE9C
- ldr r0, _0807FF44 @ =gUnknown_08396FC4
+ ldr r0, _0807FF44 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0807FF48 @ =0x000006d2
adds r0, r1, r2
@@ -1105,7 +1105,7 @@ _0807FF3C:
pop {r0}
bx r0
.align 2, 0
-_0807FF44: .4byte gUnknown_08396FC4
+_0807FF44: .4byte gWeatherPtr
_0807FF48: .4byte 0x000006d2
thumb_func_end sub_807FF1C
@@ -1114,7 +1114,7 @@ sub_807FF4C: @ 807FF4C
push {r4,r5,lr}
bl sub_8080064
bl sub_808002C
- ldr r0, _0807FF7C @ =gUnknown_08396FC4
+ ldr r0, _0807FF7C @ =gWeatherPtr
ldr r5, [r0]
ldr r0, _0807FF80 @ =0x00000712
adds r1, r5, r0
@@ -1135,7 +1135,7 @@ _0807FF68:
beq _0807FF8E
b _0807FFBC
.align 2, 0
-_0807FF7C: .4byte gUnknown_08396FC4
+_0807FF7C: .4byte gWeatherPtr
_0807FF80: .4byte 0x00000712
_0807FF84: .4byte 0x000006cc
_0807FF88:
@@ -1178,7 +1178,7 @@ sub_807FFC8: @ 807FFC8
push {r4,lr}
bl sub_8080064
bl sub_808002C
- ldr r0, _0807FFEC @ =gUnknown_08396FC4
+ ldr r0, _0807FFEC @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0807FFF0 @ =0x000006ce
adds r4, r0, r1
@@ -1191,7 +1191,7 @@ sub_807FFC8: @ 807FFC8
beq _0807FFFA
b _0808001E
.align 2, 0
-_0807FFEC: .4byte gUnknown_08396FC4
+_0807FFEC: .4byte gWeatherPtr
_0807FFF0: .4byte 0x000006ce
_0807FFF4:
cmp r0, 0x2
@@ -1230,7 +1230,7 @@ _08080024:
thumb_func_start sub_808002C
sub_808002C: @ 808002C
push {lr}
- ldr r0, _08080058 @ =gUnknown_08396FC4
+ ldr r0, _08080058 @ =gWeatherPtr
ldr r2, [r0]
ldr r0, _0808005C @ =0x00000714
adds r3, r2, r0
@@ -1252,7 +1252,7 @@ _08080052:
pop {r0}
bx r0
.align 2, 0
-_08080058: .4byte gUnknown_08396FC4
+_08080058: .4byte gWeatherPtr
_0808005C: .4byte 0x00000714
_08080060: .4byte 0x00000712
thumb_func_end sub_808002C
@@ -1260,7 +1260,7 @@ _08080060: .4byte 0x00000712
thumb_func_start sub_8080064
sub_8080064: @ 8080064
push {r4-r6,lr}
- ldr r0, _080800C8 @ =gUnknown_08396FC4
+ ldr r0, _080800C8 @ =gWeatherPtr
ldr r2, [r0]
ldr r0, _080800CC @ =0x00000704
adds r4, r2, r0
@@ -1310,7 +1310,7 @@ sub_8080064: @ 8080064
pop {r0}
bx r0
.align 2, 0
-_080800C8: .4byte gUnknown_08396FC4
+_080800C8: .4byte gWeatherPtr
_080800CC: .4byte 0x00000704
_080800D0: .4byte gSineTable
_080800D4: .4byte 0x00000712
@@ -1322,7 +1322,7 @@ _080800E0: .4byte gSpriteCoordOffsetY
thumb_func_start sub_80800E4
sub_80800E4: @ 80800E4
push {r4,r5,lr}
- ldr r0, _08080168 @ =gUnknown_08396FC4
+ ldr r0, _08080168 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _0808016C @ =0x00000716
adds r0, r1, r2
@@ -1346,7 +1346,7 @@ _0808010A:
lsrs r4, r0, 16
cmp r4, 0x13
bls _080800FC
- ldr r0, _08080168 @ =gUnknown_08396FC4
+ ldr r0, _08080168 @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _0808016C @ =0x00000716
adds r0, r1
@@ -1355,7 +1355,7 @@ _0808010A:
ldr r0, _08080170 @ =0x00001204
bl FreeSpriteTilesByTag
_08080126:
- ldr r0, _08080168 @ =gUnknown_08396FC4
+ ldr r0, _08080168 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _08080174 @ =0x00000717
adds r0, r1, r2
@@ -1379,7 +1379,7 @@ _0808014A:
lsrs r4, r0, 16
cmp r4, 0x4
bls _0808013C
- ldr r0, _08080168 @ =gUnknown_08396FC4
+ ldr r0, _08080168 @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _08080174 @ =0x00000717
adds r0, r1
@@ -1390,7 +1390,7 @@ _08080160:
pop {r0}
bx r0
.align 2, 0
-_08080168: .4byte gUnknown_08396FC4
+_08080168: .4byte gWeatherPtr
_0808016C: .4byte 0x00000716
_08080170: .4byte 0x00001204
_08080174: .4byte 0x00000717
@@ -1400,14 +1400,14 @@ _08080174: .4byte 0x00000717
sub_8080178: @ 8080178
push {r4-r7,lr}
sub sp, 0x4
- ldr r0, _080801E8 @ =gUnknown_08396FC4
+ ldr r0, _080801E8 @ =gWeatherPtr
ldr r0, [r0]
ldr r1, _080801EC @ =0x00000716
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _08080226
- ldr r0, _080801F0 @ =gUnknown_0839AC54
+ ldr r0, _080801F0 @ =gWeatherSandstormSpriteSheet
bl LoadSpriteSheet
ldr r0, _080801F4 @ =gUnknown_08397128
bl sub_807D8C0
@@ -1427,7 +1427,7 @@ _08080198:
lsrs r1, r0, 24
cmp r1, 0x40
beq _08080200
- ldr r2, _080801E8 @ =gUnknown_08396FC4
+ ldr r2, _080801E8 @ =gWeatherPtr
ldr r5, [r2]
lsls r0, r7, 2
movs r3, 0xC8
@@ -1450,14 +1450,14 @@ _08080198:
ldr r2, [sp]
b _08080212
.align 2, 0
-_080801E8: .4byte gUnknown_08396FC4
+_080801E8: .4byte gWeatherPtr
_080801EC: .4byte 0x00000716
-_080801F0: .4byte gUnknown_0839AC54
+_080801F0: .4byte gWeatherSandstormSpriteSheet
_080801F4: .4byte gUnknown_08397128
_080801F8: .4byte gSpriteTemplate_839AC3C
_080801FC: .4byte gSprites
_08080200:
- ldr r2, _08080230 @ =gUnknown_08396FC4
+ ldr r2, _08080230 @ =gWeatherPtr
ldr r1, [r2]
lsls r0, r7, 2
movs r3, 0xC8
@@ -1483,7 +1483,7 @@ _08080226:
pop {r0}
bx r0
.align 2, 0
-_08080230: .4byte gUnknown_08396FC4
+_08080230: .4byte gWeatherPtr
_08080234: .4byte 0x00000716
thumb_func_end sub_8080178
@@ -1494,7 +1494,7 @@ sub_8080238: @ 8080238
mov r6, r9
mov r5, r8
push {r5-r7}
- ldr r4, _080802E0 @ =gUnknown_08396FC4
+ ldr r4, _080802E0 @ =gWeatherPtr
ldr r0, [r4]
ldr r1, _080802E4 @ =0x00000717
adds r0, r1
@@ -1571,7 +1571,7 @@ _08080258:
str r0, [r1, 0x1C]
b _0808030E
.align 2, 0
-_080802E0: .4byte gUnknown_08396FC4
+_080802E0: .4byte gWeatherPtr
_080802E4: .4byte 0x00000717
_080802E8: .4byte gSpriteTemplate_839AC3C
_080802EC: .4byte gSprites
@@ -1616,7 +1616,7 @@ _08080334: .4byte 0x00000717
sub_8080338: @ 8080338
push {r4,lr}
adds r3, r0, 0
- ldr r0, _08080388 @ =gUnknown_08396FC4
+ ldr r0, _08080388 @ =gWeatherPtr
ldr r1, [r0]
movs r2, 0xE2
lsls r2, 3
@@ -1655,7 +1655,7 @@ _08080380:
pop {r0}
bx r0
.align 2, 0
-_08080388: .4byte gUnknown_08396FC4
+_08080388: .4byte gWeatherPtr
_0808038C: .4byte 0x0000070e
_08080390: .4byte 0x010f0000
_08080394: .4byte 0x000001ff
@@ -1749,7 +1749,7 @@ _0808042C: .4byte gSineTable
thumb_func_start sub_8080430
sub_8080430: @ 8080430
- ldr r0, _08080450 @ =gUnknown_08396FC4
+ ldr r0, _08080450 @ =gWeatherPtr
ldr r1, [r0]
ldr r0, _08080454 @ =0x000006cc
adds r2, r1, r0
@@ -1765,7 +1765,7 @@ sub_8080430: @ 8080430
strb r0, [r1]
bx lr
.align 2, 0
-_08080450: .4byte gUnknown_08396FC4
+_08080450: .4byte gWeatherPtr
_08080454: .4byte 0x000006cc
_08080458: .4byte 0x000006c1
_0808045C: .4byte 0x000006c2
@@ -1794,14 +1794,14 @@ sub_8080470: @ 8080470
sub_8080474: @ 8080474
push {r4,r5,lr}
bl sub_807F49C
- ldr r0, _080804B4 @ =gUnknown_08396FC4
+ ldr r0, _080804B4 @ =gWeatherPtr
ldr r4, [r0]
ldr r1, _080804B8 @ =0x0000072e
adds r0, r4, r1
ldrb r5, [r0]
cmp r5, 0
bne _080804AC
- ldr r0, _080804BC @ =gUnknown_0839AC70
+ ldr r0, _080804BC @ =gWeatherBubbleSpriteSheet
bl LoadSpriteSheet
movs r2, 0xE5
lsls r2, 3
@@ -1823,9 +1823,9 @@ _080804AC:
pop {r0}
bx r0
.align 2, 0
-_080804B4: .4byte gUnknown_08396FC4
+_080804B4: .4byte gWeatherPtr
_080804B8: .4byte 0x0000072e
-_080804BC: .4byte gUnknown_0839AC70
+_080804BC: .4byte gWeatherBubbleSpriteSheet
_080804C0: .4byte gUnknown_0839AC68
_080804C4: .4byte 0x0000072a
thumb_func_end sub_8080474
@@ -1834,7 +1834,7 @@ _080804C4: .4byte 0x0000072a
sub_80804C8: @ 80804C8
push {r4,lr}
bl sub_8080474
- ldr r0, _080804F0 @ =gUnknown_08396FC4
+ ldr r0, _080804F0 @ =gWeatherPtr
ldr r1, [r0]
ldr r2, _080804F4 @ =0x000006d2
adds r0, r1, r2
@@ -1852,7 +1852,7 @@ _080804E8:
pop {r0}
bx r0
.align 2, 0
-_080804F0: .4byte gUnknown_08396FC4
+_080804F0: .4byte gWeatherPtr
_080804F4: .4byte 0x000006d2
thumb_func_end sub_80804C8
@@ -1860,7 +1860,7 @@ _080804F4: .4byte 0x000006d2
sub_80804F8: @ 80804F8
push {r4-r7,lr}
bl sub_807F52C
- ldr r0, _08080558 @ =gUnknown_08396FC4
+ ldr r0, _08080558 @ =gWeatherPtr
ldr r5, [r0]
ldr r0, _0808055C @ =0x00000726
adds r4, r5, r0
@@ -1906,7 +1906,7 @@ _08080550:
pop {r0}
bx r0
.align 2, 0
-_08080558: .4byte gUnknown_08396FC4
+_08080558: .4byte gWeatherPtr
_0808055C: .4byte 0x00000726
_08080560: .4byte 0x0000ffff
_08080564: .4byte gUnknown_0839AC68
@@ -1976,7 +1976,7 @@ sub_8080588: @ 8080588
strh r0, [r1, 0x2E]
strh r0, [r1, 0x30]
strh r0, [r1, 0x32]
- ldr r0, _08080608 @ =gUnknown_08396FC4
+ ldr r0, _08080608 @ =gWeatherPtr
ldr r1, [r0]
ldr r0, _0808060C @ =0x0000072c
adds r1, r0
@@ -1992,7 +1992,7 @@ _080805F8: .4byte gUnknown_0839AC78
_080805FC: .4byte gSpriteCoordOffsetY
_08080600: .4byte gSpriteTemplate_839ACBC
_08080604: .4byte gSprites
-_08080608: .4byte gUnknown_08396FC4
+_08080608: .4byte gWeatherPtr
_0808060C: .4byte 0x0000072c
thumb_func_end sub_8080588
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 21:32:50 +0000