naming work

13 files changed, 79 insertions, 79 deletions

diff --git a/asm/object/bigBarrel.s b/asm/object/bigBarrel.s
index 237d053a..f22fefa0 100644
--- a/asm/object/bigBarrel.s
+++ b/asm/object/bigBarrel.s
@@ -586,7 +586,7 @@ _08088E94:
 	.align 2, 0
 _08088EB0: .4byte gRoomVars
 _08088EB4:
-	ldr r0, _08088F18 @ =gScreenTransition
+	ldr r0, _08088F18 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 	ands r0, r1
@@ -635,7 +635,7 @@ _08088EB4:
 _08088F14:
 	pop {r4, pc}
 	.align 2, 0
-_08088F18: .4byte gScreenTransition
+_08088F18: .4byte gRoomTransition
 _08088F1C: .4byte gUnk_08120C52
 
 	thumb_func_start sub_08088F20
diff --git a/asm/object/bossDoor.s b/asm/object/bossDoor.s
index 44e5991b..0f95c9f3 100644
--- a/asm/object/bossDoor.s
+++ b/asm/object/bossDoor.s
@@ -196,7 +196,7 @@ sub_0808C348: @ 0x0808C348
 	ands r0, r1
 	cmp r0, #0
 	bne _0808C37C
-	ldr r0, _0808C374 @ =gScreenTransition
+	ldr r0, _0808C374 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #3
 	ands r0, r1
@@ -209,7 +209,7 @@ _0808C36A:
 	bl GetNextFrame
 	b _0808C382
 	.align 2, 0
-_0808C374: .4byte gScreenTransition
+_0808C374: .4byte gRoomTransition
 _0808C378: .4byte 0x00000185
 _0808C37C:
 	adds r0, r4, #0
diff --git a/asm/object/gyorgBossObject.s b/asm/object/gyorgBossObject.s
index 92dafc65..4066ef56 100644
--- a/asm/object/gyorgBossObject.s
+++ b/asm/object/gyorgBossObject.s
@@ -135,7 +135,7 @@ _080A0F5A:
 	strh r1, [r0]
 	adds r0, #2
 	strh r1, [r0]
-	ldr r0, _080A1060 @ =gScreenTransition
+	ldr r0, _080A1060 @ =gRoomTransition
 	adds r0, #0x39
 	mov r2, sb
 	strb r2, [r0]
@@ -165,7 +165,7 @@ _080A1050: .4byte gEntCount
 _080A1054: .4byte gRoomControls
 _080A1058: .4byte gScreen
 _080A105C: .4byte 0x00001E07
-_080A1060: .4byte gScreenTransition
+_080A1060: .4byte gRoomTransition
 _080A1064: .4byte gPlayerState
 
 .else
@@ -274,7 +274,7 @@ _080A171E:
 	strh r1, [r0]
 	adds r0, #2
 	strh r1, [r0]
-	ldr r0, _080A1838 @ =gScreenTransition
+	ldr r0, _080A1838 @ =gRoomTransition
 	adds r0, #0x39
 	mov r2, sb
 	strb r2, [r0]
@@ -314,7 +314,7 @@ _080A1828: .4byte gEntCount
 _080A182C: .4byte gRoomControls
 _080A1830: .4byte gScreen
 _080A1834: .4byte 0x00001E07
-_080A1838: .4byte gScreenTransition
+_080A1838: .4byte gRoomTransition
 _080A183C: .4byte gPlayerState
 _080A1840: .4byte 0x80100000
 _080A1844: .4byte gArea
@@ -740,7 +740,7 @@ sub_080A1B4C: @ 0x080A1B4C
 _080A1B80:
 	movs r6, #0
 	strh r7, [r5]
-	ldr r0, _080A1BF0 @ =gScreenTransition
+	ldr r0, _080A1BF0 @ =gRoomTransition
 	adds r0, #0x39
 	strb r6, [r0]
 	bl sub_08079F8C
@@ -792,7 +792,7 @@ _080A1BD0:
 	strh r0, [r2, #0x18]
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_080A1BF0: .4byte gScreenTransition
+_080A1BF0: .4byte gRoomTransition
 _080A1BF4: .4byte gPlayerEntity
 _080A1BF8: .4byte gPlayerState
 _080A1BFC: .4byte 0xFFFDFFFF
diff --git a/asm/object/lilypadLarge.s b/asm/object/lilypadLarge.s
index e2e96fc6..c178744a 100644
--- a/asm/object/lilypadLarge.s
+++ b/asm/object/lilypadLarge.s
@@ -417,7 +417,7 @@ _080857F6:
 _08085806:
 	str r1, [r7, #0x6c]
 _08085808:
-	ldr r0, _080858B0 @ =gScreenTransition
+	ldr r0, _080858B0 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #0xf
 	ands r0, r1
@@ -495,7 +495,7 @@ _08085884:
 	.align 2, 0
 _080858A8: .4byte gSineTable
 _080858AC: .4byte 0xFFFF0000
-_080858B0: .4byte gScreenTransition
+_080858B0: .4byte gRoomTransition
 _080858B4: .4byte 0x00000FFF
 _080858B8:
 	movs r0, #0
@@ -679,7 +679,7 @@ _080859E6:
 	bl sub_08085D60
 	b _08085A0A
 _080859F4:
-	ldr r0, _08085A18 @ =gScreenTransition
+	ldr r0, _08085A18 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #0x1f
 	ands r0, r1
@@ -696,7 +696,7 @@ _08085A0A:
 	mov r8, r3
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08085A18: .4byte gScreenTransition
+_08085A18: .4byte gRoomTransition
 
 	thumb_func_start sub_08085A1C
 sub_08085A1C: @ 0x08085A1C
diff --git a/asm/object/mazaalBossObject.s b/asm/object/mazaalBossObject.s
index 1a02086b..ffe7e4a1 100644
--- a/asm/object/mazaalBossObject.s
+++ b/asm/object/mazaalBossObject.s
@@ -44,7 +44,7 @@ _0809AB22:
 	adds r1, r4, #0
 	bl CopyPosition
 	str r4, [r5, #0x54]
-	ldr r2, _0809AB68 @ =gScreenTransition
+	ldr r2, _0809AB68 @ =gRoomTransition
 	adds r0, r2, #0
 	adds r0, #0x38
 	ldrb r1, [r0]
@@ -67,7 +67,7 @@ _0809AB52:
 	bl sub_080809D4
 	b _0809AB9C
 	.align 2, 0
-_0809AB68: .4byte gScreenTransition
+_0809AB68: .4byte gRoomTransition
 _0809AB6C: .4byte gRoomControls
 _0809AB70:
 	movs r0, #1
@@ -253,7 +253,7 @@ sub_0809ACA0: @ 0x0809ACA0
 	ldr r1, [r2, #0x54]
 	movs r0, #6
 	strb r0, [r1, #0xd]
-	ldr r0, _0809ACC8 @ =gScreenTransition
+	ldr r0, _0809ACC8 @ =gRoomTransition
 	adds r0, #0x38
 	movs r1, #0xf1
 	strb r1, [r0]
@@ -262,7 +262,7 @@ sub_0809ACA0: @ 0x0809ACA0
 _0809ACC4:
 	pop {pc}
 	.align 2, 0
-_0809ACC8: .4byte gScreenTransition
+_0809ACC8: .4byte gRoomTransition
 
 	thumb_func_start sub_0809ACCC
 sub_0809ACCC: @ 0x0809ACCC
diff --git a/asm/object/object17.s b/asm/object/object17.s
index 23b434a2..2dee5055 100644
--- a/asm/object/object17.s
+++ b/asm/object/object17.s
@@ -84,7 +84,7 @@ sub_08086234: @ 0x08086234
 	ldrb r0, [r4, #0xa]
 	cmp r0, #0
 	beq _08086258
-	ldr r0, _08086254 @ =gScreenTransition
+	ldr r0, _08086254 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #1
 	ands r0, r1
@@ -94,7 +94,7 @@ sub_08086234: @ 0x08086234
 	bl GetNextFrame
 	b _0808625E
 	.align 2, 0
-_08086254: .4byte gScreenTransition
+_08086254: .4byte gRoomTransition
 _08086258:
 	adds r0, r4, #0
 	bl GetNextFrame
diff --git a/asm/object/object3D.s b/asm/object/object3D.s
index 3a81976a..c04687c7 100644
--- a/asm/object/object3D.s
+++ b/asm/object/object3D.s
@@ -88,7 +88,7 @@ _0808CF82:
 	strh r1, [r0]
 	bl sub_0808D030
 	movs r0, #0
-	bl sub_0801CFA8
+	bl ResetPaletteTable
 	bl ResetPalettes
 	ldr r0, _0808D024 @ =gGFXSlots
 	movs r6, #1
@@ -180,14 +180,14 @@ _0808D046:
 	subs r5, #1
 	cmp r5, #0
 	bne _0808D046
-	ldr r1, _0808D060 @ =gUnk_03000000
+	ldr r1, _0808D060 @ =gOAMControls
 	movs r0, #1
 	strb r0, [r1]
 	pop {r4, r5, pc}
 	.align 2, 0
 _0808D058: .4byte gUnk_03000020
 _0808D05C: .4byte 0x00000B74
-_0808D060: .4byte gUnk_03000000
+_0808D060: .4byte gOAMControls
 
 	thumb_func_start sub_0808D064
 sub_0808D064: @ 0x0808D064
diff --git a/asm/object/object3E.s b/asm/object/object3E.s
index 2345a89d..e40bcee1 100644
--- a/asm/object/object3E.s
+++ b/asm/object/object3E.s
@@ -171,7 +171,7 @@ _0808D1AE:
 _0808D1F4: .4byte 0x00004069
 _0808D1F8: .4byte gRoomControls
 _0808D1FC:
-	ldr r0, _0808D274 @ =gScreenTransition
+	ldr r0, _0808D274 @ =gRoomTransition
 	ldr r3, [r0]
 	movs r0, #3
 	ands r3, r0
@@ -233,7 +233,7 @@ _0808D24E:
 _0808D272:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0808D274: .4byte gScreenTransition
+_0808D274: .4byte gRoomTransition
 _0808D278: .4byte gScreen
 _0808D27C: .4byte gUnk_08121704
 
@@ -339,7 +339,7 @@ _0808D31C:
 	ldrsh r0, [r4, r1]
 	cmp r5, r0
 	beq _0808D350
-	ldr r0, _0808D358 @ =gScreenTransition
+	ldr r0, _0808D358 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #8
 	ands r0, r1
@@ -351,7 +351,7 @@ _0808D350:
 	pop {r4, r5, pc}
 	.align 2, 0
 _0808D354: .4byte gRoomControls
-_0808D358: .4byte gScreenTransition
+_0808D358: .4byte gRoomTransition
 _0808D35C: .4byte 0x0000010F
 
 	thumb_func_start sub_0808D360
@@ -585,7 +585,7 @@ _0808D514: .4byte 0x00004069
 sub_0808D518: @ 0x0808D518
 	push {r4, r5, r6, lr}
 	adds r5, r0, #0
-	ldr r0, _0808D58C @ =gScreenTransition
+	ldr r0, _0808D58C @ =gRoomTransition
 	ldr r2, [r0]
 	movs r0, #3
 	ands r2, r0
@@ -642,7 +642,7 @@ sub_0808D518: @ 0x0808D518
 _0808D58A:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0808D58C: .4byte gScreenTransition
+_0808D58C: .4byte gRoomTransition
 _0808D590: .4byte gScreen
 _0808D594: .4byte 0x00004069
 _0808D598: .4byte gRoomControls
diff --git a/asm/object/object43.s b/asm/object/object43.s
index 7ad10e72..24d96cfa 100644
--- a/asm/object/object43.s
+++ b/asm/object/object43.s
@@ -240,7 +240,7 @@ _0808E084:
 	ldrh r0, [r5]
 	cmp r0, #0
 	beq _0808E0BC
-	ldr r0, _0808E0B8 @ =gScreenTransition
+	ldr r0, _0808E0B8 @ =gRoomTransition
 	ldr r1, [r0]
 	movs r0, #0x1f
 	ands r1, r0
@@ -260,7 +260,7 @@ _0808E084:
 	strb r1, [r0]
 	b _0808E0E4
 	.align 2, 0
-_0808E0B8: .4byte gScreenTransition
+_0808E0B8: .4byte gRoomTransition
 _0808E0BC:
 	ldr r0, _0808E140 @ =0x00000115
 	bl EnqueueSFX
@@ -446,7 +446,7 @@ sub_0808E208: @ 0x0808E208
 	ldrb r0, [r0, #0x1b]
 	cmp r0, #0
 	beq _0808E248
-	ldr r0, _0808E244 @ =gScreenTransition
+	ldr r0, _0808E244 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #3
 	ands r0, r1
@@ -464,7 +464,7 @@ sub_0808E208: @ 0x0808E208
 	b _0808E24C
 	.align 2, 0
 _0808E240: .4byte gPlayerState
-_0808E244: .4byte gScreenTransition
+_0808E244: .4byte gRoomTransition
 _0808E248:
 	bl DeleteThisEntity
 _0808E24C:
diff --git a/asm/object/object8E.s b/asm/object/object8E.s
index 94969da8..16e40405 100644
--- a/asm/object/object8E.s
+++ b/asm/object/object8E.s
@@ -90,7 +90,7 @@ _0809B8D8:
 	ldrb r0, [r4, #0xf]
 	cmp r0, #0x1f
 	bhi _0809B914
-	ldr r5, _0809B90C @ =gScreenTransition
+	ldr r5, _0809B90C @ =gRoomTransition
 	ldr r0, [r5]
 	movs r1, #0x1f
 	ands r0, r1
@@ -113,7 +113,7 @@ _0809B8F0:
 	bl sub_0809B97C
 	b _0809B972
 	.align 2, 0
-_0809B90C: .4byte gScreenTransition
+_0809B90C: .4byte gRoomTransition
 _0809B910: .4byte 0x00000133
 _0809B914:
 	movs r0, #2
@@ -273,7 +273,7 @@ _0809BA40:
 	ldrb r0, [r4, #0xf]
 	cmp r0, #0
 	beq _0809BA7C
-	ldr r5, _0809BA74 @ =gScreenTransition
+	ldr r5, _0809BA74 @ =gRoomTransition
 	ldr r0, [r5]
 	movs r1, #0x1f
 	ands r0, r1
@@ -296,7 +296,7 @@ _0809BA58:
 	bl sub_0809B97C
 	b _0809BAC2
 	.align 2, 0
-_0809BA74: .4byte gScreenTransition
+_0809BA74: .4byte gRoomTransition
 _0809BA78: .4byte 0x00000133
 _0809BA7C:
 	movs r0, #2
@@ -436,7 +436,7 @@ _0809BB88:
 	ldrh r0, [r5]
 	cmp r0, #0xdf
 	bhi _0809BBC4
-	ldr r4, _0809BBBC @ =gScreenTransition
+	ldr r4, _0809BBBC @ =gRoomTransition
 	ldr r0, [r4]
 	movs r1, #0x1f
 	ands r0, r1
@@ -456,7 +456,7 @@ _0809BBA6:
 	b _0809BC68
 	.align 2, 0
 _0809BBB8: .4byte gScreen
-_0809BBBC: .4byte gScreenTransition
+_0809BBBC: .4byte gRoomTransition
 _0809BBC0: .4byte 0x00000133
 _0809BBC4:
 	movs r0, #2
@@ -631,7 +631,7 @@ _0809BD20:
 	ldrb r0, [r4, #0xd]
 	cmp r0, #0
 	beq _0809BD64
-	ldr r6, _0809BD58 @ =gScreenTransition
+	ldr r6, _0809BD58 @ =gRoomTransition
 	ldr r0, [r6]
 	movs r1, #0x1f
 	ands r0, r1
@@ -656,7 +656,7 @@ _0809BD38:
 	strh r0, [r1]
 	b _0809BDAE
 	.align 2, 0
-_0809BD58: .4byte gScreenTransition
+_0809BD58: .4byte gRoomTransition
 _0809BD5C: .4byte 0x00000133
 _0809BD60: .4byte gScreen
 _0809BD64:
@@ -753,7 +753,7 @@ _0809BE0C:
 	lsls r0, r0, #0x18
 	cmp r0, #0
 	beq _0809BE34
-	ldr r0, _0809BE2C @ =gScreenTransition
+	ldr r0, _0809BE2C @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #0x1f
 	ands r0, r1
@@ -763,7 +763,7 @@ _0809BE0C:
 	bl SoundReq
 	b _0809BE70
 	.align 2, 0
-_0809BE2C: .4byte gScreenTransition
+_0809BE2C: .4byte gRoomTransition
 _0809BE30: .4byte 0x00000133
 _0809BE34:
 	movs r0, #2
diff --git a/asm/object/object91.s b/asm/object/object91.s
index 6c4c5fba..6a8d37f8 100644
--- a/asm/object/object91.s
+++ b/asm/object/object91.s
@@ -463,7 +463,7 @@ _0809C74A:
 	ldrb r0, [r5, #0xf]
 	cmp r0, #0
 	beq _0809C7BC
-	ldr r0, _0809C7AC @ =gScreenTransition
+	ldr r0, _0809C7AC @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 	ands r0, r1
@@ -502,7 +502,7 @@ _0809C7A0:
 	b _0809C7BC
 	.align 2, 0
 _0809C7A8: .4byte gUnk_08123DF8
-_0809C7AC: .4byte gScreenTransition
+_0809C7AC: .4byte gRoomTransition
 _0809C7B0: .4byte 0xFFFFD000
 _0809C7B4:
 	ldr r0, [r5, #0x50]
@@ -776,7 +776,7 @@ sub_0809C988: @ 0x0809C988
 	strb r0, [r2, #0xb]
 	b _0809C9DC
 _0809C9AC:
-	ldr r0, _0809C9C8 @ =gScreenTransition
+	ldr r0, _0809C9C8 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #8
 	ands r0, r1
@@ -791,7 +791,7 @@ _0809C9AC:
 	subs r0, #4
 	b _0809C9DA
 	.align 2, 0
-_0809C9C8: .4byte gScreenTransition
+_0809C9C8: .4byte gRoomTransition
 _0809C9CC:
 	adds r0, r2, #0
 	adds r0, #0x84
@@ -810,7 +810,7 @@ _0809C9DC:
 sub_0809C9E0: @ 0x0809C9E0
 	push {r4, r5, r6, r7, lr}
 	adds r4, r0, #0
-	ldr r0, _0809CA04 @ =gScreenTransition
+	ldr r0, _0809CA04 @ =gRoomTransition
 	ldr r1, [r0]
 	movs r2, #2
 	ands r1, r2
@@ -826,7 +826,7 @@ sub_0809C9E0: @ 0x0809C9E0
 	subs r0, #8
 	b _0809CA16
 	.align 2, 0
-_0809CA04: .4byte gScreenTransition
+_0809CA04: .4byte gRoomTransition
 _0809CA08:
 	adds r2, r4, #0
 	adds r2, #0x84
@@ -971,7 +971,7 @@ sub_0809CAC8: @ 0x0809CAC8
 	movs r0, #7
 	strb r0, [r5, #0xd]
 _0809CB26:
-	ldr r0, _0809CB44 @ =gScreenTransition
+	ldr r0, _0809CB44 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #0xf
 	ands r0, r1
@@ -984,7 +984,7 @@ _0809CB38:
 	.align 2, 0
 _0809CB3C: .4byte gRoomControls
 _0809CB40: .4byte gPlayerEntity
-_0809CB44: .4byte gScreenTransition
+_0809CB44: .4byte gRoomTransition
 _0809CB48: .4byte 0x00000163
 
 	thumb_func_start sub_0809CB4C
diff --git a/asm/object/objectA8.s b/asm/object/objectA8.s
index 52c6a36d..c7b728bc 100644
--- a/asm/object/objectA8.s
+++ b/asm/object/objectA8.s
@@ -283,7 +283,7 @@ _0809FCAC:
 	ldrb r0, [r4, #0xa]
 	cmp r0, #0
 	bne _0809FCF8
-	ldr r0, _0809FCFC @ =gScreenTransition
+	ldr r0, _0809FCFC @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #1
 	ands r0, r1
@@ -314,7 +314,7 @@ _0809FCE0:
 _0809FCF8:
 	pop {r4, r5, pc}
 	.align 2, 0
-_0809FCFC: .4byte gScreenTransition
+_0809FCFC: .4byte gRoomTransition
 
 	thumb_func_start sub_0809FD00
 sub_0809FD00: @ 0x0809FD00
diff --git a/asm/object/windTribeTeleporter.s b/asm/object/windTribeTeleporter.s
index 15a1b7a2..34541e9e 100644
--- a/asm/object/windTribeTeleporter.s
+++ b/asm/object/windTribeTeleporter.s
@@ -163,12 +163,12 @@ _080A0B60:
 	bl SoundReq
 	b _080A0BF0
 _080A0B7E:
-	ldr r0, _080A0B88 @ =gScreenTransition
+	ldr r0, _080A0B88 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 	b _080A0BDE
 	.align 2, 0
-_080A0B88: .4byte gScreenTransition
+_080A0B88: .4byte gRoomTransition
 _080A0B8C:
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
@@ -184,11 +184,11 @@ _080A0B98:
 	strb r0, [r4, #0xe]
 	b _080A0BF0
 _080A0BA4:
-	ldr r0, _080A0BAC @ =gScreenTransition
+	ldr r0, _080A0BAC @ =gRoomTransition
 	ldr r0, [r0]
 	b _080A0BDE
 	.align 2, 0
-_080A0BAC: .4byte gScreenTransition
+_080A0BAC: .4byte gRoomTransition
 _080A0BB0:
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
@@ -209,7 +209,7 @@ _080A0BB0:
 	.align 2, 0
 _080A0BD4: .4byte 0x0813AA10
 _080A0BD8:
-	ldr r0, _080A0BF4 @ =gScreenTransition
+	ldr r0, _080A0BF4 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #1
 _080A0BDE:
@@ -225,7 +225,7 @@ _080A0BDE:
 _080A0BF0:
 	pop {r4, pc}
 	.align 2, 0
-_080A0BF4: .4byte gScreenTransition
+_080A0BF4: .4byte gRoomTransition
 _080A0BF8: .4byte gPlayerEntity
 
 
@@ -391,12 +391,12 @@ _080A0884:
 	bl SoundReq
 	b _080A0910
 _080A08A2:
-	ldr r0, _080A08AC @ =gScreenTransition
+	ldr r0, _080A08AC @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 	b _080A08FE
 	.align 2, 0
-_080A08AC: .4byte gScreenTransition
+_080A08AC: .4byte gRoomTransition
 _080A08B0:
 	ldrb r0, [r1, #0xe]
 	subs r0, #1
@@ -412,12 +412,12 @@ _080A08BC:
 	strb r0, [r1, #0xe]
 	b _080A0910
 _080A08C8:
-	ldr r0, _080A08D0 @ =gScreenTransition
+	ldr r0, _080A08D0 @ =gRoomTransition
 	ldr r0, [r0]
 	ands r0, r2
 	b _080A0900
 	.align 2, 0
-_080A08D0: .4byte gScreenTransition
+_080A08D0: .4byte gRoomTransition
 _080A08D4:
 	ldrb r0, [r1, #0xe]
 	subs r0, #1
@@ -436,7 +436,7 @@ _080A08D4:
 	.align 2, 0
 _080A08F4: .4byte gUnk_0813ADEC
 _080A08F8:
-	ldr r0, _080A0914 @ =gScreenTransition
+	ldr r0, _080A0914 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #1
 _080A08FE:
@@ -453,7 +453,7 @@ _080A0900:
 _080A0910:
 	pop {pc}
 	.align 2, 0
-_080A0914: .4byte gScreenTransition
+_080A0914: .4byte gRoomTransition
 _080A0918: .4byte gPlayerEntity
 
 .else
@@ -504,12 +504,12 @@ _080A1038:
 	bl SoundReq
 	b _080A10D4
 _080A1056:
-	ldr r0, _080A1060 @ =gScreenTransition
+	ldr r0, _080A1060 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 	b _080A10C2
 	.align 2, 0
-_080A1060: .4byte gScreenTransition
+_080A1060: .4byte gRoomTransition
 _080A1064:
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
@@ -525,11 +525,11 @@ _080A1070:
 	strb r0, [r4, #0xe]
 	b _080A10D4
 _080A107C:
-	ldr r0, _080A1084 @ =gScreenTransition
+	ldr r0, _080A1084 @ =gRoomTransition
 	ldr r0, [r0]
 	b _080A10C2
 	.align 2, 0
-_080A1084: .4byte gScreenTransition
+_080A1084: .4byte gRoomTransition
 _080A1088:
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
@@ -556,7 +556,7 @@ _080A10A2:
 _080A10B4: .4byte gRoomControls
 _080A10B8: .4byte gUnk_0813ADEC
 _080A10BC:
-	ldr r0, _080A10D8 @ =gScreenTransition
+	ldr r0, _080A10D8 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #1
 _080A10C2:
@@ -572,7 +572,7 @@ _080A10C2:
 _080A10D4:
 	pop {r4, pc}
 	.align 2, 0
-_080A10D8: .4byte gScreenTransition
+_080A10D8: .4byte gRoomTransition
 _080A10DC: .4byte gPlayerEntity
 .endif
 .endif
@@ -611,11 +611,11 @@ _080A110E:
 	lsls r0, r0, #0x18
 	cmp r0, #0
 	beq _080A1130
-	ldr r0, _080A1120 @ =gScreenTransition
+	ldr r0, _080A1120 @ =gRoomTransition
 	ldr r0, [r0]
 	b _080A1162
 	.align 2, 0
-_080A1120: .4byte gScreenTransition
+_080A1120: .4byte gRoomTransition
 _080A1124:
 	ldrb r0, [r2, #0xe]
 	subs r0, #1
@@ -631,12 +631,12 @@ _080A1130:
 	strb r0, [r2, #0xe]
 	b _080A11BA
 _080A113C:
-	ldr r0, _080A1144 @ =gScreenTransition
+	ldr r0, _080A1144 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #3
 	b _080A1162
 	.align 2, 0
-_080A1144: .4byte gScreenTransition
+_080A1144: .4byte gRoomTransition
 _080A1148:
 	ldrb r0, [r2, #0xe]
 	subs r0, #1
@@ -649,7 +649,7 @@ _080A1148:
 	strb r0, [r2, #0xd]
 	b _080A11BA
 _080A115C:
-	ldr r0, _080A1178 @ =gScreenTransition
+	ldr r0, _080A1178 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 _080A1162:
@@ -664,14 +664,14 @@ _080A1162:
 	strb r1, [r0, #0x14]
 	b _080A11BA
 	.align 2, 0
-_080A1178: .4byte gScreenTransition
+_080A1178: .4byte gRoomTransition
 _080A117C: .4byte gPlayerEntity
 _080A1180:
 	ldr r4, _080A11A0 @ =gPlayerEntity
 	ldrb r3, [r4, #0x14]
 	cmp r3, #4
 	beq _080A11A8
-	ldr r0, _080A11A4 @ =gScreenTransition
+	ldr r0, _080A11A4 @ =gRoomTransition
 	ldr r0, [r0]
 	movs r1, #7
 	ands r0, r1
@@ -684,7 +684,7 @@ _080A1180:
 	b _080A11BA
 	.align 2, 0
 _080A11A0: .4byte gPlayerEntity
-_080A11A4: .4byte gScreenTransition
+_080A11A4: .4byte gRoomTransition
 _080A11A8:
 	movs r0, #0
 	movs r1, #1