Merge branch 'master' of https://github.com/zeldaret/tmc

.gitignore

@@ -62,3 +62,5 @@ types_*.taghl
 !sound/programmable_wave_samples/*.pcm
 _Deparsed_XSubs.pm
 *.py
+*.sna
+__pycache__

INSTALL.md

@@ -37,15 +37,12 @@ To set up the repository:
 	sh install.sh ../tmc
 
 	cd ../tmc
+	make tools
 
 To build **tmc.gba**:
 
 	make -j$(nproc)
 
-To confirm it matches the official ROM image while building, do this instead:
-
-	make compare -j$(nproc)
-
 If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes.
 
 	make -j$(nproc) NODEP=1

Makefile

@@ -69,6 +69,7 @@ FIX := tools/gbafix/gbafix
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
+
 $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR) $(MID_BUILDDIR))
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
@@ -83,7 +84,7 @@ endif
 
 #$(C_BUILDDIR)/need_interworking_file_name.o: CFLAGS += -mthumb-interwork
 
-C_SRCS := $(wildcard $(C_SUBDIR)/*.c)
+C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
@@ -101,32 +102,32 @@ MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
 OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
+SUBDIRS  := $(sort $(dir $(OBJS)))
+
+$(shell mkdir -p $(SUBDIRS))
+
 TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
 TOOLBASE = $(TOOLDIRS:tools/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
 
-.PHONY: all rom tools clean-tools mostlyclean clean compare tidy $(TOOLDIRS)
+.PHONY: all setup clean-tools mostlyclean clean tidy $(TOOLDIRS)
 
 MAKEFLAGS += --no-print-directory
 
 AUTO_GEN_TARGETS :=
 
-all: tools rom
-
-rom: $(ROM)
-ifeq ($(COMPARE),1)
+all: $(ROM)
 	@$(SHA1) tmc.sha1
-endif
 
-tools: $(TOOLDIRS)
+# kept for backwards compat
+compare: $(ROM)
+	@$(SHA1) tmc.sha1
+
+setup: $(TOOLDIRS)
 
 $(TOOLDIRS):
 	@$(MAKE) -C $@
 
-# For contributors to make sure a change didn't affect the contents of the ROM.
-compare:
-	@$(MAKE) COMPARE=1
-
 mostlyclean: tidy
 	rm -f sound/direct_sound_samples/*.bin
 	rm -f $(SONG_OBJS) $(MID_SUBDIR)/*.s

README.md

@@ -1,5 +1,7 @@
 # The Legend of Zelda: The Minish Cap
 
+**Progress:**  [⬛⬛⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜⬜] 10%
+
 ```diff
 - WARNING! -
 

asm/anju.s

@@ -1,122 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Anju
-Anju: @ 0x0806C2C4
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #1
-	beq _0806C2FA
-	cmp r0, #1
-	bgt _0806C2D8
-	cmp r0, #0
-	beq _0806C2DE
-	b _0806C350
-_0806C2D8:
-	cmp r0, #2
-	beq _0806C342
-	b _0806C350
-_0806C2DE:
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, #0x18]
-	ldrb r0, [r4, #0xe]
-	strb r0, [r4, #0x14]
-	adds r0, r4, #0
-	bl sub_0807DD50
-	b _0806C350
-_0806C2FA:
-	adds r2, r4, #0
-	adds r2, #0x39
-	movs r1, #0
-	ldrsb r1, [r2, r1]
-	cmp r1, #2
-	bne _0806C338
-	movs r0, #0
-	strb r1, [r4, #0xc]
-	strb r0, [r2]
-	ldr r1, _0806C334 @ =gLinkEntity
-	adds r0, r4, #0
-	bl sub_080045C4
-	bl sub_0806F5A4
-	adds r1, r4, #0
-	adds r1, #0x58
-	ldrb r1, [r1]
-	movs r2, #4
-	rsbs r2, r2, #0
-	ands r1, r2
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_0806F118
-	b _0806C350
-	.align 2, 0
-_0806C334: .4byte gLinkEntity
-_0806C338:
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_0807DD94
-	b _0806C350
-_0806C342:
-	adds r0, r4, #0
-	bl UpdateFuseInteraction
-	cmp r0, #0
-	beq _0806C350
-	movs r0, #1
-	strb r0, [r4, #0xc]
-_0806C350:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0806C354
-sub_0806C354: @ 0x0806C354
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0801E99C
-	adds r1, r4, #0
-	adds r1, #0x68
-	strb r0, [r1]
-	ldrb r1, [r1]
-	adds r0, r4, #0
-	bl sub_08078784
-	pop {r4, pc}
-
-	thumb_func_start Anju_Fusion
-Anju_Fusion: @ 0x0806C36C
-	push {lr}
-	adds r2, r0, #0
-	ldrb r0, [r2, #0xc]
-	cmp r0, #0
-	bne _0806C392
-	adds r0, #1
-	strb r0, [r2, #0xc]
-	ldrb r1, [r2, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r2, #0x18]
-	adds r0, r2, #0
-	movs r1, #6
-	bl InitAnimationForceUpdate
-	b _0806C398
-_0806C392:
-	adds r0, r2, #0
-	bl UpdateAnimationSingleFrame
-_0806C398:
-	pop {pc}
-	.align 2, 0

asm/armos.s

@@ -46,7 +46,7 @@ sub_080301D4: @ 0x080301D4
 	cmp r0, #1
 	bne _080301EE
 	ldr r1, [r4, #0x4c]
-	ldr r0, _08030238 @ =gLinkEntity
+	ldr r0, _08030238 @ =gPlayerEntity
 	cmp r1, r0
 	bne _080301EE
 	adds r1, r4, #0
@@ -89,7 +89,7 @@ _08030228:
 	bl sub_0804AA30
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08030238: .4byte gLinkEntity
+_08030238: .4byte gPlayerEntity
 _0803023C: .4byte gUnk_080CE124
 
 	thumb_func_start sub_08030240
@@ -237,7 +237,7 @@ sub_08030338: @ 0x08030338
 _0803034C:
 	adds r0, r4, #0
 	movs r1, #3
-	bl InitializeAnimationAnimation
+	bl UpdateAnimationVariableFrames
 	adds r0, r4, #0
 	adds r0, #0x84
 	ldr r0, [r0]
@@ -942,7 +942,7 @@ sub_0803086C: @ 0x0803086C
 	bne _08030880
 	b _0803099C
 _08030880:
-	ldr r0, _08030928 @ =gLinkState
+	ldr r0, _08030928 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -1003,7 +1003,7 @@ _0803088E:
 	bl CheckPlayerInRegion
 	cmp r0, #0
 	beq _0803098A
-	ldr r2, _08030934 @ =gLinkEntity
+	ldr r2, _08030934 @ =gPlayerEntity
 	adds r2, #0x29
 	ldrb r1, [r2]
 	movs r0, #8
@@ -1014,7 +1014,7 @@ _0803088E:
 	strb r0, [r2]
 	ldr r0, [r5, #0x7c]
 	bl DoExitTransition
-	ldr r0, _08030938 @ =gUnk_030010A0
+	ldr r0, _08030938 @ =gScreenTransition
 	adds r1, r5, #0
 	adds r1, #0x80
 	ldrb r1, [r1]
@@ -1023,11 +1023,11 @@ _0803088E:
 	movs r0, #1
 	b _0803099E
 	.align 2, 0
-_08030928: .4byte gLinkState
+_08030928: .4byte gPlayerState
 _0803092C: .4byte gRoomControls
 _08030930: .4byte 0x00004049
-_08030934: .4byte gLinkEntity
-_08030938: .4byte gUnk_030010A0
+_08030934: .4byte gPlayerEntity
+_08030938: .4byte gScreenTransition
 _0803093C:
 	ldr r0, _0803094C @ =0x00004022
 	mov r3, r8

asm/backgroundCloud.s

@@ -1,175 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start BackgroundCloud
-BackgroundCloud: @ 0x0808F640
-	push {lr}
-	ldr r2, _0808F654 @ =gUnk_08121EA4
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0808F654: .4byte gUnk_08121EA4
-
-	thumb_func_start sub_0808F658
-sub_0808F658: @ 0x0808F658
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r5, #0x18]
-	ldrb r0, [r5, #0x1b]
-	movs r1, #0xc0
-	orrs r0, r1
-	strb r0, [r5, #0x1b]
-	ldrb r0, [r5, #0x19]
-	orrs r0, r1
-	strb r0, [r5, #0x19]
-	ldrb r0, [r5, #0xa]
-	adds r3, r5, #0
-	adds r3, #0x29
-	movs r1, #7
-	ands r1, r0
-	ldrb r2, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r0, [r5, #0xa]
-	strb r0, [r5, #0x1e]
-	movs r0, #8
-	strb r0, [r5, #0x15]
-	ldr r1, _0808F6D8 @ =gUnk_08121EB0
-	ldrb r0, [r5, #0xa]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	movs r4, #0
-	strh r0, [r5, #0x24]
-	ldr r3, _0808F6DC @ =gRoomControls
-	ldrh r1, [r3, #6]
-	adds r2, r1, #0
-	subs r2, #0x60
-	adds r0, r5, #0
-	adds r0, #0x78
-	strh r2, [r0]
-	ldrh r0, [r3, #0x1e]
-	adds r1, r1, r0
-	adds r1, #0x60
-	adds r0, r5, #0
-	adds r0, #0x7a
-	strh r1, [r0]
-	strb r4, [r5, #0x14]
-	bl Random
-	movs r1, #0xf
-	ands r0, r1
-	lsls r0, r0, #4
-	ldrh r1, [r5, #0x2e]
-	adds r0, r0, r1
-	strh r0, [r5, #0x2e]
-	strb r4, [r5, #0xe]
-	strb r4, [r5, #0xd]
-	pop {r4, r5, pc}
-	.align 2, 0
-_0808F6D8: .4byte gUnk_08121EB0
-_0808F6DC: .4byte gRoomControls
-
-	thumb_func_start sub_0808F6E0
-sub_0808F6E0: @ 0x0808F6E0
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0806F69C
-	adds r0, r4, #0
-	adds r0, #0x78
-	movs r2, #0x2e
-	ldrsh r1, [r4, r2]
-	movs r2, #0
-	ldrsh r0, [r0, r2]
-	cmp r1, r0
-	blt _0808F704
-	adds r0, r4, #0
-	adds r0, #0x7a
-	movs r2, #0
-	ldrsh r0, [r0, r2]
-	cmp r1, r0
-	ble _0808F708
-_0808F704:
-	movs r0, #2
-	strb r0, [r4, #0xc]
-_0808F708:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0808F70C
-sub_0808F70C: @ 0x0808F70C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xd]
-	cmp r0, #0
-	bne _0808F75C
-	movs r0, #1
-	strb r0, [r4, #0xd]
-	bl Random
-	movs r1, #7
-	ands r0, r1
-	lsls r0, r0, #3
-	adds r0, #0x1f
-	strb r0, [r4, #0xe]
-	ldrb r1, [r4, #0x15]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _0808F738
-	adds r0, r4, #0
-	adds r0, #0x7a
-	b _0808F73C
-_0808F738:
-	adds r0, r4, #0
-	adds r0, #0x78
-_0808F73C:
-	ldrh r0, [r0]
-	strh r0, [r4, #0x2e]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #2
-	bne _0808F75C
-	bl Random
-	ldr r3, _0808F778 @ =gUnk_08121EB3
-	ldrb r1, [r4, #0xb]
-	lsls r1, r1, #1
-	movs r2, #1
-	ands r2, r0
-	adds r1, r1, r2
-	adds r1, r1, r3
-	ldrb r0, [r1]
-	strh r0, [r4, #0x32]
-_0808F75C:
-	ldrb r1, [r4, #0xd]
-	cmp r1, #1
-	bne _0808F774
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0
-	bne _0808F774
-	strb r1, [r4, #0xc]
-	strb r0, [r4, #0xd]
-_0808F774:
-	pop {r4, pc}
-	.align 2, 0
-_0808F778: .4byte gUnk_08121EB3

asm/bakerOven.s

@@ -1,289 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start BakerOven
-BakerOven: @ 0x0809CC5C
-	push {lr}
-	ldr r2, _0809CC70 @ =gUnk_08123E20
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0809CC70: .4byte gUnk_08123E20
-
-	thumb_func_start sub_0809CC74
-sub_0809CC74: @ 0x0809CC74
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r4, #1
-	strb r4, [r5, #0xc]
-	bl UpdateSpriteOrderAndFlip
-	ldrb r0, [r5, #0xa]
-	cmp r0, #0
-	bne _0809CCD4
-	adds r2, r5, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #8
-	rsbs r1, r1, #0
-	ands r1, r0
-	movs r0, #5
-	orrs r1, r0
-	strb r1, [r2]
-	movs r4, #0
-_0809CC9A:
-	movs r0, #0x92
-	movs r1, #1
-	adds r2, r4, #0
-	bl CreateObject
-	adds r1, r0, #0
-	adds r4, #1
-	cmp r1, #0
-	beq _0809CCBE
-	str r5, [r1, #0x50]
-	lsrs r2, r4, #1
-	lsls r2, r2, #0x14
-	ldr r0, _0809CCCC @ =0xFFF80000
-	adds r2, r2, r0
-	adds r0, r5, #0
-	ldr r3, _0809CCD0 @ =0xFFF20000
-	bl PositionRelative
-_0809CCBE:
-	cmp r4, #2
-	bls _0809CC9A
-	adds r0, r5, #0
-	bl sub_0809CDF0
-	b _0809CD0A
-	.align 2, 0
-_0809CCCC: .4byte 0xFFF80000
-_0809CCD0: .4byte 0xFFF20000
-_0809CCD4:
-	ldrb r1, [r5, #0xb]
-	adds r0, r4, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _0809CCF2
-	ldrb r1, [r5, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	movs r0, #0x14
-	strb r0, [r5, #0xe]
-	b _0809CD02
-_0809CCF2:
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	ands r0, r1
-	movs r1, #0x12
-	cmp r0, #0
-	beq _0809CD00
-	movs r1, #0x14
-_0809CD00:
-	strb r1, [r5, #0xe]
-_0809CD02:
-	adds r0, r5, #0
-	movs r1, #0
-	bl InitializeAnimation
-_0809CD0A:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_0809CD0C
-sub_0809CD0C: @ 0x0809CD0C
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _0809CDAC
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r1, r4, #0
-	adds r1, #0x5a
-	ldrb r2, [r1]
-	movs r0, #1
-	ands r0, r2
-	cmp r0, #0
-	beq _0809CD36
-	movs r0, #0xfe
-	ands r0, r2
-	strb r0, [r1]
-	ldrh r0, [r4, #0x32]
-	adds r0, #1
-	strh r0, [r4, #0x32]
-_0809CD36:
-	ldrb r1, [r1]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0809CD56
-	adds r0, r4, #0
-	adds r0, #0x59
-	ldrb r0, [r0]
-	cmp r0, #1
-	bne _0809CD56
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #6
-	ands r0, r1
-	strb r0, [r4, #0x18]
-_0809CD56:
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	bne _0809CDAC
-	ldr r5, _0809CDB0 @ =gLinkEntity
-	adds r6, r5, #0
-	adds r6, #0x3d
-	movs r0, #0
-	ldrsb r0, [r6, r0]
-	cmp r0, #0
-	bne _0809CDAC
-	ldrb r0, [r4, #0x1e]
-	cmp r0, #0
-	beq _0809CDAC
-	adds r0, r4, #0
-	adds r1, r5, #0
-	movs r2, #4
-	bl sub_0806FC80
-	cmp r0, #0
-	beq _0809CDAC
-	ldrb r0, [r4, #0xf]
-	adds r0, #1
-	strb r0, [r4, #0xf]
-	movs r0, #2
-	rsbs r0, r0, #0
-	bl ModHealth
-	adds r0, r5, #0
-	movs r1, #0x7a
-	bl sub_0800449C
-	movs r1, #0x10
-	strb r1, [r6]
-	adds r0, r5, #0
-	adds r0, #0x3e
-	strb r1, [r0]
-	adds r2, r5, #0
-	adds r2, #0x42
-	movs r0, #0xc
-	strb r0, [r2]
-	adds r0, r5, #0
-	adds r0, #0x46
-	strh r1, [r0]
-_0809CDAC:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0809CDB0: .4byte gLinkEntity
-
-	thumb_func_start sub_0809CDB4
-sub_0809CDB4: @ 0x0809CDB4
-	push {lr}
-	adds r3, r0, #0
-	ldrb r0, [r3, #0xe]
-	subs r0, #1
-	strb r0, [r3, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r1, #0
-	bne _0809CDEC
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r3, #0xc]
-	movs r0, #0x1e
-	strb r0, [r3, #0xe]
-	strb r1, [r3, #0xf]
-	ldrb r1, [r3, #0x18]
-	subs r0, #0x22
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3, #0x18]
-	ldr r0, [r3, #0x50]
-	ldrh r0, [r0, #0x32]
-	subs r0, #0xe
-	strh r0, [r3, #0x32]
-	adds r0, r3, #0
-	movs r1, #0
-	bl InitializeAnimation
-_0809CDEC:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0809CDF0
-sub_0809CDF0: @ 0x0809CDF0
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	movs r0, #0x2e
-	ldrsh r1, [r4, r0]
-	ldr r2, _0809CE80 @ =gRoomControls
-	ldrh r0, [r2, #6]
-	subs r1, r1, r0
-	asrs r1, r1, #4
-	movs r3, #0x3f
-	ands r1, r3
-	movs r5, #0x32
-	ldrsh r0, [r4, r5]
-	ldrh r2, [r2, #8]
-	subs r0, r0, r2
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r1, r0
-	adds r0, r4, #0
-	adds r0, #0x80
-	strh r1, [r0]
-	ldrh r6, [r0]
-	ldr r0, _0809CE84 @ =0x0000402E
-	subs r1, r6, #1
-	adds r4, #0x38
-	ldrb r2, [r4]
-	bl SetTile
-	ldr r5, _0809CE88 @ =0x00004022
-	ldrb r2, [r4]
-	adds r0, r5, #0
-	adds r1, r6, #0
-	bl SetTile
-	adds r1, r6, #1
-	ldrb r2, [r4]
-	adds r0, r5, #0
-	bl SetTile
-	adds r5, #4
-	adds r1, r6, #0
-	subs r1, #0x41
-	ldrb r2, [r4]
-	adds r0, r5, #0
-	bl SetTile
-	adds r1, r6, #0
-	subs r1, #0x40
-	ldrb r2, [r4]
-	adds r0, r5, #0
-	bl SetTile
-	ldr r0, _0809CE8C @ =0x00004024
-	adds r1, r6, #0
-	subs r1, #0x3f
-	ldrb r2, [r4]
-	bl SetTile
-	adds r1, r6, #0
-	subs r1, #0x81
-	ldrb r2, [r4]
-	adds r0, r5, #0
-	bl SetTile
-	adds r1, r6, #0
-	subs r1, #0x80
-	ldrb r2, [r4]
-	adds r0, r5, #0
-	bl SetTile
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0809CE80: .4byte gRoomControls
-_0809CE84: .4byte 0x0000402E
-_0809CE88: .4byte 0x00004022
-_0809CE8C: .4byte 0x00004024

asm/ballChainSoldier.s

@@ -479,7 +479,7 @@ sub_0803E86C: @ 0x0803E86C
 	ldr r0, _0803E8C4 @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r0, #4
 	movs r1, #0x18
 	ands r0, r1
@@ -669,7 +669,7 @@ sub_0803E9D4: @ 0x0803E9D4
 	ldr r0, _0803EA0C @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r0, #4
 	movs r1, #0x18
 	ands r0, r1

asm/beanstalk.s

@@ -552,11 +552,11 @@ _0808A0F6:
 	ble _0808A0FC
 	b _0808A202
 _0808A0FC:
-	ldr r0, _0808A118 @ =gLinkState
+	ldr r0, _0808A118 @ =gPlayerState
 	ldrb r0, [r0, #0x12]
 	cmp r0, #0x1e
 	bne _0808A1DA
-	ldr r1, _0808A11C @ =gLinkEntity
+	ldr r1, _0808A11C @ =gPlayerEntity
 	adds r0, r5, #0
 	movs r2, #0
 	movs r3, #8
@@ -565,8 +565,8 @@ _0808A0FC:
 	beq _0808A1DC
 	b _0808A1B0
 	.align 2, 0
-_0808A118: .4byte gLinkState
-_0808A11C: .4byte gLinkEntity
+_0808A118: .4byte gPlayerState
+_0808A11C: .4byte gPlayerEntity
 _0808A120:
 	ldrb r0, [r5, #0xe]
 	cmp r0, #0
@@ -826,7 +826,7 @@ sub_0808A2F0: @ 0x0808A2F0
 	adds r1, #0x72
 	strh r0, [r1]
 _0808A316:
-	ldr r3, _0808A38C @ =gLinkEntity
+	ldr r3, _0808A38C @ =gPlayerEntity
 	ldrb r1, [r3, #0x1b]
 	lsrs r1, r1, #6
 	lsls r1, r1, #6
@@ -844,7 +844,7 @@ _0808A316:
 	ands r0, r2
 	orrs r0, r1
 	strb r0, [r5, #0x19]
-	ldr r0, _0808A390 @ =gLinkState
+	ldr r0, _0808A390 @ =gPlayerState
 	ldrb r0, [r0, #0x12]
 	cmp r0, #0x1e
 	bne _0808A39C
@@ -884,8 +884,8 @@ _0808A316:
 	bl SetTile
 	b _0808A3EC
 	.align 2, 0
-_0808A38C: .4byte gLinkEntity
-_0808A390: .4byte gLinkState
+_0808A38C: .4byte gPlayerEntity
+_0808A390: .4byte gPlayerState
 _0808A394: .4byte 0x00004014
 _0808A398: .4byte gRoomControls
 _0808A39C:

asm/beedle.s

@@ -1,345 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Beedle
-Beedle: @ 0x080632A8
-	push {lr}
-	adds r2, r0, #0
-	ldrb r1, [r2, #0x10]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _080632BE
-	adds r0, r2, #0
-	bl sub_08063410
-	b _080632C4
-_080632BE:
-	adds r0, r2, #0
-	bl sub_080632C8
-_080632C4:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_080632C8
-sub_080632C8: @ 0x080632C8
-	push {lr}
-	ldr r2, _080632DC @ =gUnk_0810C8E0
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080632DC: .4byte gUnk_0810C8E0
-
-	thumb_func_start sub_080632E0
-sub_080632E0: @ 0x080632E0
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _08063310 @ =gUnk_0810C8D4
-	bl LoadExtraSpriteData
-	cmp r0, #0
-	beq _0806330E
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_08078778
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	movs r0, #1
-	strb r0, [r4, #0xc]
-_0806330E:
-	pop {r4, pc}
-	.align 2, 0
-_08063310: .4byte gUnk_0810C8D4
-
-	thumb_func_start sub_08063314
-sub_08063314: @ 0x08063314
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xf]
-	adds r0, #1
-	strb r0, [r4, #0xf]
-	movs r1, #0xff
-	ands r0, r1
-	movs r1, #0xf
-	ands r0, r1
-	cmp r0, #0
-	bne _08063342
-	adds r0, r4, #0
-	bl sub_080633C8
-	adds r1, r0, #0
-	adds r0, r4, #0
-	adds r0, #0x58
-	ldrb r0, [r0]
-	cmp r0, r1
-	beq _08063342
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08063342:
-	adds r0, r4, #0
-	adds r0, #0x39
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	cmp r0, #0
-	beq _08063360
-	ldrb r0, [r4, #0xe]
-	ldr r1, _08063368 @ =0x00000A01
-	adds r0, r0, r1
-	bl TextboxNoOverlapFollow
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-_08063360:
-	adds r0, r4, #0
-	bl sub_0806ED78
-	pop {r4, pc}
-	.align 2, 0
-_08063368: .4byte 0x00000A01
-
-	thumb_func_start sub_0806336C
-sub_0806336C: @ 0x0806336C
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, _0806338C @ =gTextBox
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	bne _0806338A
-	ldrb r0, [r2, #0xc]
-	adds r0, #1
-	strb r0, [r2, #0xc]
-	adds r0, r2, #0
-	movs r1, #8
-	bl InitializeAnimation
-_0806338A:
-	pop {pc}
-	.align 2, 0
-_0806338C: .4byte gTextBox
-
-	thumb_func_start sub_08063390
-sub_08063390: @ 0x08063390
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080633BE
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	bl sub_0806EDC4
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_08078778
-_080633BE:
-	adds r0, r4, #0
-	bl sub_0806ED78
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080633C8
-sub_080633C8: @ 0x080633C8
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0x20
-	movs r2, #0x20
-	bl sub_0806ED9C
-	cmp r0, #0
-	bge _080633DE
-	adds r0, r4, #0
-	adds r0, #0x58
-	ldrb r0, [r0]
-_080633DE:
-	pop {r4, pc}
-
-	thumb_func_start Beedle_Head
-Beedle_Head: @ 0x080633E0
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	movs r2, #0x3f
-	ands r2, r0
-	adds r0, r4, #0
-	movs r1, #0
-	bl SetExtraSpriteFrame
-	ldrb r2, [r4, #0x1e]
-	adds r0, r4, #0
-	movs r1, #1
-	bl SetExtraSpriteFrame
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r4, #0
-	bl sub_0807000C
-	pop {r4, pc}
-
-	thumb_func_start sub_08063410
-sub_08063410: @ 0x08063410
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r5, [r4, #0xc]
-	cmp r5, #0
-	bne _08063442
-	ldr r1, _08063464 @ =gUnk_0810C8D4
-	bl LoadExtraSpriteData
-	cmp r0, #0
-	beq _08063462
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _08063436
-	ldr r0, _08063468 @ =gUnk_0810C894
-	str r0, [r4, #0x48]
-	strb r5, [r4, #0xb]
-_08063436:
-	adds r0, r4, #0
-	bl sub_0807DD64
-	adds r0, r4, #0
-	bl sub_08078778
-_08063442:
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	beq _0806344E
-	adds r0, r4, #0
-	bl sub_0806346C
-_0806344E:
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_0807DDAC
-	adds r0, r4, #0
-	bl sub_0807DDE4
-	adds r0, r4, #0
-	bl GetNextFrame
-_08063462:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08063464: .4byte gUnk_0810C8D4
-_08063468: .4byte gUnk_0810C894
-
-	thumb_func_start sub_0806346C
-sub_0806346C: @ 0x0806346C
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldr r6, _080634D8 @ =gLinkEntity
-	movs r0, #0x2e
-	ldrsh r1, [r6, r0]
-	movs r2, #0x2e
-	ldrsh r0, [r5, r2]
-	subs r4, r1, r0
-	movs r0, #0x32
-	ldrsh r1, [r6, r0]
-	movs r2, #0x32
-	ldrsh r0, [r5, r2]
-	subs r3, r1, r0
-	adds r4, #0x30
-	adds r3, #0x18
-	cmp r4, #0
-	bge _08063490
-	movs r4, #0
-_08063490:
-	cmp r4, #0x50
-	ble _08063496
-	movs r4, #0x50
-_08063496:
-	cmp r3, #0
-	bge _0806349C
-	movs r3, #0
-_0806349C:
-	cmp r3, #0x40
-	ble _080634A2
-	movs r3, #0x40
-_080634A2:
-	asrs r4, r4, #4
-	asrs r3, r3, #4
-	ldr r2, _080634DC @ =gUnk_0810C8F0
-	ldrb r1, [r6, #0x14]
-	lsrs r1, r1, #1
-	lsls r0, r4, #2
-	adds r1, r1, r0
-	lsls r0, r3, #1
-	adds r0, r0, r3
-	lsls r0, r0, #3
-	adds r1, r1, r0
-	adds r1, r1, r2
-	ldrb r4, [r1]
-	ldrb r0, [r5, #0xb]
-	cmp r4, r0
-	beq _080634D6
-	lsls r3, r4, #3
-	ldr r0, _080634E0 @ =gUnk_0810C89C
-	adds r3, r3, r0
-	movs r2, #4
-	ldrsb r2, [r3, r2]
-	adds r0, r5, #0
-	movs r1, #1
-	bl sub_08078850
-	strb r4, [r5, #0xb]
-_080634D6:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080634D8: .4byte gLinkEntity
-_080634DC: .4byte gUnk_0810C8F0
-_080634E0: .4byte gUnk_0810C89C
-
-	thumb_func_start sub_080634E4
-sub_080634E4: @ 0x080634E4
-	ldrb r0, [r0, #0xb]
-	str r0, [r1, #4]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_080634EC
-sub_080634EC: @ 0x080634EC
-	ldr r2, _080634FC @ =gRoomVars
-	ldr r1, _08063500 @ =gUnk_0810C88C
-	ldrb r0, [r0, #0xb]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	strb r0, [r2, #6]
-	bx lr
-	.align 2, 0
-_080634FC: .4byte gRoomVars
-_08063500: .4byte gUnk_0810C88C
-
-	thumb_func_start sub_08063504
-sub_08063504: @ 0x08063504
-	push {r4, lr}
-	adds r4, r1, #0
-	ldr r1, _08063520 @ =gUnk_0810C88C
-	ldrb r0, [r0, #0xb]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	bl sub_080544DC
-	rsbs r1, r0, #0
-	orrs r1, r0
-	lsrs r1, r1, #0x1f
-	str r1, [r4, #0x14]
-	pop {r4, pc}
-	.align 2, 0
-_08063520: .4byte gUnk_0810C88C

asm/beetle.s

@@ -41,7 +41,7 @@ sub_08021780: @ 0x08021780
 	beq _080217F4
 	b _080217FA
 _08021792:
-	ldr r0, _080217A4 @ =gLinkState
+	ldr r0, _080217A4 @ =gPlayerState
 	adds r0, #0xa8
 	ldrb r0, [r0]
 	cmp r0, #0x18
@@ -50,7 +50,7 @@ _08021792:
 	bl sub_08021768
 	b _080217FA
 	.align 2, 0
-_080217A4: .4byte gLinkState
+_080217A4: .4byte gPlayerState
 _080217A8:
 	movs r1, #0
 	movs r0, #5
@@ -71,7 +71,7 @@ _080217A8:
 	movs r1, #3
 	orrs r0, r1
 	strb r0, [r2]
-	ldr r0, _080217EC @ =gLinkEntity
+	ldr r0, _080217EC @ =gPlayerEntity
 	adds r1, r4, #0
 	bl CopyPositionAndSpriteOffset
 	ldr r0, _080217F0 @ =0x0000FFFF
@@ -85,7 +85,7 @@ _080217A8:
 	bl InitializeAnimation
 	b _080217FA
 	.align 2, 0
-_080217EC: .4byte gLinkEntity
+_080217EC: .4byte gPlayerEntity
 _080217F0: .4byte 0x0000FFFF
 _080217F4:
 	adds r0, r4, #0
@@ -364,7 +364,7 @@ _080219C2:
 	movs r1, #0
 	bl InitializeAnimation
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08021A04:
 	pop {r4, pc}
 	.align 2, 0
@@ -376,7 +376,7 @@ sub_08021A10: @ 0x08021A10
 	push {r4, lr}
 	adds r4, r0, #0
 	bl GetNextFrame
-	ldr r1, _08021A60 @ =gLinkEntity
+	ldr r1, _08021A60 @ =gPlayerEntity
 	adds r0, r4, #0
 	movs r2, #0x78
 	movs r3, #0x50
@@ -409,7 +409,7 @@ sub_08021A10: @ 0x08021A10
 _08021A5E:
 	pop {r4, pc}
 	.align 2, 0
-_08021A60: .4byte gLinkEntity
+_08021A60: .4byte gPlayerEntity
 
 	thumb_func_start sub_08021A64
 sub_08021A64: @ 0x08021A64
@@ -542,7 +542,7 @@ _08021B60:
 sub_08021B64: @ 0x08021B64
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
-	ldr r0, _08021B88 @ =gLinkState
+	ldr r0, _08021B88 @ =gPlayerState
 	ldr r1, [r0, #0x30]
 	movs r2, #4
 	ands r1, r2
@@ -558,7 +558,7 @@ sub_08021B64: @ 0x08021B64
 	bl InitializeAnimation
 	b _08021C4E
 	.align 2, 0
-_08021B88: .4byte gLinkState
+_08021B88: .4byte gPlayerState
 _08021B8C:
 	movs r5, #1
 	adds r0, r6, #0
@@ -603,7 +603,7 @@ _08021BC8:
 	adds r0, r4, #0
 	adds r0, #0x87
 	strb r5, [r0]
-	ldr r2, _08021BEC @ =gLinkEntity
+	ldr r2, _08021BEC @ =gPlayerEntity
 	ldrb r1, [r2, #0x15]
 	adds r0, r1, #0
 	cmp r0, #0xff
@@ -611,7 +611,7 @@ _08021BC8:
 	movs r0, #0x10
 	b _08021BF6
 	.align 2, 0
-_08021BEC: .4byte gLinkEntity
+_08021BEC: .4byte gPlayerEntity
 _08021BF0:
 	ldrb r0, [r2, #0x14]
 	lsls r0, r0, #2
@@ -637,7 +637,7 @@ _08021C04:
 	ldrb r0, [r1]
 	adds r0, #1
 	strb r0, [r1]
-	ldr r0, _08021C50 @ =gLinkEntity
+	ldr r0, _08021C50 @ =gPlayerEntity
 	adds r1, r4, #0
 	bl CopyPositionAndSpriteOffset
 	ldr r2, _08021C54 @ =gUnk_080CB5E4
@@ -662,7 +662,7 @@ _08021C04:
 _08021C4E:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08021C50: .4byte gLinkEntity
+_08021C50: .4byte gPlayerEntity
 _08021C54: .4byte gUnk_080CB5E4
 
 	thumb_func_start sub_08021C58

asm/bell.s

@@ -1,58 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Bell
-Bell: @ 0x08097D78
-	push {lr}
-	ldr r2, _08097D8C @ =gUnk_08123384
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08097D8C: .4byte gUnk_08123384
-
-	thumb_func_start sub_08097D90
-sub_08097D90: @ 0x08097D90
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r3, #1
-	movs r2, #1
-	strb r2, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	orrs r0, r3
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x38
-	strb r2, [r0]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitAnimationForceUpdate
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08097DCC
-sub_08097DCC: @ 0x08097DCC
-	push {lr}
-	bl UpdateAnimationSingleFrame
-	pop {pc}

asm/bigBarrel.s

@@ -509,7 +509,7 @@ _08088DEC:
 _08088E1E:
 	strb r1, [r4, #0xb]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	b _08088E6E
 _08088E28:
 	ldrb r0, [r4, #0xb]
@@ -586,7 +586,7 @@ _08088E94:
 	.align 2, 0
 _08088EB0: .4byte gRoomVars
 _08088EB4:
-	ldr r0, _08088F18 @ =gUnk_030010A0
+	ldr r0, _08088F18 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #7
 	ands r0, r1
@@ -635,7 +635,7 @@ _08088EB4:
 _08088F14:
 	pop {r4, pc}
 	.align 2, 0
-_08088F18: .4byte gUnk_030010A0
+_08088F18: .4byte gScreenTransition
 _08088F1C: .4byte gUnk_08120C52
 
 	thumb_func_start sub_08088F20

asm/bigGoron.s

@@ -89,13 +89,13 @@ sub_0806D0B0: @ 0x0806D0B0
 	movs r1, #0
 	str r1, [r0]
 	movs r0, #0x30
-	bl sub_0801D7EC
+	bl LoadGfxGroup
 	bl sub_0806D110
 	ldr r5, _0806D0EC @ =gUnk_02002F00
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r5, #0
-	bl sub_0801D630
+	bl _DmaZero
 	cmp r4, #0
 	beq _0806D0DA
 	adds r0, r4, #0
@@ -120,7 +120,7 @@ sub_0806D0F8: @ 0x0806D0F8
 	movs r0, #7
 	movs r1, #0x4c
 	movs r2, #7
-	bl sub_0805EB00
+	bl FindEntityInListBySubtype
 	cmp r0, #0
 	beq _0806D10C
 	bl sub_0806D0B0
@@ -570,7 +570,7 @@ _0806D45E:
 	adds r0, r4, #0
 	bl sub_0807DDE4
 _0806D46C:
-	ldr r0, _0806D4A8 @ =gUnk_030010A0
+	ldr r0, _0806D4A8 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #1
 	ands r0, r1
@@ -599,7 +599,7 @@ _0806D46C:
 	strb r0, [r2]
 	b _0806D4BE
 	.align 2, 0
-_0806D4A8: .4byte gUnk_030010A0
+_0806D4A8: .4byte gScreenTransition
 _0806D4AC:
 	adds r1, r4, #0
 	adds r1, #0x63
@@ -771,7 +771,7 @@ sub_0806D5D4: @ 0x0806D5D4
 	push {lr}
 	bl sub_08053500
 	movs r0, #0xd
-	bl sub_0805436C
+	bl IsItemEquipped
 	adds r1, r0, #0
 	cmp r1, #2
 	beq _0806D5F0
@@ -928,7 +928,7 @@ sub_0806D6D0: @ 0x0806D6D0
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #2
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D6EE
@@ -940,7 +940,7 @@ _0806D6EE:
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #1
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D706
@@ -961,7 +961,7 @@ sub_0806D70C: @ 0x0806D70C
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #2
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0806D728
@@ -972,7 +972,7 @@ _0806D728:
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #1
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0806D746
@@ -996,7 +996,7 @@ sub_0806D74C: @ 0x0806D74C
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #2
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D76A
@@ -1008,7 +1008,7 @@ _0806D76A:
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #1
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D782
@@ -1029,7 +1029,7 @@ sub_0806D788: @ 0x0806D788
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #2
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D7A6
@@ -1041,7 +1041,7 @@ _0806D7A6:
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #1
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D7BE
@@ -1058,7 +1058,7 @@ sub_0806D7C4: @ 0x0806D7C4
 	sub sp, #4
 	adds r4, r0, #0
 	adds r5, r1, #0
-	ldr r1, _0806D800 @ =gLinkEntity
+	ldr r1, _0806D800 @ =gPlayerEntity
 	ldrh r0, [r1, #0x2e]
 	movs r2, #0
 	strh r0, [r4, #0x2e]
@@ -1070,7 +1070,7 @@ sub_0806D7C4: @ 0x0806D7C4
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #2
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	cmp r0, #0
 	beq _0806D7FC
 	movs r1, #0x2e
@@ -1084,7 +1084,7 @@ _0806D7FC:
 	add sp, #4
 	pop {r4, r5, pc}
 	.align 2, 0
-_0806D800: .4byte gLinkEntity
+_0806D800: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806D804
 sub_0806D804: @ 0x0806D804
@@ -1098,7 +1098,7 @@ sub_0806D804: @ 0x0806D804
 	movs r1, #0x4c
 	movs r2, #7
 	movs r3, #2
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0806D83A
@@ -1115,7 +1115,7 @@ sub_0806D804: @ 0x0806D804
 	ands r0, r1
 	strb r0, [r2]
 _0806D83A:
-	ldr r0, _0806D854 @ =gLinkEntity
+	ldr r0, _0806D854 @ =gPlayerEntity
 	movs r1, #0x2e
 	ldrsh r2, [r0, r1]
 	movs r1, #0x32
@@ -1127,7 +1127,7 @@ _0806D83A:
 	add sp, #4
 	pop {r4, r5, pc}
 	.align 2, 0
-_0806D854: .4byte gLinkEntity
+_0806D854: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806D858
 sub_0806D858: @ 0x0806D858

asm/bigPushableLever.s

@@ -73,7 +73,7 @@ sub_08098F14: @ 0x08098F14
 	bl sub_08079F8C
 	cmp r0, #0
 	beq _08098F84
-	ldr r2, _08098F88 @ =gLinkState
+	ldr r2, _08098F88 @ =gPlayerState
 	movs r0, #0x98
 	strb r0, [r2, #6]
 	movs r0, #5
@@ -82,7 +82,7 @@ sub_08098F14: @ 0x08098F14
 	movs r1, #1
 	orrs r0, r1
 	str r0, [r2, #0x30]
-	ldr r1, _08098F8C @ =gLinkEntity
+	ldr r1, _08098F8C @ =gPlayerEntity
 	strh r6, [r1, #0x2c]
 	strh r6, [r1, #0x30]
 	ldrb r0, [r1, #0x14]
@@ -91,8 +91,8 @@ sub_08098F14: @ 0x08098F14
 _08098F84:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08098F88: .4byte gLinkState
-_08098F8C: .4byte gLinkEntity
+_08098F88: .4byte gPlayerState
+_08098F8C: .4byte gPlayerEntity
 
 	thumb_func_start sub_08098F90
 sub_08098F90: @ 0x08098F90

asm/bigVortex.s

@@ -123,7 +123,7 @@ _08098DC2:
 sub_08098DC4: @ 0x08098DC4
 	push {r4, r5, r6, lr}
 	adds r5, r0, #0
-	ldr r6, _08098E2C @ =gLinkEntity
+	ldr r6, _08098E2C @ =gPlayerEntity
 	adds r1, r6, #0
 	movs r2, #8
 	movs r3, #8
@@ -144,7 +144,7 @@ sub_08098DC4: @ 0x08098DC4
 	adds r0, r5, #0
 	adds r1, r6, #0
 	bl ResolveEntityOnTop
-	ldr r1, _08098E30 @ =gLinkState
+	ldr r1, _08098E30 @ =gPlayerState
 	movs r0, #0x1f
 	strb r0, [r1, #0xc]
 	adds r0, r1, #0
@@ -168,8 +168,8 @@ _08098E24:
 	bl UpdateAnimationSingleFrame
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08098E2C: .4byte gLinkEntity
-_08098E30: .4byte gLinkState
+_08098E2C: .4byte gPlayerEntity
+_08098E30: .4byte gPlayerState
 
 	thumb_func_start sub_08098E34
 sub_08098E34: @ 0x08098E34

asm/bird.s

@@ -74,7 +74,7 @@ sub_0809CF54: @ 0x0809CF54
 	ldr r0, _0809CFE8 @ =0x00000123
 	bl PlaySFX
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0
 	bl InitAnimationForceUpdate
@@ -162,7 +162,7 @@ sub_0809D048: @ 0x0809D048
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x17
 	bl InitAnimationForceUpdate
@@ -266,7 +266,7 @@ sub_0809D10C: @ 0x0809D10C
 	movs r0, #1
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	movs r1, #0x17
 	bl InitAnimationForceUpdate
@@ -277,7 +277,7 @@ sub_0809D10C: @ 0x0809D10C
 sub_0809D130: @ 0x0809D130
 	push {lr}
 	adds r2, r0, #0
-	ldr r0, _0809D148 @ =gLinkState
+	ldr r0, _0809D148 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -287,7 +287,7 @@ sub_0809D130: @ 0x0809D130
 	bl sub_0800445C
 	b _0809D170
 	.align 2, 0
-_0809D148: .4byte gLinkState
+_0809D148: .4byte gPlayerState
 _0809D14C:
 	adds r0, r2, #0
 	bl sub_08017850
@@ -323,7 +323,7 @@ sub_0809D178: @ 0x0809D178
 	movs r0, #2
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r1, r4, #0
 	adds r1, #0x5a
 	movs r0, #0x80
@@ -384,7 +384,7 @@ sub_0809D1F0: @ 0x0809D1F0
 	cmp r0, #1
 	beq _0809D2B0
 	bl sub_08078B48
-	ldr r2, _0809D220 @ =gLinkEntity
+	ldr r2, _0809D220 @ =gPlayerEntity
 	ldrb r1, [r2, #0x18]
 	movs r0, #4
 	rsbs r0, r0, #0
@@ -395,7 +395,7 @@ sub_0809D1F0: @ 0x0809D1F0
 	mov r8, r1
 	b _0809D3A8
 	.align 2, 0
-_0809D220: .4byte gLinkEntity
+_0809D220: .4byte gPlayerEntity
 _0809D224:
 	ldrb r1, [r5, #0xe]
 	cmp r1, #0
@@ -440,7 +440,7 @@ _0809D234:
 	ldr r0, _0809D2A4 @ =gRoomControls
 	ldrh r0, [r0, #0xa]
 	strh r0, [r5, #0x2e]
-	ldr r0, _0809D2A8 @ =gLinkEntity
+	ldr r0, _0809D2A8 @ =gPlayerEntity
 	ldrh r0, [r0, #0x32]
 	strh r0, [r5, #0x32]
 	mov r3, sb
@@ -460,10 +460,10 @@ _0809D234:
 	.align 2, 0
 _0809D2A0: .4byte 0xFFEC0000
 _0809D2A4: .4byte gRoomControls
-_0809D2A8: .4byte gLinkEntity
+_0809D2A8: .4byte gPlayerEntity
 _0809D2AC: .4byte 0x00000123
 _0809D2B0:
-	ldr r6, _0809D430 @ =gLinkEntity
+	ldr r6, _0809D430 @ =gPlayerEntity
 	adds r0, r6, #0
 	adds r0, #0x38
 	ldrb r1, [r0]
@@ -504,7 +504,7 @@ _0809D2D6:
 	beq _0809D3A8
 	cmp r0, #9
 	beq _0809D3A8
-	ldr r7, _0809D438 @ =gLinkState
+	ldr r7, _0809D438 @ =gPlayerState
 	adds r0, r7, #0
 	adds r0, #0xa8
 	ldrb r0, [r0]
@@ -594,7 +594,7 @@ _0809D3A8:
 	ldr r4, [r5, #0x54]
 	cmp r4, #0
 	beq _0809D454
-	ldr r2, _0809D430 @ =gLinkEntity
+	ldr r2, _0809D430 @ =gPlayerEntity
 	movs r3, #0x2e
 	ldrsh r1, [r2, r3]
 	movs r3, #0x2e
@@ -647,9 +647,9 @@ _0809D3DA:
 	strb r1, [r4, #0x1b]
 	b _0809D454
 	.align 2, 0
-_0809D430: .4byte gLinkEntity
+_0809D430: .4byte gPlayerEntity
 _0809D434: .4byte gTextBox
-_0809D438: .4byte gLinkState
+_0809D438: .4byte gPlayerState
 _0809D43C: .4byte gUnk_03003DC0
 _0809D440: .4byte gUnk_02034490
 _0809D444: .4byte 0xFFF80000
@@ -675,13 +675,13 @@ _0809D454:
 	str r1, [r0, #0x40]
 	movs r0, #9
 	movs r1, #0
-	bl sub_080A7138
+	bl MenuFadeIn
 _0809D478:
 	ldr r4, [r5, #0x54]
 	cmp r4, #0
 	beq _0809D484
 	adds r0, r4, #0
-	bl sub_0805E79C
+	bl DeleteEntityAny
 _0809D484:
 	bl DeleteThisEntity
 _0809D488:
@@ -751,7 +751,7 @@ sub_0809D498: @ 0x0809D498
 	ldr r0, _0809D53C @ =gRoomControls
 	ldrh r0, [r0, #0xa]
 	strh r0, [r5, #0x2e]
-	ldr r0, _0809D540 @ =gLinkEntity
+	ldr r0, _0809D540 @ =gPlayerEntity
 	ldrh r0, [r0, #0x32]
 	strh r0, [r5, #0x32]
 	ldr r0, _0809D544 @ =0x00000123
@@ -773,14 +773,14 @@ sub_0809D498: @ 0x0809D498
 _0809D534: .4byte 0xFFFD8000
 _0809D538: .4byte 0xFFB4C000
 _0809D53C: .4byte gRoomControls
-_0809D540: .4byte gLinkEntity
+_0809D540: .4byte gPlayerEntity
 _0809D544: .4byte 0x00000123
 _0809D548:
 	adds r7, r5, #0
 	adds r7, #0x68
 	cmp r0, #1
 	bne _0809D62E
-	ldr r6, _0809D658 @ =gLinkEntity
+	ldr r6, _0809D658 @ =gPlayerEntity
 	ldrb r1, [r6, #0x18]
 	movs r0, #4
 	rsbs r0, r0, #0
@@ -904,7 +904,7 @@ _0809D652:
 	mov r8, r3
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0809D658: .4byte gLinkEntity
+_0809D658: .4byte gPlayerEntity
 _0809D65C: .4byte 0xFFF80000
 _0809D660: .4byte gRoomControls
 _0809D664: .4byte gUnk_02034490
@@ -914,7 +914,7 @@ _0809D668: .4byte gUnk_0800B0AC
 sub_0809D66C: @ 0x0809D66C
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _0809D694 @ =gLinkEntity
+	ldr r0, _0809D694 @ =gPlayerEntity
 	ldrb r1, [r0, #0x1a]
 	lsls r1, r1, #0x1c
 	lsrs r1, r1, #0x1c
@@ -933,7 +933,7 @@ sub_0809D66C: @ 0x0809D66C
 	beq _0809D6A2
 	b _0809D6FE
 	.align 2, 0
-_0809D694: .4byte gLinkEntity
+_0809D694: .4byte gPlayerEntity
 _0809D698:
 	cmp r0, #2
 	beq _0809D6F4
@@ -1002,7 +1002,7 @@ CreateBird: @ 0x0809D700
 	movs r1, #0x95
 	movs r2, #6
 	movs r3, #8
-	bl sub_0805EB2C
+	bl FindEntityInListByForm
 	adds r4, r0, #0
 	cmp r4, #0
 	bne _0809D732

asm/bobomb.s

@@ -86,13 +86,13 @@ _0802C70C:
 	adds r1, #0x42
 	movs r0, #0
 	strb r0, [r1]
-	ldr r0, _0802C728 @ =gLinkEntity
+	ldr r0, _0802C728 @ =gPlayerEntity
 	adds r0, #0x42
 	movs r1, #4
 	strb r1, [r0]
 	b _0802C7A6
 	.align 2, 0
-_0802C728: .4byte gLinkEntity
+_0802C728: .4byte gPlayerEntity
 _0802C72C:
 	movs r1, #0
 	movs r0, #3
@@ -258,7 +258,7 @@ sub_0802C83C: @ 0x0802C83C
 	bne _0802C884
 	movs r0, #3
 	strb r0, [r4, #0xc]
-	ldr r0, _0802C86C @ =gLinkEntity
+	ldr r0, _0802C86C @ =gPlayerEntity
 	ldrb r0, [r0, #0x14]
 	movs r1, #6
 	ands r1, r0
@@ -268,7 +268,7 @@ sub_0802C83C: @ 0x0802C83C
 	beq _0802C876
 	b _0802C87C
 	.align 2, 0
-_0802C86C: .4byte gLinkEntity
+_0802C86C: .4byte gPlayerEntity
 _0802C870:
 	ldrh r0, [r4, #0x2e]
 	subs r0, #6
@@ -495,7 +495,7 @@ sub_0802C9D0: @ 0x0802C9D0
 sub_0802CA10: @ 0x0802CA10
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _0802CA30 @ =gLinkState
+	ldr r0, _0802CA30 @ =gPlayerState
 	ldrb r0, [r0, #5]
 	cmp r0, #5
 	beq _0802CA42
@@ -509,7 +509,7 @@ sub_0802CA10: @ 0x0802CA10
 	bl sub_0802CBC4
 	b _0802CA66
 	.align 2, 0
-_0802CA30: .4byte gLinkState
+_0802CA30: .4byte gPlayerState
 _0802CA34:
 	adds r0, r4, #0
 	bl sub_0802CC18
@@ -521,7 +521,7 @@ _0802CA42:
 	adds r1, #0x83
 	movs r0, #2
 	strb r0, [r1]
-	ldr r0, _0802CA68 @ =gLinkEntity
+	ldr r0, _0802CA68 @ =gPlayerEntity
 	ldrb r0, [r0, #0x14]
 	lsls r0, r0, #2
 	movs r1, #4
@@ -536,7 +536,7 @@ _0802CA42:
 _0802CA66:
 	pop {r4, pc}
 	.align 2, 0
-_0802CA68: .4byte gLinkEntity
+_0802CA68: .4byte gPlayerEntity
 
 	thumb_func_start sub_0802CA6C
 sub_0802CA6C: @ 0x0802CA6C
@@ -594,7 +594,7 @@ sub_0802CA94: @ 0x0802CA94
 	strb r0, [r1]
 	subs r1, #2
 	strb r0, [r1]
-	ldr r0, _0802CAF4 @ =gLinkEntity
+	ldr r0, _0802CAF4 @ =gPlayerEntity
 	ldrb r1, [r0, #0x14]
 	lsls r1, r1, #2
 	movs r0, #4
@@ -609,7 +609,7 @@ sub_0802CA94: @ 0x0802CA94
 	bl InitializeAnimation
 	pop {pc}
 	.align 2, 0
-_0802CAF4: .4byte gLinkEntity
+_0802CAF4: .4byte gPlayerEntity
 
 	thumb_func_start sub_0802CAF8
 sub_0802CAF8: @ 0x0802CAF8

asm/bombPeahat.s

@@ -1110,7 +1110,7 @@ _0802B10E:
 	ldrb r0, [r4, #0xd]
 	cmp r0, #1
 	bne _0802B12E
-	ldr r0, _0802B188 @ =gLinkState
+	ldr r0, _0802B188 @ =gPlayerState
 	strb r1, [r0, #5]
 _0802B12E:
 	adds r0, r4, #0
@@ -1157,7 +1157,7 @@ _0802B16C:
 	strb r0, [r1]
 	b _0802B19E
 	.align 2, 0
-_0802B188: .4byte gLinkState
+_0802B188: .4byte gPlayerState
 _0802B18C: .4byte gUnk_080CD17C
 _0802B190:
 	adds r0, r4, #0

asm/book.s

@@ -71,7 +71,7 @@ _0809B420:
 	strb r0, [r4, #0xb]
 _0809B424:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r1, [r4, #0xa]
 	adds r1, #0x39
 	adds r0, r4, #0
@@ -174,7 +174,7 @@ _0809B4C0:
 	strh r0, [r4, #0x24]
 	movs r0, #0x10
 	strb r0, [r4, #0x15]
-	ldr r2, _0809B510 @ =gLinkState
+	ldr r2, _0809B510 @ =gPlayerState
 	movs r0, #0x9e
 	strb r0, [r2, #6]
 	movs r0, #5
@@ -183,7 +183,7 @@ _0809B4C0:
 	movs r1, #1
 	orrs r0, r1
 	str r0, [r2, #0x30]
-	ldr r1, _0809B514 @ =gLinkEntity
+	ldr r1, _0809B514 @ =gPlayerEntity
 	strh r3, [r1, #0x2c]
 	strh r3, [r1, #0x30]
 	ldrb r0, [r1, #0x14]
@@ -193,8 +193,8 @@ _0809B4C0:
 	bl sub_08004488
 	b _0809B520
 	.align 2, 0
-_0809B510: .4byte gLinkState
-_0809B514: .4byte gLinkEntity
+_0809B510: .4byte gPlayerState
+_0809B514: .4byte gPlayerEntity
 _0809B518: .4byte 0x0000010F
 _0809B51C:
 	movs r0, #0x16
@@ -283,7 +283,7 @@ _0809B5B0:
 sub_0809B5B4: @ 0x0809B5B4
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _0809B5CC @ =gLinkState
+	ldr r0, _0809B5CC @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -293,7 +293,7 @@ sub_0809B5B4: @ 0x0809B5B4
 	bl sub_0800445C
 	b _0809B5EA
 	.align 2, 0
-_0809B5CC: .4byte gLinkState
+_0809B5CC: .4byte gPlayerState
 _0809B5D0:
 	adds r0, r4, #0
 	bl sub_08017850
@@ -327,7 +327,7 @@ _0809B606:
 	movs r0, #7
 	movs r1, #0x1a
 	movs r2, #7
-	bl sub_0805EB00
+	bl FindEntityInListBySubtype
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0809B682
@@ -396,14 +396,14 @@ _0809B684: .4byte gTextBox
 	thumb_func_start sub_0809B688
 sub_0809B688: @ 0x0809B688
 	push {lr}
-	ldr r1, _0809B6A8 @ =gLinkEntity
+	ldr r1, _0809B6A8 @ =gPlayerEntity
 	movs r2, #6
 	movs r3, #0xc
 	bl sub_080041A0
 	adds r1, r0, #0
 	cmp r1, #1
 	bne _0809B6A4
-	ldr r0, _0809B6AC @ =gLinkState
+	ldr r0, _0809B6AC @ =gPlayerState
 	ldrb r0, [r0, #0xd]
 	cmp r0, #0x10
 	beq _0809B6A4
@@ -412,8 +412,8 @@ _0809B6A4:
 	adds r0, r1, #0
 	pop {pc}
 	.align 2, 0
-_0809B6A8: .4byte gLinkEntity
-_0809B6AC: .4byte gLinkState
+_0809B6A8: .4byte gPlayerEntity
+_0809B6AC: .4byte gPlayerState
 
 	thumb_func_start sub_0809B6B0
 sub_0809B6B0: @ 0x0809B6B0

asm/bossDoor.s

@@ -196,7 +196,7 @@ sub_0808C348: @ 0x0808C348
 	ands r0, r1
 	cmp r0, #0
 	bne _0808C37C
-	ldr r0, _0808C374 @ =gUnk_030010A0
+	ldr r0, _0808C374 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #3
 	ands r0, r1
@@ -209,7 +209,7 @@ _0808C36A:
 	bl GetNextFrame
 	b _0808C382
 	.align 2, 0
-_0808C374: .4byte gUnk_030010A0
+_0808C374: .4byte gScreenTransition
 _0808C378: .4byte 0x00000185
 _0808C37C:
 	adds r0, r4, #0
@@ -235,7 +235,7 @@ sub_0808C384: @ 0x0808C384
 	movs r1, #0
 	movs r2, #1
 	bl sub_08078AC0
-	ldr r1, _0808C3B8 @ =gLinkEntity
+	ldr r1, _0808C3B8 @ =gPlayerEntity
 	ldrb r0, [r4, #0xa]
 	lsls r0, r0, #3
 	strb r0, [r1, #0x15]
@@ -244,7 +244,7 @@ _0808C3B0:
 _0808C3B4:
 	pop {r4, pc}
 	.align 2, 0
-_0808C3B8: .4byte gLinkEntity
+_0808C3B8: .4byte gPlayerEntity
 
 	thumb_func_start sub_0808C3BC
 sub_0808C3BC: @ 0x0808C3BC

asm/bowMoblin.s

@@ -498,7 +498,7 @@ _0803C598:
 	beq _0803C5C0
 	adds r0, r5, #0
 	adds r1, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r0, #4
 	movs r1, #0x18
 	ands r0, r1

asm/bowUse.s

@@ -104,7 +104,7 @@ _0801921A:
 	ands r1, r3
 	lsls r1, r1, #6
 	orrs r0, r1
-	ldr r1, _0801928C @ =gLinkEntity
+	ldr r1, _0801928C @ =gPlayerEntity
 	adds r1, #0x38
 	ldrb r1, [r1]
 	movs r2, #0x80
@@ -141,7 +141,7 @@ _0801921A:
 	b _080192A2
 	.align 2, 0
 _08019288: .4byte gRoomControls
-_0801928C: .4byte gLinkEntity
+_0801928C: .4byte gPlayerEntity
 _08019290: .4byte gUnk_08003E44
 _08019294:
 	adds r0, r4, #0
@@ -238,7 +238,7 @@ _08019336:
 	strb r0, [r4, #0x18]
 	b _08019402
 _0801934A:
-	ldr r1, _0801938C @ =gLinkState
+	ldr r1, _0801938C @ =gPlayerState
 	ldr r0, [r1, #0x2c]
 	cmp r0, r4
 	bne _0801935E
@@ -259,7 +259,7 @@ _08019368:
 	ldrb r0, [r0]
 	cmp r0, #0xa
 	bne _08019398
-	ldr r0, _0801938C @ =gLinkState
+	ldr r0, _0801938C @ =gPlayerState
 	adds r2, r0, #0
 	adds r2, #0x21
 	ldrb r0, [r2]
@@ -272,7 +272,7 @@ _08019368:
 	strb r0, [r2]
 	b _08019398
 	.align 2, 0
-_0801938C: .4byte gLinkState
+_0801938C: .4byte gPlayerState
 _08019390:
 	adds r1, r4, #0
 	adds r1, #0x40
@@ -285,7 +285,7 @@ _08019398:
 	ldrb r1, [r4, #0x1e]
 	ldr r2, [r4, #0x78]
 	subs r1, r1, r2
-	ldr r0, _08019408 @ =gLinkEntity
+	ldr r0, _08019408 @ =gPlayerEntity
 	ldrb r0, [r0, #0x1e]
 	cmp r1, r0
 	beq _080193C2
@@ -301,7 +301,7 @@ _080193B8:
 	adds r0, r4, #0
 	bl sub_080042D0
 _080193C2:
-	ldr r0, _08019408 @ =gLinkEntity
+	ldr r0, _08019408 @ =gPlayerEntity
 	adds r0, #0x5a
 	ldrb r1, [r0]
 	movs r0, #1
@@ -316,10 +316,10 @@ _080193C2:
 	movs r0, #4
 	movs r1, #1
 	movs r3, #9
-	bl sub_08077CB8
+	bl CreatePlayerItem
 	cmp r0, #0
 	beq _080193FA
-	ldr r2, _0801940C @ =gLinkState
+	ldr r2, _0801940C @ =gPlayerState
 	ldrb r1, [r2, #4]
 	movs r0, #0x80
 	orrs r0, r1
@@ -328,12 +328,12 @@ _080193C2:
 	rsbs r0, r0, #0
 	bl ModArrows
 _080193FA:
-	ldr r1, _08019408 @ =gLinkEntity
+	ldr r1, _08019408 @ =gPlayerEntity
 	adds r0, r4, #0
 	bl sub_08078E84
 _08019402:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _08019404: .4byte gUnk_02002A40
-_08019408: .4byte gLinkEntity
-_0801940C: .4byte gLinkState
+_08019408: .4byte gPlayerEntity
+_0801940C: .4byte gPlayerState

asm/brocco.s

@@ -109,7 +109,7 @@ _080635D0:
 	movs r0, #2
 	strb r0, [r4, #0xc]
 	adds r0, r4, #0
-	bl sub_0806EDC4
+	bl GetAnimationState
 	adds r1, r0, #0
 	adds r1, #4
 	adds r0, r4, #0
@@ -192,9 +192,9 @@ _08063662:
 	adds r1, r4, #0
 	adds r1, #0x69
 	strb r0, [r1]
-	ldr r1, _080636A0 @ =gLinkEntity
+	ldr r1, _080636A0 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	bl sub_0806F5A4
 	adds r1, r0, #0
 	adds r1, #4
@@ -204,7 +204,7 @@ _08063662:
 	bl sub_0806F118
 	b _080636D4
 	.align 2, 0
-_080636A0: .4byte gLinkEntity
+_080636A0: .4byte gPlayerEntity
 _080636A4:
 	adds r0, r4, #0
 	movs r1, #0

asm/businessScrub.s

@@ -631,7 +631,7 @@ _08028DE4: .4byte 0x00002903
 sub_08028DE8: @ 0x08028DE8
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _08028E08 @ =gLinkEntity
+	ldr r0, _08028E08 @ =gPlayerEntity
 	ldrb r0, [r0, #0xc]
 	cmp r0, #8
 	bne _08028E0C
@@ -645,7 +645,7 @@ sub_08028DE8: @ 0x08028DE8
 	strb r0, [r4]
 	b _08028E3A
 	.align 2, 0
-_08028E08: .4byte gLinkEntity
+_08028E08: .4byte gPlayerEntity
 _08028E0C:
 	ldr r0, _08028E3C @ =0x00002902
 	bl TextboxNoOverlapFollow
@@ -805,7 +805,7 @@ _08028F2C:
 	adds r0, r5, #0
 	bl sub_0804AA1C
 	adds r0, r5, #0
-	bl sub_0806EDC4
+	bl GetAnimationState
 	lsls r0, r0, #3
 	strb r0, [r5, #0x15]
 	adds r0, r5, #0
@@ -928,7 +928,7 @@ sub_08028FFC: @ 0x08028FFC
 	adds r0, r4, #0
 	bl sub_080AE068
 	adds r0, r4, #0
-	bl sub_0801D230
+	bl UnloadOBJPalette
 	adds r1, r4, #0
 	adds r1, #0x60
 	movs r0, #0xe8

asm/businessScrubPrologue.s

@@ -80,7 +80,7 @@ sub_08045BC8: @ 0x08045BC8
 	subs r0, #8
 	strh r0, [r1, #0x36]
 _08045C16:
-	ldr r0, _08045C30 @ =gLinkState
+	ldr r0, _08045C30 @ =gPlayerState
 	adds r0, #0x27
 	movs r1, #0xff
 	strb r1, [r0]
@@ -92,7 +92,7 @@ _08045C16:
 _08045C2C:
 	pop {r4, pc}
 	.align 2, 0
-_08045C30: .4byte gLinkState
+_08045C30: .4byte gPlayerState
 _08045C34: .4byte 0x000001BB
 
 	thumb_func_start nullsub_174
@@ -341,7 +341,7 @@ _08045E12:
 sub_08045E14: @ 0x08045E14
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _08045E2C @ =gLinkState
+	ldr r0, _08045E2C @ =gPlayerState
 	adds r0, #0x27
 	movs r1, #0xff
 	strb r1, [r0]
@@ -352,7 +352,7 @@ sub_08045E14: @ 0x08045E14
 	beq _08045E70
 	b _08045EBA
 	.align 2, 0
-_08045E2C: .4byte gLinkState
+_08045E2C: .4byte gPlayerState
 _08045E30:
 	ldrb r0, [r4, #0xe]
 	cmp r0, #0
@@ -667,7 +667,7 @@ _08046074: .4byte gUnk_080D1A3E
 sub_08046078: @ 0x08046078
 	push {r4, r5, r6, r7, lr}
 	adds r7, r0, #0
-	ldr r0, _08046114 @ =gLinkState
+	ldr r0, _08046114 @ =gPlayerState
 	adds r0, #0x27
 	movs r1, #0
 	strb r1, [r0]
@@ -737,7 +737,7 @@ _0804610C:
 	bl sub_0804AA1C
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08046114: .4byte gLinkState
+_08046114: .4byte gPlayerState
 _08046118: .4byte gUnk_080D1A4E
 _0804611C: .4byte gRoomControls
 _08046120: .4byte 0x000007A2

asm/button.s

@@ -172,7 +172,7 @@ sub_08081BE0: @ 0x08081BE0
 	strb r0, [r4, #0xc]
 	movs r0, #1
 	strb r0, [r4, #0xf]
-	ldr r1, _08081C1C @ =gLinkState
+	ldr r1, _08081C1C @ =gPlayerState
 	ldrb r0, [r1, #5]
 	cmp r0, #2
 	beq _08081C16
@@ -188,7 +188,7 @@ _08081C16:
 	strb r0, [r4, #0xe]
 	b _08081C2C
 	.align 2, 0
-_08081C1C: .4byte gLinkState
+_08081C1C: .4byte gPlayerState
 _08081C20:
 	movs r0, #8
 	strb r0, [r4, #0xe]
@@ -389,19 +389,19 @@ _08081D8E:
 	bl sub_08081E0C
 	cmp r0, #0
 	beq _08081DB4
-	ldr r0, _08081DAC @ =gLinkState
+	ldr r0, _08081DAC @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x90
 	ands r0, r1
 	cmp r0, #0
 	bne _08081E06
-	ldr r6, _08081DB0 @ =gLinkEntity
+	ldr r6, _08081DB0 @ =gPlayerEntity
 	b _08081E06
 	.align 2, 0
-_08081DAC: .4byte gLinkState
-_08081DB0: .4byte gLinkEntity
+_08081DAC: .4byte gPlayerState
+_08081DB0: .4byte gPlayerEntity
 _08081DB4:
-	ldr r0, _08081DD8 @ =gLinkState
+	ldr r0, _08081DD8 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	lsls r1, r1, #0xf
@@ -419,7 +419,7 @@ _08081DB4:
 	ldr r6, [r5]
 	b _08081E06
 	.align 2, 0
-_08081DD8: .4byte gLinkState
+_08081DD8: .4byte gPlayerState
 _08081DDC: .4byte gUnk_03004040
 _08081DE0:
 	ldr r1, [r5, #4]
@@ -450,7 +450,7 @@ _08081E0A:
 sub_08081E0C: @ 0x08081E0C
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r5, _08081E28 @ =gLinkEntity
+	ldr r5, _08081E28 @ =gPlayerEntity
 	movs r1, #0x36
 	ldrsh r0, [r5, r1]
 	cmp r0, #0
@@ -462,7 +462,7 @@ _08081E22:
 	movs r0, #0
 	b _08081E38
 	.align 2, 0
-_08081E28: .4byte gLinkEntity
+_08081E28: .4byte gPlayerEntity
 _08081E2C:
 	adds r0, r4, #0
 	adds r1, r5, #0
@@ -711,12 +711,12 @@ sub_08081FF8: @ 0x08081FF8
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
 	ldr r1, [r4, #0x54]
-	ldr r0, _08082038 @ =gLinkEntity
+	ldr r0, _08082038 @ =gPlayerEntity
 	cmp r1, r0
 	bne _08082036
 	adds r0, r1, #0
 	adds r1, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r6, r0, #0
 	ldr r0, [r4, #0x54]
 	movs r1, #0x80
@@ -741,5 +741,5 @@ _0808202E:
 _08082036:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08082038: .4byte gLinkEntity
+_08082038: .4byte gPlayerEntity
 _0808203C: .4byte gUnk_03004040

asm/carlov.s

@@ -1,53 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start Carlov
-Carlov: @ 0x0806BD54
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _0806BD6A
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	bl sub_0807DD50
-	b _0806BD72
-_0806BD6A:
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_0807DD94
-_0806BD72:
-	adds r4, #0x5a
-	ldrb r1, [r4]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _0806BD94
-	movs r0, #0xef
-	ands r0, r1
-	strb r0, [r4]
-	movs r0, #0x82
-	lsls r0, r0, #1
-	bl sub_08004488
-	movs r0, #0x10
-	movs r1, #0
-	bl sub_08080964
-_0806BD94:
-	ldrb r1, [r4]
-	movs r0, #0x20
-	ands r0, r1
-	cmp r0, #0
-	beq _0806BDAA
-	movs r0, #0xdf
-	ands r0, r1
-	strb r0, [r4]
-	movs r0, #0x7c
-	bl sub_08004488
-_0806BDAA:
-	pop {r4, pc}

asm/carpenter.s

@@ -6,183 +6,6 @@
 
 	.text
 
-
-	thumb_func_start Carpenter
-Carpenter: @ 0x08067158
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r0, #0x84
-	ldr r0, [r0]
-	cmp r0, #0
-	bne _08067168
-	bl DeleteThisEntity
-_08067168:
-	ldrb r5, [r4, #0xc]
-	cmp r5, #1
-	beq _080671A8
-	cmp r5, #1
-	bgt _08067178
-	cmp r5, #0
-	beq _0806717E
-	b _08067224
-_08067178:
-	cmp r5, #2
-	beq _0806720A
-	b _08067224
-_0806717E:
-	ldrb r1, [r4, #0xa]
-	lsls r1, r1, #4
-	ldr r0, _080671EC @ =gUnk_08110CA8
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl LoadExtraSpriteData
-	cmp r0, #0
-	beq _08067224
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	adds r0, #0x69
-	strb r5, [r0]
-	adds r0, r4, #0
-	movs r1, #2
-	bl sub_0805E3A0
-	adds r0, r4, #0
-	bl sub_0807DD64
-_080671A8:
-	adds r2, r4, #0
-	adds r2, #0x39
-	movs r1, #0
-	ldrsb r1, [r2, r1]
-	cmp r1, #2
-	bne _080671F4
-	movs r0, #0
-	strb r1, [r4, #0xc]
-	strb r0, [r2]
-	adds r0, r4, #0
-	adds r0, #0x58
-	ldrb r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x69
-	strb r0, [r1]
-	ldr r1, _080671F0 @ =gLinkEntity
-	adds r0, r4, #0
-	bl sub_080045C4
-	bl sub_0806F5A4
-	adds r1, r0, #0
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #3
-	adds r0, #4
-	adds r1, r1, r0
-	adds r0, r4, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_0806F118
-	b _08067224
-	.align 2, 0
-_080671EC: .4byte gUnk_08110CA8
-_080671F0: .4byte gLinkEntity
-_080671F4:
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_0807DDAC
-	adds r0, r4, #0
-	bl sub_0807DDE4
-	adds r0, r4, #0
-	bl GetNextFrame
-	b _08067224
-_0806720A:
-	adds r0, r4, #0
-	bl UpdateFuseInteraction
-	cmp r0, #0
-	beq _08067224
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	adds r0, #0x69
-	ldrb r1, [r0]
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08067224:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start Carpenter_Head
-Carpenter_Head: @ 0x08067228
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	cmp r0, #1
-	bhi _0806727E
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r2, [r0]
-	movs r0, #0x81
-	rsbs r0, r0, #0
-	ands r2, r0
-	adds r0, r4, #0
-	movs r1, #0
-	bl SetExtraSpriteFrame
-	ldrb r2, [r4, #0x1e]
-	adds r0, r4, #0
-	movs r1, #1
-	bl SetExtraSpriteFrame
-	adds r0, r4, #0
-	adds r0, #0x5b
-	ldrb r0, [r0]
-	movs r2, #0x3f
-	ands r2, r0
-	adds r0, r4, #0
-	movs r1, #2
-	bl SetExtraSpriteFrame
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #2
-	bl SetSpriteSubEntryOffsetData2
-	adds r0, r4, #0
-	bl sub_0807000C
-	b _080672AC
-_0806727E:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r2, [r0]
-	movs r0, #0x81
-	rsbs r0, r0, #0
-	ands r2, r0
-	adds r0, r4, #0
-	movs r1, #0
-	bl SetExtraSpriteFrame
-	ldrb r2, [r4, #0x1e]
-	adds r0, r4, #0
-	movs r1, #1
-	bl SetExtraSpriteFrame
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #0
-	bl SetSpriteSubEntryOffsetData1
-	adds r0, r4, #0
-	bl sub_0807000C
-_080672AC:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080672B0
-sub_080672B0: @ 0x080672B0
-	push {lr}
-	ldrb r2, [r0, #0x14]
-	lsrs r2, r2, #1
-	ldr r1, [r1, #4]
-	adds r1, r1, r2
-	ldrb r2, [r0, #0xa]
-	lsls r2, r2, #3
-	adds r1, r1, r2
-	bl InitializeAnimation
-	pop {pc}
-	.align 2, 0
-
 	thumb_func_start sub_080672C8
 sub_080672C8: @ 0x080672C8
 	push {r4, r5, lr}

asm/castleMaid.s

@@ -142,9 +142,9 @@ _080645EA:
 	movs r1, #0
 	strb r0, [r4, #0xc]
 	strb r1, [r2]
-	ldr r1, _08064628 @ =gLinkEntity
+	ldr r1, _08064628 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	bl sub_0806F5A4
 	adds r1, r0, #0
 	adds r0, r4, #0
@@ -155,7 +155,7 @@ _080645EA:
 	bl _call_via_r0
 	b _0806463C
 	.align 2, 0
-_08064628: .4byte gLinkEntity
+_08064628: .4byte gPlayerEntity
 _0806462C:
 	ldr r0, _08064640 @ =gTextBox
 	ldrb r1, [r0]

asm/castorWildsStatue.s

@@ -45,7 +45,7 @@ _080673BC: .4byte gUnk_08110E4C
 sub_080673C0: @ 0x080673C0
 	push {lr}
 	adds r2, r0, #0
-	ldr r0, _080673D4 @ =gUnk_030010A0
+	ldr r0, _080673D4 @ =gScreenTransition
 	adds r0, #0x2c
 	ldrb r0, [r0]
 	cmp r0, #0
@@ -53,7 +53,7 @@ sub_080673C0: @ 0x080673C0
 	movs r0, #3
 	b _080673DA
 	.align 2, 0
-_080673D4: .4byte gUnk_030010A0
+_080673D4: .4byte gScreenTransition
 _080673D8:
 	movs r0, #1
 _080673DA:

asm/cat.s

@@ -37,7 +37,7 @@ sub_080677EC: @ 0x080677EC
 	adds r1, #0x2e
 	movs r0, #0xff
 	strb r0, [r1]
-	ldr r0, _0806783C @ =gLinkEntity
+	ldr r0, _0806783C @ =gPlayerEntity
 	movs r2, #0x2e
 	ldrsh r1, [r4, r2]
 	movs r2, #0x2e
@@ -49,7 +49,7 @@ sub_080677EC: @ 0x080677EC
 	orrs r0, r1
 	b _08067848
 	.align 2, 0
-_0806783C: .4byte gLinkEntity
+_0806783C: .4byte gPlayerEntity
 _08067840:
 	ldrb r1, [r4, #0x18]
 	movs r0, #0x41
@@ -500,7 +500,7 @@ sub_08067B80: @ 0x08067B80
 	bl InitAnimationForceUpdate
 	adds r0, r5, #0
 	bl sub_08067DDC
-	ldr r0, _08067BC4 @ =gLinkEntity
+	ldr r0, _08067BC4 @ =gPlayerEntity
 	movs r2, #0x2e
 	ldrsh r1, [r5, r2]
 	movs r2, #0x2e
@@ -512,7 +512,7 @@ sub_08067B80: @ 0x08067B80
 	orrs r0, r1
 	b _08067BD0
 	.align 2, 0
-_08067BC4: .4byte gLinkEntity
+_08067BC4: .4byte gPlayerEntity
 _08067BC8:
 	ldrb r1, [r5, #0x18]
 	movs r0, #0x41
@@ -533,7 +533,7 @@ sub_08067BD4: @ 0x08067BD4
 	movs r1, #0x2e
 	ldrsh r0, [r2, r1]
 	subs r0, #4
-	ldr r1, _08067BF8 @ =gLinkEntity
+	ldr r1, _08067BF8 @ =gPlayerEntity
 	movs r4, #0x2e
 	ldrsh r1, [r1, r4]
 	cmp r0, r1
@@ -543,12 +543,12 @@ sub_08067BD4: @ 0x08067BD4
 	ands r0, r3
 	b _08067C10
 	.align 2, 0
-_08067BF8: .4byte gLinkEntity
+_08067BF8: .4byte gPlayerEntity
 _08067BFC:
 	movs r1, #0x2e
 	ldrsh r0, [r2, r1]
 	adds r0, #4
-	ldr r1, _08067C14 @ =gLinkEntity
+	ldr r1, _08067C14 @ =gPlayerEntity
 	movs r4, #0x2e
 	ldrsh r1, [r1, r4]
 	cmp r0, r1
@@ -560,7 +560,7 @@ _08067C10:
 _08067C12:
 	pop {r4, pc}
 	.align 2, 0
-_08067C14: .4byte gLinkEntity
+_08067C14: .4byte gPlayerEntity
 
 	thumb_func_start sub_08067C18
 sub_08067C18: @ 0x08067C18
@@ -591,7 +591,7 @@ sub_08067C24: @ 0x08067C24
 sub_08067C44: @ 0x08067C44
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r0, _08067C6C @ =gLinkState
+	ldr r0, _08067C6C @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -608,7 +608,7 @@ sub_08067C44: @ 0x08067C44
 	bl sub_08078778
 	b _08067C7C
 	.align 2, 0
-_08067C6C: .4byte gLinkState
+_08067C6C: .4byte gPlayerState
 _08067C70:
 	adds r0, r4, #0
 	adds r0, #0x68
@@ -625,7 +625,7 @@ _08067C7C:
 	adds r5, r0, #0
 	cmp r1, #0
 	beq _08067D1C
-	ldr r1, _08067CB4 @ =gLinkEntity
+	ldr r1, _08067CB4 @ =gPlayerEntity
 	adds r0, r4, #0
 	bl sub_0806FCA0
 	adds r2, r0, #0
@@ -644,7 +644,7 @@ _08067CA6:
 	bl InitAnimationForceUpdate
 	b _08067CEC
 	.align 2, 0
-_08067CB4: .4byte gLinkEntity
+_08067CB4: .4byte gPlayerEntity
 _08067CB8:
 	cmp r2, #1
 	bne _08067CC4

asm/cellOverwriteSet.s

@@ -14,7 +14,7 @@ CellOverwriteSet: @ 0x0801BEF8
 	mov r5, r8
 	push {r5, r6, r7}
 	mov r8, r0
-	ldr r7, _0801BFF0 @ =gLinkEntity
+	ldr r7, _0801BFF0 @ =gPlayerEntity
 	ldrb r0, [r0, #0xc]
 	cmp r0, #0
 	bne _0801BF62
@@ -61,7 +61,7 @@ CellOverwriteSet: @ 0x0801BEF8
 	adds r0, #1
 	strb r0, [r1, #0xc]
 _0801BF62:
-	ldr r2, _0801BFFC @ =gLinkState
+	ldr r2, _0801BFFC @ =gPlayerState
 	mov sb, r2
 	ldrb r1, [r2, #0x1a]
 	movs r0, #0x80
@@ -133,10 +133,10 @@ _0801BFDA:
 	strb r0, [r1]
 	b _0801C0D4
 	.align 2, 0
-_0801BFF0: .4byte gLinkEntity
+_0801BFF0: .4byte gPlayerEntity
 _0801BFF4: .4byte gUnk_080B7B6C
 _0801BFF8: .4byte gRoomControls
-_0801BFFC: .4byte gLinkState
+_0801BFFC: .4byte gPlayerState
 _0801C000: .4byte gUnk_03000FF0
 _0801C004:
 	ldrh r2, [r6, #2]

asm/chestSpawner.s

@@ -158,7 +158,7 @@ sub_08083F14: @ 0x08083F14
 	.align 2, 0
 _08083F74: .4byte gScreen
 _08083F78:
-	ldr r5, _08083FA0 @ =gLinkEntity
+	ldr r5, _08083FA0 @ =gPlayerEntity
 	adds r0, r4, #0
 	adds r1, r5, #0
 	movs r2, #0x10
@@ -177,12 +177,12 @@ _08083F98:
 	strb r0, [r4, #0xd]
 	b _08083FE6
 	.align 2, 0
-_08083FA0: .4byte gLinkEntity
+_08083FA0: .4byte gPlayerEntity
 _08083FA4:
 	ldrb r0, [r4, #0xa]
 	cmp r0, #5
 	beq _08083FB2
-	ldr r0, _08083FC8 @ =gLinkEntity
+	ldr r0, _08083FC8 @ =gPlayerEntity
 	ldrb r0, [r0, #0xc]
 	cmp r0, #1
 	bne _08083FE6
@@ -198,7 +198,7 @@ _08083FB2:
 	bl PlaySFX
 	b _08083FE6
 	.align 2, 0
-_08083FC8: .4byte gLinkEntity
+_08083FC8: .4byte gPlayerEntity
 _08083FCC:
 	ldr r1, _08083FE8 @ =gUnk_02034490
 	movs r0, #0

asm/chuchu.s

@@ -1475,7 +1475,7 @@ _0801F91C:
 	ldr r0, _0801F93C @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 _0801F92C:
 	adds r0, r4, #0

asm/chuchuBoss.s

@@ -584,14 +584,14 @@ _080260EA:
 	cmp r0, #0xff
 	bne _08026106
 	ldr r1, _08026108 @ =gRoomControls
-	ldr r0, _0802610C @ =gLinkEntity
+	ldr r0, _0802610C @ =gPlayerEntity
 	str r0, [r1, #0x30]
 	bl DeleteThisEntity
 _08026106:
 	pop {r4, pc}
 	.align 2, 0
 _08026108: .4byte gRoomControls
-_0802610C: .4byte gLinkEntity
+_0802610C: .4byte gPlayerEntity
 
 	thumb_func_start sub_08026110
 sub_08026110: @ 0x08026110
@@ -791,7 +791,7 @@ sub_0802626C: @ 0x0802626C
 	adds r1, r1, r2
 	ldr r1, [r1]
 	bl _call_via_r1
-	ldr r0, _080262A4 @ =gLinkEntity
+	ldr r0, _080262A4 @ =gPlayerEntity
 	ldrb r0, [r0, #0xc]
 	cmp r0, #0x17
 	beq _08026298
@@ -803,7 +803,7 @@ _08026298:
 	.align 2, 0
 _0802629C: .4byte gUnk_02034490
 _080262A0: .4byte gUnk_080CC20C
-_080262A4: .4byte gLinkEntity
+_080262A4: .4byte gPlayerEntity
 
 	thumb_func_start sub_080262A8
 sub_080262A8: @ 0x080262A8
@@ -829,7 +829,7 @@ sub_080262A8: @ 0x080262A8
 	ldrb r0, [r4, #0xb]
 	cmp r0, #0
 	bne _080262EC
-	ldr r1, _080262E8 @ =gLinkState
+	ldr r1, _080262E8 @ =gPlayerState
 	movs r0, #0x82
 	lsls r0, r0, #1
 	strh r0, [r1, #8]
@@ -839,7 +839,7 @@ sub_080262A8: @ 0x080262A8
 	strb r5, [r0, #3]
 	b _0802631A
 	.align 2, 0
-_080262E8: .4byte gLinkState
+_080262E8: .4byte gPlayerState
 _080262EC:
 	adds r0, r4, #0
 	adds r0, #0x7c
@@ -853,7 +853,7 @@ _080262EC:
 	ldr r1, [r0]
 	movs r0, #3
 	strb r0, [r1, #3]
-	ldr r0, _0802631C @ =gLinkEntity
+	ldr r0, _0802631C @ =gPlayerEntity
 	strb r6, [r0, #0x14]
 	ldr r0, _08026320 @ =gRoomControls
 	str r4, [r0, #0x30]
@@ -866,7 +866,7 @@ _080262EC:
 _0802631A:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0802631C: .4byte gLinkEntity
+_0802631C: .4byte gPlayerEntity
 _08026320: .4byte gRoomControls
 _08026324: .4byte 0x00004022
 
@@ -874,7 +874,7 @@ _08026324: .4byte 0x00004022
 sub_08026328: @ 0x08026328
 	push {lr}
 	adds r2, r0, #0
-	ldr r0, _08026354 @ =gLinkEntity
+	ldr r0, _08026354 @ =gPlayerEntity
 	ldrb r0, [r0, #0xc]
 	cmp r0, #0x17
 	beq _08026352
@@ -895,13 +895,13 @@ sub_08026328: @ 0x08026328
 _08026352:
 	pop {pc}
 	.align 2, 0
-_08026354: .4byte gLinkEntity
+_08026354: .4byte gPlayerEntity
 
 	thumb_func_start sub_08026358
 sub_08026358: @ 0x08026358
 	push {r4, lr}
 	adds r3, r0, #0
-	ldr r4, _08026398 @ =gLinkEntity
+	ldr r4, _08026398 @ =gPlayerEntity
 	ldrb r0, [r4, #0xc]
 	cmp r0, #0xf
 	beq _080263B0
@@ -932,7 +932,7 @@ sub_08026358: @ 0x08026358
 	strb r0, [r1, #0xe]
 	b _080263B0
 	.align 2, 0
-_08026398: .4byte gLinkEntity
+_08026398: .4byte gPlayerEntity
 _0802639C: .4byte gRoomControls
 _080263A0:
 	cmp r2, #0x60
@@ -1145,7 +1145,7 @@ sub_0802650C: @ 0x0802650C
 	adds r0, #1
 	strb r0, [r1, #3]
 	ldr r1, _08026534 @ =gRoomControls
-	ldr r0, _08026538 @ =gLinkEntity
+	ldr r0, _08026538 @ =gPlayerEntity
 	str r0, [r1, #0x30]
 _0802652C:
 	adds r0, r2, #0
@@ -1153,7 +1153,7 @@ _0802652C:
 	pop {pc}
 	.align 2, 0
 _08026534: .4byte gRoomControls
-_08026538: .4byte gLinkEntity
+_08026538: .4byte gPlayerEntity
 
 	thumb_func_start sub_0802653C
 sub_0802653C: @ 0x0802653C
@@ -1221,9 +1221,9 @@ _0802659C:
 	adds r4, #0x7c
 	movs r0, #0x3c
 	strb r0, [r4]
-	ldr r1, _080265E4 @ =gLinkEntity
+	ldr r1, _080265E4 @ =gPlayerEntity
 	adds r0, r5, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r5, #0x15]
 	ldr r0, [r7]
 	ldrb r0, [r0, #4]
@@ -1239,7 +1239,7 @@ _0802659C:
 	adds r0, #0x10
 	b _080265EE
 	.align 2, 0
-_080265E4: .4byte gLinkEntity
+_080265E4: .4byte gPlayerEntity
 _080265E8:
 	adds r1, r5, #0
 	adds r1, #0x80
@@ -1366,15 +1366,15 @@ _080266B0:
 	strh r0, [r4, #0x24]
 	b _08026742
 _080266D6:
-	ldr r0, _08026700 @ =gUnk_030010A0
+	ldr r0, _08026700 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #0x7f
 	ands r0, r1
 	cmp r0, #0
 	bne _080266EC
-	ldr r1, _08026704 @ =gLinkEntity
+	ldr r1, _08026704 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 _080266EC:
 	adds r0, r4, #0
@@ -1387,8 +1387,8 @@ _080266EC:
 	lsls r0, r0, #1
 	b _0802670A
 	.align 2, 0
-_08026700: .4byte gUnk_030010A0
-_08026704: .4byte gLinkEntity
+_08026700: .4byte gScreenTransition
+_08026704: .4byte gPlayerEntity
 _08026708:
 	movs r0, #0xc0
 _0802670A:
@@ -1396,7 +1396,7 @@ _0802670A:
 	ldrb r0, [r4, #0xe]
 	cmp r0, #0
 	beq _0802672C
-	ldr r0, _0802674C @ =gUnk_030010A0
+	ldr r0, _0802674C @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #7
 	ands r0, r1
@@ -1427,7 +1427,7 @@ _08026748:
 	add sp, #4
 	pop {r4, r5, pc}
 	.align 2, 0
-_0802674C: .4byte gUnk_030010A0
+_0802674C: .4byte gScreenTransition
 
 	thumb_func_start sub_08026750
 sub_08026750: @ 0x08026750
@@ -1549,9 +1549,9 @@ _08026820:
 	strh r0, [r5]
 	b _08026860
 _08026830:
-	ldr r1, _08026868 @ =gLinkEntity
+	ldr r1, _08026868 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 	movs r0, #4
 	strb r0, [r4, #0xd]
@@ -1575,7 +1575,7 @@ _08026860:
 	bl sub_080277F8
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08026868: .4byte gLinkEntity
+_08026868: .4byte gPlayerEntity
 
 	thumb_func_start sub_0802686C
 sub_0802686C: @ 0x0802686C
@@ -2643,7 +2643,7 @@ sub_08027064: @ 0x08027064
 	ldrb r0, [r0]
 	cmp r0, #0xa
 	beq _08027098
-	ldr r0, _080270C8 @ =gUnk_030010A0
+	ldr r0, _080270C8 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #0xf
 	ands r0, r1
@@ -2659,14 +2659,14 @@ _08027098:
 	adds r7, r0, #0
 	cmp r1, #0
 	beq _080270E0
-	ldr r0, _080270CC @ =gLinkEntity
+	ldr r0, _080270CC @ =gPlayerEntity
 	movs r2, #0x32
 	ldrsh r4, [r5, r2]
 	movs r1, #0x32
 	ldrsh r2, [r0, r1]
 	cmp r4, r2
 	beq _080270E0
-	ldr r0, _080270C8 @ =gUnk_030010A0
+	ldr r0, _080270C8 @ =gScreenTransition
 	ldr r1, [r0]
 	movs r0, #0xf
 	ands r1, r0
@@ -2677,8 +2677,8 @@ _08027098:
 	strb r1, [r3, #0xc]
 	b _080270D4
 	.align 2, 0
-_080270C8: .4byte gUnk_030010A0
-_080270CC: .4byte gLinkEntity
+_080270C8: .4byte gScreenTransition
+_080270CC: .4byte gPlayerEntity
 _080270D0:
 	movs r0, #0x10
 	strb r0, [r3, #0xc]
@@ -2789,7 +2789,7 @@ _08027152:
 	ldrb r0, [r0, #3]
 	cmp r0, #1
 	bls _080271B2
-	ldr r0, _080271DC @ =gLinkEntity
+	ldr r0, _080271DC @ =gPlayerEntity
 	movs r2, #0x2e
 	ldrsh r1, [r5, r2]
 	movs r2, #0x2e
@@ -2821,7 +2821,7 @@ _080271C0:
 	movs r0, #0xf
 	b _080271FC
 	.align 2, 0
-_080271DC: .4byte gLinkEntity
+_080271DC: .4byte gPlayerEntity
 _080271E0:
 	adds r0, r1, #1
 	strb r0, [r2, #3]
@@ -4186,7 +4186,7 @@ _08027C22:
 	ldrb r0, [r6, #0x15]
 	lsrs r0, r0, #2
 	strb r0, [r6, #0x14]
-	ldr r0, _08027C44 @ =gLinkEntity
+	ldr r0, _08027C44 @ =gPlayerEntity
 	movs r2, #0x32
 	ldrsh r1, [r6, r2]
 	movs r2, #0x32
@@ -4201,7 +4201,7 @@ _08027C22:
 	movs r0, #0
 	b _08027C50
 	.align 2, 0
-_08027C44: .4byte gLinkEntity
+_08027C44: .4byte gPlayerEntity
 _08027C48:
 	adds r0, r6, #0
 	adds r0, #0x84

asm/code_08000108.s

@@ -167,140 +167,240 @@ gUnk_08000278::
 	.4byte gUnk_02016654
 	.4byte gUnk_02030EB4
 
+@ call 0x80B19CC
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_08000288
 sub_08000288: @ 0x08000288
 	ldr r3, _080002F4 @ =gUnk_03005740
 	bx r3
 
+@ call 0x80B19D8
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_0800028C
 sub_0800028C: @ 0x0800028C
 	ldr r3, _080002F8 @ =gUnk_0300574C
 	bx r3
 
+@ call 0x80B19EC
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_08000290
 sub_08000290: @ 0x08000290
 	ldr r3, _080002FC @ =gUnk_03005760
 	bx r3
 
+@ call 0x80B19FC
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_08000294
 sub_08000294: @ 0x08000294
 	ldr r3, _08000300 @ =gUnk_03005770
 	bx r3
 
+@ call 0x80B1A04
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_08000298
 sub_08000298: @ 0x08000298
 	ldr r3, _08000304 @ =gUnk_03005778
 	bx r3
 
+@ call 0x80B1A0C
+@ r0: entity*
+@ r1: s32
+@ r2: s32
 	thumb_func_start sub_0800029C
 sub_0800029C: @ 0x0800029C
 	ldr r3, _08000308 @ =gUnk_03005780
 	bx r3
 
+@ call 0x080B1A28
+@ r0: entity
+@ return: u32 (tileType)
 	thumb_func_start GetTileTypeByEntity
 GetTileTypeByEntity: @ 0x080002A0
 	ldr r3, _0800030C @ =gUnk_0300579C
 	bx r3
 
+@ call 0x080B1A34
+@ r0: s32 (xPos)
+@ r1: s32 (yPos)
+@ r2: u32 (layer)
+@ return: u32 (tileType)
 	thumb_func_start GetTileTypeByPos
 GetTileTypeByPos: @ 0x080002A4
 	ldr r3, _08000310 @ =gUnk_030057A8
 	bx r3
 
+@ call 0x080B1A48
+@ r0: s32 (xPos)
+@ r1: s32 (yPos)
+@ r2: u32 (layer)
 	thumb_func_start sub_080002A8
 sub_080002A8: @ 0x080002A8
 	ldr r3, _08000314 @ =gUnk_030057BC
 	bx r3
 
+@ call 0x080B1A58
+@ r0: s32 (xPos)
+@ r1: s32 (yPos)
+@ r2: u32 (layer)
 	thumb_func_start sub_080002AC
 sub_080002AC: @ 0x080002AC
 	ldr r3, _08000318 @ =gUnk_030057CC
 	bx r3
 
+@ call 0x080B1A60
+@ r0: u32 (tileIndex)
+@ r1: u32 (layer)
+@ return: u32 (tileType)
 	thumb_func_start GetTileType
 GetTileType: @ 0x080002B0
 	ldr r3, _0800031C @ =gUnk_030057D4
 	bx r3
 
+@ call 0x080B1A8C
+@ r0: Entity*
+@ r1: u32
+@ r2: u32
 	thumb_func_start sub_080002B4
 sub_080002B4: @ 0x080002B4
 	ldr r3, _08000320 @ =gUnk_03005800
 	bx r3
 
+@ call 0x080B1AA8
+@ r0:
+@ r1:
+@ r2:
+@ return: 
+@ ========
+@ Called every frame a pot is thrown, every frame the screen is sliding in a transition, and once when entering stairs.
 	thumb_func_start sub_080002B8
 sub_080002B8: @ 0x080002B8
 	ldr r3, _08000324 @ =gUnk_0300581C
 	bx r3
 
+@ call 0x080B1AB4
+@ r0: s32 (xPos)
+@ r1: s32 (yPos)
+@ r2: u32 (layer)
 	thumb_func_start sub_080002BC
 sub_080002BC: @ 0x080002BC
 	ldr r3, _08000328 @ =gUnk_03005828
 	bx r3
 
+@ call 0x080B1AC8
+@ r0: u32
+@ r1: u32
+@ r2: u32
+@ return: ???
 	thumb_func_start sub_080002C0
 sub_080002C0: @ 0x080002C0
 	ldr r3, _0800032C @ =gUnk_0300583C
 	bx r3
 
+@ call 0x080B1AD8
+@ r0: Entity*
+@ r1: s32 (xOffset)
+@ r2: s32 (yOffset)
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_080002C4
 sub_080002C4: @ 0x080002C4
 	ldr r3, _08000330 @ =gUnk_0300584C
 	bx r3
 
+@ call 0x080B1AE0
+@ r0: u32 (tileIndex)
+@ r1: u32 (layer)
 	thumb_func_start sub_080002C8
 sub_080002C8: @ 0x080002C8
 	ldr r3, _08000334 @ =gUnk_03005854
 	bx r3
 
+@ call 0x080B1AF0
+@ r0: Entity*
+@ r1: ???
+@ r2: ???
 	thumb_func_start sub_080002CC
 sub_080002CC: @ 0x080002CC
 	ldr r3, _08000338 @ =gUnk_03005864
 	bx r3
 
+@ call 0x080B1B0C
+@ r0: Entity*
 	thumb_func_start sub_080002D0
 sub_080002D0: @ 0x080002D0
 	ldr r3, _0800033C @ =gUnk_03005880
 	bx r3
 
+@ call 0x080B1B18
+@ r0: s32 (xPos)
+@ r1: s32 (yPos)
+@ r2: u32 (layer)
 	thumb_func_start sub_080002D4
 sub_080002D4: @ 0x080002D4
 	ldr r3, _08000340 @ =gUnk_0300588C
 	bx r3
 
+@ call 0x080B1B2C
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_080002D8
 sub_080002D8: @ 0x080002D8
 	ldr r3, _08000344 @ =gUnk_030058A0
 	bx r3
 
+@ call 0x080B1B3C
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_080002DC
 sub_080002DC: @ 0x080002DC
 	ldr r3, _08000348 @ =gUnk_030058B0
 	bx r3
 
+@ call 0x080B1B44
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_080002E0
 sub_080002E0: @ 0x080002E0
 	ldr r3, _0800034C @ =gUnk_030058B8
 	bx r3
 
+@ call 0x080B1B54
+@ r0: u32 (tileIndex)
 	thumb_func_start sub_080002E4
 sub_080002E4: @ 0x080002E4
 	ldr r3, _08000350 @ =gUnk_030058C8
 	bx r3
 
+@ call 0x080B1B68
+@ ========
+@ Unused? Doesn't seem to be called by anything in Ghidra.
 	thumb_func_start sub_080002E8
 sub_080002E8: @ 0x080002E8
 	ldr r3, _08000354 @ =gUnk_030058DC
 	bx r3
 
+@ call 0x080B1B84
+@ r0: u32 (tileIndex)
+@ r1: u32 (layer)
 	thumb_func_start sub_080002EC
 sub_080002EC: @ 0x080002EC
 	ldr r3, _08000358 @ =gUnk_030058F8
 	bx r3
 
+@ call 0x080B1BA4
+@ r0: u32 (tileIndex)
+@ r1: u32 (layer)
+@ r2: ???
 	thumb_func_start sub_080002F0
 sub_080002F0: @ 0x080002F0
 	ldr r3, _0800035C @ =gUnk_03005918
 	bx r3
+
 _080002F4: .4byte gUnk_03005740
 _080002F8: .4byte gUnk_0300574C
 _080002FC: .4byte gUnk_03005760

asm/code_08000E44.s

@@ -59,8 +59,8 @@ sub_08000E92: @ 0x08000E92
 	movs r3, #1
 	b _08000E98
 
-	non_word_aligned_thumb_func_start sub_08000E96
-sub_08000E96: @ 0x08000E96
+	non_word_aligned_thumb_func_start LoadAssetAsync
+LoadAssetAsync: @ 0x08000E96
 	movs r3, #0
 _08000E98:
 	push {r4, r5}

asm/code_080011C4.s

@@ -68,7 +68,7 @@ _08001230:
 	beq _0800123E
 	strb r1, [r0, #0xe]
 	movs r1, #4
-	ldr r3, _0800135C @ =InitializeAnimationAnimation
+	ldr r3, _0800135C @ =UpdateAnimationVariableFrames
 	bx r3
 _0800123E:
 	ldr r3, _08001360 @ =sub_080043B4
@@ -231,21 +231,21 @@ sub_0800132C: @ 0x0800132C
 	cmp r2, #0x11
 	blo _08001352
 _0800134E:
-	ldr r3, _08001378 @ =sub_080045C4
+	ldr r3, _08001378 @ =GetFacingDirection
 	bx r3
 _08001352:
 	movs r0, #0xff
 	bx lr
 	.align 2, 0
 _08001358: .4byte gEnemyFunctions
-_0800135C: .4byte InitializeAnimationAnimation
+_0800135C: .4byte UpdateAnimationVariableFrames
 _08001360: .4byte sub_080043B4
 _08001364: .4byte 0x00001800
 _08001368: .4byte gUnk_080012C8
 _0800136C: .4byte gUnk_080012C8
 _08001370: .4byte sub_080AF18C
 _08001374: .4byte sub_080AF1BC
-_08001378: .4byte sub_080045C4
+_08001378: .4byte GetFacingDirection
 
 gUnk_0800137C:: @ 0800137C
 	.incbin "baserom.gba", 0x00137C, 0x0000004
@@ -1404,7 +1404,7 @@ _0800293A:
 CheckPlayerInRegion: @ 0x0800293E
 	push {r4, r5, r6, r7, lr}
 	ldr r4, _080029AC @ =gRoomControls
-	ldr r7, _080029B0 @ =gLinkEntity
+	ldr r7, _080029B0 @ =gPlayerEntity
 	ldrh r6, [r4, #6]
 	ldrh r5, [r7, #0x2e]
 	subs r5, r5, r6
@@ -1444,4 +1444,4 @@ _080029A0: .4byte 0x0000E040
 _080029A4: .4byte 0x00000E20
 _080029A8: .4byte gRoomControls
 _080029AC: .4byte gRoomControls
-_080029B0: .4byte gLinkEntity
+_080029B0: .4byte gPlayerEntity

asm/code_08003FC4.s

@@ -431,8 +431,8 @@ InitializeAnimation: @ 0x08004260
 GetNextFrame: @ 0x08004274
 	movs r1, #1
 
-	non_word_aligned_thumb_func_start InitializeAnimationAnimation
-InitializeAnimationAnimation: @ 0x08004276
+	non_word_aligned_thumb_func_start UpdateAnimationVariableFrames
+UpdateAnimationVariableFrames: @ 0x08004276
 	movs r3, #0x59
 	ldrb r2, [r0, r3]
 	subs r2, r2, r1
@@ -478,7 +478,7 @@ UpdateAnimationSingleFrame: @ 0x080042B8
 	non_word_aligned_thumb_func_start sub_080042BA
 sub_080042BA: @ 0x080042BA
 	push {lr}
-	bl InitializeAnimationAnimation
+	bl UpdateAnimationVariableFrames
 _080042C0:
 	pop {r1}
 	mov lr, r1

asm/code_080041E8.s

@@ -97,8 +97,8 @@ InitializeAnimation: @ 0x08004260
 GetNextFrame: @ 0x08004274
 	movs r1, #1
 
-	non_word_aligned_thumb_func_start InitializeAnimationAnimation
-InitializeAnimationAnimation: @ 0x08004276
+	non_word_aligned_thumb_func_start UpdateAnimationVariableFrames
+UpdateAnimationVariableFrames: @ 0x08004276
 	movs r3, #0x59
 	ldrb r2, [r0, r3]
 	subs r2, r2, r1
@@ -144,7 +144,7 @@ UpdateAnimationSingleFrame: @ 0x080042B8
 	non_word_aligned_thumb_func_start sub_080042BA
 sub_080042BA: @ 0x080042BA
 	push {lr}
-	bl InitializeAnimationAnimation
+	bl UpdateAnimationVariableFrames
 _080042C0:
 	pop {r1}
 	mov lr, r1

asm/code_080043E8.s

@@ -64,7 +64,7 @@ sub_0800445C: @ 0x0800445C
 	bl sub_08079F8C
 	cmp r0, #0
 	beq _08004482
-	ldr r5, _080044D8 @ =gLinkEntity
+	ldr r5, _080044D8 @ =gPlayerEntity
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_08004484
@@ -113,7 +113,7 @@ _080044AC:
 	non_word_aligned_thumb_func_start sub_080044AE
 sub_080044AE: @ 0x080044AE
 	push {lr}
-	ldr r3, _080044E8 @ =gLinkEntity
+	ldr r3, _080044E8 @ =gPlayerEntity
 	cmp r0, r3
 	beq _080044CC
 	push {r0, r1, r2}
@@ -132,11 +132,11 @@ _080044CC:
 	bl sub_08079E58
 	b _080044C8
 	.align 2, 0
-_080044D8: .4byte gLinkEntity
+_080044D8: .4byte gPlayerEntity
 _080044DC: .4byte gUnk_03005FF0
 _080044E0: .4byte gUnk_02024048
 _080044E4: .4byte gUnk_02021F20
-_080044E8: .4byte gLinkEntity
+_080044E8: .4byte gPlayerEntity
 
 	thumb_func_start sub_080044EC
 sub_080044EC: @ 0x080044EC
@@ -269,8 +269,8 @@ sub_080045B4: @ 0x080045B4
 	ldr r3, _08004690 @ =gUnk_030060F0
 	bx r3
 
-	thumb_func_start sub_080045C4
-sub_080045C4: @ 0x080045C4
+	thumb_func_start GetFacingDirection
+GetFacingDirection: @ 0x080045C4
 	push {r4, r5}
 	movs r4, #0x32
 	movs r5, #0x2e

asm/code_0800857C.s

@@ -16,7 +16,7 @@ sub_0800857C: @ 0x0800857C
 	ldrb r1, [r0, #0xb]
 	lsrs r1, r1, #8
 	bhs _0800859C
-	ldr r1, _08008888 @ =gLinkState
+	ldr r1, _08008888 @ =gPlayerState
 	ldrb r1, [r1, #2]
 	movs r2, #0x80
 	ands r1, r2
@@ -52,7 +52,7 @@ sub_080085B0: @ 0x080085B0
 	thumb_func_start sub_080085CC
 sub_080085CC: @ 0x080085CC
 	push {lr}
-	ldr r2, _0800888C @ =gLinkState
+	ldr r2, _0800888C @ =gPlayerState
 	ldr r1, _08008890 @ =gUnk_080083FC
 	movs r3, #0x26
 	ldrb r3, [r2, r3]
@@ -78,7 +78,7 @@ _080085E6:
 	ands r2, r3
 	bne _0800861A
 	ldr r1, _080088A4 @ =gUnk_080084BC
-	ldr r3, _080088A8 @ =gLinkState
+	ldr r3, _080088A8 @ =gPlayerState
 	ldrb r2, [r3, #0x1c]
 	orrs r2, r2
 	bne _0800861A
@@ -179,7 +179,7 @@ sub_080086B4: @ 0x080086B4
 	mov r7, fp
 	push {r4, r5, r6, r7}
 	mov fp, r2
-	ldr r2, _080088BC @ =gLinkEntity
+	ldr r2, _080088BC @ =gPlayerEntity
 	mov r8, r2
 	bl sub_080086D8
 	pop {r4, r5, r6, r7}
@@ -208,7 +208,7 @@ sub_080086D8: @ 0x080086D8
 	ldrb r2, [r0, r1]
 	push {r2}
 	mov r0, r8
-	ldr r1, _080088C8 @ =gLinkState
+	ldr r1, _080088C8 @ =gPlayerState
 	movs r2, #0x26
 	ldrb r2, [r1, r2]
 	cmp r2, #0
@@ -387,7 +387,7 @@ _0800882C:
 	movs r3, #0x38
 	ldrb r1, [r4, r3]
 	strb r1, [r0, r3]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0800883A:
 	ldr r1, _080088E0 @ =gRoomControls
 	ldrh r0, [r1, #6]
@@ -428,23 +428,23 @@ _0800887E:
 	adds r0, r5, #0
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_08008888: .4byte gLinkState
-_0800888C: .4byte gLinkState
+_08008888: .4byte gPlayerState
+_0800888C: .4byte gPlayerState
 _08008890: .4byte gUnk_080083FC
 _08008894: .4byte gUnk_0800839C
 _08008898: .4byte gUnk_0800845C
 _0800889C: .4byte 0x01000000
 _080088A0: .4byte gUnk_0800833C
 _080088A4: .4byte gUnk_080084BC
-_080088A8: .4byte gLinkState
+_080088A8: .4byte gPlayerState
 _080088AC: .4byte gUnk_0800851C
 _080088B0: .4byte gUnk_080082DC
 _080088B4: .4byte gUnk_03000BF6
 _080088B8: .4byte gUnk_03000BF8
-_080088BC: .4byte gLinkEntity
+_080088BC: .4byte gPlayerEntity
 _080088C0: .4byte 0x000003F0
 _080088C4: .4byte gUnk_08000248
-_080088C8: .4byte gLinkState
+_080088C8: .4byte gPlayerState
 _080088CC: .4byte gUnk_0800823C
 _080088D0: .4byte gUnk_08007DF4
 _080088D4: .4byte gRoomControls
@@ -487,13 +487,13 @@ sub_08008936: @ 0x08008936
 	ldrb r2, [r0, #0x14]
 	lsrs r2, r2, #1
 	lsls r2, r2, #3
-	ldr r1, _08008A68 @ =gLinkState
+	ldr r1, _08008A68 @ =gPlayerState
 	b _08008960
 
 	non_word_aligned_thumb_func_start sub_08008942
 sub_08008942: @ 0x08008942
 	push {lr}
-	ldr r1, _08008A6C @ =gLinkState
+	ldr r1, _08008A6C @ =gPlayerState
 	ldrb r2, [r1, #7]
 	ldrb r3, [r1, #0xa]
 	orrs r2, r3
@@ -502,7 +502,7 @@ sub_08008942: @ 0x08008942
 	b _08008956
 _08008952:
 	push {lr}
-	ldr r1, _08008A70 @ =gLinkState
+	ldr r1, _08008A70 @ =gPlayerState
 _08008956:
 	movs r3, #0x15
 	strb r2, [r0, r3]
@@ -559,7 +559,7 @@ _080089A8:
 	ldrsb r3, [r4, r3]
 	bl sub_08008A46
 _080089C0:
-	ldr r1, _08008A80 @ =gLinkState
+	ldr r1, _08008A80 @ =gPlayerState
 	movs r4, #0x8c
 	movs r2, #8
 	ldrsh r3, [r1, r4]
@@ -636,7 +636,7 @@ _08008A3E:
 	non_word_aligned_thumb_func_start sub_08008A46
 sub_08008A46: @ 0x08008A46
 	push {lr}
-	ldr r1, _08008A84 @ =gLinkState
+	ldr r1, _08008A84 @ =gPlayerState
 	movs r4, #0x8c
 	ldrsh r5, [r1, r4]
 	adds r5, r5, r2
@@ -651,14 +651,14 @@ _08008A60:
 	strh r3, [r1]
 	pop {pc}
 	.align 2, 0
-_08008A68: .4byte gLinkState
-_08008A6C: .4byte gLinkState
-_08008A70: .4byte gLinkState
+_08008A68: .4byte gPlayerState
+_08008A6C: .4byte gPlayerState
+_08008A70: .4byte gPlayerState
 _08008A74: .4byte _080088FC
 _08008A78: .4byte _080088EC
 _08008A7C: .4byte _0800890C
-_08008A80: .4byte gLinkState
-_08008A84: .4byte gLinkState
+_08008A80: .4byte gPlayerState
+_08008A84: .4byte gPlayerState
 
 	thumb_func_start sub_08008A88
 sub_08008A88: @ 0x08008A88
@@ -681,7 +681,7 @@ _08008A9C:
 	thumb_func_start sub_08008AA0
 sub_08008AA0: @ 0x08008AA0
 	push {r4, r5, lr}
-	ldr r1, _08008B40 @ =gLinkState
+	ldr r1, _08008B40 @ =gPlayerState
 	ldrb r2, [r1, #0x12]
 	cmp r2, #1
 	beq _08008AC4
@@ -704,7 +704,7 @@ _08008AC4:
 	non_word_aligned_thumb_func_start sub_08008AC6
 sub_08008AC6: @ 0x08008AC6
 	push {r0, lr}
-	ldr r1, _08008B48 @ =gLinkState
+	ldr r1, _08008B48 @ =gPlayerState
 	movs r3, #0x26
 	ldrb r2, [r1, r3]
 	movs r3, #0xf
@@ -760,7 +760,7 @@ _08008B20:
 	non_word_aligned_thumb_func_start sub_08008B22
 sub_08008B22: @ 0x08008B22
 	push {lr}
-	ldr r0, _08008B58 @ =gLinkEntity
+	ldr r0, _08008B58 @ =gPlayerEntity
 	bl sub_08008B02
 	adds r0, r2, #0
 	pop {pc}
@@ -774,13 +774,13 @@ sub_08008B2E: @ 0x08008B2E
 	.align 2, 0
 _08008B38: .4byte 0x00000180
 _08008B3C: .4byte 0xFFFFFE80
-_08008B40: .4byte gLinkState
+_08008B40: .4byte gPlayerState
 _08008B44: .4byte gSineTable
-_08008B48: .4byte gLinkState
+_08008B48: .4byte gPlayerState
 _08008B4C: .4byte gUnk_02000020
 _08008B50: .4byte 0x00004000
 _08008B54: .4byte gUnk_08007CAC
-_08008B58: .4byte gLinkEntity
+_08008B58: .4byte gPlayerEntity
 
 gUnk_08008B5C:: @ 08008B5C
 	.incbin "baserom.gba", 0x008B5C, 0x0000034
@@ -4030,8 +4030,8 @@ gUnk_080169A4::
 	.byte 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00
 	.byte 0x00, 0x00, 0x01, 0x00
 
-	thumb_func_start UpdateSpriteOrderAndFlip
-UpdateSpriteOrderAndFlip: @ 0x08016A04
+	thumb_func_start UpdateSpriteForCollisionLayer
+UpdateSpriteForCollisionLayer: @ 0x08016A04
 	movs r1, #0x38
 	ldrb r1, [r0, r1]
 	lsls r1, r1, #1
@@ -4083,7 +4083,7 @@ _08016A62:
 	strb r3, [r4, r5]
 _08016A64:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r4, r5, pc}
 
 	thumb_func_start sub_08016A6C
@@ -4123,6 +4123,6 @@ sub_08016AD2: @ 0x08016AD2
 	bl sub_08016A6C
 	push {r0}
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	pop {r0, r4, pc}
 

asm/code_08016B30.s

@@ -53,7 +53,7 @@ sub_08016B6C: @ 0x08016B6C
 	ldrb r0, [r5]
 	cmp r0, #0
 	bne _08016BA6
-	bl sub_08016CF4
+	bl UpdateBackgroundRegisters
 	ldr r0, _08016BCC @ =gUnk_03000FBC
 	str r0, [r4]
 	ldr r0, _08016BD0 @ =gUnk_02022730

asm/code_08016DF8.s

@@ -166,7 +166,7 @@ sub_08016F28: @ 0x08016F28
 	ldrb r0, [r0]
 	cmp r0, #0
 	beq _08016F4C
-	ldr r0, _08016F48 @ =gLinkState
+	ldr r0, _08016F48 @ =gPlayerState
 	ldr r1, [r0, #0x30]
 	movs r2, #0x80
 	lsls r2, r2, #7
@@ -174,9 +174,9 @@ sub_08016F28: @ 0x08016F28
 	b _08016F54
 	.align 2, 0
 _08016F44: .4byte gUnk_02002A40
-_08016F48: .4byte gLinkState
+_08016F48: .4byte gPlayerState
 _08016F4C:
-	ldr r0, _08016F98 @ =gLinkState
+	ldr r0, _08016F98 @ =gPlayerState
 	ldr r1, [r0, #0x30]
 	ldr r2, _08016F9C @ =0xFFFFBFFF
 	ands r1, r2
@@ -186,7 +186,7 @@ _08016F54:
 	bl sub_0805E3B0
 	cmp r0, #0
 	bne _08016FDC
-	ldr r5, _08016F98 @ =gLinkState
+	ldr r5, _08016F98 @ =gPlayerState
 	ldr r0, [r5, #0x30]
 	movs r1, #0x80
 	lsls r1, r1, #0xc
@@ -213,7 +213,7 @@ _08016F54:
 	strb r0, [r4, #0x10]
 	b _08016FB4
 	.align 2, 0
-_08016F98: .4byte gLinkState
+_08016F98: .4byte gPlayerState
 _08016F9C: .4byte 0xFFFFBFFF
 _08016FA0: .4byte 0xFFF7FFFF
 _08016FA4:
@@ -268,7 +268,7 @@ sub_08016FF4: @ 0x08016FF4
 	strb r1, [r2]
 	adds r0, #0x2e
 	strb r1, [r0]
-	ldr r2, _080170A4 @ =gLinkEntity
+	ldr r2, _080170A4 @ =gPlayerEntity
 	adds r0, r2, #0
 	adds r0, #0x41
 	ldrb r1, [r0]
@@ -286,7 +286,7 @@ sub_08016FF4: @ 0x08016FF4
 	movs r0, #0x86
 	bl PlaySFX
 _0801702E:
-	ldr r4, _080170A8 @ =gLinkState
+	ldr r4, _080170A8 @ =gPlayerState
 	ldr r0, [r4, #0x30]
 	ldr r1, _080170AC @ =0xFDFFFDFF
 	ands r0, r1
@@ -296,7 +296,7 @@ _0801702E:
 	ands r0, r1
 	cmp r0, #0
 	beq _08017046
-	bl sub_08077B2C
+	bl ResetPlayer
 _08017046:
 	ldr r0, [r4, #0x30]
 	movs r1, #0x80
@@ -320,7 +320,7 @@ _0801706E:
 	ldr r0, _080170B0 @ =gUnk_03003DF0
 	movs r4, #0
 	strb r4, [r0]
-	ldr r2, _080170A8 @ =gLinkState
+	ldr r2, _080170A8 @ =gPlayerState
 	adds r1, r2, #0
 	adds r1, #0x27
 	ldrb r0, [r1]
@@ -345,8 +345,8 @@ _08017084:
 	b _080171EA
 	.align 2, 0
 _080170A0: .4byte gUnk_0200AF00
-_080170A4: .4byte gLinkEntity
-_080170A8: .4byte gLinkState
+_080170A4: .4byte gPlayerEntity
+_080170A8: .4byte gPlayerState
 _080170AC: .4byte 0xFDFFFDFF
 _080170B0: .4byte gUnk_03003DF0
 _080170B4:
@@ -391,7 +391,7 @@ _080170E8:
 	ldrb r0, [r0, #1]
 	cmp r0, #0
 	bne _08017112
-	ldr r0, _08017134 @ =gUnk_030010A0
+	ldr r0, _08017134 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #0x5a
 	bl __modsi3
@@ -414,7 +414,7 @@ _08017124: .4byte gTextBox
 _08017128: .4byte gRoomVars
 _0801712C: .4byte gUnk_02002A40
 _08017130: .4byte gUnk_0200AF00
-_08017134: .4byte gUnk_030010A0
+_08017134: .4byte gScreenTransition
 _08017138: .4byte 0x0000011F
 _0801713C:
 	adds r1, r0, #0
@@ -517,11 +517,11 @@ sub_080171F0: @ 0x080171F0
 	push {r4, r5, r6, r7, lr}
 	mov r7, r8
 	push {r7}
-	ldr r4, _080172DC @ =gLinkState
+	ldr r4, _080172DC @ =gPlayerState
 	ldrb r0, [r4, #0x1a]
 	cmp r0, #0
 	beq _08017202
-	bl sub_08077B2C
+	bl ResetPlayer
 _08017202:
 	ldrb r0, [r4, #0x14]
 	cmp r0, #0
@@ -529,7 +529,7 @@ _08017202:
 	subs r0, #1
 	strb r0, [r4, #0x14]
 _0801720C:
-	ldr r6, _080172E0 @ =gLinkEntity
+	ldr r6, _080172E0 @ =gPlayerEntity
 	adds r1, r6, #0
 	adds r1, #0x7a
 	ldrh r0, [r1]
@@ -601,7 +601,7 @@ _08017268:
 	strb r5, [r0]
 	ldr r0, _080172EC @ =gUnk_03003BE0
 	movs r1, #0x8c
-	bl sub_0801D630
+	bl _DmaZero
 	adds r2, r4, #0
 	adds r2, #0x3f
 	ldrb r0, [r2]
@@ -634,8 +634,8 @@ _080172CC:
 	orrs r0, r1
 	b _080172FA
 	.align 2, 0
-_080172DC: .4byte gLinkState
-_080172E0: .4byte gLinkEntity
+_080172DC: .4byte gPlayerState
+_080172E0: .4byte gPlayerEntity
 _080172E4: .4byte 0xFFFEFFFF
 _080172E8: .4byte gUnk_0200AF00
 _080172EC: .4byte gUnk_03003BE0
@@ -646,10 +646,10 @@ _080172F4:
 	ands r0, r1
 _080172FA:
 	str r0, [r4, #0x30]
-	ldr r4, _08017330 @ =gLinkEntity
+	ldr r4, _08017330 @ =gPlayerEntity
 	adds r0, r4, #0
 	bl sub_0807A8D8
-	ldr r0, _08017334 @ =gLinkState
+	ldr r0, _08017334 @ =gPlayerState
 	ldrb r1, [r0, #2]
 	movs r0, #0xc0
 	ands r0, r1
@@ -672,8 +672,8 @@ _08017322:
 	bx r0
 	.align 2, 0
 _0801732C: .4byte 0xDFFFFFFF
-_08017330: .4byte gLinkEntity
-_08017334: .4byte gLinkState
+_08017330: .4byte gPlayerEntity
+_08017334: .4byte gPlayerState
 
 	thumb_func_start sub_08017338
 sub_08017338: @ 0x08017338
@@ -779,7 +779,7 @@ _080173CE:
 	ldrh r1, [r3, #6]
 	cmp r1, #0
 	bne _0801741C
-	ldr r2, _08017418 @ =gLinkEntity
+	ldr r2, _08017418 @ =gPlayerEntity
 	adds r0, r2, #0
 	adds r0, #0x60
 	ldrh r1, [r0]
@@ -791,14 +791,14 @@ _080173CE:
 	.align 2, 0
 _08017410: .4byte gUnk_08126DA8
 _08017414: .4byte gUnk_08126ED8
-_08017418: .4byte gLinkEntity
+_08017418: .4byte gPlayerEntity
 _0801741C:
 	ldr r0, _0801749C @ =0x000003FF
 	ands r0, r1
 	mov r1, ip
 	adds r1, #0x60
 	strh r0, [r1]
-	ldr r5, _080174A0 @ =gLinkEntity
+	ldr r5, _080174A0 @ =gPlayerEntity
 _08017428:
 	mov r3, ip
 	ldrb r0, [r3, #0x14]
@@ -860,7 +860,7 @@ _08017438:
 	bx r0
 	.align 2, 0
 _0801749C: .4byte 0x000003FF
-_080174A0: .4byte gLinkEntity
+_080174A0: .4byte gPlayerEntity
 
 	thumb_func_start sub_080174A4
 sub_080174A4: @ 0x080174A4
@@ -1047,12 +1047,12 @@ _08017602:
 	cmp r0, #0
 	bne _08017638
 	ldr r1, _08017628 @ =gUnk_030059F0
-	ldr r0, _0801762C @ =gLinkState
+	ldr r0, _0801762C @ =gPlayerState
 	adds r0, #0x8b
 	ldrb r0, [r0]
 	cmp r0, #0
 	beq _08017634
-	ldr r4, _08017630 @ =gLinkEntity
+	ldr r4, _08017630 @ =gPlayerEntity
 	ldrb r5, [r4, #0x10]
 	movs r0, #0x7f
 	ands r0, r5
@@ -1063,8 +1063,8 @@ _08017602:
 	.align 2, 0
 _08017624: .4byte gUnk_03003DC0
 _08017628: .4byte gUnk_030059F0
-_0801762C: .4byte gLinkState
-_08017630: .4byte gLinkEntity
+_0801762C: .4byte gPlayerState
+_08017630: .4byte gPlayerEntity
 _08017634:
 	bl _call_via_r1
 _08017638:
@@ -1080,12 +1080,12 @@ sub_08017640: @ 0x08017640
 	movs r1, #0x80
 	lsls r1, r1, #1
 	adds r0, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _08017664 @ =gUnk_02018EA0
 	str r4, [r0]
 	str r4, [r4]
 	str r4, [r4, #4]
-	ldr r0, _08017668 @ =gLinkEntity
+	ldr r0, _08017668 @ =gPlayerEntity
 	str r0, [r4, #8]
 	pop {r4}
 	pop {r0}
@@ -1093,7 +1093,7 @@ sub_08017640: @ 0x08017640
 	.align 2, 0
 _08017660: .4byte gUnk_03003C70
 _08017664: .4byte gUnk_02018EA0
-_08017668: .4byte gLinkEntity
+_08017668: .4byte gPlayerEntity
 
 	thumb_func_start sub_0801766C
 sub_0801766C: @ 0x0801766C
@@ -1376,7 +1376,7 @@ sub_08017850: @ 0x08017850
 	movs r0, #0
 	b _08017868
 _08017860:
-	ldr r1, _08017870 @ =gLinkEntity
+	ldr r1, _08017870 @ =gPlayerEntity
 	adds r0, r4, #0
 	bl sub_080177A0
 _08017868:
@@ -1384,7 +1384,7 @@ _08017868:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08017870: .4byte gLinkEntity
+_08017870: .4byte gPlayerEntity
 
 	thumb_func_start sub_08017874
 sub_08017874: @ 0x08017874
@@ -1567,10 +1567,10 @@ sub_08017940: @ 0x08017940
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r2, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _080179CC:
 	movs r1, #0
-	ldr r0, _080179E8 @ =gLinkEntity
+	ldr r0, _080179E8 @ =gPlayerEntity
 	cmp r5, r0
 	beq _080179DA
 	cmp r4, r0
@@ -1585,7 +1585,7 @@ _080179E0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080179E8: .4byte gLinkEntity
+_080179E8: .4byte gPlayerEntity
 
 	thumb_func_start sub_080179EC
 sub_080179EC: @ 0x080179EC
@@ -1754,7 +1754,7 @@ sub_08017B1C: @ 0x08017B1C
 	push {lr}
 	adds r2, r0, #0
 	adds r3, r1, #0
-	ldr r0, _08017B38 @ =gLinkState
+	ldr r0, _08017B38 @ =gPlayerState
 	ldrb r1, [r0, #0x1e]
 	movs r0, #0x60
 	ands r0, r1
@@ -1766,7 +1766,7 @@ sub_08017B1C: @ 0x08017B1C
 	strb r0, [r3, #0x10]
 	b _08017B52
 	.align 2, 0
-_08017B38: .4byte gLinkState
+_08017B38: .4byte gPlayerState
 _08017B3C:
 	adds r1, r2, #0
 	adds r1, #0x42
@@ -1800,7 +1800,7 @@ sub_08017B58: @ 0x08017B58
 	ldrb r1, [r2, #0x1d]
 	cmp r1, #0
 	beq _08017BA2
-	ldr r0, _08017B94 @ =gLinkState
+	ldr r0, _08017B94 @ =gPlayerState
 	ldrb r0, [r0, #0x1d]
 	subs r0, r1, r0
 	movs r1, #0
@@ -1816,7 +1816,7 @@ sub_08017B58: @ 0x08017B58
 	strh r1, [r0]
 	b _08017BA2
 	.align 2, 0
-_08017B94: .4byte gLinkState
+_08017B94: .4byte gPlayerState
 _08017B98:
 	strb r0, [r2, #0xd]
 	ldrb r0, [r3]
@@ -1845,7 +1845,7 @@ sub_08017BBC: @ 0x08017BBC
 	adds r4, r0, #0
 	adds r6, r1, #0
 	adds r7, r2, #0
-	ldr r5, _08017C38 @ =gLinkState
+	ldr r5, _08017C38 @ =gPlayerState
 	ldr r0, [r5, #0x30]
 	ldr r1, _08017C3C @ =0x00001481
 	ands r0, r1
@@ -1903,7 +1903,7 @@ _08017C2E:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08017C38: .4byte gLinkState
+_08017C38: .4byte gPlayerState
 _08017C3C: .4byte 0x00001481
 
 	thumb_func_start sub_08017C40
@@ -1911,7 +1911,7 @@ sub_08017C40: @ 0x08017C40
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
 	adds r5, r1, #0
-	ldr r6, _08017CB4 @ =gLinkState
+	ldr r6, _08017CB4 @ =gPlayerState
 	ldr r0, [r6, #0x30]
 	ldr r1, _08017CB8 @ =0x00001881
 	ands r0, r1
@@ -1968,7 +1968,7 @@ _08017CAA:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08017CB4: .4byte gLinkState
+_08017CB4: .4byte gPlayerState
 _08017CB8: .4byte 0x00001881
 
 	thumb_func_start sub_08017CBC
@@ -2033,7 +2033,7 @@ _08017D1E:
 sub_08017D28: @ 0x08017D28
 	push {lr}
 	adds r3, r0, #0
-	ldr r2, _08017D68 @ =gLinkState
+	ldr r2, _08017D68 @ =gPlayerState
 	movs r0, #1
 	strb r0, [r2, #0x1a]
 	adds r2, r3, #0
@@ -2064,7 +2064,7 @@ _08017D60:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08017D68: .4byte gLinkState
+_08017D68: .4byte gPlayerState
 
 	thumb_func_start sub_08017D6C
 sub_08017D6C: @ 0x08017D6C
@@ -2147,7 +2147,7 @@ _08017DFC:
 	movs r0, #4
 _08017DFE:
 	strb r0, [r1]
-	ldr r4, _08017E34 @ =gLinkEntity
+	ldr r4, _08017E34 @ =gPlayerEntity
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_08017874
@@ -2158,7 +2158,7 @@ _08017DFE:
 	adds r2, #0x3d
 	movs r0, #0xf4
 	strb r0, [r2]
-	ldr r0, _08017E38 @ =gLinkState
+	ldr r0, _08017E38 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -2172,8 +2172,8 @@ _08017DFE:
 	strb r0, [r1]
 	b _08017E6E
 	.align 2, 0
-_08017E34: .4byte gLinkEntity
-_08017E38: .4byte gLinkState
+_08017E34: .4byte gPlayerEntity
+_08017E38: .4byte gPlayerState
 _08017E3C:
 	adds r0, r5, #0
 	adds r0, #0x40
@@ -2253,7 +2253,7 @@ sub_08017EB0: @ 0x08017EB0
 	movs r0, #0
 	b _08017F36
 _08017EC4:
-	ldr r6, _08017EF8 @ =gLinkEntity
+	ldr r6, _08017EF8 @ =gPlayerEntity
 	cmp r2, r6
 	bne _08017EFC
 	ldrb r4, [r5]
@@ -2278,7 +2278,7 @@ _08017EC4:
 	strh r0, [r1]
 	b _08017F22
 	.align 2, 0
-_08017EF8: .4byte gLinkEntity
+_08017EF8: .4byte gPlayerEntity
 _08017EFC:
 	ldrh r1, [r2, #8]
 	movs r0, #0xa1
@@ -2331,13 +2331,13 @@ sub_08017F40: @ 0x08017F40
 	ldrb r6, [r0]
 	cmp r6, #0
 	bne _0801800A
-	ldr r0, _08017FAC @ =gLinkEntity
+	ldr r0, _08017FAC @ =gPlayerEntity
 	cmp r4, r0
 	bne _08018002
 	bl sub_08079F8C
 	cmp r0, #0
 	beq _0801801E
-	ldr r2, _08017FB0 @ =gLinkState
+	ldr r2, _08017FB0 @ =gPlayerState
 	ldr r3, [r2, #0x30]
 	movs r0, #0x80
 	ands r0, r3
@@ -2377,8 +2377,8 @@ _08017F9A:
 	bl PositionRelative
 	b _08017FC2
 	.align 2, 0
-_08017FAC: .4byte gLinkEntity
-_08017FB0: .4byte gLinkState
+_08017FAC: .4byte gPlayerEntity
+_08017FB0: .4byte gPlayerState
 _08017FB4:
 	movs r3, #0x80
 	lsls r3, r3, #9
@@ -2415,7 +2415,7 @@ _08017FC2:
 	adds r1, #0x3d
 	movs r0, #0xf8
 	strb r0, [r1]
-	bl sub_08077B2C
+	bl ResetPlayer
 	movs r0, #1
 	b _08018020
 _08018002:
@@ -2427,7 +2427,7 @@ _0801800A:
 	ldrb r0, [r5, #8]
 	cmp r0, #3
 	bne _0801801E
-	ldr r0, _08018028 @ =gLinkEntity
+	ldr r0, _08018028 @ =gPlayerEntity
 	cmp r4, r0
 	bne _0801801E
 	adds r0, r5, #0
@@ -2440,7 +2440,7 @@ _08018020:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08018028: .4byte gLinkEntity
+_08018028: .4byte gPlayerEntity
 
 	thumb_func_start sub_0801802C
 sub_0801802C: @ 0x0801802C
@@ -2620,13 +2620,13 @@ sub_08018168: @ 0x08018168
 	ldrb r5, [r0]
 	cmp r5, #0
 	bne _08018208
-	ldr r0, _080181F4 @ =gLinkEntity
+	ldr r0, _080181F4 @ =gPlayerEntity
 	cmp r4, r0
 	bne _08018200
 	bl sub_08079F8C
 	cmp r0, #0
 	beq _0801821C
-	ldr r2, _080181F8 @ =gLinkState
+	ldr r2, _080181F8 @ =gPlayerState
 	ldr r3, [r2, #0x30]
 	ldr r0, _080181FC @ =0x00040080
 	ands r0, r3
@@ -2681,8 +2681,8 @@ sub_08018168: @ 0x08018168
 	movs r0, #1
 	b _0801821E
 	.align 2, 0
-_080181F4: .4byte gLinkEntity
-_080181F8: .4byte gLinkState
+_080181F4: .4byte gPlayerEntity
+_080181F8: .4byte gPlayerState
 _080181FC: .4byte 0x00040080
 _08018200:
 	adds r0, r4, #0
@@ -2693,7 +2693,7 @@ _08018208:
 	ldrb r0, [r6, #8]
 	cmp r0, #3
 	bne _0801821C
-	ldr r0, _08018224 @ =gLinkEntity
+	ldr r0, _08018224 @ =gPlayerEntity
 	cmp r4, r0
 	bne _0801821C
 	adds r0, r6, #0
@@ -2706,14 +2706,14 @@ _0801821E:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08018224: .4byte gLinkEntity
+_08018224: .4byte gPlayerEntity
 
 	thumb_func_start sub_08018228
 sub_08018228: @ 0x08018228
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	adds r5, r1, #0
-	ldr r0, _0801824C @ =gLinkEntity
+	ldr r0, _0801824C @ =gPlayerEntity
 	cmp r4, r0
 	bne _08018244
 	bl sub_08079F8C
@@ -2728,7 +2728,7 @@ _08018244:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0801824C: .4byte gLinkEntity
+_0801824C: .4byte gPlayerEntity
 
 	thumb_func_start sub_08018250
 sub_08018250: @ 0x08018250
@@ -2766,13 +2766,13 @@ _08018280:
 sub_08018288: @ 0x08018288
 	push {lr}
 	adds r1, r0, #0
-	ldr r0, _08018298 @ =gLinkEntity
+	ldr r0, _08018298 @ =gPlayerEntity
 	cmp r1, r0
 	bne _0801829C
 	bl sub_0807AFE8
 	b _080182A2
 	.align 2, 0
-_08018298: .4byte gLinkEntity
+_08018298: .4byte gPlayerEntity
 _0801829C:
 	adds r1, #0x45
 	movs r0, #0
@@ -2852,7 +2852,7 @@ sub_08018308: @ 0x08018308
 	ldrb r0, [r4, #8]
 	cmp r0, #3
 	bne _08018338
-	ldr r0, _0801835C @ =gLinkEntity
+	ldr r0, _0801835C @ =gPlayerEntity
 	cmp r6, r0
 	bne _08018338
 	adds r0, r4, #0
@@ -2865,7 +2865,7 @@ _08018338:
 	lsls r0, r0, #3
 	cmp r1, r0
 	bne _08018360
-	ldr r0, _0801835C @ =gLinkEntity
+	ldr r0, _0801835C @ =gPlayerEntity
 	ldrb r2, [r0, #0x14]
 	mov r0, r8
 	adds r0, #4
@@ -2879,7 +2879,7 @@ _08018338:
 	movs r0, #0
 	b _080184F0
 	.align 2, 0
-_0801835C: .4byte gLinkEntity
+_0801835C: .4byte gPlayerEntity
 _08018360:
 	cmp r3, #0
 	bne _08018408
@@ -3074,7 +3074,7 @@ _080184BA:
 _080184CE:
 	cmp r0, #5
 	bne _080184DA
-	ldr r0, _080184FC @ =gLinkEntity
+	ldr r0, _080184FC @ =gPlayerEntity
 	adds r0, #0x3d
 	movs r1, #0x80
 	strb r1, [r0]
@@ -3085,7 +3085,7 @@ _080184DA:
 	ldrb r0, [r6, #9]
 	cmp r0, #5
 	bne _080184EE
-	ldr r0, _080184FC @ =gLinkEntity
+	ldr r0, _080184FC @ =gPlayerEntity
 	adds r0, #0x3d
 	movs r1, #0x80
 	strb r1, [r0]
@@ -3098,4 +3098,4 @@ _080184F0:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080184FC: .4byte gLinkEntity
+_080184FC: .4byte gPlayerEntity

asm/code_08018500.s

@@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C
 	ldr r4, _08018570 @ =gUnk_02033AB8
 	adds r0, r4, #0
 	movs r1, #0x14
-	bl sub_0801D630
+	bl _DmaZero
 	adds r5, r4, #0
 	ldr r4, _08018574 @ =gUnk_080B3D20
 	movs r6, #0
@@ -163,11 +163,11 @@ _08018628: .4byte gUnk_080B3D20
 	thumb_func_start sub_0801862C
 sub_0801862C: @ 0x0801862C
 	push {r4, r5, lr}
-	ldr r1, _0801864C @ =gLinkState
+	ldr r1, _0801864C @ =gPlayerState
 	movs r2, #0
 	movs r0, #0x16
 	strb r0, [r1, #0xc]
-	ldr r5, _08018650 @ =gUnk_030010A0
+	ldr r5, _08018650 @ =gScreenTransition
 	adds r0, r5, #0
 	adds r0, #0x35
 	strb r2, [r0]
@@ -179,8 +179,8 @@ sub_0801862C: @ 0x0801862C
 	strh r0, [r5, #0x36]
 	b _0801868C
 	.align 2, 0
-_0801864C: .4byte gLinkState
-_08018650: .4byte gUnk_030010A0
+_0801864C: .4byte gPlayerState
+_08018650: .4byte gScreenTransition
 _08018654: .4byte gUnk_02033AB8
 _08018658:
 	ldrb r0, [r4, #2]
@@ -475,7 +475,7 @@ _0801889A:
 	ldr r1, _080188AC @ =gUnk_080FECC8
 _080188A4:
 	adds r0, r0, r1
-	bl CreateEntity
+	bl LoadRoomEntity
 	b _080189E4
 	.align 2, 0
 _080188AC: .4byte gUnk_080FECC8
@@ -488,7 +488,7 @@ _080188B8:
 	lsls r0, r0, #4
 	ldr r1, _080188DC @ =gUnk_080FED18
 	adds r0, r0, r1
-	bl CreateEntity
+	bl LoadRoomEntity
 	adds r2, r0, #0
 	cmp r2, #0
 	bne _080188CC
@@ -527,7 +527,7 @@ _080188FE:
 	lsls r0, r0, #4
 	ldr r1, _08018924 @ =gUnk_080FED58
 	adds r0, r0, r1
-	bl CreateEntity
+	bl LoadRoomEntity
 	ldr r2, _08018928 @ =gRoomVars
 	ldrb r0, [r5, #1]
 	lsls r0, r0, #2
@@ -549,7 +549,7 @@ _08018930:
 	lsls r0, r0, #4
 	ldr r1, _08018974 @ =gUnk_080FEE78
 	adds r0, r0, r1
-	bl CreateEntity
+	bl LoadRoomEntity
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _08018958
@@ -612,13 +612,13 @@ _080189B4:
 	cmp r4, #0
 	beq _080189C4
 	ldr r0, _080189C0 @ =gUnk_080FEE58
-	bl CreateEntity
+	bl LoadRoomEntity
 	b _080189E4
 	.align 2, 0
 _080189C0: .4byte gUnk_080FEE58
 _080189C4:
 	ldr r0, _080189CC @ =gUnk_080FEE48
-	bl CreateEntity
+	bl LoadRoomEntity
 	b _080189E4
 	.align 2, 0
 _080189CC: .4byte gUnk_080FEE48
@@ -924,501 +924,3 @@ _08018C10:
 	.align 2, 0
 _08018C14: .4byte gUnk_080FEAC8
 _08018C18: .4byte gUnk_080FE320
-
-	thumb_func_start sub_08018C1C
-sub_08018C1C: @ 0x08018C1C
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, #0
-	ldr r6, _08018C54 @ =0x00000185
-	movs r0, #0
-_08018C28:
-	movs r4, #0
-	movs r1, #0x40
-	adds r1, r1, r5
-	mov r8, r1
-	adds r7, r0, #1
-_08018C32:
-	adds r0, r6, #0
-	adds r6, #1
-	adds r1, r5, r4
-	movs r2, #1
-	bl SetTileType
-	adds r4, #1
-	cmp r4, #4
-	bls _08018C32
-	mov r5, r8
-	adds r0, r7, #0
-	cmp r0, #3
-	bls _08018C28
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08018C54: .4byte 0x00000185
-
-	thumb_func_start sub_08018C58
-sub_08018C58: @ 0x08018C58
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	movs r5, #0
-_08018C5E:
-	movs r1, #0x98
-	lsls r1, r1, #2
-	adds r0, r5, r1
-	adds r1, r4, #0
-	movs r2, #1
-	bl SetTileType
-	ldr r1, _08018C84 @ =0x00000261
-	adds r0, r5, r1
-	adds r1, r4, #1
-	movs r2, #1
-	bl SetTileType
-	adds r5, #2
-	adds r4, #0x40
-	cmp r5, #5
-	bls _08018C5E
-	pop {r4, r5, pc}
-	.align 2, 0
-_08018C84: .4byte 0x00000261
-
-	thumb_func_start sub_08018C88
-sub_08018C88: @ 0x08018C88
-	push {lr}
-	adds r2, r0, #0
-	adds r0, #0x45
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _08018CB4
-	adds r1, r2, #0
-	adds r1, #0x3d
-	movs r0, #0
-	strb r0, [r1]
-	ldr r1, _08018CB0 @ =gUnk_080B3DD0
-	ldrb r0, [r2, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r2, #0
-	bl _call_via_r1
-	b _08018CB8
-	.align 2, 0
-_08018CB0: .4byte gUnk_080B3DD0
-_08018CB4:
-	bl DeleteThisEntity
-_08018CB8:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08018CBC
-sub_08018CBC: @ 0x08018CBC
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	adds r1, r4, #0
-	adds r1, #0x84
-	ldr r5, _08018D50 @ =gLinkEntity
-	ldr r0, [r5, #0x2c]
-	str r0, [r4, #0x2c]
-	str r0, [r1]
-	subs r1, #4
-	ldr r0, [r5, #0x30]
-	str r0, [r4, #0x30]
-	str r0, [r1]
-	ldrb r1, [r5, #0x14]
-	movs r0, #0xe
-	ands r0, r1
-	strb r0, [r4, #0x14]
-	lsls r0, r0, #2
-	strb r0, [r4, #0x15]
-	movs r0, #0x80
-	lsls r0, r0, #3
-	strh r0, [r4, #0x24]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x96
-	strb r0, [r1]
-	adds r0, r5, #0
-	adds r0, #0x3c
-	ldrb r0, [r0]
-	adds r0, #1
-	movs r2, #0x80
-	rsbs r2, r2, #0
-	adds r1, r2, #0
-	adds r2, r4, #0
-	adds r2, #0x3c
-	orrs r0, r1
-	strb r0, [r2]
-	adds r0, r5, #0
-	adds r0, #0x3b
-	ldrb r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x3b
-	strb r0, [r1]
-	ldr r6, [r4, #0x54]
-	cmp r6, #0
-	beq _08018D58
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #0x56
-	strb r0, [r4, #0xe]
-	adds r1, r4, #0
-	adds r1, #0x40
-	movs r0, #0x1c
-	strb r0, [r1]
-	adds r1, #4
-	movs r0, #6
-	strb r0, [r1]
-	ldr r0, _08018D54 @ =gUnk_080B3E18
-	str r0, [r4, #0x48]
-	ldr r0, [r4, #0x54]
-	adds r0, #0x62
-	movs r1, #0
-	strb r1, [r0]
-	ldr r2, [r4, #0x54]
-	ldrb r1, [r2, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2, #0x18]
-	b _08018DD2
-	.align 2, 0
-_08018D50: .4byte gLinkEntity
-_08018D54: .4byte gUnk_080B3E18
-_08018D58:
-	ldr r7, _08018DDC @ =gLinkState
-	ldrb r0, [r7, #0x1c]
-	cmp r0, #0
-	bne _08018D64
-	bl DeleteThisEntity
-_08018D64:
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #6
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	movs r0, #0xa6
-	strh r0, [r4, #0x12]
-	movs r0, #0x33
-	strb r0, [r4, #0x1a]
-	adds r0, r4, #0
-	adds r0, #0x60
-	strh r6, [r0]
-	ldrb r0, [r7, #0x1d]
-	subs r0, #1
-	strb r0, [r4, #0xa]
-	ldr r1, _08018DE0 @ =gUnk_080B3DE0
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	strb r0, [r4, #0xe]
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #1
-	adds r0, #1
-	adds r0, r0, r1
-	ldrb r1, [r0]
-	adds r0, r4, #0
-	adds r0, #0x44
-	strb r1, [r0]
-	adds r1, r4, #0
-	adds r1, #0x40
-	movs r0, #0x1b
-	strb r0, [r1]
-	ldr r1, _08018DE4 @ =gUnk_080B3DE8
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	str r0, [r4, #0x48]
-	str r4, [r5, #0x70]
-	adds r0, r5, #0
-	bl sub_08078CD0
-	str r6, [r5, #0x70]
-	ldrb r1, [r4, #0xa]
-	adds r1, #0xa
-	adds r0, r4, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_08018FA0
-_08018DD2:
-	adds r0, r4, #0
-	bl sub_0801766C
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08018DDC: .4byte gLinkState
-_08018DE0: .4byte gUnk_080B3DE0
-_08018DE4: .4byte gUnk_080B3DE8
-
-	thumb_func_start sub_08018DE8
-sub_08018DE8: @ 0x08018DE8
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x54]
-	adds r0, #0x3a
-	ldrb r1, [r0]
-	movs r5, #4
-	adds r0, r5, #0
-	ands r0, r1
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r1, #0
-	bne _08018E08
-	ldr r0, _08018E18 @ =gLinkState
-	strb r1, [r0, #0x1c]
-	bl DeleteThisEntity
-_08018E08:
-	ldr r0, _08018E18 @ =gLinkState
-	ldrb r0, [r0, #0x1c]
-	cmp r0, #0
-	beq _08018E1C
-	cmp r0, #5
-	beq _08018E24
-	b _08018E5A
-	.align 2, 0
-_08018E18: .4byte gLinkState
-_08018E1C:
-	adds r0, r4, #0
-	bl sub_08018F6C
-	b _08018E5A
-_08018E24:
-	ldr r0, [r4, #0x54]
-	strb r5, [r0, #0xd]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	movs r2, #2
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	adds r3, r4, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	subs r0, #0xa
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r3]
-	ldr r2, [r4, #0x54]
-	ldrb r1, [r2, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r2, #0x18]
-	adds r0, r4, #0
-	bl sub_08018FA0
-_08018E5A:
-	ldr r0, _08018E64 @ =gLinkEntity
-	bl sub_08078CD0
-	pop {r4, r5, pc}
-	.align 2, 0
-_08018E64: .4byte gLinkEntity
-
-	thumb_func_start sub_08018E68
-sub_08018E68: @ 0x08018E68
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #0x54]
-	cmp r0, #0
-	bne _08018E82
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	movs r1, #5
-	bl sub_08008790
-	b _08018EA8
-_08018E82:
-	adds r0, #0x3a
-	ldrb r1, [r0]
-	movs r0, #4
-	ands r0, r1
-	cmp r0, #0
-	bne _08018E92
-	bl DeleteThisEntity
-_08018E92:
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08018EA8
-	adds r0, r4, #0
-	bl sub_08018F6C
-	b _08018F62
-_08018EA8:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0xff
-	beq _08018F46
-	adds r0, r4, #0
-	bl sub_0806F69C
-	ldrb r0, [r4, #0x15]
-	cmp r0, #8
-	beq _08018EEA
-	cmp r0, #8
-	bgt _08018ECC
-	cmp r0, #0
-	beq _08018ED6
-	b _08018EEE
-_08018ECC:
-	cmp r0, #0x10
-	beq _08018EDE
-	cmp r0, #0x18
-	beq _08018EE4
-	b _08018EEE
-_08018ED6:
-	movs r6, #0
-	movs r5, #4
-	rsbs r5, r5, #0
-	b _08018EEE
-_08018EDE:
-	movs r6, #0
-	movs r5, #4
-	b _08018EEE
-_08018EE4:
-	movs r6, #4
-	rsbs r6, r6, #0
-	b _08018EEC
-_08018EEA:
-	movs r6, #4
-_08018EEC:
-	movs r5, #0
-_08018EEE:
-	ldr r1, [r4, #0x54]
-	cmp r1, #0
-	beq _08018F00
-	ldrb r0, [r4, #0x15]
-	strb r0, [r1, #0x15]
-	ldr r1, [r4, #0x54]
-	adds r0, r4, #0
-	bl CopyPosition
-_08018F00:
-	ldrb r0, [r4, #0xb]
-	cmp r0, #0
-	bne _08018F0C
-	adds r0, r4, #0
-	bl sub_0800451C
-_08018F0C:
-	adds r0, r4, #0
-	adds r1, r6, #0
-	adds r2, r5, #0
-	bl sub_0800029C
-	ldr r1, _08018F64 @ =gUnk_080B3DF4
-	bl sub_08007DD6
-	cmp r0, #0
-	bne _08018F62
-	adds r0, r4, #0
-	adds r1, r6, #0
-	adds r2, r5, #0
-	bl sub_080002B4
-	cmp r0, #0x74
-	beq _08018F62
-	ldr r1, _08018F68 @ =gUnk_08003E44
-	movs r0, #0x2e
-	ldrsh r2, [r4, r0]
-	adds r2, r2, r6
-	movs r0, #0x32
-	ldrsh r3, [r4, r0]
-	adds r3, r3, r5
-	adds r0, r4, #0
-	bl sub_080040D8
-	cmp r0, #0
-	beq _08018F62
-_08018F46:
-	ldr r0, [r4, #0x54]
-	cmp r0, #0
-	bne _08018F56
-	ldrb r1, [r4, #0xa]
-	adds r1, #0xd
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08018F56:
-	ldrb r0, [r4, #0xc]
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	bl sub_08018F6C
-_08018F62:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08018F64: .4byte gUnk_080B3DF4
-_08018F68: .4byte gUnk_08003E44
-
-	thumb_func_start sub_08018F6C
-sub_08018F6C: @ 0x08018F6C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, [r4, #0x54]
-	cmp r1, #0
-	beq _08018F8A
-	movs r0, #5
-	strb r0, [r1, #0xd]
-	ldr r2, [r4, #0x54]
-	ldrb r1, [r2, #0x18]
-	subs r0, #9
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r2, #0x18]
-	b _08018F9A
-_08018F8A:
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _08018F9E
-_08018F9A:
-	bl DeleteThisEntity
-_08018F9E:
-	pop {r4, pc}
-
-	thumb_func_start sub_08018FA0
-sub_08018FA0: @ 0x08018FA0
-	push {lr}
-	adds r2, r0, #0
-	ldr r0, _08018FC8 @ =gLinkEntity
-	adds r0, #0x38
-	ldrb r0, [r0]
-	adds r1, r2, #0
-	adds r1, #0x38
-	strb r0, [r1]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #2
-	bne _08018FBC
-	movs r0, #1
-	strb r0, [r2, #0xb]
-_08018FBC:
-	ldrb r0, [r2, #0xa]
-	adds r0, #0xea
-	bl PlaySFX
-	pop {pc}
-	.align 2, 0
-_08018FC8: .4byte gLinkEntity
-
-	thumb_func_start sub_08018FCC
-sub_08018FCC: @ 0x08018FCC
-	push {lr}
-	ldr r2, _08018FE0 @ =gUnk_080B3E30
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08018FE0: .4byte gUnk_080B3E30

asm/code_0801C370.s

@@ -32,7 +32,7 @@ _0801C398:
 	movs r1, #0xcd
 	lsls r1, r1, #2
 	adds r0, r5, #0
-	bl sub_0801D630
+	bl _DmaZero
 	strb r6, [r5, #3]
 	strh r4, [r5, #0xe]
 	ldr r0, _0801C474 @ =gUnk_02002A40
@@ -41,14 +41,14 @@ _0801C398:
 	lsrs r0, r0, #1
 	strb r0, [r5, #4]
 	movs r0, #0xc
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 	movs r0, #0x10
-	bl sub_0801D7EC
+	bl LoadGfxGroup
 	ldr r4, _0801C478 @ =gUnk_02034CB0
 	movs r1, #0x80
 	lsls r1, r1, #4
 	adds r0, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r1, _0801C47C @ =gScreen
 	str r4, [r1, #0x10]
 	ldr r0, _0801C480 @ =0x00001F0C
@@ -93,7 +93,7 @@ _0801C398:
 	adds r0, #0x34
 	movs r1, #0xc0
 	lsls r1, r1, #2
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #5
 	movs r1, #9
 	bl sub_0801CA6C

asm/code_0801CEC0.s

@@ -0,0 +1,863 @@
+	.include "asm/macros.inc"
+
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+
+	thumb_func_start sub_0801CFA8
+sub_0801CFA8: @ 0x0801CFA8
+	push {r4, r5, lr}
+	adds r5, r0, #0
+	ldr r0, _0801CFCC @ =gUnk_02001A00
+	movs r1, #0x40
+	bl _DmaZero
+	movs r4, #0
+_0801CFB6:
+	adds r0, r4, #0
+	bl sub_0801CFD0
+	adds r4, #1
+	cmp r4, #5
+	bls _0801CFB6
+	adds r0, r5, #0
+	bl sub_0801D000
+	pop {r4, r5, pc}
+	.align 2, 0
+_0801CFCC: .4byte gUnk_02001A00
+
+	thumb_func_start sub_0801CFD0
+sub_0801CFD0: @ 0x0801CFD0
+	lsls r0, r0, #2
+	ldr r1, _0801CFF8 @ =gUnk_02001A00
+	adds r0, r0, r1
+	ldrb r2, [r0]
+	movs r1, #0x10
+	rsbs r1, r1, #0
+	ands r1, r2
+	movs r2, #4
+	orrs r1, r2
+	movs r2, #0xf
+	ands r1, r2
+	movs r2, #0x10
+	orrs r1, r2
+	strb r1, [r0]
+	movs r1, #0x80
+	strb r1, [r0, #1]
+	ldr r1, _0801CFFC @ =0x0000FFFF
+	strh r1, [r0, #2]
+	bx lr
+	.align 2, 0
+_0801CFF8: .4byte gUnk_02001A00
+_0801CFFC: .4byte 0x0000FFFF
+
+	thumb_func_start sub_0801D000
+sub_0801D000: @ 0x0801D000
+	push {lr}
+	adds r2, r0, #0
+	ldr r0, _0801D024 @ =gScreenTransition
+	movs r1, #0
+	cmp r2, #0
+	beq _0801D00E
+	movs r1, #0xf
+_0801D00E:
+	adds r0, #0x2f
+	strb r1, [r0]
+	cmp r2, #0
+	beq _0801D028
+	bl sub_0801D34C
+	movs r0, #0xf
+	bl sub_0801CFD0
+	b _0801D03A
+	.align 2, 0
+_0801D024: .4byte gScreenTransition
+_0801D028:
+	ldr r3, _0801D03C @ =gUnk_02001A3C
+	ldrb r1, [r3]
+	movs r0, #0xf
+	ands r0, r1
+	cmp r0, #4
+	bne _0801D03A
+	strb r2, [r3]
+	strb r2, [r3, #1]
+	strh r2, [r3, #2]
+_0801D03A:
+	pop {pc}
+	.align 2, 0
+_0801D03C: .4byte gUnk_02001A3C
+
+	thumb_func_start sub_0801D040
+sub_0801D040: @ 0x0801D040
+	push {r4, r5, r6, r7, lr}
+	mov r7, sl
+	mov r6, sb
+	mov r5, r8
+	push {r5, r6, r7}
+	sub sp, #4
+	str r0, [sp]
+	adds r6, r1, #0
+	adds r0, r6, #0
+	bl sub_0801D108
+	adds r5, r0, #0
+	cmp r5, #0
+	bge _0801D0E8
+	cmp r6, #0x15
+	bhi _0801D064
+	movs r4, #1
+	b _0801D074
+_0801D064:
+	ldr r0, _0801D100 @ =gUnk_08133368
+	adds r1, r6, #0
+	subs r1, #0x16
+	lsls r1, r1, #2
+	adds r1, r1, r0
+	ldrb r4, [r1, #3]
+	movs r0, #0xf
+	ands r4, r0
+_0801D074:
+	adds r0, r4, #0
+	bl sub_0801D134
+	adds r5, r0, #0
+	cmp r5, #0
+	bge _0801D090
+	bl sub_0801D34C
+	adds r0, r4, #0
+	bl sub_0801D134
+	adds r5, r0, #0
+	cmp r5, #0
+	blt _0801D0E8
+_0801D090:
+	lsls r1, r5, #2
+	ldr r0, _0801D104 @ =gUnk_02001A00
+	adds r3, r1, r0
+	movs r0, #0
+	strh r6, [r3, #2]
+	strb r0, [r3, #1]
+	movs r2, #0x10
+	rsbs r2, r2, #0
+	lsls r0, r4, #4
+	movs r1, #3
+	orrs r0, r1
+	strb r0, [r3]
+	subs r4, #1
+	cmp r4, #0
+	beq _0801D0E0
+	movs r0, #0
+	mov sl, r0
+	movs r1, #0
+	mov r8, r1
+	movs r0, #0xf
+	mov sb, r0
+	mov ip, r2
+	movs r7, #2
+_0801D0BE:
+	adds r3, #4
+	mov r1, r8
+	strh r1, [r3, #2]
+	mov r0, sl
+	strb r0, [r3, #1]
+	lsls r2, r4, #4
+	ldrb r1, [r3]
+	mov r0, sb
+	ands r0, r1
+	orrs r0, r2
+	mov r1, ip
+	ands r0, r1
+	orrs r0, r7
+	strb r0, [r3]
+	subs r4, #1
+	cmp r4, #0
+	bne _0801D0BE
+_0801D0E0:
+	adds r0, r6, #0
+	adds r1, r5, #0
+	bl sub_0801D2C8
+_0801D0E8:
+	ldr r0, [sp]
+	adds r1, r5, #0
+	bl sub_0801D19C
+	adds r0, r5, #0
+	add sp, #4
+	pop {r3, r4, r5}
+	mov r8, r3
+	mov sb, r4
+	mov sl, r5
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_0801D100: .4byte gUnk_08133368
+_0801D104: .4byte gUnk_02001A00
+
+	thumb_func_start sub_0801D108
+sub_0801D108: @ 0x0801D108
+	push {lr}
+	adds r2, r0, #0
+	cmp r2, #5
+	bhi _0801D116
+	b _0801D12E
+_0801D112:
+	adds r0, r1, #0
+	b _0801D12E
+_0801D116:
+	movs r1, #6
+	ldr r0, _0801D130 @ =gUnk_02001A00
+	adds r0, #0x18
+_0801D11C:
+	ldrh r3, [r0, #2]
+	cmp r2, r3
+	beq _0801D112
+	adds r0, #4
+	adds r1, #1
+	cmp r1, #0xf
+	bls _0801D11C
+	movs r0, #1
+	rsbs r0, r0, #0
+_0801D12E:
+	pop {pc}
+	.align 2, 0
+_0801D130: .4byte gUnk_02001A00
+
+	thumb_func_start sub_0801D134
+sub_0801D134: @ 0x0801D134
+	push {r4, lr}
+	adds r4, r0, #0
+	movs r1, #0
+	movs r2, #6
+	ldr r0, _0801D154 @ =gUnk_02001A00
+	adds r3, r0, #0
+	adds r3, #0x18
+_0801D142:
+	ldrb r0, [r3]
+	lsls r0, r0, #0x1c
+	cmp r0, #0
+	bne _0801D158
+	adds r1, #1
+	cmp r4, r1
+	bhi _0801D15A
+	b _0801D180
+	.align 2, 0
+_0801D154: .4byte gUnk_02001A00
+_0801D158:
+	movs r1, #0
+_0801D15A:
+	adds r3, #4
+	adds r2, #1
+	cmp r2, #0xf
+	bls _0801D142
+	movs r1, #0
+	movs r2, #6
+	ldr r0, _0801D188 @ =gUnk_02001A00
+	adds r3, r0, #0
+	adds r3, #0x18
+_0801D16C:
+	ldrb r0, [r3]
+	lsls r0, r0, #0x1c
+	lsrs r0, r0, #0x1c
+	cmp r0, #1
+	bgt _0801D18C
+	cmp r0, #0
+	blt _0801D18C
+	adds r1, #1
+	cmp r4, r1
+	bhi _0801D18E
+_0801D180:
+	subs r0, r1, #1
+	subs r0, r2, r0
+	b _0801D19A
+	.align 2, 0
+_0801D188: .4byte gUnk_02001A00
+_0801D18C:
+	movs r1, #0
+_0801D18E:
+	adds r3, #4
+	adds r2, #1
+	cmp r2, #0xf
+	bls _0801D16C
+	movs r0, #1
+	rsbs r0, r0, #0
+_0801D19A:
+	pop {r4, pc}
+
+	thumb_func_start sub_0801D19C
+sub_0801D19C: @ 0x0801D19C
+	push {r4, r5, r6, r7, lr}
+	adds r4, r0, #0
+	adds r3, r1, #0
+	cmp r3, #0
+	bge _0801D1A8
+	movs r3, #0
+_0801D1A8:
+	adds r0, r4, #0
+	adds r0, #0x28
+	ldrb r0, [r0]
+	subs r0, #1
+	lsls r0, r0, #0x18
+	lsrs r0, r0, #0x18
+	cmp r0, #0x7e
+	bls _0801D1BE
+	adds r0, r4, #0
+	adds r0, #0x27
+	strb r3, [r0]
+_0801D1BE:
+	movs r0, #0xf
+	adds r1, r3, #0
+	ands r1, r0
+	ldrb r2, [r4, #0x1a]
+	movs r5, #0x10
+	rsbs r5, r5, #0
+	adds r0, r5, #0
+	ands r0, r2
+	orrs r0, r1
+	movs r2, #0xf
+	adds r1, r3, #0
+	ands r1, r2
+	lsls r1, r1, #4
+	ands r0, r2
+	orrs r0, r1
+	strb r0, [r4, #0x1a]
+	lsls r1, r3, #2
+	ldr r0, _0801D22C @ =gUnk_02001A00
+	adds r4, r1, r0
+	ldr r0, [r4]
+	lsls r0, r0, #0x1c
+	lsrs r0, r0, #0x1c
+	cmp r0, #4
+	beq _0801D22A
+	ldrb r0, [r4, #1]
+	adds r0, #1
+	strb r0, [r4, #1]
+	ldr r0, [r4]
+	lsls r0, r0, #0x18
+	lsrs r3, r0, #0x1c
+	ldrb r1, [r4]
+	adds r0, r5, #0
+	ands r0, r1
+	movs r1, #3
+	orrs r0, r1
+	strb r0, [r4]
+	subs r3, #1
+	cmp r3, #0
+	beq _0801D22A
+	movs r7, #0xf
+	adds r6, r5, #0
+	movs r5, #2
+_0801D212:
+	adds r4, #4
+	lsls r2, r3, #4
+	ldrb r1, [r4]
+	adds r0, r7, #0
+	ands r0, r1
+	orrs r0, r2
+	ands r0, r6
+	orrs r0, r5
+	strb r0, [r4]
+	subs r3, #1
+	cmp r3, #0
+	bne _0801D212
+_0801D22A:
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_0801D22C: .4byte gUnk_02001A00
+
+	thumb_func_start UnloadOBJPalette
+UnloadOBJPalette: @ 0x0801D230
+	push {lr}
+	adds r0, #0x27
+	ldrb r2, [r0]
+	movs r1, #0
+	strb r1, [r0]
+	adds r0, r2, #0
+	bl sub_0801D244
+	pop {pc}
+	.align 2, 0
+
+	thumb_func_start sub_0801D244
+sub_0801D244: @ 0x0801D244
+	push {r4, r5, r6, lr}
+	lsls r0, r0, #2
+	ldr r1, _0801D288 @ =gUnk_02001A00
+	adds r2, r0, r1
+	ldr r0, [r2]
+	lsls r0, r0, #0x1c
+	lsrs r0, r0, #0x1c
+	cmp r0, #3
+	bne _0801D284
+	ldrb r0, [r2, #1]
+	subs r0, #1
+	strb r0, [r2, #1]
+	lsls r0, r0, #0x18
+	cmp r0, #0
+	bne _0801D284
+	ldr r0, [r2]
+	lsls r0, r0, #0x18
+	lsrs r3, r0, #0x1c
+	movs r5, #0
+	movs r6, #0x10
+	rsbs r6, r6, #0
+	movs r4, #1
+_0801D270:
+	strb r5, [r2, #1]
+	ldrb r1, [r2]
+	adds r0, r6, #0
+	ands r0, r1
+	orrs r0, r4
+	strb r0, [r2]
+	adds r2, #4
+	subs r3, #1
+	cmp r3, #0
+	bne _0801D270
+_0801D284:
+	pop {r4, r5, r6, pc}
+	.align 2, 0
+_0801D288: .4byte gUnk_02001A00
+
+	thumb_func_start sub_0801D28C
+sub_0801D28C: @ 0x0801D28C
+	push {lr}
+	adds r3, r1, #0
+	adds r0, #0x27
+	ldrb r2, [r0]
+	ldr r1, _0801D2B0 @ =gUnk_02001A00
+	lsls r0, r2, #2
+	adds r1, r0, r1
+	ldrb r0, [r1]
+	lsls r0, r0, #0x1c
+	lsrs r0, r0, #0x1c
+	cmp r0, #3
+	bne _0801D2AE
+	strh r3, [r1, #2]
+	adds r0, r3, #0
+	adds r1, r2, #0
+	bl sub_0801D2C8
+_0801D2AE:
+	pop {pc}
+	.align 2, 0
+_0801D2B0: .4byte gUnk_02001A00
+
+	thumb_func_start sub_0801D2B4
+sub_0801D2B4: @ 0x0801D2B4
+	push {r4, r5, lr}
+	adds r4, r0, #0
+	adds r5, r1, #0
+	bl UnloadOBJPalette
+	adds r0, r4, #0
+	adds r1, r5, #0
+	bl sub_0801D040
+	pop {r4, r5, pc}
+
+	thumb_func_start sub_0801D2C8
+sub_0801D2C8: @ 0x0801D2C8
+	push {r4, lr}
+	adds r3, r0, #0
+	ldr r2, _0801D2F8 @ =gUsedPalettes
+	adds r4, r1, #0
+	adds r4, #0x10
+	movs r1, #1
+	lsls r1, r4
+	ldr r0, [r2]
+	orrs r0, r1
+	str r0, [r2]
+	cmp r3, #5
+	bls _0801D33C
+	cmp r3, #0x15
+	bne _0801D300
+	ldr r2, _0801D2FC @ =gPaletteBuffer
+	adds r0, r2, #0
+	adds r0, #0x78
+	ldrh r0, [r0]
+	lsls r1, r4, #5
+	adds r1, r1, r2
+	movs r2, #0x20
+	bl _DmaFill16
+	b _0801D33C
+	.align 2, 0
+_0801D2F8: .4byte gUsedPalettes
+_0801D2FC: .4byte gPaletteBuffer
+_0801D300:
+	cmp r3, #0x14
+	bhi _0801D31C
+	subs r0, r3, #6
+	lsls r0, r0, #5
+	ldr r1, _0801D318 @ =gPaletteBuffer
+	adds r0, r0, r1
+	adds r1, r4, #0
+	movs r2, #1
+	bl LoadPalettes
+	b _0801D33C
+	.align 2, 0
+_0801D318: .4byte gPaletteBuffer
+_0801D31C:
+	ldr r1, _0801D340 @ =gUnk_08133368
+	adds r0, r3, #0
+	subs r0, #0x16
+	lsls r0, r0, #2
+	adds r0, r0, r1
+	ldr r0, [r0]
+	lsrs r2, r0, #0x18
+	movs r1, #0xf
+	ands r2, r1
+	ldr r1, _0801D344 @ =0x00FFFFFF
+	ands r0, r1
+	ldr r1, _0801D348 @ =gGlobalGfxAndPalettes
+	adds r0, r0, r1
+	adds r1, r4, #0
+	bl LoadPalettes
+_0801D33C:
+	pop {r4, pc}
+	.align 2, 0
+_0801D340: .4byte gUnk_08133368
+_0801D344: .4byte 0x00FFFFFF
+_0801D348: .4byte gGlobalGfxAndPalettes
+
+	thumb_func_start sub_0801D34C
+sub_0801D34C: @ 0x0801D34C
+	push {r4, r5, r6, r7, lr}
+	sub sp, #0x10
+	movs r2, #0
+	movs r3, #0
+	ldr r1, _0801D37C @ =gUnk_02001A00
+_0801D356:
+	mov r4, sp
+	adds r0, r4, r2
+	strb r2, [r0]
+	ldrb r0, [r1]
+	lsls r0, r0, #0x1c
+	lsrs r0, r0, #0x1c
+	cmp r0, #1
+	bgt _0801D370
+	cmp r0, #0
+	blt _0801D370
+	strb r3, [r1]
+	strb r3, [r1, #1]
+	strh r3, [r1, #2]
+_0801D370:
+	adds r1, #4
+	adds r2, #1
+	cmp r2, #0xf
+	bls _0801D356
+	movs r4, #6
+	b _0801D390
+	.align 2, 0
+_0801D37C: .4byte gUnk_02001A00
+_0801D380:
+	cmp r4, r1
+	ble _0801D390
+	mov r2, sp
+	adds r0, r2, r4
+	strb r1, [r0]
+	adds r0, r4, #0
+	bl sub_0801D48C
+_0801D390:
+	adds r0, r4, #1
+	bl sub_0801D458
+	adds r4, r0, #0
+	cmp r4, #0
+	beq _0801D3AC
+	movs r0, #1
+	bl sub_0801D134
+	adds r1, r0, #0
+	movs r0, #1
+	rsbs r0, r0, #0
+	cmp r1, r0
+	bne _0801D380
+_0801D3AC:
+	movs r1, #0
+	ldr r4, _0801D450 @ =gEntityLists
+	mov ip, r4
+_0801D3B2:
+	lsls r0, r1, #3
+	mov r2, ip
+	adds r3, r0, r2
+	adds r0, r3, #0
+	ldr r3, [r3, #4]
+	adds r5, r1, #1
+	cmp r0, r3
+	beq _0801D444
+	movs r7, #0x10
+	rsbs r7, r7, #0
+	adds r4, r0, #0
+	ldr r6, _0801D454 @ =gUnk_020000C0
+_0801D3CA:
+	ldrb r0, [r3, #8]
+	cmp r0, #9
+	beq _0801D43E
+	adds r1, r3, #0
+	adds r1, #0x28
+	ldrb r0, [r1]
+	subs r0, #1
+	lsls r0, r0, #0x18
+	lsrs r0, r0, #0x18
+	cmp r0, #0x7e
+	bhi _0801D40C
+	ldrb r1, [r1]
+	lsls r1, r1, #6
+	adds r1, r1, r6
+	ldrb r0, [r1, #5]
+	add r0, sp
+	ldrb r0, [r0]
+	strb r0, [r1, #5]
+	ldrb r0, [r1, #0x15]
+	add r0, sp
+	ldrb r0, [r0]
+	strb r0, [r1, #0x15]
+	adds r2, r1, #0
+	adds r2, #0x25
+	ldrb r0, [r2]
+	add r0, sp
+	ldrb r0, [r0]
+	strb r0, [r2]
+	adds r1, #0x35
+	ldrb r0, [r1]
+	add r0, sp
+	ldrb r0, [r0]
+	strb r0, [r1]
+_0801D40C:
+	adds r1, r3, #0
+	adds r1, #0x27
+	ldrb r0, [r1]
+	add r0, sp
+	ldrb r0, [r0]
+	strb r0, [r1]
+	ldrb r2, [r3, #0x1a]
+	lsls r0, r2, #0x1c
+	lsrs r0, r0, #0x1c
+	add r0, sp
+	ldrb r1, [r0]
+	movs r0, #0xf
+	ands r1, r0
+	adds r0, r7, #0
+	ands r0, r2
+	orrs r0, r1
+	strb r0, [r3, #0x1a]
+	lsrs r1, r0, #4
+	add r1, sp
+	ldrb r2, [r1]
+	lsls r2, r2, #4
+	movs r1, #0xf
+	ands r0, r1
+	orrs r0, r2
+	strb r0, [r3, #0x1a]
+_0801D43E:
+	ldr r3, [r3, #4]
+	cmp r4, r3
+	bne _0801D3CA
+_0801D444:
+	adds r1, r5, #0
+	cmp r1, #8
+	bls _0801D3B2
+	add sp, #0x10
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_0801D450: .4byte gEntityLists
+_0801D454: .4byte gUnk_020000C0
+
+	thumb_func_start sub_0801D458
+sub_0801D458: @ 0x0801D458
+	push {lr}
+	adds r2, r0, #0
+	cmp r2, #0xf
+	bhi _0801D488
+	ldr r1, _0801D47C @ =gUnk_02001A00
+	lsls r0, r2, #2
+	adds r1, r0, r1
+_0801D466:
+	ldrb r0, [r1]
+	lsls r0, r0, #0x1c
+	lsrs r0, r0, #0x1c
+	cmp r0, #0
+	blt _0801D478
+	cmp r0, #1
+	ble _0801D480
+	cmp r0, #4
+	beq _0801D480
+_0801D478:
+	adds r0, r2, #0
+	b _0801D48A
+	.align 2, 0
+_0801D47C: .4byte gUnk_02001A00
+_0801D480:
+	adds r1, #4
+	adds r2, #1
+	cmp r2, #0xf
+	bls _0801D466
+_0801D488:
+	movs r0, #0
+_0801D48A:
+	pop {pc}
+
+	thumb_func_start sub_0801D48C
+sub_0801D48C: @ 0x0801D48C
+	push {r4, r5, r6, r7, lr}
+	mov r7, r8
+	push {r7}
+	sub sp, #4
+	adds r6, r0, #0
+	adds r3, r1, #0
+	ldr r0, _0801D50C @ =gUnk_02001A00
+	mov r8, r0
+	lsls r0, r6, #2
+	mov r1, r8
+	adds r4, r0, r1
+	ldrb r0, [r4]
+	lsrs r5, r0, #4
+	subs r5, #1
+	movs r0, #1
+	rsbs r0, r0, #0
+	cmp r5, r0
+	beq _0801D4F8
+	ldr r2, _0801D510 @ =gPaletteBuffer
+	lsls r0, r3, #5
+	movs r1, #0x80
+	lsls r1, r1, #2
+	adds r0, r0, r1
+	adds r7, r0, r2
+	lsls r0, r3, #2
+	add r8, r0
+	lsls r0, r6, #5
+	adds r0, r0, r1
+	adds r6, r0, r2
+	movs r3, #0
+_0801D4C8:
+	ldr r0, [r4]
+	mov r1, r8
+	adds r1, #4
+	mov r8, r1
+	subs r1, #4
+	stm r1!, {r0}
+	strb r3, [r4]
+	strb r3, [r4, #1]
+	strh r3, [r4, #2]
+	adds r0, r6, #0
+	adds r1, r7, #0
+	movs r2, #0x20
+	str r3, [sp]
+	bl sub_0801D66C
+	adds r6, #0x20
+	adds r4, #4
+	adds r7, #0x20
+	subs r5, #1
+	movs r0, #1
+	rsbs r0, r0, #0
+	ldr r3, [sp]
+	cmp r5, r0
+	bne _0801D4C8
+_0801D4F8:
+	ldr r0, _0801D514 @ =gUsedPalettes
+	ldr r1, [r0]
+	ldr r2, _0801D518 @ =0xFFFF0000
+	orrs r1, r2
+	str r1, [r0]
+	add sp, #4
+	pop {r3}
+	mov r8, r3
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_0801D50C: .4byte gUnk_02001A00
+_0801D510: .4byte gPaletteBuffer
+_0801D514: .4byte gUsedPalettes
+_0801D518: .4byte 0xFFFF0000
+
+	thumb_func_start sub_0801D51C
+sub_0801D51C: @ 0x0801D51C
+	push {r4, lr}
+	adds r2, r0, #0
+	ldr r0, _0801D58C @ =0x05F5E0FF
+	cmp r2, r0
+	bhi _0801D5A0
+	ldr r1, _0801D590 @ =0x00989680
+	adds r0, r2, #0
+	bl Div
+	adds r4, r0, #0
+	lsls r4, r4, #0x1c
+	ldr r2, _0801D594 @ =0x000F4240
+	adds r0, r1, #0
+	adds r1, r2, #0
+	bl Div
+	lsls r0, r0, #0x18
+	adds r4, r4, r0
+	ldr r2, _0801D598 @ =0x000186A0
+	adds r0, r1, #0
+	adds r1, r2, #0
+	bl Div
+	lsls r0, r0, #0x14
+	adds r4, r4, r0
+	ldr r2, _0801D59C @ =0x00002710
+	adds r0, r1, #0
+	adds r1, r2, #0
+	bl Div
+	lsls r0, r0, #0x10
+	adds r4, r4, r0
+	movs r2, #0xfa
+	lsls r2, r2, #2
+	adds r0, r1, #0
+	adds r1, r2, #0
+	bl Div
+	lsls r0, r0, #0xc
+	adds r4, r4, r0
+	adds r0, r1, #0
+	movs r1, #0x64
+	bl Div
+	lsls r0, r0, #8
+	adds r4, r4, r0
+	adds r0, r1, #0
+	movs r1, #0xa
+	bl Div
+	lsls r0, r0, #4
+	adds r4, r4, r0
+	adds r4, r4, r1
+	adds r0, r4, #0
+	b _0801D5A2
+	.align 2, 0
+_0801D58C: .4byte 0x05F5E0FF
+_0801D590: .4byte 0x00989680
+_0801D594: .4byte 0x000F4240
+_0801D598: .4byte 0x000186A0
+_0801D59C: .4byte 0x00002710
+_0801D5A0:
+	ldr r0, _0801D5A4 @ =0x99999999
+_0801D5A2:
+	pop {r4, pc}
+	.align 2, 0
+_0801D5A4: .4byte 0x99999999
+
+	thumb_func_start ReadBit
+ReadBit: @ 0x0801D5A8
+	lsrs r2, r1, #3
+	adds r0, r0, r2
+	ldrb r0, [r0]
+	movs r2, #7
+	ands r2, r1
+	asrs r0, r2
+	movs r1, #1
+	ands r0, r1
+	bx lr
+	.align 2, 0
+
+	thumb_func_start WriteBit
+WriteBit: @ 0x0801D5BC
+	lsrs r2, r1, #3
+	adds r3, r0, r2
+	movs r2, #7
+	ands r1, r2
+	movs r2, #1
+	lsls r2, r1
+	ldrb r0, [r3]
+	adds r1, r0, #0
+	orrs r1, r2
+	strb r1, [r3]
+	ands r0, r2
+	bx lr
+
+	thumb_func_start ClearBit
+ClearBit: @ 0x0801D5D4
+	lsrs r2, r1, #3
+	adds r3, r0, r2
+	movs r2, #7
+	ands r1, r2
+	movs r2, #1
+	lsls r2, r1
+	ldrb r0, [r3]
+	adds r1, r0, #0
+	bics r1, r2
+	strb r1, [r3]
+	ands r0, r2
+	bx lr

asm/code_0801D714.s

@@ -1,81 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start LoadPalettesByPaletteGroupIndex
-LoadPalettesByPaletteGroupIndex: @ 0x0801D714
-	push {r4, lr}
-	ldr r1, _0801D748 @ =gUnk_080FF850
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r4, [r0]
-_0801D71E:
-	ldrb r3, [r4, #2]
-	ldrb r0, [r4, #3]
-	movs r2, #0xf
-	ands r2, r0
-	cmp r2, #0
-	bne _0801D72C
-	movs r2, #0x10
-_0801D72C:
-	ldrh r0, [r4]
-	lsls r0, r0, #5
-	ldr r1, _0801D74C @ =gUnk_085A2E80
-	adds r0, r0, r1
-	adds r1, r3, #0
-	bl sub_0801D754
-	ldrb r1, [r4, #3]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0801D750
-	adds r4, #4
-	b _0801D71E
-	.align 2, 0
-_0801D748: .4byte gUnk_080FF850
-_0801D74C: .4byte gUnk_085A2E80
-_0801D750:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0801D754
-sub_0801D754: @ 0x0801D754
-	push {r4, r5, r6, r7, lr}
-	adds r6, r0, #0
-	lsls r5, r2, #5
-	movs r3, #1
-	lsls r3, r1
-	subs r2, #1
-	ldr r4, _0801D790 @ =gUnk_0200B644
-	ldr r7, _0801D794 @ =gUnk_020176A0
-	cmp r2, #0
-	ble _0801D772
-_0801D768:
-	lsls r0, r3, #1
-	orrs r3, r0
-	subs r2, #1
-	cmp r2, #0
-	bgt _0801D768
-_0801D772:
-	ldr r0, [r4]
-	orrs r0, r3
-	str r0, [r4]
-	lsls r0, r1, #5
-	adds r0, r0, r7
-	ldr r2, _0801D798 @ =0x040000D4
-	str r6, [r2]
-	str r0, [r2, #4]
-	lsrs r0, r5, #2
-	movs r1, #0x84
-	lsls r1, r1, #0x18
-	orrs r0, r1
-	str r0, [r2, #8]
-	ldr r0, [r2, #8]
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0801D790: .4byte gUnk_0200B644
-_0801D794: .4byte gUnk_020176A0
-_0801D798: .4byte 0x040000D4

asm/code_0801D79C.s

@@ -4,142 +4,6 @@
 	.syntax unified
 
 	.text
-	
-	thumb_func_start sub_0801D79C
-sub_0801D79C: @ 0x0801D79C
-	ldr r3, _0801D7B4 @ =gUnk_020176A0
-	lsls r2, r0, #1
-	adds r2, r2, r3
-	strh r1, [r2]
-	ldr r2, _0801D7B8 @ =gUnk_0200B644
-	lsrs r0, r0, #4
-	movs r1, #1
-	lsls r1, r0
-	ldr r0, [r2]
-	orrs r0, r1
-	str r0, [r2]
-	bx lr
-	.align 2, 0
-_0801D7B4: .4byte gUnk_020176A0
-_0801D7B8: .4byte gUnk_0200B644
-
-	thumb_func_start sub_0801D7BC
-sub_0801D7BC: @ 0x0801D7BC
-	push {lr}
-	adds r2, r0, #0
-	cmp r1, #0
-	beq _0801D7D4
-	ldr r1, _0801D7CC @ =gScreen
-	ldr r0, _0801D7D0 @ =0x0000E0FF
-	b _0801D7D8
-	.align 2, 0
-_0801D7CC: .4byte gScreen
-_0801D7D0: .4byte 0x0000E0FF
-_0801D7D4:
-	ldr r1, _0801D7E4 @ =gScreen
-	ldr r0, _0801D7E8 @ =0x0000FFFF
-_0801D7D8:
-	strh r0, [r1, #6]
-	movs r0, #0
-	adds r1, r2, #0
-	bl sub_0801D79C
-	pop {pc}
-	.align 2, 0
-_0801D7E4: .4byte gScreen
-_0801D7E8: .4byte 0x0000FFFF
-
-	thumb_func_start sub_0801D7EC
-sub_0801D7EC: @ 0x0801D7EC
-	push {r4, r5, r6, lr}
-	ldr r1, _0801D814 @ =gUnk_08100AA8
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r4, [r0]
-	movs r6, #0x80
-	lsls r6, r6, #0x12
-	ldr r5, _0801D818 @ =0x040000D4
-_0801D7FC:
-	movs r2, #0
-	ldrb r1, [r4, #3]
-	movs r0, #0xf
-	ands r1, r0
-	cmp r1, #0xd
-	beq _0801D894
-	cmp r1, #0xd
-	bhi _0801D81C
-	cmp r1, #7
-	beq _0801D842
-	b _0801D836
-	.align 2, 0
-_0801D814: .4byte gUnk_08100AA8
-_0801D818: .4byte 0x040000D4
-_0801D81C:
-	cmp r1, #0xe
-	beq _0801D826
-	cmp r1, #0xf
-	beq _0801D82E
-	b _0801D836
-_0801D826:
-	ldrb r0, [r6, #7]
-	cmp r0, #1
-	bls _0801D83E
-	b _0801D842
-_0801D82E:
-	ldrb r0, [r6, #7]
-	cmp r0, #0
-	beq _0801D83E
-	b _0801D842
-_0801D836:
-	ldrb r0, [r6, #7]
-	cmp r1, r0
-	bne _0801D83E
-	movs r2, #1
-_0801D83E:
-	cmp r2, #0
-	beq _0801D888
-_0801D842:
-	ldr r0, [r4]
-	ldr r1, _0801D868 @ =0x00FFFFFF
-	ands r0, r1
-	ldr r1, _0801D86C @ =gUnk_085A2E80
-	adds r2, r0, r1
-	ldr r1, [r4, #4]
-	ldr r0, [r4, #8]
-	movs r3, #0x80
-	lsls r3, r3, #0x18
-	cmp r0, #0
-	bge _0801D87C
-	ldr r0, _0801D870 @ =0x05FFFFFF
-	cmp r1, r0
-	bls _0801D874
-	adds r0, r2, #0
-	bl LZ77UnCompVram
-	b _0801D888
-	.align 2, 0
-_0801D868: .4byte 0x00FFFFFF
-_0801D86C: .4byte gUnk_085A2E80
-_0801D870: .4byte 0x05FFFFFF
-_0801D874:
-	adds r0, r2, #0
-	bl LZ77UnCompWram
-	b _0801D888
-_0801D87C:
-	str r2, [r5]
-	str r1, [r5, #4]
-	lsrs r0, r0, #1
-	orrs r0, r3
-	str r0, [r5, #8]
-	ldr r0, [r5, #8]
-_0801D888:
-	ldrb r1, [r4, #3]
-	movs r0, #0x80
-	ands r1, r0
-	adds r4, #0xc
-	cmp r1, #0
-	bne _0801D7FC
-_0801D894:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
 
 	thumb_func_start sub_0801D898
 sub_0801D898: @ 0x0801D898
@@ -339,7 +203,7 @@ _0801D9D8:
 	strh r0, [r3]
 	adds r0, r4, #0
 	mov r1, ip
-	bl sub_0801D630
+	bl _DmaZero
 	adds r0, r4, #0
 	b _0801DA02
 	.align 2, 0
@@ -418,7 +282,7 @@ sub_0801DA7C: @ 0x0801DA7C
 	ldr r0, _0801DA8C @ =gUnk_02035540
 	movs r1, #0x80
 	lsls r1, r1, #5
-	bl sub_0801D630
+	bl _DmaZero
 	pop {pc}
 	.align 2, 0
 _0801DA8C: .4byte gUnk_02035540
@@ -434,7 +298,7 @@ sub_0801DA90: @ 0x0801DA90
 	strb r0, [r1]
 	ldr r0, _0801DAF0 @ =gUnk_03003DE0
 	strb r3, [r0]
-	ldr r0, _0801DAF4 @ =gUnk_03000FD0
+	ldr r0, _0801DAF4 @ =gFadeControl
 	strb r3, [r0]
 	ldr r5, _0801DAF8 @ =gScreen
 	adds r0, r5, #0
@@ -459,17 +323,17 @@ sub_0801DA90: @ 0x0801DA90
 	bl sub_0801DB34
 	ldr r0, _0801DB08 @ =0x0600C000
 	movs r1, #0x20
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0801DB0C @ =gUnk_02034CB0
 	movs r1, #0x80
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	strh r4, [r5, #0xe]
 	pop {r4, r5, pc}
 	.align 2, 0
 _0801DAEC: .4byte gUnk_03001000
 _0801DAF0: .4byte gUnk_03003DE0
-_0801DAF4: .4byte gUnk_03000FD0
+_0801DAF4: .4byte gFadeControl
 _0801DAF8: .4byte gScreen
 _0801DAFC: .4byte 0x040000B0
 _0801DB00: .4byte 0x0000C5FF
@@ -505,7 +369,7 @@ sub_0801DB34: @ 0x0801DB34
 	ldr r4, _0801DB6C @ =gScreen
 	adds r0, r4, #0
 	movs r1, #0x7c
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0801DB70 @ =gUnk_02034CB0
 	str r0, [r4, #0x10]
 	ldr r0, _0801DB74 @ =0x00001F0C
@@ -542,12 +406,12 @@ _0801DB90: .4byte 0x0000FFFF
 
 	thumb_func_start sub_0801DB94
 sub_0801DB94: @ 0x0801DB94
-	ldr r0, _0801DB9C @ =gUnk_030010A0
+	ldr r0, _0801DB9C @ =gScreenTransition
 	ldrh r0, [r0, #0x1e]
 	lsrs r0, r0, #0xb
 	bx lr
 	.align 2, 0
-_0801DB9C: .4byte gUnk_030010A0
+_0801DB9C: .4byte gScreenTransition
 
 	thumb_func_start sub_0801DBA0
 sub_0801DBA0: @ 0x0801DBA0
@@ -560,10 +424,10 @@ sub_0801DBA0: @ 0x0801DBA0
 	adds r5, r1, #0
 	adds r1, r2, #0
 	adds r0, r5, #0
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #1
 	strb r0, [r5]
-	ldr r2, _0801DBE4 @ =gUnk_030010A0
+	ldr r2, _0801DBE4 @ =gScreenTransition
 	ldrh r0, [r2, #0x1c]
 	lsrs r0, r0, #4
 	movs r1, #0x7f
@@ -585,14 +449,14 @@ sub_0801DBA0: @ 0x0801DBA0
 	ldr r6, [r4]
 	b _0801DD3A
 	.align 2, 0
-_0801DBE4: .4byte gUnk_030010A0
+_0801DBE4: .4byte gScreenTransition
 _0801DBE8: .4byte gUnk_080C9C50
 _0801DBEC: .4byte gArea
 _0801DBF0:
 	ldrb r0, [r6]
 	ldrb r1, [r6, #1]
 	movs r2, #3
-	bl sub_0804B0FC
+	bl GetRoomProperty
 	adds r4, r0, #0
 	cmp r4, #0
 	bne _0801DC04
@@ -736,7 +600,7 @@ _0801DCF8:
 	strb r0, [r5, #2]
 	adds r5, #3
 _0801DD16:
-	ldr r2, _0801DD54 @ =gUnk_030010A0
+	ldr r2, _0801DD54 @ =gScreenTransition
 	ldrh r0, [r6]
 	ldrh r1, [r2, #0x16]
 	cmp r0, r1
@@ -769,7 +633,7 @@ _0801DD42:
 	.align 2, 0
 _0801DD4C: .4byte gArea
 _0801DD50: .4byte gUnk_0811E214
-_0801DD54: .4byte gUnk_030010A0
+_0801DD54: .4byte gScreenTransition
 
 	thumb_func_start sub_0801DD58
 sub_0801DD58: @ 0x0801DD58
@@ -803,7 +667,7 @@ sub_0801DD88: @ 0x0801DD88
 	ldr r1, _0801DD9C @ =0x06006000
 	movs r2, #0x80
 	lsls r2, r2, #6
-	bl sub_08000E96
+	bl LoadAssetAsync
 	pop {pc}
 	.align 2, 0
 _0801DD98: .4byte gUnk_0201AEE0
@@ -835,7 +699,7 @@ _0801DDB8:
 	ldr r0, _0801DDE0 @ =gUnk_02019EE0
 	movs r1, #0x80
 	lsls r1, r1, #8
-	bl sub_0801D630
+	bl _DmaZero
 	b _0801DEE2
 	.align 2, 0
 _0801DDD8: .4byte gUnk_080C9C50
@@ -845,7 +709,7 @@ _0801DDE4:
 	ldrb r0, [r4]
 	ldrb r1, [r4, #1]
 	movs r2, #3
-	bl sub_0804B0FC
+	bl GetRoomProperty
 	adds r6, r0, #0
 	adds r0, r4, #0
 	bl sub_0801DF10
@@ -1104,7 +968,7 @@ sub_0801DFB4: @ 0x0801DFB4
 	ldr r7, _0801E004 @ =gUnk_02022740
 	adds r0, r7, #0
 	movs r1, #0x10
-	bl sub_0801D630
+	bl _DmaZero
 	strh r4, [r7, #6]
 	strh r5, [r7, #8]
 	strh r6, [r7, #0xa]
@@ -1178,7 +1042,7 @@ sub_0801E044: @ 0x0801E044
 	bne _0801E06A
 	movs r0, #4
 	movs r1, #0
-	bl sub_080A7138
+	bl MenuFadeIn
 	ldr r0, _0801E070 @ =gUnk_02022740
 	movs r1, #4
 	strb r1, [r0]
@@ -1345,7 +1209,7 @@ sub_0801E160: @ 0x0801E160
 	adds r0, r0, r4
 	movs r1, #0xa0
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	adds r0, r6, #0
 	mov r1, r8
 	mov r2, sb
@@ -1415,7 +1279,7 @@ sub_0801E1EC: @ 0x0801E1EC
 	adds r0, r0, r5
 	movs r1, #0xa0
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	adds r0, r4, #0
 	movs r1, #0
 	bl sub_0801E24C
@@ -1579,7 +1443,7 @@ sub_0801E31C: @ 0x0801E31C
 	adds r0, r0, r1
 	movs r1, #0xa0
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	cmp sl, sb
 	bge _0801E3DC
 	movs r6, #0
@@ -1764,7 +1628,7 @@ sub_0801E49C: @ 0x0801E49C
 	movs r2, #0xf0
 	lsls r2, r2, #3
 	ldr r1, _0801E5E8 @ =gUnk_02018EE0
-	bl sub_0801D5EC
+	bl _DmaFill16
 	adds r3, r5, #0
 	subs r3, #0x40
 	movs r2, #0xff
@@ -1874,7 +1738,7 @@ sub_0801E49C: @ 0x0801E49C
 	adds r0, r0, r6
 	movs r1, #0xa0
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r2, _0801E5E8 @ =gUnk_02018EE0
 	ldrb r1, [r5]
 	lsls r0, r1, #2

asm/code_080300AC.s

@@ -0,0 +1,101 @@
+	.include "asm/macros.inc"
+
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+
+	thumb_func_start sub_080300E8
+sub_080300E8: @ 0x080300E8
+	push {lr}
+	ldr r1, _08030110 @ =gScreenTransition
+	adds r3, r1, #0
+	adds r3, #0xae
+	ldrh r0, [r3]
+	cmp r0, #0xff
+	beq _0803010C
+	lsls r0, r0, #2
+	adds r1, #0x6c
+	adds r0, r0, r1
+	ldr r2, _08030114 @ =gPlayerEntity
+	ldrh r1, [r0]
+	strh r1, [r2, #0x2e]
+	ldrh r0, [r0, #2]
+	adds r0, #0xc
+	strh r0, [r2, #0x32]
+	movs r0, #0xff
+	strh r0, [r3]
+_0803010C:
+	pop {pc}
+	.align 2, 0
+_08030110: .4byte gScreenTransition
+_08030114: .4byte gPlayerEntity
+
+	thumb_func_start sub_08030118
+sub_08030118: @ 0x08030118
+	push {lr}
+	adds r2, r0, #0
+	ldr r0, _0803013C @ =gScreenTransition
+	adds r0, #0xac
+	ldrh r0, [r0]
+	asrs r0, r2
+	movs r1, #1
+	ands r0, r1
+	cmp r0, #0
+	beq _08030140
+	movs r0, #0xc0
+	lsls r0, r0, #2
+	adds r1, r2, #0
+	adds r1, #0x67
+	bl SetLocalFlagByOffset
+	b _0803014C
+	.align 2, 0
+_0803013C: .4byte gScreenTransition
+_08030140:
+	movs r0, #0xc0
+	lsls r0, r0, #2
+	adds r1, r2, #0
+	adds r1, #0x67
+	bl ClearLocalFlagByOffset
+_0803014C:
+	pop {pc}
+	.align 2, 0
+
+	thumb_func_start sub_08030150
+sub_08030150: @ 0x08030150
+	push {r4, r5, lr}
+	mov ip, r0
+	ldr r2, _08030194 @ =gScreenTransition
+	adds r5, r2, #0
+	adds r5, #0xac
+	mov r3, ip
+	adds r3, #0x80
+	ldrb r4, [r3]
+	movs r0, #1
+	lsls r0, r4
+	ldrh r1, [r5]
+	bics r1, r0
+	mov r0, ip
+	adds r0, #0x84
+	ldr r0, [r0]
+	lsls r0, r4
+	orrs r1, r0
+	strh r1, [r5]
+	ldrb r0, [r3]
+	lsls r0, r0, #2
+	adds r2, #0x6c
+	adds r0, r0, r2
+	mov r4, ip
+	ldrh r1, [r4, #0x2e]
+	strh r1, [r0]
+	ldrb r0, [r3]
+	lsls r0, r0, #1
+	adds r0, #1
+	lsls r0, r0, #1
+	adds r0, r0, r2
+	ldrh r1, [r4, #0x32]
+	strh r1, [r0]
+	pop {r4, r5, pc}
+	.align 2, 0
+_08030194: .4byte gScreenTransition

asm/code_08049D30.s

@@ -131,7 +131,7 @@ _08049E14: .4byte gUnk_080D3BE8
 	thumb_func_start sub_08049E18
 sub_08049E18: @ 0x08049E18
 	push {lr}
-	ldr r1, _08049E38 @ =gLinkState
+	ldr r1, _08049E38 @ =gPlayerState
 	adds r0, r1, #0
 	adds r0, #0x3c
 	ldrb r0, [r0]
@@ -143,14 +143,14 @@ sub_08049E18: @ 0x08049E18
 	cmp r0, #0
 	bne _08049E48
 	ldr r1, _08049E40 @ =gUnk_020000B0
-	ldr r0, _08049E44 @ =gLinkEntity
+	ldr r0, _08049E44 @ =gPlayerEntity
 	str r0, [r1]
 	b _08049E4A
 	.align 2, 0
-_08049E38: .4byte gLinkState
+_08049E38: .4byte gPlayerState
 _08049E3C: .4byte 0x22189B75
 _08049E40: .4byte gUnk_020000B0
-_08049E44: .4byte gLinkEntity
+_08049E44: .4byte gPlayerEntity
 _08049E48:
 	movs r0, #0
 _08049E4A:
@@ -159,7 +159,7 @@ _08049E4A:
 	thumb_func_start sub_08049E4C
 sub_08049E4C: @ 0x08049E4C
 	push {lr}
-	ldr r1, _08049E6C @ =gLinkState
+	ldr r1, _08049E6C @ =gPlayerState
 	adds r0, r1, #0
 	adds r0, #0x3c
 	ldrb r0, [r0]
@@ -171,14 +171,14 @@ sub_08049E4C: @ 0x08049E4C
 	cmp r0, #0
 	bne _08049E7C
 	ldr r1, _08049E74 @ =gUnk_020000B0
-	ldr r0, _08049E78 @ =gLinkEntity
+	ldr r0, _08049E78 @ =gPlayerEntity
 	str r0, [r1]
 	b _08049E7E
 	.align 2, 0
-_08049E6C: .4byte gLinkState
+_08049E6C: .4byte gPlayerState
 _08049E70: .4byte 0x22189BF5
 _08049E74: .4byte gUnk_020000B0
-_08049E78: .4byte gLinkEntity
+_08049E78: .4byte gPlayerEntity
 _08049E7C:
 	movs r0, #0
 _08049E7E:
@@ -187,7 +187,7 @@ _08049E7E:
 	thumb_func_start sub_08049E80
 sub_08049E80: @ 0x08049E80
 	push {lr}
-	ldr r1, _08049E9C @ =gLinkState
+	ldr r1, _08049E9C @ =gPlayerState
 	adds r0, r1, #0
 	adds r0, #0x3c
 	ldrb r0, [r0]
@@ -202,21 +202,21 @@ _08049E98:
 	movs r0, #0
 	b _08049EA6
 	.align 2, 0
-_08049E9C: .4byte gLinkState
+_08049E9C: .4byte gPlayerState
 _08049EA0:
 	ldr r1, _08049EA8 @ =gUnk_020000B0
-	ldr r0, _08049EAC @ =gLinkEntity
+	ldr r0, _08049EAC @ =gPlayerEntity
 	str r0, [r1]
 _08049EA6:
 	pop {pc}
 	.align 2, 0
 _08049EA8: .4byte gUnk_020000B0
-_08049EAC: .4byte gLinkEntity
+_08049EAC: .4byte gPlayerEntity
 
 	thumb_func_start sub_08049EB0
 sub_08049EB0: @ 0x08049EB0
 	push {lr}
-	ldr r1, _08049ED0 @ =gLinkState
+	ldr r1, _08049ED0 @ =gPlayerState
 	adds r0, r1, #0
 	adds r0, #0x3c
 	ldrb r0, [r0]
@@ -228,14 +228,14 @@ sub_08049EB0: @ 0x08049EB0
 	cmp r0, #0
 	bne _08049EE0
 	ldr r1, _08049ED8 @ =gUnk_020000B0
-	ldr r0, _08049EDC @ =gLinkEntity
+	ldr r0, _08049EDC @ =gPlayerEntity
 	str r0, [r1]
 	b _08049EE2
 	.align 2, 0
-_08049ED0: .4byte gLinkState
+_08049ED0: .4byte gPlayerState
 _08049ED4: .4byte 0x00080190
 _08049ED8: .4byte gUnk_020000B0
-_08049EDC: .4byte gLinkEntity
+_08049EDC: .4byte gPlayerEntity
 _08049EE0:
 	movs r0, #0
 _08049EE2:
@@ -341,7 +341,7 @@ sub_08049F84: @ 0x08049F84
 	cmp r1, #0
 	beq _08049F9C
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	b _08049F9E
 _08049F9C:
 	movs r0, #0xff
@@ -1238,7 +1238,7 @@ _0804A612:
 	strb r0, [r1]
 _0804A638:
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r5, r4, #0
 	adds r5, #0x6d
 	ldrb r1, [r5]
@@ -1515,7 +1515,7 @@ _0804A81C:
 	ldrb r0, [r5, #9]
 	cmp r0, #0x37
 	bne _0804A84A
-	ldr r0, _0804A85C @ =gUnk_030010A0
+	ldr r0, _0804A85C @ =gScreenTransition
 	adds r0, #0x39
 	ldrb r0, [r0]
 	cmp r0, #0
@@ -1528,7 +1528,7 @@ _0804A84A:
 	bl DeleteThisEntity
 	b _0804A982
 	.align 2, 0
-_0804A85C: .4byte gUnk_030010A0
+_0804A85C: .4byte gScreenTransition
 _0804A860: .4byte 0x80100000
 _0804A864:
 	adds r4, r5, #0

asm/code_0804AA84.s

@@ -4,127 +4,6 @@
 	.syntax unified
 
 	.text
-	
-		thumb_func_start sub_0804AA84
-sub_0804AA84: @ 0x0804AA84
-	push {lr}
-	ldr r3, _0804AA98 @ =gArea
-	ldrb r0, [r3, #0x19]
-	cmp r0, #0
-	bne _0804AA9C
-	strb r0, [r3, #0x18]
-	strb r0, [r3, #0x19]
-	movs r0, #0
-	b _0804AAB0
-	.align 2, 0
-_0804AA98: .4byte gArea
-_0804AA9C:
-	ldr r2, _0804AAB4 @ =gUnk_03001000
-	movs r1, #0
-	movs r0, #4
-	strb r0, [r2, #4]
-	strb r1, [r3, #0xe]
-	strb r1, [r3, #0xf]
-	strh r1, [r3, #0x10]
-	bl sub_0805E5A8
-	movs r0, #1
-_0804AAB0:
-	pop {pc}
-	.align 2, 0
-_0804AAB4: .4byte gUnk_03001000
-
-	thumb_func_start sub_0804AAB8
-sub_0804AAB8: @ 0x0804AAB8
-	push {lr}
-	ldr r1, _0804AACC @ =gUnk_080D4120
-	ldr r0, _0804AAD0 @ =gArea
-	ldrb r0, [r0, #0xe]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {pc}
-	.align 2, 0
-_0804AACC: .4byte gUnk_080D4120
-_0804AAD0: .4byte gArea
-
-	thumb_func_start sub_0804AAD4
-sub_0804AAD4: @ 0x0804AAD4
-	push {r4, lr}
-	ldr r4, _0804AAFC @ =gUnk_02018EB0
-	adds r0, r4, #0
-	movs r1, #0x28
-	bl sub_0801D630
-	movs r0, #0
-	str r0, [r4, #0x14]
-	bl sub_0805E60C
-	ldr r4, _0804AB00 @ =gArea
-	ldrb r1, [r4, #0x17]
-	movs r0, #0x3d
-	movs r2, #0
-	bl CreateObject
-	ldrb r0, [r4, #0xe]
-	adds r0, #1
-	strb r0, [r4, #0xe]
-	pop {r4, pc}
-	.align 2, 0
-_0804AAFC: .4byte gUnk_02018EB0
-_0804AB00: .4byte gArea
-
-	thumb_func_start sub_0804AB04
-sub_0804AB04: @ 0x0804AB04
-	push {lr}
-	bl sub_0805E5C0
-	ldr r0, _0804AB20 @ =gArea
-	ldrh r0, [r0, #0x10]
-	cmp r0, #0
-	beq _0804AB1E
-	bl sub_080AD90C
-	bl sub_080AD9B0
-	bl sub_080AD918
-_0804AB1E:
-	pop {pc}
-	.align 2, 0
-_0804AB20: .4byte gArea
-
-	thumb_func_start sub_0804AB24
-sub_0804AB24: @ 0x0804AB24
-	push {r4, r5, lr}
-	ldr r5, _0804AB48 @ =gUnk_03000FD0
-	ldrb r1, [r5]
-	cmp r1, #0
-	bne _0804AB46
-	ldr r0, _0804AB4C @ =gScreen
-	movs r4, #0
-	strh r1, [r0]
-	bl sub_0801E104
-	ldr r0, _0804AB50 @ =gArea
-	strb r4, [r0, #0xe]
-	movs r0, #6
-	movs r1, #0
-	bl sub_080A7138
-	strb r4, [r5]
-_0804AB46:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0804AB48: .4byte gUnk_03000FD0
-_0804AB4C: .4byte gScreen
-_0804AB50: .4byte gArea
-
-	thumb_func_start sub_0804AB54
-sub_0804AB54: @ 0x0804AB54
-	push {lr}
-	ldr r1, _0804AB68 @ =gUnk_080D412C
-	ldr r0, _0804AB6C @ =gArea
-	ldrb r0, [r0, #0xe]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	pop {pc}
-	.align 2, 0
-_0804AB68: .4byte gUnk_080D412C
-_0804AB6C: .4byte gArea
 
 	thumb_func_start sub_0804AB70
 sub_0804AB70: @ 0x0804AB70
@@ -158,22 +37,22 @@ _0804ABA4:
 	ldr r0, _0804AC0C @ =gUnk_080D4138
 	adds r4, r4, r0
 	ldrb r0, [r4]
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 	ldrb r0, [r4, #1]
-	bl sub_0801D7EC
+	bl LoadGfxGroup
 	ldr r0, _0804AC10 @ =gUnk_02017700
 	movs r2, #0x90
 	lsls r2, r2, #2
 	adds r1, r0, r2
 	movs r2, #0x20
 	bl sub_0801D66C
-	ldr r2, _0804AC14 @ =gUnk_0200B644
+	ldr r2, _0804AC14 @ =gUsedPalettes
 	ldr r0, [r2]
 	movs r1, #0x80
 	lsls r1, r1, #0xe
 	orrs r0, r1
 	str r0, [r2]
-	bl sub_0805E60C
+	bl EraseAllEntities
 	ldr r1, _0804AC18 @ =gUnk_080D4110
 	lsls r0, r5, #2
 	adds r0, r0, r1
@@ -196,7 +75,7 @@ _0804AC04: .4byte gArea
 _0804AC08: .4byte gUnk_02032EC0
 _0804AC0C: .4byte gUnk_080D4138
 _0804AC10: .4byte gUnk_02017700
-_0804AC14: .4byte gUnk_0200B644
+_0804AC14: .4byte gUsedPalettes
 _0804AC18: .4byte gUnk_080D4110
 
 	thumb_func_start sub_0804AC1C
@@ -289,7 +168,7 @@ _0804ACC6:
 	thumb_func_start sub_0804ACC8
 sub_0804ACC8: @ 0x0804ACC8
 	push {lr}
-	ldr r0, _0804ACEC @ =gUnk_03000FD0
+	ldr r0, _0804ACEC @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _0804ACE8
@@ -304,7 +183,7 @@ sub_0804ACC8: @ 0x0804ACC8
 _0804ACE8:
 	pop {pc}
 	.align 2, 0
-_0804ACEC: .4byte gUnk_03000FD0
+_0804ACEC: .4byte gFadeControl
 _0804ACF0: .4byte gArea
 _0804ACF4: .4byte gUnk_02032EDC
 
@@ -369,7 +248,7 @@ sub_0804AD6C: @ 0x0804AD6C
 	push {r4, r5, r6, lr}
 	mov r6, r8
 	push {r6}
-	ldr r3, _0804ADD0 @ =gUnk_030010A0
+	ldr r3, _0804ADD0 @ =gScreenTransition
 	movs r1, #0
 	movs r6, #1
 	strb r6, [r3, #8]
@@ -414,6 +293,6 @@ sub_0804AD6C: @ 0x0804AD6C
 	mov r8, r3
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0804ADD0: .4byte gUnk_030010A0
+_0804ADD0: .4byte gScreenTransition
 _0804ADD4: .4byte gArea
 _0804ADD8: .4byte gUnk_080D4140

asm/code_0804AEB0.s

@@ -5,8 +5,8 @@
 
 	.text
 	
-	thumb_func_start sub_0804AEB0
-sub_0804AEB0: @ 0x0804AEB0
+	thumb_func_start RegisterRoomEntity
+RegisterRoomEntity: @ 0x0804AEB0
 	push {r4, r5, r6, lr}
 	adds r5, r0, #0
 	adds r6, r1, #0
@@ -26,7 +26,7 @@ sub_0804AEB0: @ 0x0804AEB0
 	adds r0, r4, r0
 	ldrb r1, [r0]
 	adds r0, r5, #0
-	bl sub_0805EA2C
+	bl AppendEntityToList
 	b _0804AEF6
 	.align 2, 0
 _0804AEDC: .4byte gUnk_081091E4
@@ -35,12 +35,12 @@ _0804AEE0:
 	bne _0804AEEE
 	adds r0, r5, #0
 	movs r1, #8
-	bl sub_0805EA2C
+	bl AppendEntityToList
 	b _0804AEF6
 _0804AEEE:
 	adds r0, r5, #0
 	adds r1, r2, #0
-	bl sub_0805EA2C
+	bl AppendEntityToList
 _0804AEF6:
 	adds r1, r5, #0
 	adds r1, #0x78

asm/code_0804B058.s

@@ -2,124 +2,6 @@
 	.text
 	.syntax unified
 
-	thumb_func_start sub_0804B058
-sub_0804B058: @ 0x0804B058
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	cmp r4, #0
-	beq _0804B0AE
-	ldrb r0, [r4]
-	cmp r0, #0xff
-	beq _0804B0AE
-	movs r5, #0
-_0804B068:
-	cmp r5, #0x1f
-	bhi _0804B09E
-	ldrb r1, [r4]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #3
-	bne _0804B09E
-	adds r0, r5, #0
-	bl sub_08049D1C
-	cmp r0, #0
-	beq _0804B0A4
-	adds r0, r4, #0
-	bl CreateEntity
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _0804B0A4
-	ldrb r0, [r2, #8]
-	cmp r0, #3
-	bne _0804B0A4
-	movs r0, #0x80
-	adds r2, #0x6c
-	adds r1, r5, #0
-	orrs r1, r0
-	strb r1, [r2]
-	b _0804B0A4
-_0804B09E:
-	adds r0, r4, #0
-	bl CreateEntity
-_0804B0A4:
-	adds r5, #1
-	adds r4, #0x10
-	ldrb r0, [r4]
-	cmp r0, #0xff
-	bne _0804B068
-_0804B0AE:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_0804B0B0
-sub_0804B0B0: @ 0x0804B0B0
-	push {lr}
-	movs r2, #1
-	bl sub_0804B0FC
-	bl LoadRoomEntityList
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B0C0
-sub_0804B0C0: @ 0x0804B0C0
-	push {lr}
-	adds r2, r1, #0
-	ldr r3, _0804B0E0 @ =gUnk_02017654
-	movs r1, #0
-	str r1, [r3]
-	ldr r1, _0804B0E4 @ =gUnk_080D50FC
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _0804B0DE
-	lsls r0, r2, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	str r0, [r3]
-_0804B0DE:
-	pop {pc}
-	.align 2, 0
-_0804B0E0: .4byte gUnk_02017654
-_0804B0E4: .4byte gUnk_080D50FC
-
-	thumb_func_start sub_0804B0E8
-sub_0804B0E8: @ 0x0804B0E8
-	push {lr}
-	movs r2, #4
-	bl sub_0804B0FC
-	cmp r0, #0
-	beq _0804B0F8
-	bl _call_via_r0
-_0804B0F8:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B0FC
-sub_0804B0FC: @ 0x0804B0FC
-	push {r4, lr}
-	adds r3, r1, #0
-	adds r4, r2, #0
-	movs r2, #0
-	ldr r1, _0804B124 @ =gUnk_080D50FC
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	cmp r1, #0
-	beq _0804B120
-	lsls r0, r3, #2
-	adds r0, r0, r1
-	ldr r2, [r0]
-	cmp r2, #0
-	beq _0804B120
-	lsls r0, r4, #2
-	adds r0, r0, r2
-	ldr r2, [r0]
-_0804B120:
-	adds r0, r2, #0
-	pop {r4, pc}
-	.align 2, 0
-_0804B124: .4byte gUnk_080D50FC
-
 	thumb_func_start GetCurrentRoomProperty
 GetCurrentRoomProperty: @ 0x0804B128
 	push {lr}
@@ -188,16 +70,16 @@ _0804B190:
 	bl SetTileType
 _0804B198:
 	adds r4, #8
-	ldr r0, _0804B1A8 @ =gUnk_020176A0
+	ldr r0, _0804B1A8 @ =gPaletteBuffer
 	cmp r4, r0
 	blo _0804B170
 	pop {r4, pc}
 	.align 2, 0
 _0804B1A4: .4byte gUnk_02017660
-_0804B1A8: .4byte gUnk_020176A0
+_0804B1A8: .4byte gPaletteBuffer
 
-	thumb_func_start sub_0804B1AC
-sub_0804B1AC: @ 0x0804B1AC
+	thumb_func_start LoadRoomTileEntities
+LoadRoomTileEntities: @ 0x0804B1AC
 	push {r4, lr}
 	adds r4, r0, #0
 	cmp r4, #0
@@ -370,7 +252,7 @@ _0804B2FC:
 sub_0804B300: @ 0x0804B300
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0805E8D4
+	bl GetEmptyManager
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0804B332
@@ -390,7 +272,7 @@ sub_0804B300: @ 0x0804B300
 	strh r0, [r1, #0x3e]
 	adds r0, r1, #0
 	movs r1, #6
-	bl sub_0805EA2C
+	bl AppendEntityToList
 _0804B332:
 	pop {r4, pc}
 
@@ -422,7 +304,7 @@ _0804B35A:
 	bne _0804B380
 	movs r0, #1
 	strb r0, [r1, #1]
-	bl sub_0805E8D4
+	bl GetEmptyManager
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0804B380
@@ -432,7 +314,7 @@ _0804B35A:
 	strb r0, [r1, #9]
 	adds r0, r1, #0
 	movs r1, #6
-	bl sub_0805EA2C
+	bl AppendEntityToList
 _0804B380:
 	pop {r4, pc}
 	.align 2, 0
@@ -468,803 +350,3 @@ _0804B3BA:
 	rsbs r0, r0, #0
 	bl sub_080526F8
 	pop {r4, r5, pc}
-
-	thumb_func_start sub_0804B3C4
-sub_0804B3C4: @ 0x0804B3C4
-	push {lr}
-	bl sub_0804B29C
-	pop {pc}
-
-	thumb_func_start sub_0804B3CC
-sub_0804B3CC: @ 0x0804B3CC
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B3D0
-sub_0804B3D0: @ 0x0804B3D0
-	push {lr}
-	movs r0, #0
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B3DC
-sub_0804B3DC: @ 0x0804B3DC
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B3E0
-sub_0804B3E0: @ 0x0804B3E0
-	push {lr}
-	movs r0, #1
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B3EC
-sub_0804B3EC: @ 0x0804B3EC
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B3F0
-sub_0804B3F0: @ 0x0804B3F0
-	push {lr}
-	movs r0, #2
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B3FC
-sub_0804B3FC: @ 0x0804B3FC
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B400
-sub_0804B400: @ 0x0804B400
-	push {lr}
-	movs r0, #3
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B40C
-sub_0804B40C: @ 0x0804B40C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B410
-sub_0804B410: @ 0x0804B410
-	push {lr}
-	movs r0, #4
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B41C
-sub_0804B41C: @ 0x0804B41C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B420
-sub_0804B420: @ 0x0804B420
-	push {lr}
-	movs r0, #5
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B42C
-sub_0804B42C: @ 0x0804B42C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B430
-sub_0804B430: @ 0x0804B430
-	push {lr}
-	movs r0, #6
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B43C
-sub_0804B43C: @ 0x0804B43C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B440
-sub_0804B440: @ 0x0804B440
-	push {lr}
-	movs r0, #7
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B44C
-sub_0804B44C: @ 0x0804B44C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B450
-sub_0804B450: @ 0x0804B450
-	push {lr}
-	movs r0, #8
-	bl sub_08030118
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B45C
-sub_0804B45C: @ 0x0804B45C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B460
-sub_0804B460: @ 0x0804B460
-	push {lr}
-	movs r0, #9
-	bl sub_08030118
-	ldr r0, _0804B474 @ =gArea
-	movs r1, #3
-	strb r1, [r0, #3]
-	movs r1, #0x4e
-	strb r1, [r0]
-	pop {pc}
-	.align 2, 0
-_0804B474: .4byte gArea
-
-	thumb_func_start sub_0804B478
-sub_0804B478: @ 0x0804B478
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B47C
-sub_0804B47C: @ 0x0804B47C
-	push {lr}
-	movs r0, #0xa
-	bl sub_08030118
-	ldr r0, _0804B490 @ =gArea
-	movs r1, #3
-	strb r1, [r0, #3]
-	movs r1, #0x4e
-	strb r1, [r0]
-	pop {pc}
-	.align 2, 0
-_0804B490: .4byte gArea
-
-	thumb_func_start sub_0804B494
-sub_0804B494: @ 0x0804B494
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B498
-sub_0804B498: @ 0x0804B498
-	push {lr}
-	movs r0, #0x23
-	bl sub_080575C8
-	bl sub_08057688
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B4A8
-sub_0804B4A8: @ 0x0804B4A8
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B4AC
-sub_0804B4AC: @ 0x0804B4AC
-	push {lr}
-	movs r0, #0x23
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B4B8
-sub_0804B4B8: @ 0x0804B4B8
-	push {lr}
-	movs r0, #0x23
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B4C4
-sub_0804B4C4: @ 0x0804B4C4
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B4C8
-sub_0804B4C8: @ 0x0804B4C8
-	push {lr}
-	movs r0, #0x22
-	bl sub_080580B0
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B4D4
-sub_0804B4D4: @ 0x0804B4D4
-	push {lr}
-	movs r0, #0x22
-	bl sub_080580B0
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B4E0
-sub_0804B4E0: @ 0x0804B4E0
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B4E4
-sub_0804B4E4: @ 0x0804B4E4
-	push {lr}
-	movs r0, #0x22
-	bl sub_080580B0
-	movs r0, #2
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _0804B4FC
-	movs r0, #0x56
-	bl SetGlobalFlag
-_0804B4FC:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B500
-sub_0804B500: @ 0x0804B500
-	push {lr}
-	movs r0, #0x22
-	bl sub_080580B0
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B50C
-sub_0804B50C: @ 0x0804B50C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B510
-sub_0804B510: @ 0x0804B510
-	push {lr}
-	movs r0, #0x1e
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B51C
-sub_0804B51C: @ 0x0804B51C
-	push {lr}
-	movs r0, #0x1e
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B528
-sub_0804B528: @ 0x0804B528
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B52C
-sub_0804B52C: @ 0x0804B52C
-	push {lr}
-	movs r0, #0x21
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B538
-sub_0804B538: @ 0x0804B538
-	push {lr}
-	movs r0, #0x21
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B544
-sub_0804B544: @ 0x0804B544
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B548
-sub_0804B548: @ 0x0804B548
-	push {lr}
-	movs r0, #0x1f
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B554
-sub_0804B554: @ 0x0804B554
-	push {lr}
-	movs r0, #0x1f
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B560
-sub_0804B560: @ 0x0804B560
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B564
-sub_0804B564: @ 0x0804B564
-	push {lr}
-	movs r0, #0x20
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B570
-sub_0804B570: @ 0x0804B570
-	push {lr}
-	movs r0, #0x20
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B57C
-sub_0804B57C: @ 0x0804B57C
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B580
-sub_0804B580: @ 0x0804B580
-	push {lr}
-	movs r0, #0x20
-	bl sub_080575C8
-	ldr r0, _0804B5A0 @ =gLinkEntity
-	movs r1, #0x32
-	ldrsh r0, [r0, r1]
-	ldr r1, _0804B5A4 @ =gRoomControls
-	ldrh r1, [r1, #8]
-	subs r0, r0, r1
-	cmp r0, #0x40
-	ble _0804B59E
-	ldr r0, _0804B5A8 @ =gUnk_080D6138
-	bl LoadRoomEntityList
-_0804B59E:
-	pop {pc}
-	.align 2, 0
-_0804B5A0: .4byte gLinkEntity
-_0804B5A4: .4byte gRoomControls
-_0804B5A8: .4byte gUnk_080D6138
-
-	thumb_func_start sub_0804B5AC
-sub_0804B5AC: @ 0x0804B5AC
-	push {lr}
-	movs r0, #0x20
-	bl sub_080575C8
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0804B5B8
-sub_0804B5B8: @ 0x0804B5B8
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B5BC
-sub_0804B5BC: @ 0x0804B5BC
-	push {lr}
-	ldr r0, _0804B5D0 @ =gUnk_030010A0
-	ldrh r0, [r0, #0x12]
-	cmp r0, #0x40
-	bls _0804B5CC
-	ldr r0, _0804B5D4 @ =gUnk_080D6210
-	bl LoadRoomEntityList
-_0804B5CC:
-	pop {pc}
-	.align 2, 0
-_0804B5D0: .4byte gUnk_030010A0
-_0804B5D4: .4byte gUnk_080D6210
-
-	thumb_func_start sub_0804B5D8
-sub_0804B5D8: @ 0x0804B5D8
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B5DC
-sub_0804B5DC: @ 0x0804B5DC
-	push {r4, r5, r6, lr}
-	movs r0, #0x2c
-	bl CheckKinstoneFused
-	cmp r0, #0
-	beq _0804B5EE
-	ldr r0, _0804B618 @ =gUnk_080D6340
-	bl LoadRoomEntityList
-_0804B5EE:
-	movs r6, #0
-	ldr r4, _0804B61C @ =gUnk_080D64F8
-	movs r5, #7
-_0804B5F4:
-	ldrh r0, [r4]
-	adds r4, #2
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _0804B602
-	adds r6, #1
-_0804B602:
-	subs r5, #1
-	cmp r5, #0
-	bge _0804B5F4
-	movs r0, #0x8b
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B648
-	ldr r4, _0804B620 @ =gUnk_080D6508
-	movs r5, #0
-	b _0804B628
-	.align 2, 0
-_0804B618: .4byte gUnk_080D6340
-_0804B61C: .4byte gUnk_080D64F8
-_0804B620: .4byte gUnk_080D6508
-_0804B624:
-	adds r5, #1
-	adds r4, #2
-_0804B628:
-	cmp r5, r6
-	bge _0804B648
-	ldrh r0, [r4]
-	bl CheckLocalFlag
-	cmp r0, #0
-	bne _0804B624
-	ldrh r0, [r4]
-	bl SetLocalFlag
-	movs r0, #0x8b
-	bl ClearLocalFlag
-	movs r0, #0x8c
-	bl SetLocalFlag
-_0804B648:
-	movs r0, #0x1f
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B658
-	ldr r0, _0804B6CC @ =gUnk_080D6360
-	bl LoadRoomEntityList
-_0804B658:
-	movs r0, #0x20
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B668
-	ldr r0, _0804B6D0 @ =gUnk_080D6380
-	bl LoadRoomEntityList
-_0804B668:
-	movs r0, #0x21
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B678
-	ldr r0, _0804B6D4 @ =gUnk_080D63A0
-	bl LoadRoomEntityList
-_0804B678:
-	movs r0, #0x22
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B688
-	ldr r0, _0804B6D8 @ =gUnk_080D63C0
-	bl LoadRoomEntityList
-_0804B688:
-	movs r0, #0x23
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B698
-	ldr r0, _0804B6DC @ =gUnk_080D63E0
-	bl LoadRoomEntityList
-_0804B698:
-	movs r0, #0x24
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B6A8
-	ldr r0, _0804B6E0 @ =gUnk_080D6400
-	bl LoadRoomEntityList
-_0804B6A8:
-	movs r0, #0x25
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B6B8
-	ldr r0, _0804B6E4 @ =gUnk_080D6420
-	bl LoadRoomEntityList
-_0804B6B8:
-	movs r0, #0x26
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B6C8
-	ldr r0, _0804B6E8 @ =gUnk_080D6440
-	bl LoadRoomEntityList
-_0804B6C8:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0804B6CC: .4byte gUnk_080D6360
-_0804B6D0: .4byte gUnk_080D6380
-_0804B6D4: .4byte gUnk_080D63A0
-_0804B6D8: .4byte gUnk_080D63C0
-_0804B6DC: .4byte gUnk_080D63E0
-_0804B6E0: .4byte gUnk_080D6400
-_0804B6E4: .4byte gUnk_080D6420
-_0804B6E8: .4byte gUnk_080D6440
-
-	thumb_func_start sub_0804B6EC
-sub_0804B6EC: @ 0x0804B6EC
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B6F0
-sub_0804B6F0: @ 0x0804B6F0
-	push {lr}
-	movs r0, #0x46
-	bl GetInventoryValue
-	cmp r0, #0
-	bne _0804B71C
-	ldr r0, _0804B714 @ =gUnk_080D6578
-	bl LoadRoomEntityList
-	movs r0, #0x73
-	bl CheckLocalFlag
-	cmp r0, #0
-	bne _0804B722
-	ldr r0, _0804B718 @ =gUnk_080D6638
-	bl LoadRoomEntityList
-	b _0804B728
-	.align 2, 0
-_0804B714: .4byte gUnk_080D6578
-_0804B718: .4byte gUnk_080D6638
-_0804B71C:
-	ldr r0, _0804B72C @ =gUnk_080D6558
-	bl LoadRoomEntityList
-_0804B722:
-	ldr r0, _0804B730 @ =gUnk_080D6618
-	bl LoadRoomEntityList
-_0804B728:
-	pop {pc}
-	.align 2, 0
-_0804B72C: .4byte gUnk_080D6558
-_0804B730: .4byte gUnk_080D6618
-
-	thumb_func_start sub_0804B734
-sub_0804B734: @ 0x0804B734
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B738
-sub_0804B738: @ 0x0804B738
-	push {lr}
-	ldr r0, _0804B770 @ =gUnk_02002A40
-	ldrb r0, [r0, #8]
-	cmp r0, #4
-	bls _0804B748
-	ldr r0, _0804B774 @ =gUnk_080D6714
-	bl LoadRoomEntityList
-_0804B748:
-	movs r0, #0x46
-	bl GetInventoryValue
-	cmp r0, #0
-	bne _0804B77C
-	movs r0, #0x29
-	bl CheckGlobalFlag
-	cmp r0, #0
-	beq _0804B77C
-	movs r0, #0x6a
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B77C
-	ldr r0, _0804B778 @ =gUnk_080D6734
-	bl LoadRoomEntityList
-	b _0804B782
-	.align 2, 0
-_0804B770: .4byte gUnk_02002A40
-_0804B774: .4byte gUnk_080D6714
-_0804B778: .4byte gUnk_080D6734
-_0804B77C:
-	ldr r0, _0804B784 @ =gUnk_080D66F4
-	bl LoadRoomEntityList
-_0804B782:
-	pop {pc}
-	.align 2, 0
-_0804B784: .4byte gUnk_080D66F4
-
-	thumb_func_start sub_0804B788
-sub_0804B788: @ 0x0804B788
-	movs r0, #1
-	bx lr
-
-	thumb_func_start sub_0804B78C
-sub_0804B78C: @ 0x0804B78C
-	push {lr}
-	ldr r0, _0804B7A0 @ =gUnk_02002A40
-	ldrb r0, [r0, #8]
-	cmp r0, #7
-	bls _0804B79C
-	ldr r0, _0804B7A4 @ =gUnk_080D6924
-	bl LoadRoomEntityList
-_0804B79C:
-	pop {pc}
-	.align 2, 0
-_0804B7A0: .4byte gUnk_02002A40
-_0804B7A4: .4byte gUnk_080D6924
-
-	thumb_func_start sub_0804B7A8
-sub_0804B7A8: @ 0x0804B7A8
-	push {r4, lr}
-	movs r0, #0x91
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B7C8
-	bl Random
-	movs r1, #3
-	bl __modsi3
-	adds r4, r0, #0
-	movs r0, #1
-	bl ClearLocalFlag
-	b _0804B7D0
-_0804B7C8:
-	movs r4, #0
-	movs r0, #1
-	bl SetLocalFlag
-_0804B7D0:
-	ldr r2, _0804B7E0 @ =gRoomVars
-	ldr r1, _0804B7E4 @ =gUnk_080D6A74
-	lsls r0, r4, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	str r0, [r2, #0x78]
-	movs r0, #1
-	pop {r4, pc}
-	.align 2, 0
-_0804B7E0: .4byte gRoomVars
-_0804B7E4: .4byte gUnk_080D6A74
-
-	thumb_func_start sub_0804B7E8
-sub_0804B7E8: @ 0x0804B7E8
-	push {lr}
-	movs r0, #0x91
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B81E
-	movs r0, #0x91
-	bl ClearLocalFlag
-	movs r1, #0x80
-	lsls r1, r1, #1
-	movs r0, #5
-	bl DoFade
-	ldr r2, _0804B820 @ =gLinkEntity
-	ldr r1, _0804B824 @ =gRoomControls
-	ldrh r0, [r1, #6]
-	adds r0, #0x50
-	strh r0, [r2, #0x2e]
-	ldrh r0, [r1, #8]
-	adds r0, #0x38
-	strh r0, [r2, #0x32]
-	ldr r2, _0804B828 @ =gUnk_08010A5C
-	movs r0, #1
-	movs r1, #2
-	bl sub_080751E8
-_0804B81E:
-	pop {pc}
-	.align 2, 0
-_0804B820: .4byte gLinkEntity
-_0804B824: .4byte gRoomControls
-_0804B828: .4byte gUnk_08010A5C
-
-	thumb_func_start sub_0804B82C
-sub_0804B82C: @ 0x0804B82C
-	push {r4, lr}
-	movs r0, #0x91
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B84A
-	bl Random
-	adds r4, r0, #0
-	movs r0, #1
-	ands r4, r0
-	movs r0, #2
-	bl ClearLocalFlag
-	b _0804B852
-_0804B84A:
-	movs r4, #0
-	movs r0, #2
-	bl SetLocalFlag
-_0804B852:
-	ldr r2, _0804B864 @ =gRoomVars
-	ldr r1, _0804B868 @ =gUnk_080D6B18
-	lsls r0, r4, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	str r0, [r2, #0x78]
-	movs r0, #1
-	pop {r4, pc}
-	.align 2, 0
-_0804B864: .4byte gRoomVars
-_0804B868: .4byte gUnk_080D6B18
-
-	thumb_func_start sub_0804B86C
-sub_0804B86C: @ 0x0804B86C
-	push {lr}
-	movs r0, #0x91
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B8A2
-	movs r0, #0x91
-	bl ClearLocalFlag
-	movs r1, #0x80
-	lsls r1, r1, #1
-	movs r0, #5
-	bl DoFade
-	ldr r2, _0804B8A4 @ =gLinkEntity
-	ldr r1, _0804B8A8 @ =gRoomControls
-	ldrh r0, [r1, #6]
-	adds r0, #0x50
-	strh r0, [r2, #0x2e]
-	ldrh r0, [r1, #8]
-	adds r0, #0x38
-	strh r0, [r2, #0x32]
-	ldr r2, _0804B8AC @ =gUnk_08010A5C
-	movs r0, #1
-	movs r1, #2
-	bl sub_080751E8
-_0804B8A2:
-	pop {pc}
-	.align 2, 0
-_0804B8A4: .4byte gLinkEntity
-_0804B8A8: .4byte gRoomControls
-_0804B8AC: .4byte gUnk_08010A5C
-
-	thumb_func_start sub_0804B8B0
-sub_0804B8B0: @ 0x0804B8B0
-	push {r4, lr}
-	movs r0, #0x91
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B8D0
-	bl Random
-	movs r1, #3
-	bl __modsi3
-	adds r4, r0, #0
-	movs r0, #3
-	bl ClearLocalFlag
-	b _0804B8D8
-_0804B8D0:
-	movs r4, #0
-	movs r0, #3
-	bl SetLocalFlag
-_0804B8D8:
-	ldr r2, _0804B8E8 @ =gRoomVars
-	ldr r1, _0804B8EC @ =gUnk_080D6BB8
-	lsls r0, r4, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	str r0, [r2, #0x78]
-	movs r0, #1
-	pop {r4, pc}
-	.align 2, 0
-_0804B8E8: .4byte gRoomVars
-_0804B8EC: .4byte gUnk_080D6BB8
-
-	thumb_func_start sub_0804B8F0
-sub_0804B8F0: @ 0x0804B8F0
-	push {lr}
-	movs r0, #0x91
-	bl CheckLocalFlag
-	cmp r0, #0
-	beq _0804B926
-	movs r0, #0x91
-	bl ClearLocalFlag
-	movs r1, #0x80
-	lsls r1, r1, #1
-	movs r0, #5
-	bl DoFade
-	ldr r2, _0804B928 @ =gLinkEntity
-	ldr r1, _0804B92C @ =gRoomControls
-	ldrh r0, [r1, #6]
-	adds r0, #0x60
-	strh r0, [r2, #0x2e]
-	ldrh r0, [r1, #8]
-	adds r0, #0x38
-	strh r0, [r2, #0x32]
-	ldr r2, _0804B930 @ =gUnk_08010A5C
-	movs r0, #1
-	movs r1, #2
-	bl sub_080751E8
-_0804B926:
-	pop {pc}
-	.align 2, 0
-_0804B928: .4byte gLinkEntity
-_0804B92C: .4byte gRoomControls
-_0804B930: .4byte gUnk_08010A5C
-
-	thumb_func_start sub_0804B934
-sub_0804B934: @ 0x0804B934
-	movs r0, #1
-	bx lr

asm/code_08055FF4.s

@@ -4,107 +4,6 @@
 	.syntax unified
 
 	.text
-	
-	thumb_func_start sub_08055FF4
-sub_08055FF4: @ 0x08055FF4
-	push {lr}
-	movs r2, #0
-	ldr r0, _0805600C @ =gUnk_03000FF0
-	ldrh r1, [r0]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0xf
-	bne _08056006
-	movs r2, #1
-_08056006:
-	adds r0, r2, #0
-	pop {pc}
-	.align 2, 0
-_0805600C: .4byte gUnk_03000FF0
-
-	thumb_func_start sub_08056010
-sub_08056010: @ 0x08056010
-	ldr r1, _0805601C @ =gUnk_03001000
-	movs r2, #0
-	strb r0, [r1, #2]
-	strb r2, [r1, #3]
-	strb r2, [r1, #4]
-	bx lr
-	.align 2, 0
-_0805601C: .4byte gUnk_03001000
-
-	thumb_func_start sub_08056020
-sub_08056020: @ 0x08056020
-	push {r4, lr}
-	ldr r2, _08056088 @ =0x04000208
-	movs r1, #0
-	strh r1, [r2]
-	ldr r0, _0805608C @ =0x04000200
-	strh r1, [r0]
-	ldr r0, _08056090 @ =0x04000004
-	strh r1, [r0]
-	ldr r0, _08056094 @ =0x04000202
-	strh r1, [r0]
-	strh r1, [r2]
-	ldr r1, _08056098 @ =0x040000B0
-	ldrh r2, [r1, #0xa]
-	ldr r4, _0805609C @ =0x0000C5FF
-	adds r0, r4, #0
-	ands r0, r2
-	strh r0, [r1, #0xa]
-	ldrh r2, [r1, #0xa]
-	ldr r3, _080560A0 @ =0x00007FFF
-	adds r0, r3, #0
-	ands r0, r2
-	strh r0, [r1, #0xa]
-	ldrh r0, [r1, #0xa]
-	adds r1, #0xc
-	ldrh r2, [r1, #0xa]
-	adds r0, r4, #0
-	ands r0, r2
-	strh r0, [r1, #0xa]
-	ldrh r2, [r1, #0xa]
-	adds r0, r3, #0
-	ands r0, r2
-	strh r0, [r1, #0xa]
-	ldrh r0, [r1, #0xa]
-	adds r1, #0xc
-	ldrh r2, [r1, #0xa]
-	adds r0, r4, #0
-	ands r0, r2
-	strh r0, [r1, #0xa]
-	ldrh r2, [r1, #0xa]
-	adds r0, r3, #0
-	ands r0, r2
-	strh r0, [r1, #0xa]
-	ldrh r0, [r1, #0xa]
-	ldr r0, _080560A4 @ =0x040000D4
-	ldrh r1, [r0, #0xa]
-	ands r4, r1
-	strh r4, [r0, #0xa]
-	ldrh r1, [r0, #0xa]
-	ands r3, r1
-	strh r3, [r0, #0xa]
-	ldrh r0, [r0, #0xa]
-	pop {r4, pc}
-	.align 2, 0
-_08056088: .4byte 0x04000208
-_0805608C: .4byte 0x04000200
-_08056090: .4byte 0x04000004
-_08056094: .4byte 0x04000202
-_08056098: .4byte 0x040000B0
-_0805609C: .4byte 0x0000C5FF
-_080560A0: .4byte 0x00007FFF
-_080560A4: .4byte 0x040000D4
-
-	thumb_func_start sub_080560A8
-sub_080560A8: @ 0x080560A8
-	push {lr}
-	bl sub_08056020
-	movs r0, #0xde
-	bl SoftReset
-	pop {pc}
-	.align 2, 0
 
 	thumb_func_start sub_080560B8
 sub_080560B8: @ 0x080560B8
@@ -156,7 +55,7 @@ _08056112:
 	ldr r4, _0805612C @ =gUnk_02000010
 	adds r0, r4, #0
 	movs r1, #0x20
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _08056130 @ =0x4D435A33
 	str r0, [r4]
 _08056124:

asm/code_08056418.s

@@ -16,7 +16,7 @@ sub_08056458: @ 0x08056458
 	bne _08056470
 	ldr r0, _08056488 @ =gUnk_02022780
 	movs r1, #0xa8
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #1
 	bl sub_080564C8
 _08056470:
@@ -91,14 +91,14 @@ sub_080564EC: @ 0x080564EC
 	push {r4, lr}
 	ldr r0, _08056598 @ =gUnk_02036A40
 	movs r1, #8
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0805659C @ =gUnk_02024030
 	movs r1, #0x18
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r4, _080565A0 @ =gUnk_02022780
 	adds r0, r4, #0
 	movs r1, #0xa8
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _080565A4 @ =gTextBox
 	adds r1, r4, #0
 	movs r2, #0x20
@@ -572,11 +572,11 @@ _080568B2:
 	beq _080568D2
 	adds r0, r6, #0
 	movs r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r4, _08056910 @ =gUnk_02024030
 	adds r0, r4, #0
 	movs r1, #0x18
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #1
 	strb r0, [r4]
 	strb r0, [r6]
@@ -777,7 +777,7 @@ _08056A30:
 	movs r1, #3
 	strb r1, [r2]
 	movs r1, #0x18
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #0x6a
 	bl PlaySFX
 	adds r1, r6, #0
@@ -1468,7 +1468,7 @@ sub_08056F70: @ 0x08056F70
 	ldr r1, _08056F84 @ =0x0600D040
 	movs r2, #0xd0
 	lsls r2, r2, #4
-	bl sub_08000E96
+	bl LoadAssetAsync
 	pop {pc}
 	.align 2, 0
 _08056F80: .4byte gUnk_02000D00

asm/code_0805E3B0.s

@@ -252,7 +252,7 @@ sub_0805E544: @ 0x0805E544
 	movs r3, #6
 	movs r0, #6
 	strb r0, [r1]
-	ldr r2, _0805E560 @ =gLinkEntity
+	ldr r2, _0805E560 @ =gPlayerEntity
 	ldrb r1, [r2, #0x11]
 	subs r0, #0x16
 	ands r0, r1
@@ -261,14 +261,14 @@ sub_0805E544: @ 0x0805E544
 	bx lr
 	.align 2, 0
 _0805E55C: .4byte gUnk_03003DC0
-_0805E560: .4byte gLinkEntity
+_0805E560: .4byte gPlayerEntity
 
 	thumb_func_start UnfreezeTime
 UnfreezeTime: @ 0x0805E564
 	ldr r1, _0805E57C @ =gUnk_03003DC0
 	movs r0, #0
 	strb r0, [r1]
-	ldr r2, _0805E580 @ =gLinkEntity
+	ldr r2, _0805E580 @ =gPlayerEntity
 	ldrb r1, [r2, #0x11]
 	subs r0, #0x10
 	ands r0, r1
@@ -278,7 +278,7 @@ UnfreezeTime: @ 0x0805E564
 	bx lr
 	.align 2, 0
 _0805E57C: .4byte gUnk_03003DC0
-_0805E580: .4byte gLinkEntity
+_0805E580: .4byte gPlayerEntity
 
 	thumb_func_start sub_0805E584
 sub_0805E584: @ 0x0805E584
@@ -336,7 +336,7 @@ sub_0805E5C0: @ 0x0805E5C0
 	ldr r1, _0805E5F4 @ =gUnk_03005F40
 	movs r0, #0
 	bl _call_via_r1
-	bl sub_0805E84C
+	bl ClearAllDeletedEntities
 	bl sub_0805EE88
 	pop {pc}
 	.align 2, 0
@@ -349,31 +349,31 @@ sub_0805E5F8: @ 0x0805E5F8
 	ldr r1, _0805E608 @ =gUnk_03005F40
 	movs r0, #1
 	bl _call_via_r1
-	bl sub_0805E84C
+	bl ClearAllDeletedEntities
 	pop {pc}
 	.align 2, 0
 _0805E608: .4byte gUnk_03005F40
 
-	thumb_func_start sub_0805E60C
-sub_0805E60C: @ 0x0805E60C
+	thumb_func_start EraseAllEntities
+EraseAllEntities: @ 0x0805E60C
 	push {lr}
-	bl sub_0805E89C
+	bl DeleteAllEntities
 	ldr r0, _0805E654 @ =gUnk_03003DC0
 	movs r1, #0xc
-	bl sub_0801D630
-	ldr r0, _0805E658 @ =gLinkEntity
+	bl _DmaZero
+	ldr r0, _0805E658 @ =gPlayerEntity
 	movs r1, #0xaa
 	lsls r1, r1, #6
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0805E65C @ =gUnk_02033290
 	movs r1, #0x80
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	bl sub_0805E98C
-	ldr r0, _0805E660 @ =gUnk_03003DBC
+	ldr r0, _0805E660 @ =gEntCount
 	movs r1, #0
 	strb r1, [r0]
-	ldr r0, _0805E664 @ =gUnk_020354B4
+	ldr r0, _0805E664 @ =gManagerCount
 	strb r1, [r0]
 	ldr r1, _0805E668 @ =gUnk_03000000
 	ldr r2, _0805E66C @ =0x00000427
@@ -389,10 +389,10 @@ sub_0805E60C: @ 0x0805E60C
 	pop {pc}
 	.align 2, 0
 _0805E654: .4byte gUnk_03003DC0
-_0805E658: .4byte gLinkEntity
+_0805E658: .4byte gPlayerEntity
 _0805E65C: .4byte gUnk_02033290
-_0805E660: .4byte gUnk_03003DBC
-_0805E664: .4byte gUnk_020354B4
+_0805E660: .4byte gEntCount
+_0805E664: .4byte gManagerCount
 _0805E668: .4byte gUnk_03000000
 _0805E66C: .4byte 0x00000427
 _0805E670: .4byte 0x00000426

asm/code_0805EC04.s

@@ -5,688 +5,6 @@
 
 	.text
 	
-	thumb_func_start sub_0805E744
-sub_0805E744: @ 0x0805E744
-	push {lr}
-	ldr r1, _0805E760 @ =gUnk_030011E8
-	movs r0, #0xee
-	lsls r0, r0, #2
-	adds r2, r1, r0
-_0805E74E:
-	ldr r0, [r1]
-	cmp r0, #0
-	beq _0805E764
-	adds r1, #0x88
-	cmp r1, r2
-	blo _0805E74E
-	movs r0, #0
-	b _0805E766
-	.align 2, 0
-_0805E760: .4byte gUnk_030011E8
-_0805E764:
-	adds r0, r1, #0
-_0805E766:
-	pop {pc}
-
-	thumb_func_start sub_0805E768
-sub_0805E768: @ 0x0805E768
-	push {lr}
-	ldr r1, _0805E778 @ =GetEmptyEntity
-	cmp r0, #9
-	bne _0805E772
-	ldr r1, _0805E77C @ =sub_0805E8D4
-_0805E772:
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0805E778: .4byte GetEmptyEntity
-_0805E77C: .4byte sub_0805E8D4
-
-	thumb_func_start DeleteThisEntity
-DeleteThisEntity: @ 0x0805E780
-	push {lr}
-	ldr r0, _0805E794 @ =gUnk_03003DD0
-	ldr r0, [r0, #8]
-	bl sub_0805E79C
-	ldr r0, _0805E798 @ =gUnk_03005F24
-	bl _call_via_r0
-	pop {pc}
-	.align 2, 0
-_0805E794: .4byte gUnk_03003DD0
-_0805E798: .4byte gUnk_03005F24
-
-	thumb_func_start sub_0805E79C
-sub_0805E79C: @ 0x0805E79C
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #8]
-	ldr r2, _0805E7B4 @ =DeleteEntity
-	cmp r0, #9
-	bne _0805E7AA
-	ldr r2, _0805E7B8 @ =sub_0805E900
-_0805E7AA:
-	adds r0, r1, #0
-	bl _call_via_r2
-	pop {pc}
-	.align 2, 0
-_0805E7B4: .4byte DeleteEntity
-_0805E7B8: .4byte sub_0805E900
-
-	thumb_func_start DeleteEntity
-DeleteEntity: @ 0x0805E7BC
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #4]
-	cmp r0, #0
-	beq _0805E84A
-	adds r0, r4, #0
-	bl sub_080AE068
-	adds r0, r4, #0
-	bl sub_0801D230
-	adds r0, r4, #0
-	bl sub_0806FE84
-	adds r0, r4, #0
-	bl sub_080788E0
-	adds r0, r4, #0
-	bl sub_08078954
-	adds r0, r4, #0
-	bl sub_0805EC60
-	adds r0, r4, #0
-	bl sub_08017744
-	adds r0, r4, #0
-	bl sub_0805E92C
-	adds r0, r4, #0
-	bl sub_0807DB08
-	adds r0, r4, #0
-	bl sub_0806FBEC
-	ldr r0, [r4, #0x64]
-	bl sub_0801DA0C
-	movs r5, #0
-	str r5, [r4, #0x64]
-	ldrb r0, [r4, #8]
-	cmp r0, #3
-	bne _0805E818
-	adds r0, r4, #0
-	bl sub_0804AA1C
-_0805E818:
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x3c
-	strb r5, [r0]
-	adds r0, #5
-	strb r5, [r0]
-	adds r0, #1
-	strb r5, [r0]
-	adds r0, #3
-	strb r5, [r0]
-	adds r0, r4, #0
-	bl sub_0805EA98
-	str r5, [r4, #4]
-	movs r0, #1
-	rsbs r0, r0, #0
-	str r0, [r4]
-_0805E84A:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_0805E84C
-sub_0805E84C: @ 0x0805E84C
-	push {r4, r5, lr}
-	ldr r4, _0805E86C @ =gLinkEntity
-	movs r0, #0xaa
-	lsls r0, r0, #6
-	adds r5, r4, r0
-_0805E856:
-	ldr r0, [r4]
-	cmp r0, #0
-	bge _0805E862
-	adds r0, r4, #0
-	bl sub_0805E870
-_0805E862:
-	adds r4, #0x88
-	cmp r4, r5
-	blo _0805E856
-	pop {r4, r5, pc}
-	.align 2, 0
-_0805E86C: .4byte gLinkEntity
-
-	thumb_func_start sub_0805E870
-sub_0805E870: @ 0x0805E870
-	sub sp, #4
-	movs r1, #0
-	str r1, [sp]
-	ldr r1, _0805E890 @ =0x040000D4
-	mov r2, sp
-	str r2, [r1]
-	str r0, [r1, #4]
-	ldr r0, _0805E894 @ =0x85000022
-	str r0, [r1, #8]
-	ldr r0, [r1, #8]
-	ldr r1, _0805E898 @ =gUnk_03003DBC
-	ldrb r0, [r1]
-	subs r0, #1
-	strb r0, [r1]
-	add sp, #4
-	bx lr
-	.align 2, 0
-_0805E890: .4byte 0x040000D4
-_0805E894: .4byte 0x85000022
-_0805E898: .4byte gUnk_03003DBC
-
-	thumb_func_start sub_0805E89C
-sub_0805E89C: @ 0x0805E89C
-	push {r4, r5, r6, lr}
-	ldr r5, _0805E8CC @ =gUnk_03003D70
-	ldr r0, [r5, #4]
-	cmp r0, #0
-	beq _0805E8C8
-_0805E8A6:
-	ldr r0, [r5, #4]
-	adds r6, r5, #0
-	adds r6, #8
-	cmp r0, r5
-	beq _0805E8BC
-_0805E8B0:
-	ldr r4, [r0, #4]
-	bl sub_0805E79C
-	adds r0, r4, #0
-	cmp r0, r5
-	bne _0805E8B0
-_0805E8BC:
-	adds r5, r6, #0
-	ldr r0, _0805E8D0 @ =gUnk_03003DB8
-	cmp r5, r0
-	blo _0805E8A6
-	bl sub_0805E84C
-_0805E8C8:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0805E8CC: .4byte gUnk_03003D70
-_0805E8D0: .4byte gUnk_03003DB8
-
-	thumb_func_start sub_0805E8D4
-sub_0805E8D4: @ 0x0805E8D4
-	push {lr}
-	ldr r1, _0805E8F0 @ =gUnk_02033290
-	movs r2, #0x80
-	lsls r2, r2, #4
-	adds r0, r1, r2
-	cmp r1, r0
-	bhs _0805E8FA
-	adds r2, r0, #0
-_0805E8E4:
-	ldr r0, [r1]
-	cmp r0, #0
-	bne _0805E8F4
-	adds r0, r1, #0
-	b _0805E8FC
-	.align 2, 0
-_0805E8F0: .4byte gUnk_02033290
-_0805E8F4:
-	adds r1, #0x40
-	cmp r1, r2
-	blo _0805E8E4
-_0805E8FA:
-	movs r0, #0
-_0805E8FC:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_0805E900
-sub_0805E900: @ 0x0805E900
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r0, [r4, #4]
-	cmp r0, #0
-	beq _0805E926
-	adds r0, r4, #0
-	bl sub_0805E92C
-	adds r0, r4, #0
-	bl sub_0805EA98
-	adds r0, r4, #0
-	movs r1, #0x40
-	bl sub_0801D630
-	ldr r1, _0805E928 @ =gUnk_020354B4
-	ldrb r0, [r1]
-	subs r0, #1
-	strb r0, [r1]
-_0805E926:
-	pop {r4, pc}
-	.align 2, 0
-_0805E928: .4byte gUnk_020354B4
-
-	thumb_func_start sub_0805E92C
-sub_0805E92C: @ 0x0805E92C
-	push {lr}
-	ldr r2, _0805E94C @ =gArea
-	ldr r1, _0805E950 @ =0x00000888
-	adds r3, r2, r1
-	ldr r1, [r3]
-	cmp r0, r1
-	bne _0805E94A
-	movs r0, #0
-	str r0, [r3]
-	ldr r3, _0805E954 @ =0x0000088C
-	adds r1, r2, r3
-	str r0, [r1]
-	adds r3, #4
-	adds r1, r2, r3
-	str r0, [r1]
-_0805E94A:
-	pop {pc}
-	.align 2, 0
-_0805E94C: .4byte gArea
-_0805E950: .4byte 0x00000888
-_0805E954: .4byte 0x0000088C
-
-	thumb_func_start sub_0805E958
-sub_0805E958: @ 0x0805E958
-	push {lr}
-	ldr r0, _0805E96C @ =gUnk_03003D70
-	ldr r1, _0805E970 @ =gUnk_020369F0
-	movs r2, #0x48
-	bl sub_0801D66C
-	bl sub_0805E98C
-	pop {pc}
-	.align 2, 0
-_0805E96C: .4byte gUnk_03003D70
-_0805E970: .4byte gUnk_020369F0
-
-	thumb_func_start sub_0805E974
-sub_0805E974: @ 0x0805E974
-	push {lr}
-	ldr r0, _0805E984 @ =gUnk_020369F0
-	ldr r1, _0805E988 @ =gUnk_03003D70
-	movs r2, #0x48
-	bl sub_0801D66C
-	pop {pc}
-	.align 2, 0
-_0805E984: .4byte gUnk_020369F0
-_0805E988: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805E98C
-sub_0805E98C: @ 0x0805E98C
-	push {lr}
-	ldr r0, _0805E9A4 @ =gUnk_03003D70
-	adds r1, r0, #0
-	adds r1, #0x48
-	cmp r0, r1
-	bhs _0805E9A2
-_0805E998:
-	str r0, [r0]
-	str r0, [r0, #4]
-	adds r0, #8
-	cmp r0, r1
-	blo _0805E998
-_0805E9A2:
-	pop {pc}
-	.align 2, 0
-_0805E9A4: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805E9A8
-sub_0805E9A8: @ 0x0805E9A8
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	ldr r3, _0805E9F0 @ =gUnk_03003D70
-	movs r7, #0x10
-	movs r0, #0x48
-	adds r0, r0, r3
-	mov r8, r0
-_0805E9B8:
-	ldr r2, [r3, #4]
-	adds r4, r3, #0
-	adds r4, #8
-	cmp r2, r3
-	beq _0805E9E2
-	movs r6, #0xfd
-	movs r5, #0x20
-_0805E9C6:
-	ldrb r0, [r2, #0x10]
-	adds r1, r6, #0
-	ands r1, r0
-	strb r1, [r2, #0x10]
-	adds r0, r1, #0
-	ands r0, r5
-	cmp r0, #0
-	bne _0805E9DC
-	adds r0, r1, #0
-	orrs r0, r7
-	strb r0, [r2, #0x10]
-_0805E9DC:
-	ldr r2, [r2, #4]
-	cmp r2, r3
-	bne _0805E9C6
-_0805E9E2:
-	adds r3, r4, #0
-	cmp r3, r8
-	blo _0805E9B8
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0805E9F0: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805E9F4
-sub_0805E9F4: @ 0x0805E9F4
-	push {r4, r5, r6, lr}
-	ldr r5, _0805EA24 @ =gUnk_03003D70
-_0805E9F8:
-	ldr r2, [r5, #4]
-	adds r6, r5, #0
-	adds r6, #8
-	cmp r2, r5
-	beq _0805EA1A
-_0805EA02:
-	ldr r4, [r2, #4]
-	ldrb r1, [r2, #0x10]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _0805EA14
-	adds r0, r2, #0
-	bl sub_0805E79C
-_0805EA14:
-	adds r2, r4, #0
-	cmp r2, r5
-	bne _0805EA02
-_0805EA1A:
-	adds r5, r6, #0
-	ldr r0, _0805EA28 @ =gUnk_03003DB8
-	cmp r5, r0
-	blo _0805E9F8
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0805EA24: .4byte gUnk_03003D70
-_0805EA28: .4byte gUnk_03003DB8
-
-	thumb_func_start sub_0805EA2C
-sub_0805EA2C: @ 0x0805EA2C
-	push {lr}
-	adds r2, r0, #0
-	lsls r1, r1, #3
-	ldr r0, _0805EA5C @ =gUnk_03003D70
-	adds r1, r1, r0
-	str r1, [r2, #4]
-	ldr r0, [r1]
-	str r0, [r2]
-	str r2, [r0, #4]
-	str r2, [r1]
-	ldrb r0, [r2, #8]
-	cmp r0, #9
-	beq _0805EA64
-	adds r3, r2, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #4
-	orrs r0, r1
-	strb r0, [r3]
-	ldr r1, _0805EA60 @ =gUnk_03003DBC
-	b _0805EA66
-	.align 2, 0
-_0805EA5C: .4byte gUnk_03003D70
-_0805EA60: .4byte gUnk_03003DBC
-_0805EA64:
-	ldr r1, _0805EA74 @ =gUnk_020354B4
-_0805EA66:
-	ldrb r0, [r1]
-	adds r0, #1
-	strb r0, [r1]
-	adds r0, r2, #0
-	bl sub_0805E374
-	pop {pc}
-	.align 2, 0
-_0805EA74: .4byte gUnk_020354B4
-
-	thumb_func_start sub_0805EA78
-sub_0805EA78: @ 0x0805EA78
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	adds r4, r1, #0
-	bl sub_0805EA98
-	lsls r4, r4, #3
-	ldr r0, _0805EA94 @ =gUnk_03003D70
-	adds r4, r4, r0
-	str r4, [r5]
-	ldr r0, [r4, #4]
-	str r0, [r5, #4]
-	str r5, [r0]
-	str r5, [r4, #4]
-	pop {r4, r5, pc}
-	.align 2, 0
-_0805EA94: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805EA98
-sub_0805EA98: @ 0x0805EA98
-	push {lr}
-	adds r2, r0, #0
-	ldr r1, _0805EAB8 @ =gUnk_03003DD0
-	ldr r0, [r1, #8]
-	cmp r2, r0
-	bne _0805EAA8
-	ldr r0, [r2]
-	str r0, [r1, #8]
-_0805EAA8:
-	ldr r1, [r2]
-	ldr r0, [r2, #4]
-	str r0, [r1, #4]
-	ldr r1, [r2, #4]
-	ldr r0, [r2]
-	str r0, [r1]
-	pop {pc}
-	.align 2, 0
-_0805EAB8: .4byte gUnk_03003DD0
-
-	thumb_func_start sub_0805EABC
-sub_0805EABC: @ 0x0805EABC
-	push {r4, r5, r6, r7, lr}
-	adds r6, r0, #0
-	ldr r4, _0805EAE8 @ =gUnk_03003D70
-	adds r7, r4, #0
-	adds r7, #0x48
-_0805EAC6:
-	ldr r3, [r4, #4]
-	cmp r3, r4
-	beq _0805EAF6
-	ldr r5, _0805EAEC @ =0x0000FFFF
-_0805EACE:
-	cmp r3, r6
-	beq _0805EAF0
-	ldrh r0, [r3, #8]
-	ldrh r2, [r6, #8]
-	adds r1, r5, #0
-	ands r1, r0
-	adds r0, r5, #0
-	ands r0, r2
-	cmp r1, r0
-	bne _0805EAF0
-	movs r0, #1
-	b _0805EAFE
-	.align 2, 0
-_0805EAE8: .4byte gUnk_03003D70
-_0805EAEC: .4byte 0x0000FFFF
-_0805EAF0:
-	ldr r3, [r3, #4]
-	cmp r3, r4
-	bne _0805EACE
-_0805EAF6:
-	adds r4, #8
-	cmp r4, r7
-	blo _0805EAC6
-	movs r0, #0
-_0805EAFE:
-	pop {r4, r5, r6, r7, pc}
-
-	thumb_func_start sub_0805EB00
-sub_0805EB00: @ 0x0805EB00
-	push {r4, lr}
-	adds r3, r0, #0
-	lsls r2, r2, #3
-	ldr r0, _0805EB28 @ =gUnk_03003D70
-	adds r2, r2, r0
-	ldr r0, [r2, #4]
-	cmp r0, r2
-	beq _0805EB22
-_0805EB10:
-	ldrb r4, [r0, #8]
-	cmp r3, r4
-	bne _0805EB1C
-	ldrb r4, [r0, #9]
-	cmp r1, r4
-	beq _0805EB24
-_0805EB1C:
-	ldr r0, [r0, #4]
-	cmp r0, r2
-	bne _0805EB10
-_0805EB22:
-	movs r0, #0
-_0805EB24:
-	pop {r4, pc}
-	.align 2, 0
-_0805EB28: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805EB2C
-sub_0805EB2C: @ 0x0805EB2C
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldr r5, [sp, #0x10]
-	lsls r2, r2, #3
-	ldr r0, _0805EB60 @ =gUnk_03003D70
-	adds r2, r2, r0
-	ldr r0, [r2, #4]
-	cmp r0, r2
-	beq _0805EB5C
-_0805EB3E:
-	ldrb r6, [r0, #8]
-	cmp r4, r6
-	bne _0805EB56
-	ldrb r6, [r0, #9]
-	cmp r1, r6
-	bne _0805EB56
-	ldrb r6, [r0, #0xa]
-	cmp r3, r6
-	bne _0805EB56
-	ldrb r6, [r0, #0xb]
-	cmp r5, r6
-	beq _0805EB5E
-_0805EB56:
-	ldr r0, [r0, #4]
-	cmp r0, r2
-	bne _0805EB3E
-_0805EB5C:
-	movs r0, #0
-_0805EB5E:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0805EB60: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805EB64
-sub_0805EB64: @ 0x0805EB64
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	lsls r1, r1, #3
-	ldr r0, _0805EB88 @ =gUnk_03003D70
-	adds r3, r1, r0
-	ldr r2, [r4, #4]
-	cmp r2, r3
-	beq _0805EB96
-	ldr r5, _0805EB8C @ =0x0000FFFF
-	ldrh r4, [r4, #8]
-_0805EB78:
-	ldrh r1, [r2, #8]
-	adds r0, r5, #0
-	ands r0, r1
-	cmp r0, r4
-	bne _0805EB90
-	adds r0, r2, #0
-	b _0805EB98
-	.align 2, 0
-_0805EB88: .4byte gUnk_03003D70
-_0805EB8C: .4byte 0x0000FFFF
-_0805EB90:
-	ldr r2, [r2, #4]
-	cmp r2, r3
-	bne _0805EB78
-_0805EB96:
-	movs r0, #0
-_0805EB98:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0805EB9C
-sub_0805EB9C: @ 0x0805EB9C
-	push {r4, r5, lr}
-	adds r3, r0, #0
-	ldr r2, _0805EBC8 @ =gUnk_03003D70
-	adds r4, r2, #0
-	adds r4, #0x48
-_0805EBA6:
-	ldr r0, [r2, #4]
-	cmp r0, r2
-	beq _0805EBBE
-_0805EBAC:
-	ldrb r5, [r0, #8]
-	cmp r3, r5
-	bne _0805EBB8
-	ldrb r5, [r0, #9]
-	cmp r1, r5
-	beq _0805EBC6
-_0805EBB8:
-	ldr r0, [r0, #4]
-	cmp r0, r2
-	bne _0805EBAC
-_0805EBBE:
-	adds r2, #8
-	cmp r2, r4
-	blo _0805EBA6
-	movs r0, #0
-_0805EBC6:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0805EBC8: .4byte gUnk_03003D70
-
-	thumb_func_start sub_0805EBCC
-sub_0805EBCC: @ 0x0805EBCC
-	push {r4, r5, r6, lr}
-	ldr r5, _0805EBFC @ =gUnk_03003D70
-_0805EBD0:
-	ldr r1, [r5, #4]
-	adds r6, r5, #0
-	adds r6, #8
-	cmp r1, r5
-	beq _0805EBEE
-_0805EBDA:
-	ldr r4, [r1, #4]
-	ldrb r0, [r1, #8]
-	cmp r0, #3
-	bne _0805EBE8
-	adds r0, r1, #0
-	bl DeleteEntity
-_0805EBE8:
-	adds r1, r4, #0
-	cmp r1, r5
-	bne _0805EBDA
-_0805EBEE:
-	adds r5, r6, #0
-	ldr r0, _0805EC00 @ =gUnk_03003DB8
-	cmp r5, r0
-	blo _0805EBD0
-	bl sub_0805E84C
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_0805EBFC: .4byte gUnk_03003D70
-_0805EC00: .4byte gUnk_03003DB8
-
 	thumb_func_start sub_0805EC04
 sub_0805EC04: @ 0x0805EC04
 	push {r4, r5, r6, r7, lr}
@@ -834,7 +152,7 @@ _0805ED10: .4byte 0x00000427
 
 	thumb_func_start sub_0805ED14
 sub_0805ED14: @ 0x0805ED14
-	ldr r2, _0805ED2C @ =gLinkState
+	ldr r2, _0805ED2C @ =gPlayerState
 	adds r1, r2, #0
 	adds r1, #0x9c
 	str r0, [r1]
@@ -846,12 +164,12 @@ sub_0805ED14: @ 0x0805ED14
 	strh r1, [r0]
 	bx lr
 	.align 2, 0
-_0805ED2C: .4byte gLinkState
+_0805ED2C: .4byte gPlayerState
 
 	thumb_func_start sub_0805ED30
 sub_0805ED30: @ 0x0805ED30
 	push {r4, lr}
-	ldr r2, _0805ED50 @ =gLinkState
+	ldr r2, _0805ED50 @ =gPlayerState
 	adds r0, r2, #0
 	adds r0, #0x9c
 	ldr r0, [r0]
@@ -867,7 +185,7 @@ sub_0805ED30: @ 0x0805ED30
 	movs r4, #0
 	b _0805ED62
 	.align 2, 0
-_0805ED50: .4byte gLinkState
+_0805ED50: .4byte gPlayerState
 _0805ED54:
 	cmp r0, #2
 	beq _0805ED5E
@@ -940,7 +258,7 @@ _0805EDC6:
 _0805EDCA:
 	adds r0, r1, #0
 	bl sub_0805EE04
-	ldr r3, _0805EDFC @ =gLinkState
+	ldr r3, _0805EDFC @ =gPlayerState
 	adds r1, r3, #0
 	adds r1, #0x90
 	ldrh r2, [r1]
@@ -961,7 +279,7 @@ _0805EDCA:
 	pop {r4, pc}
 	.align 2, 0
 _0805EDF8: .4byte gUnk_03000FF0
-_0805EDFC: .4byte gLinkState
+_0805EDFC: .4byte gPlayerState
 _0805EE00: .4byte gUnk_08109202
 
 	thumb_func_start sub_0805EE04
@@ -1043,7 +361,7 @@ _0805EE82:
 	thumb_func_start sub_0805EE88
 sub_0805EE88: @ 0x0805EE88
 	push {lr}
-	ldr r1, _0805EEB0 @ =gUnk_030010A0
+	ldr r1, _0805EEB0 @ =gScreenTransition
 	adds r0, r1, #0
 	adds r0, #0x2f
 	ldrb r0, [r0]
@@ -1058,11 +376,11 @@ sub_0805EE88: @ 0x0805EE88
 	ands r1, r0
 	lsrs r0, r1, #2
 	adds r0, #0x2f
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 _0805EEAC:
 	pop {pc}
 	.align 2, 0
-_0805EEB0: .4byte gUnk_030010A0
+_0805EEB0: .4byte gScreenTransition
 
 	thumb_func_start sub_0805EEB4
 sub_0805EEB4: @ 0x0805EEB4
@@ -1594,7 +912,7 @@ _0805F2D0:
 	bne _0805F2F0
 	adds r0, r5, #0
 	movs r1, #0xc
-	bl sub_0801D630
+	bl _DmaZero
 	ldrb r0, [r4]
 	movs r1, #1
 	orrs r0, r1
@@ -1624,7 +942,7 @@ _0805F308:
 	cmp r0, r2
 	bne _0805F318
 	movs r1, #0xc
-	bl sub_0801D630
+	bl _DmaZero
 	b _0805F320
 	.align 2, 0
 _0805F314: .4byte gUnk_02036540
@@ -1787,7 +1105,7 @@ sub_0805F440: @ 0x0805F440
 	adds r4, r0, #0
 	adds r5, r1, #0
 	movs r1, #0x30
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0805F45C @ =0x0000FFFF
 	cmp r5, r0
 	bls _0805F460
@@ -1965,7 +1283,7 @@ _0805F596:
 _0805F59E:
 	ldr r0, _0805F5C8 @ =gUnk_02034330
 	movs r1, #0x18
-	bl sub_0801D630
+	bl _DmaZero
 _0805F5A6:
 	mov r0, sb
 	mov r1, sp
@@ -2483,7 +1801,7 @@ _0805F962:
 	ldr r0, _0805F990 @ =gUnk_02036AD8
 	mov r1, sl
 	movs r2, #0xe0
-	bl sub_08000E96
+	bl LoadAssetAsync
 	pop {r3, r4, r5}
 	mov r8, r3
 	mov sb, r4
@@ -2539,8 +1857,8 @@ _0805F9E2:
 	.align 2, 0
 _0805F9E4: .4byte 0x0000031A
 
-	thumb_func_start sub_0805F9E8
-sub_0805F9E8: @ 0x0805F9E8
+	thumb_func_start HandleDebugTextScreen
+HandleDebugTextScreen: @ 0x0805F9E8
 	push {lr}
 	ldr r1, _0805F9FC @ =gUnk_08109A30
 	ldr r0, _0805FA00 @ =gUnk_03001000
@@ -2562,11 +1880,11 @@ sub_0805FA04: @ 0x0805FA04
 	ldr r0, _0805FA78 @ =gUnk_02034CB0
 	movs r1, #0x80
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0805FA7C @ =gUnk_02001A40
 	movs r1, #0x80
 	lsls r1, r1, #5
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0805FA80 @ =gScreen
 	movs r2, #0
 	movs r1, #0x94
@@ -2585,11 +1903,11 @@ sub_0805FA04: @ 0x0805FA04
 	ldr r0, _0805FA88 @ =gUnk_02032EC0
 	movs r1, #0xed
 	lsls r1, r1, #2
-	bl sub_0801D630
-	ldr r4, _0805FA8C @ =gUnk_02000080
+	bl _DmaZero
+	ldr r4, _0805FA8C @ =gMenu
 	adds r0, r4, #0
 	movs r1, #0x30
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #0x80
 	lsls r0, r0, #0x12
 	ldrb r0, [r0, #7]
@@ -2609,7 +1927,7 @@ _0805FA7C: .4byte gUnk_02001A40
 _0805FA80: .4byte gScreen
 _0805FA84: .4byte 0x00001E0F
 _0805FA88: .4byte gUnk_02032EC0
-_0805FA8C: .4byte gUnk_02000080
+_0805FA8C: .4byte gMenu
 _0805FA90: .4byte 0x00001144
 _0805FA94: .4byte gUnk_03001000
 
@@ -2641,23 +1959,23 @@ _0805FAB8:
 	beq _0805FAE8
 	b _0805FB4A
 _0805FACA:
-	ldr r1, _0805FAD4 @ =gUnk_02000080
+	ldr r1, _0805FAD4 @ =gMenu
 	ldrb r0, [r1, #0x11]
 	subs r0, #1
 	strb r0, [r1, #0x11]
 	b _0805FBA4
 	.align 2, 0
-_0805FAD4: .4byte gUnk_02000080
+_0805FAD4: .4byte gMenu
 _0805FAD8:
-	ldr r1, _0805FAE4 @ =gUnk_02000080
+	ldr r1, _0805FAE4 @ =gMenu
 	ldrb r0, [r1, #0x11]
 	adds r0, #1
 	strb r0, [r1, #0x11]
 	b _0805FBA4
 	.align 2, 0
-_0805FAE4: .4byte gUnk_02000080
+_0805FAE4: .4byte gMenu
 _0805FAE8:
-	ldr r0, _0805FB04 @ =gUnk_02000080
+	ldr r0, _0805FB04 @ =gMenu
 	ldrb r1, [r0, #0x10]
 	movs r2, #1
 	eors r1, r2
@@ -2671,7 +1989,7 @@ _0805FAE8:
 	strh r1, [r0, #0x2c]
 	b _0805FBA4
 	.align 2, 0
-_0805FB04: .4byte gUnk_02000080
+_0805FB04: .4byte gMenu
 _0805FB08: .4byte gScreen
 _0805FB0C: .4byte 0x00001F0C
 _0805FB10:
@@ -2688,7 +2006,7 @@ _0805FB24: .4byte 0x00001E0C
 _0805FB28:
 	movs r2, #0x80
 	lsls r2, r2, #0x12
-	ldr r1, _0805FB40 @ =gUnk_02000080
+	ldr r1, _0805FB40 @ =gMenu
 	ldrb r0, [r1, #0x16]
 	strb r0, [r2, #7]
 	ldrb r0, [r1, #0x14]
@@ -2698,7 +2016,7 @@ _0805FB28:
 	bl TextboxNoOverlapFollow
 	b _0805FBA4
 	.align 2, 0
-_0805FB40: .4byte gUnk_02000080
+_0805FB40: .4byte gMenu
 _0805FB44:
 	bl sub_08056418
 	b _0805FBA4
@@ -2717,7 +2035,7 @@ _0805FB5A:
 _0805FB5E:
 	movs r1, #0
 _0805FB60:
-	ldr r4, _0805FB74 @ =gUnk_02000080
+	ldr r4, _0805FB74 @ =gMenu
 	ldrb r0, [r4, #0x11]
 	cmp r0, #1
 	beq _0805FB8E
@@ -2727,7 +2045,7 @@ _0805FB60:
 	beq _0805FB7E
 	b _0805FBA4
 	.align 2, 0
-_0805FB74: .4byte gUnk_02000080
+_0805FB74: .4byte gMenu
 _0805FB78:
 	cmp r0, #2
 	beq _0805FB96
@@ -2753,7 +2071,7 @@ _0805FB96:
 	bl __modsi3
 	strb r0, [r4, #0x16]
 _0805FBA4:
-	ldr r4, _0805FBBC @ =gUnk_02000080
+	ldr r4, _0805FBBC @ =gMenu
 	ldrb r0, [r4, #0x11]
 	adds r0, #3
 	movs r1, #3
@@ -2764,14 +2082,14 @@ _0805FBA4:
 	strh r0, [r1, #0x32]
 	pop {r4, pc}
 	.align 2, 0
-_0805FBBC: .4byte gUnk_02000080
+_0805FBBC: .4byte gMenu
 _0805FBC0: .4byte gScreen
 
 	thumb_func_start sub_0805FBC4
 sub_0805FBC4: @ 0x0805FBC4
 	push {lr}
 	movs r0, #0
-	bl sub_08056010
+	bl InitScreen
 	pop {pc}
 	.align 2, 0
 
@@ -2792,7 +2110,7 @@ _0805FBE4: .4byte gUnk_08109AC8
 sub_0805FBE8: @ 0x0805FBE8
 	push {r4, r5, lr}
 	adds r5, r0, #0
-	ldr r4, _0805FC68 @ =gLinkEntity
+	ldr r4, _0805FC68 @ =gPlayerEntity
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl CopyPosition
@@ -2849,7 +2167,7 @@ _0805FC36:
 	bl PlaySFX
 	pop {r4, r5, pc}
 	.align 2, 0
-_0805FC68: .4byte gLinkEntity
+_0805FC68: .4byte gPlayerEntity
 _0805FC6C: .4byte gUnk_08109AD0
 _0805FC70: .4byte 0x0000013F
 
@@ -2893,7 +2211,7 @@ _0805FCA4:
 	ands r1, r3
 	lsls r1, r1, #6
 	orrs r0, r1
-	ldr r1, _0805FD14 @ =gLinkEntity
+	ldr r1, _0805FD14 @ =gPlayerEntity
 	adds r1, #0x38
 	ldrb r1, [r1]
 	movs r2, #0x80
@@ -2928,10 +2246,10 @@ _0805FCF6:
 	b _0805FD20
 	.align 2, 0
 _0805FD10: .4byte gRoomControls
-_0805FD14: .4byte gLinkEntity
+_0805FD14: .4byte gPlayerEntity
 _0805FD18: .4byte gUnk_08003E44
 _0805FD1C:
 	bl DeleteThisEntity
 _0805FD20:
 	pop {r4, r5, pc}
-	.align 2, 0
+	.align 2, 0

asm/code_0806EC20.s

@@ -27,7 +27,7 @@ sub_0806EC38: @ 0x0806EC38
 	movs r0, #7
 	movs r1, #0x58
 	movs r2, #7
-	bl sub_0805EB00
+	bl FindEntityInListBySubtype
 	cmp r0, #0
 	beq _0806EC4C
 	bl DeleteEntity
@@ -163,7 +163,7 @@ _0806ECD0:
 	strb r1, [r0]
 	strb r1, [r4, #0x1e]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0806ED4A:
 	pop {r4, r5, pc}
 	.align 2, 0

asm/code_0806ED78.s

@@ -13,7 +13,7 @@ sub_0806ED78: @ 0x0806ED78
 	adds r4, r0, #0
 	cmp r4, #0
 	beq _0806ED94
-	ldr r0, _0806ED98 @ =gLinkState
+	ldr r0, _0806ED98 @ =gPlayerState
 	ldrb r1, [r0, #0x1e]
 	movs r0, #0x40
 	ands r0, r1
@@ -24,7 +24,7 @@ _0806ED94:
 	adds r0, r4, #0
 	pop {r4, pc}
 	.align 2, 0
-_0806ED98: .4byte gLinkState
+_0806ED98: .4byte gPlayerState
 
 	thumb_func_start sub_0806ED9C
 sub_0806ED9C: @ 0x0806ED9C
@@ -34,29 +34,29 @@ sub_0806ED9C: @ 0x0806ED9C
 	adds r3, r2, #0
 	movs r6, #1
 	rsbs r6, r6, #0
-	ldr r1, _0806EDC0 @ =gLinkEntity
+	ldr r1, _0806EDC0 @ =gPlayerEntity
 	adds r2, r4, #0
 	bl sub_080041A0
 	cmp r0, #0
 	beq _0806EDBC
 	adds r0, r5, #0
-	bl sub_0806EDC4
+	bl GetAnimationState
 	adds r6, r0, #0
 _0806EDBC:
 	adds r0, r6, #0
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0806EDC0: .4byte gLinkEntity
+_0806EDC0: .4byte gPlayerEntity
 
-	thumb_func_start sub_0806EDC4
-sub_0806EDC4: @ 0x0806EDC4
+	thumb_func_start GetAnimationState
+GetAnimationState: @ 0x0806EDC4
 	push {lr}
-	ldr r1, _0806EDD4 @ =gLinkEntity
-	bl sub_080045C4
+	ldr r1, _0806EDD4 @ =gPlayerEntity
+	bl GetFacingDirection
 	bl sub_0806F5A4
 	pop {pc}
 	.align 2, 0
-_0806EDD4: .4byte gLinkEntity
+_0806EDD4: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806EDD8
 sub_0806EDD8: @ 0x0806EDD8
@@ -66,7 +66,7 @@ sub_0806EDD8: @ 0x0806EDD8
 	adds r3, r2, #0
 	movs r7, #1
 	rsbs r7, r7, #0
-	ldr r6, _0806EE00 @ =gLinkEntity
+	ldr r6, _0806EE00 @ =gPlayerEntity
 	adds r1, r6, #0
 	adds r2, r4, #0
 	bl sub_080041A0
@@ -74,13 +74,13 @@ sub_0806EDD8: @ 0x0806EDD8
 	beq _0806EDFC
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r7, r0, #0
 _0806EDFC:
 	adds r0, r7, #0
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0806EE00: .4byte gLinkEntity
+_0806EE00: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806EE04
 sub_0806EE04: @ 0x0806EE04
@@ -127,9 +127,9 @@ _0806EE4C:
 	adds r1, #0x46
 	movs r0, #8
 	strh r0, [r1]
-	ldr r1, _0806EE6C @ =gLinkEntity
+	ldr r1, _0806EE6C @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	bl sub_0806F5A4
 	adds r1, r4, #0
 	adds r1, #0x3e
@@ -139,7 +139,7 @@ _0806EE66:
 _0806EE68:
 	pop {r4, pc}
 	.align 2, 0
-_0806EE6C: .4byte gLinkEntity
+_0806EE6C: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806EE70
 sub_0806EE70: @ 0x0806EE70
@@ -548,14 +548,14 @@ sub_0806F118: @ 0x0806F118
 	ldrh r3, [r0, #4]
 	adds r0, r4, #0
 	bl sub_0801DFB4
-	ldr r0, _0806F144 @ =gLinkState
+	ldr r0, _0806F144 @ =gPlayerState
 	adds r0, #0x8b
 	movs r1, #3
 	strb r1, [r0]
 	pop {r4, pc}
 	.align 2, 0
 _0806F140: .4byte gUnk_08001A7C
-_0806F144: .4byte gLinkState
+_0806F144: .4byte gPlayerState
 
 	thumb_func_start UpdateFuseInteraction
 UpdateFuseInteraction: @ 0x0806F148
@@ -574,14 +574,14 @@ UpdateFuseInteraction: @ 0x0806F148
 	.align 2, 0
 _0806F164: .4byte gUnk_02022740
 _0806F168:
-	ldr r0, _0806F184 @ =gLinkState
+	ldr r0, _0806F184 @ =gPlayerState
 	adds r0, #0x8b
 	movs r1, #3
 	strb r1, [r0]
 	movs r4, #1
 _0806F172:
 	bl sub_0807919C
-	ldr r0, _0806F184 @ =gLinkState
+	ldr r0, _0806F184 @ =gPlayerState
 	adds r0, #0x8b
 	movs r1, #1
 	strb r1, [r0]
@@ -589,7 +589,7 @@ _0806F17E:
 	adds r0, r4, #0
 	pop {r4, pc}
 	.align 2, 0
-_0806F184: .4byte gLinkState
+_0806F184: .4byte gPlayerState
 
 	thumb_func_start sub_0806F188
 sub_0806F188: @ 0x0806F188
@@ -801,7 +801,7 @@ _0806F332:
 	movs r0, #0
 	b _0806F34E
 _0806F336:
-	ldr r0, _0806F348 @ =gLinkState
+	ldr r0, _0806F348 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -811,7 +811,7 @@ _0806F342:
 	ldrh r0, [r6, #6]
 	b _0806F34E
 	.align 2, 0
-_0806F348: .4byte gLinkState
+_0806F348: .4byte gPlayerState
 _0806F34C:
 	ldrh r0, [r6, #4]
 _0806F34E:
@@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364
 	adds r1, r2, r3
 	adds r0, r0, r1
 	movs r1, #0x10
-	bl sub_0801D630
+	bl _DmaZero
 	pop {pc}
 	.align 2, 0
 _0806F384: .4byte gArea
@@ -863,7 +863,7 @@ _0806F398: .4byte gArea
 sub_0806F39C: @ 0x0806F39C
 	push {r4, lr}
 	adds r3, r0, #0
-	ldr r2, _0806F3B8 @ =gLinkEntity
+	ldr r2, _0806F3B8 @ =gPlayerEntity
 	ldrb r1, [r2, #0x14]
 	movs r0, #2
 	ands r0, r1
@@ -876,7 +876,7 @@ sub_0806F39C: @ 0x0806F39C
 	ldrsh r0, [r4, r2]
 	b _0806F3C4
 	.align 2, 0
-_0806F3B8: .4byte gLinkEntity
+_0806F3B8: .4byte gPlayerEntity
 _0806F3BC:
 	movs r0, #0x32
 	ldrsh r1, [r3, r0]
@@ -907,7 +907,7 @@ sub_0806F3E4: @ 0x0806F3E4
 	push {r4, r5, r6, lr}
 	sub sp, #0x88
 	adds r5, r0, #0
-	ldr r2, _0806F408 @ =gLinkState
+	ldr r2, _0806F408 @ =gPlayerState
 	ldrb r1, [r2, #0x1c]
 	movs r0, #0x7f
 	ands r0, r1
@@ -922,7 +922,7 @@ sub_0806F3E4: @ 0x0806F3E4
 	beq _0806F416
 	b _0806F410
 	.align 2, 0
-_0806F408: .4byte gLinkState
+_0806F408: .4byte gPlayerState
 _0806F40C:
 	cmp r0, #3
 	beq _0806F42A
@@ -959,7 +959,7 @@ _0806F436:
 	bls _0806F444
 	strh r1, [r2]
 _0806F444:
-	ldr r6, _0806F4BC @ =gLinkEntity
+	ldr r6, _0806F4BC @ =gPlayerEntity
 	ldrb r0, [r6, #0x14]
 	movs r1, #0xe
 	ands r1, r0
@@ -979,7 +979,7 @@ _0806F444:
 	ldrh r4, [r3]
 	adds r0, r5, #0
 	mov r1, sp
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r2, r0, #0
 	adds r0, r5, #0
 	adds r1, r4, #0
@@ -999,14 +999,14 @@ _0806F444:
 	movs r0, #3
 	strb r0, [r5, #0xd]
 	str r5, [r6, #0x70]
-	ldr r1, _0806F4C4 @ =gLinkState
+	ldr r1, _0806F4C4 @ =gPlayerState
 	movs r0, #7
 	strb r0, [r1, #0x1c]
 	movs r0, #0x11
 	movs r1, #0
 	movs r2, #0
 	movs r3, #0
-	bl sub_08077CB8
+	bl CreatePlayerItem
 	cmp r0, #0
 	beq _0806F4B4
 	str r5, [r0, #0x54]
@@ -1016,13 +1016,13 @@ _0806F4B4:
 	bl PlaySFX
 	b _0806F4D8
 	.align 2, 0
-_0806F4BC: .4byte gLinkEntity
+_0806F4BC: .4byte gPlayerEntity
 _0806F4C0: .4byte gUnk_08126EE4
-_0806F4C4: .4byte gLinkState
+_0806F4C4: .4byte gPlayerState
 _0806F4C8:
 	cmp r1, #1
 	bne _0806F4D8
-	ldr r0, _0806F4DC @ =gLinkState
+	ldr r0, _0806F4DC @ =gPlayerState
 	ldr r0, [r0, #0x2c]
 	strb r1, [r0, #0xa]
 	movs r0, #0xef
@@ -1031,7 +1031,7 @@ _0806F4D8:
 	movs r0, #1
 	b _0806F4E2
 	.align 2, 0
-_0806F4DC: .4byte gLinkState
+_0806F4DC: .4byte gPlayerState
 _0806F4E0:
 	movs r0, #0
 _0806F4E2:
@@ -1657,7 +1657,7 @@ _0806F944:
 sub_0806F948: @ 0x0806F948
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r1, _0806F974 @ =gLinkState
+	ldr r1, _0806F974 @ =gPlayerState
 	ldrb r0, [r1, #0xd]
 	cmp r0, #0xff
 	beq _0806F994
@@ -1677,7 +1677,7 @@ sub_0806F948: @ 0x0806F948
 	adds r0, r2, #0
 	b _0806F996
 	.align 2, 0
-_0806F974: .4byte gLinkState
+_0806F974: .4byte gPlayerState
 _0806F978:
 	movs r2, #0
 	cmp r3, #4

asm/code_0806FA6C.s

@@ -106,11 +106,11 @@ _0806FBB2:
 sub_0806FBB4: @ 0x0806FBB4
 	push {lr}
 	adds r1, r0, #0
-	ldr r0, _0806FBD0 @ =gUnk_030010A0
+	ldr r0, _0806FBD0 @ =gScreenTransition
 	ldrb r0, [r0, #5]
 	cmp r0, #0
 	bne _0806FBC8
-	ldr r0, _0806FBD4 @ =gLinkState
+	ldr r0, _0806FBD4 @ =gPlayerState
 	ldrb r0, [r0, #5]
 	cmp r0, #0
 	bne _0806FBCC
@@ -120,22 +120,22 @@ _0806FBC8:
 _0806FBCC:
 	pop {pc}
 	.align 2, 0
-_0806FBD0: .4byte gUnk_030010A0
-_0806FBD4: .4byte gLinkState
+_0806FBD0: .4byte gScreenTransition
+_0806FBD4: .4byte gPlayerState
 
 	thumb_func_start sub_0806FBD8
 sub_0806FBD8: @ 0x0806FBD8
 	push {r4, lr}
 	adds r4, r0, #0
-	bl sub_0806FBEC
+	bl UnloadBoundingBox
 	movs r0, #0xc
 	bl sub_0801D8E0
 	str r0, [r4, #0x48]
 	pop {r4, pc}
 	.align 2, 0
 
-	thumb_func_start sub_0806FBEC
-sub_0806FBEC: @ 0x0806FBEC
+	thumb_func_start UnloadBoundingBox
+UnloadBoundingBox: @ 0x0806FBEC
 	push {r4, lr}
 	adds r4, r0, #0
 	ldr r0, [r4, #0x48]
@@ -148,7 +148,7 @@ sub_0806FBEC: @ 0x0806FBEC
 sub_0806FBFC: @ 0x0806FBFC
 	push {r4, r5, r6, lr}
 	adds r5, r3, #0
-	ldr r4, _0806FC20 @ =gLinkEntity
+	ldr r4, _0806FC20 @ =gPlayerEntity
 	movs r6, #0x2e
 	ldrsh r3, [r4, r6]
 	subs r3, r3, r0
@@ -165,7 +165,7 @@ _0806FC1A:
 	adds r0, r1, #0
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_0806FC20: .4byte gLinkEntity
+_0806FC20: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806FC24
 sub_0806FC24: @ 0x0806FC24
@@ -242,14 +242,14 @@ _0806FC9C:
 	thumb_func_start sub_0806FCA0
 sub_0806FCA0: @ 0x0806FCA0
 	push {lr}
-	bl sub_080045C4
+	bl GetFacingDirection
 	bl sub_0806F5A4
 	pop {pc}
 
 	thumb_func_start sub_0806FCAC
 sub_0806FCAC: @ 0x0806FCAC
 	push {lr}
-	bl sub_080045C4
+	bl GetFacingDirection
 	bl sub_0806F5B0
 	pop {pc}
 
@@ -353,7 +353,7 @@ sub_0806FD3C: @ 0x0806FD3C
 sub_0806FD54: @ 0x0806FD54
 	push {r4, lr}
 	adds r3, r0, #0
-	ldr r0, _0806FD6C @ =gLinkState
+	ldr r0, _0806FD6C @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	lsls r1, r1, #0x10
@@ -363,9 +363,9 @@ sub_0806FD54: @ 0x0806FD54
 	movs r0, #0
 	b _0806FD84
 	.align 2, 0
-_0806FD6C: .4byte gLinkState
+_0806FD6C: .4byte gPlayerState
 _0806FD70:
-	ldr r0, _0806FD88 @ =gLinkEntity
+	ldr r0, _0806FD88 @ =gPlayerEntity
 	movs r2, #0x2e
 	ldrsh r1, [r0, r2]
 	movs r4, #0x32
@@ -377,7 +377,7 @@ _0806FD70:
 _0806FD84:
 	pop {r4, pc}
 	.align 2, 0
-_0806FD88: .4byte gLinkEntity
+_0806FD88: .4byte gPlayerEntity
 
 	thumb_func_start sub_0806FD8C
 sub_0806FD8C: @ 0x0806FD8C
@@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C
 	ldr r0, _0806FD9C @ =gUnk_020000C0
 	movs r1, #0xc0
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	pop {pc}
 	.align 2, 0
 _0806FD9C: .4byte gUnk_020000C0
@@ -447,7 +447,7 @@ LoadExtraSpriteData: @ 0x0806FDEC
 	b _0806FE74
 _0806FE02:
 	adds r0, r6, #0
-	bl sub_0801D230
+	bl UnloadOBJPalette
 	adds r0, r6, #0
 	adds r0, #0x28
 	ldrb r0, [r0]
@@ -534,7 +534,7 @@ _0806FE9E:
 	bls _0806FE9E
 	adds r0, r6, #0
 	movs r1, #0x40
-	bl sub_0801D630
+	bl _DmaZero
 _0806FEB4:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
@@ -671,7 +671,7 @@ SetSpriteSubEntryOffsetData1: @ 0x0806FF88
 	adds r4, r4, r2
 	ldrh r0, [r5, #2]
 	ldrb r1, [r5, #1]
-	bl sub_080700C8
+	bl GetSpriteSubEntryOffsetDataPointer
 	ldrb r1, [r5, #6]
 	ldrb r2, [r0]
 	adds r1, r1, r2
@@ -715,7 +715,7 @@ SetSpriteSubEntryOffsetData2: @ 0x0806FFD8
 	adds r4, r4, r2
 	ldrh r0, [r5, #2]
 	ldrb r1, [r5, #1]
-	bl sub_080700C8
+	bl GetSpriteSubEntryOffsetDataPointer
 	ldrb r1, [r5, #6]
 	ldrb r2, [r0, #2]
 	adds r1, r1, r2
@@ -826,8 +826,8 @@ _080700C4:
 _080700C6:
 	pop {pc}
 
-	thumb_func_start sub_080700C8
-sub_080700C8: @ 0x080700C8
+	thumb_func_start GetSpriteSubEntryOffsetDataPointer
+GetSpriteSubEntryOffsetDataPointer: @ 0x080700C8
 	lsls r0, r0, #1
 	ldr r2, _080700E4 @ =gUnk_089FB780
 	adds r0, r0, r2
@@ -885,7 +885,7 @@ sub_08070100: @ 0x08070100
 	movs r0, #0xf0
 	lsls r0, r0, #1
 	str r0, [r5, #0x78]
-	ldr r2, _0807017C @ =gLinkEntity
+	ldr r2, _0807017C @ =gPlayerEntity
 	ldr r1, _08070180 @ =gUnk_0811B9A0
 	ldrb r0, [r5, #0x14]
 	adds r0, r0, r1
@@ -921,7 +921,7 @@ sub_08070100: @ 0x08070100
 	strb r3, [r5, #0xa]
 	b _0807018C
 	.align 2, 0
-_0807017C: .4byte gLinkEntity
+_0807017C: .4byte gPlayerEntity
 _08070180: .4byte gUnk_0811B9A0
 _08070184: .4byte gUnk_0811B9D0
 _08070188:
@@ -1062,7 +1062,7 @@ _08070280:
 	ands r1, r6
 	lsls r1, r1, #6
 	orrs r0, r1
-	ldr r1, _08070358 @ =gLinkEntity
+	ldr r1, _08070358 @ =gPlayerEntity
 	adds r1, #0x38
 	ldrb r1, [r1]
 	movs r2, #0x80
@@ -1148,7 +1148,7 @@ _08070280:
 	b _0807037A
 	.align 2, 0
 _08070354: .4byte gRoomControls
-_08070358: .4byte gLinkEntity
+_08070358: .4byte gPlayerEntity
 _0807035C: .4byte gUnk_08003E44
 _08070360: .4byte 0x00004020
 _08070364:
@@ -1368,13 +1368,13 @@ sub_080704D4: @ 0x080704D4
 sub_080704FC: @ 0x080704FC
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r5, _0807052C @ =gLinkEntity
+	ldr r5, _0807052C @ =gPlayerEntity
 	adds r0, r5, #0
 	adds r0, #0x5a
 	ldrb r2, [r0]
 	movs r0, #0x80
 	ands r0, r2
-	ldr r1, _08070530 @ =gLinkState
+	ldr r1, _08070530 @ =gPlayerState
 	cmp r0, #0
 	bne _08070518
 	ldr r0, [r1, #0x2c]
@@ -1391,8 +1391,8 @@ _08070522:
 	bl DeleteEntity
 	b _08070566
 	.align 2, 0
-_0807052C: .4byte gLinkEntity
-_08070530: .4byte gLinkState
+_0807052C: .4byte gPlayerEntity
+_08070530: .4byte gPlayerState
 _08070534:
 	movs r0, #0xf
 	ands r0, r2
@@ -1420,7 +1420,7 @@ _08070562:
 	movs r0, #0xff
 	strb r0, [r4, #0x1e]
 _08070566:
-	ldr r2, _08070580 @ =gLinkEntity
+	ldr r2, _08070580 @ =gPlayerEntity
 	ldrb r1, [r2, #0x14]
 	movs r0, #2
 	ands r0, r1
@@ -1433,7 +1433,7 @@ _08070566:
 	eors r2, r0
 	b _0807058A
 	.align 2, 0
-_08070580: .4byte gLinkEntity
+_08070580: .4byte gPlayerEntity
 _08070584:
 	ldrb r0, [r2, #0x18]
 	lsls r0, r0, #0x19
@@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C
 	push {lr}
 	ldr r0, _080705A8 @ =gUnk_02034490
 	movs r1, #0x18
-	bl sub_0801D630
+	bl _DmaZero
 	pop {pc}
 	.align 2, 0
 _080705A8: .4byte gUnk_02034490
@@ -1468,7 +1468,7 @@ sub_080705AC: @ 0x080705AC
 	ands r0, r1
 	cmp r0, #0
 	beq _08070674
-	ldr r0, _08070618 @ =gUnk_03000FD0
+	ldr r0, _08070618 @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _08070674
@@ -1493,7 +1493,7 @@ sub_080705AC: @ 0x080705AC
 	ldrb r0, [r0]
 	cmp r0, #0
 	beq _08070674
-	ldr r1, _08070628 @ =gLinkState
+	ldr r1, _08070628 @ =gPlayerState
 	adds r0, r1, #0
 	adds r0, #0x8b
 	ldrb r0, [r0]
@@ -1514,11 +1514,11 @@ sub_080705AC: @ 0x080705AC
 	b _08070632
 	.align 2, 0
 _08070614: .4byte gUnk_03000FF0
-_08070618: .4byte gUnk_03000FD0
+_08070618: .4byte gFadeControl
 _0807061C: .4byte gUnk_02034490
 _08070620: .4byte gTextBox
 _08070624: .4byte gUnk_02002A40
-_08070628: .4byte gLinkState
+_08070628: .4byte gPlayerState
 _0807062C: .4byte gUnk_03003DC0
 _08070630:
 	ldrb r0, [r2]

asm/code_08076C80.s

@@ -6,193 +6,6 @@
 
 	.text
 
-	thumb_func_start PacciCane
-PacciCane: @ 0x08076C80
-	push {lr}
-	ldr r3, _08076C94 @ =gUnk_0811BDE0
-	ldrb r2, [r0, #4]
-	lsls r2, r2, #2
-	adds r2, r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	pop {pc}
-	.align 2, 0
-_08076C94: .4byte gUnk_0811BDE0
-
-	thumb_func_start sub_08076C98
-sub_08076C98: @ 0x08076C98
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r2, [r4, #9]
-	movs r0, #0xf
-	orrs r0, r2
-	strb r0, [r4, #9]
-	adds r0, r4, #0
-	bl sub_08077D38
-	ldr r0, _08076CB8 @ =gLinkEntity
-	bl sub_0806F948
-	adds r0, r4, #0
-	bl sub_08077BB8
-	pop {r4, pc}
-	.align 2, 0
-_08076CB8: .4byte gLinkEntity
-
-	thumb_func_start sub_08076CBC
-sub_08076CBC: @ 0x08076CBC
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r2, [r4, #0xe]
-	movs r0, #0x80
-	ands r0, r2
-	cmp r0, #0
-	beq _08076CD2
-	adds r0, r4, #0
-	bl sub_08077E78
-	b _08076CE8
-_08076CD2:
-	movs r0, #0x40
-	ands r0, r2
-	cmp r0, #0
-	beq _08076CE2
-	adds r0, r4, #0
-	movs r1, #0x12
-	bl sub_08077C3C
-_08076CE2:
-	adds r0, r4, #0
-	bl UpdateItemAnim
-_08076CE8:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start Shield
-Shield: @ 0x08076CEC
-	push {lr}
-	ldr r3, _08076D00 @ =gUnk_0811BDE8
-	ldrb r2, [r0, #4]
-	lsls r2, r2, #2
-	adds r2, r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	pop {pc}
-	.align 2, 0
-_08076D00: .4byte gUnk_0811BDE8
-
-	thumb_func_start sub_08076D04
-sub_08076D04: @ 0x08076D04
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r5, r1, #0
-	ldr r1, _08076D2C @ =gLinkState
-	movs r0, #0x81
-	strb r0, [r1, #3]
-	movs r0, #2
-	strb r0, [r4, #9]
-	ldr r0, _08076D30 @ =gLinkEntity
-	bl sub_0806F948
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_08077D38
-	adds r0, r4, #0
-	bl sub_08077BB8
-	pop {r4, r5, pc}
-	.align 2, 0
-_08076D2C: .4byte gLinkState
-_08076D30: .4byte gLinkEntity
-
-	thumb_func_start sub_08076D34
-sub_08076D34: @ 0x08076D34
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r6, r1, #0
-	bl sub_08077EFC
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _08076D80
-	ldr r5, _08076D78 @ =gLinkState
-	ldrb r0, [r5, #3]
-	movs r1, #1
-	orrs r1, r0
-	strb r1, [r5, #3]
-	adds r0, r4, #0
-	bl UpdateItemAnim
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	beq _08076D8C
-	ldrb r0, [r4, #4]
-	adds r0, #1
-	strb r0, [r4, #4]
-	movs r0, #0
-	strb r0, [r4, #0xf]
-	movs r1, #8
-	asrs r1, r6
-	ldrb r0, [r5, #0xa]
-	bics r0, r1
-	strb r0, [r5, #0xa]
-	ldr r0, _08076D7C @ =0x0000015D
-	bl PlaySFX
-	b _08076D8C
-	.align 2, 0
-_08076D78: .4byte gLinkState
-_08076D7C: .4byte 0x0000015D
-_08076D80:
-	ldr r0, _08076D90 @ =gLinkState
-	strb r1, [r0, #3]
-	adds r0, r4, #0
-	adds r1, r6, #0
-	bl sub_08077E78
-_08076D8C:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08076D90: .4byte gLinkState
-
-	thumb_func_start sub_08076D94
-sub_08076D94: @ 0x08076D94
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r5, r1, #0
-	bl sub_08077EFC
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _08076DBC
-	ldr r2, _08076DB8 @ =gLinkState
-	ldrb r1, [r2, #3]
-	movs r0, #1
-	orrs r0, r1
-	strb r0, [r2, #3]
-	adds r0, r4, #0
-	bl UpdateItemAnim
-	b _08076DC8
-	.align 2, 0
-_08076DB8: .4byte gLinkState
-_08076DBC:
-	ldr r0, _08076DCC @ =gLinkState
-	strb r1, [r0, #3]
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_08077E78
-_08076DC8:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08076DCC: .4byte gLinkState
-
-	thumb_func_start GustJar
-GustJar: @ 0x08076DD0
-	push {lr}
-	ldr r2, _08076DEC @ =gLinkState
-	adds r2, #0xa8
-	movs r3, #3
-	strb r3, [r2]
-	ldr r3, _08076DF0 @ =gUnk_0811BDF4
-	ldrb r2, [r0, #4]
-	lsls r2, r2, #2
-	adds r2, r2, r3
-	ldr r2, [r2]
-	bl _call_via_r2
-	pop {pc}
-	.align 2, 0
-_08076DEC: .4byte gLinkState
-_08076DF0: .4byte gUnk_0811BDF4
-
 	thumb_func_start sub_08076DF4
 sub_08076DF4: @ 0x08076DF4
 	push {r4, r5, r6, r7, lr}
@@ -200,12 +13,12 @@ sub_08076DF4: @ 0x08076DF4
 	push {r7}
 	adds r4, r0, #0
 	adds r7, r1, #0
-	ldr r0, _08076E48 @ =gLinkEntity
+	ldr r0, _08076E48 @ =gPlayerEntity
 	mov r8, r0
 	bl sub_0807A894
 	cmp r0, #0x29
 	beq _08076E50
-	ldr r6, _08076E4C @ =gLinkState
+	ldr r6, _08076E4C @ =gPlayerState
 	ldrb r0, [r6, #0x12]
 	cmp r0, #0x12
 	beq _08076E50
@@ -235,8 +48,8 @@ sub_08076DF4: @ 0x08076DF4
 	bl sub_08077BB8
 	b _08076E58
 	.align 2, 0
-_08076E48: .4byte gLinkEntity
-_08076E4C: .4byte gLinkState
+_08076E48: .4byte gPlayerEntity
+_08076E4C: .4byte gPlayerState
 _08076E50:
 	adds r0, r4, #0
 	adds r1, r7, #0
@@ -252,7 +65,7 @@ sub_08076E60: @ 0x08076E60
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
 	adds r6, r1, #0
-	ldr r5, _08076EB4 @ =gLinkState
+	ldr r5, _08076EB4 @ =gPlayerState
 	ldrb r1, [r5, #0x1c]
 	movs r0, #0xf
 	ands r0, r1
@@ -281,17 +94,17 @@ _08076E7A:
 	movs r1, #0
 	movs r2, #0
 	movs r3, #0
-	bl sub_08077CB8
+	bl CreatePlayerItem
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _08076EC6
-	ldr r0, _08076EBC @ =gLinkEntity
+	ldr r0, _08076EBC @ =gPlayerEntity
 	str r0, [r1, #0x50]
 	b _08076EC6
 	.align 2, 0
-_08076EB4: .4byte gLinkState
+_08076EB4: .4byte gPlayerState
 _08076EB8: .4byte 0x00000504
-_08076EBC: .4byte gLinkEntity
+_08076EBC: .4byte gPlayerEntity
 _08076EC0:
 	adds r0, r4, #0
 	bl UpdateItemAnim
@@ -303,7 +116,7 @@ sub_08076EC8: @ 0x08076EC8
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
 	adds r6, r1, #0
-	ldr r5, _08076EE4 @ =gLinkState
+	ldr r5, _08076EE4 @ =gPlayerState
 	ldrb r1, [r5, #0x1c]
 	movs r0, #0xf
 	ands r0, r1
@@ -314,7 +127,7 @@ sub_08076EC8: @ 0x08076EC8
 	bl sub_08077E78
 	b _08076F60
 	.align 2, 0
-_08076EE4: .4byte gLinkState
+_08076EE4: .4byte gPlayerState
 _08076EE8:
 	adds r0, r4, #0
 	bl sub_08077EFC
@@ -338,17 +151,17 @@ _08076F0C:
 	movs r0, #1
 _08076F0E:
 	strb r0, [r5, #0x1d]
-	ldr r0, _08076F1C @ =gLinkEntity
+	ldr r0, _08076F1C @ =gPlayerEntity
 	ldrb r0, [r0, #0xd]
 	cmp r0, #0x1b
 	bne _08076F24
 	ldr r1, _08076F20 @ =0x00000524
 	b _08076F36
 	.align 2, 0
-_08076F1C: .4byte gLinkEntity
+_08076F1C: .4byte gPlayerEntity
 _08076F20: .4byte 0x00000524
 _08076F24:
-	ldr r0, _08076F44 @ =gLinkState
+	ldr r0, _08076F44 @ =gPlayerState
 	ldrb r1, [r0, #0xd]
 	movs r0, #0x80
 	ands r0, r1
@@ -365,7 +178,7 @@ _08076F36:
 	bl sub_08077DF4
 	b _08076F60
 	.align 2, 0
-_08076F44: .4byte gLinkState
+_08076F44: .4byte gPlayerState
 _08076F48:
 	adds r0, r4, #0
 	bl UpdateItemAnim
@@ -388,7 +201,7 @@ sub_08076F64: @ 0x08076F64
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
 	adds r6, r1, #0
-	ldr r1, _08076F84 @ =gLinkState
+	ldr r1, _08076F84 @ =gPlayerState
 	ldrb r0, [r1, #0x1c]
 	movs r2, #0xf
 	ands r2, r0
@@ -403,7 +216,7 @@ _08076F7A:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_08076F84: .4byte gLinkState
+_08076F84: .4byte gPlayerState
 _08076F88: .4byte _08076F8C
 _08076F8C: @ jump table
 	.4byte _08077100 @ case 0
@@ -429,7 +242,7 @@ _08076FAC:
 	strb r0, [r4, #7]
 	movs r1, #1
 	strb r1, [r3, #0x1d]
-	ldr r5, _08076FFC @ =gLinkEntity
+	ldr r5, _08076FFC @ =gPlayerEntity
 	str r0, [r5, #0x74]
 	strb r1, [r3, #0x1c]
 	movs r1, #8
@@ -446,7 +259,7 @@ _08076FAC:
 	movs r1, #0
 	movs r2, #0
 	movs r3, #0
-	bl sub_08077CB8
+	bl CreatePlayerItem
 	cmp r0, #0
 	bne _08076FF6
 	b _08077110
@@ -454,7 +267,7 @@ _08076FF6:
 	str r5, [r0, #0x50]
 	b _08077110
 	.align 2, 0
-_08076FFC: .4byte gLinkEntity
+_08076FFC: .4byte gPlayerEntity
 _08077000: .4byte 0x00000504
 _08077004:
 	movs r0, #6
@@ -472,13 +285,13 @@ _0807700E:
 _0807701C:
 	adds r0, r4, #0
 	bl UpdateItemAnim
-	ldr r0, _08077044 @ =gLinkState
+	ldr r0, _08077044 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #2
 	ands r0, r1
 	cmp r0, #0
 	bne _08077110
-	ldr r0, _08077048 @ =gLinkEntity
+	ldr r0, _08077048 @ =gPlayerEntity
 	ldrb r1, [r0, #0x14]
 	lsls r1, r1, #2
 	movs r2, #0x10
@@ -488,10 +301,10 @@ _0807701C:
 	bl sub_08079E08
 	b _08077110
 	.align 2, 0
-_08077044: .4byte gLinkState
-_08077048: .4byte gLinkEntity
+_08077044: .4byte gPlayerState
+_08077048: .4byte gPlayerEntity
 _0807704C:
-	ldr r1, _080770B0 @ =gLinkState
+	ldr r1, _080770B0 @ =gPlayerState
 	movs r0, #4
 	strb r0, [r1, #0x1c]
 _08077052:
@@ -509,11 +322,11 @@ _08077060:
 	ands r0, r1
 	cmp r0, #0
 	beq _0807708C
-	ldr r1, _080770B0 @ =gLinkState
+	ldr r1, _080770B0 @ =gPlayerState
 	movs r2, #0
 	movs r0, #5
 	strb r0, [r1, #0x1c]
-	ldr r0, _080770B4 @ =gLinkEntity
+	ldr r0, _080770B4 @ =gPlayerEntity
 	str r2, [r0, #0x70]
 	ldrb r0, [r1, #0x1d]
 	cmp r0, #0
@@ -521,15 +334,15 @@ _08077060:
 	movs r0, #0x11
 	movs r1, #0
 	movs r3, #0
-	bl sub_08077CB8
+	bl CreatePlayerItem
 _0807708C:
-	ldr r0, _080770B0 @ =gLinkState
+	ldr r0, _080770B0 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #2
 	ands r0, r1
 	cmp r0, #0
 	bne _08077110
-	ldr r2, _080770B4 @ =gLinkEntity
+	ldr r2, _080770B4 @ =gPlayerEntity
 	ldrb r0, [r2, #0x14]
 	lsls r0, r0, #2
 	movs r1, #0x10
@@ -540,8 +353,8 @@ _0807708C:
 	bl sub_08079E08
 	b _08077110
 	.align 2, 0
-_080770B0: .4byte gLinkState
-_080770B4: .4byte gLinkEntity
+_080770B0: .4byte gPlayerState
+_080770B4: .4byte gPlayerEntity
 _080770B8:
 	adds r0, r4, #0
 	bl UpdateItemAnim
@@ -550,15 +363,15 @@ _080770B8:
 	ands r0, r1
 	cmp r0, #0
 	beq _08077110
-	ldr r3, _080770CC @ =gLinkState
+	ldr r3, _080770CC @ =gPlayerState
 	b _08077100
 	.align 2, 0
-_080770CC: .4byte gLinkState
+_080770CC: .4byte gPlayerState
 _080770D0:
 	ldr r1, _080770E4 @ =0x00000514
 	adds r0, r4, #0
 	bl sub_08077DF4
-	ldr r1, _080770E8 @ =gLinkState
+	ldr r1, _080770E8 @ =gPlayerState
 	movs r2, #0
 	movs r0, #3
 	strb r0, [r1, #0x1c]
@@ -566,7 +379,7 @@ _080770D0:
 	b _08077110
 	.align 2, 0
 _080770E4: .4byte 0x00000514
-_080770E8: .4byte gLinkState
+_080770E8: .4byte gPlayerState
 _080770EC:
 	movs r0, #3
 	strb r0, [r3, #0x1c]
@@ -580,7 +393,7 @@ _080770FC: .4byte 0x00000514
 _08077100:
 	movs r1, #0
 	strb r1, [r3, #0x1c]
-	ldr r0, _08077114 @ =gLinkEntity
+	ldr r0, _08077114 @ =gPlayerEntity
 	str r1, [r0, #0x70]
 	adds r0, r4, #0
 	adds r1, r6, #0
@@ -588,7 +401,7 @@ _08077100:
 _08077110:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08077114: .4byte gLinkEntity
+_08077114: .4byte gPlayerEntity
 
 	thumb_func_start MoleMitts
 MoleMitts: @ 0x08077118
@@ -607,7 +420,7 @@ _0807712C: .4byte gUnk_0811BE04
 sub_08077130: @ 0x08077130
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
-	ldr r5, _0807718C @ =gLinkState
+	ldr r5, _0807718C @ =gPlayerState
 	ldrb r0, [r5, #2]
 	cmp r0, #0
 	bne _080771B6
@@ -635,7 +448,7 @@ sub_08077130: @ 0x08077130
 	strb r0, [r4, #4]
 	cmp r5, #0x56
 	bne _080771C4
-	ldr r2, _08077194 @ =gLinkEntity
+	ldr r2, _08077194 @ =gPlayerEntity
 	ldrb r1, [r2, #0x14]
 	ands r0, r1
 	cmp r0, #0
@@ -649,9 +462,9 @@ sub_08077130: @ 0x08077130
 	strh r1, [r2, #0x32]
 	b _080771C4
 	.align 2, 0
-_0807718C: .4byte gLinkState
+_0807718C: .4byte gPlayerState
 _08077190: .4byte 0x0000050C
-_08077194: .4byte gLinkEntity
+_08077194: .4byte gPlayerEntity
 _08077198:
 	ldrh r0, [r2, #0x2e]
 	movs r1, #0x10
@@ -693,13 +506,13 @@ sub_080771C8: @ 0x080771C8
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_08077E78
-	ldr r0, _080771F0 @ =gLinkState
+	ldr r0, _080771F0 @ =gPlayerState
 	adds r0, #0x3d
 	movs r1, #0
 	strb r1, [r0]
 	b _080772A4
 	.align 2, 0
-_080771F0: .4byte gLinkState
+_080771F0: .4byte gPlayerState
 _080771F4:
 	movs r0, #0x20
 	ands r0, r1
@@ -708,7 +521,7 @@ _080771F4:
 	ldrb r0, [r4, #8]
 	cmp r0, #0xff
 	bne _0807720E
-	ldr r0, _08077240 @ =gLinkEntity
+	ldr r0, _08077240 @ =gPlayerEntity
 	ldrb r2, [r4, #0xe]
 	movs r1, #0x1e
 	movs r3, #1
@@ -719,7 +532,7 @@ _0807720E:
 	ands r0, r1
 	cmp r0, #0
 	beq _080772A4
-	ldr r5, _08077240 @ =gLinkEntity
+	ldr r5, _08077240 @ =gPlayerEntity
 	adds r0, r5, #0
 	movs r1, #0xd
 	adds r2, r4, #0
@@ -736,7 +549,7 @@ _0807720E:
 	bl PlaySFX
 	b _080772A4
 	.align 2, 0
-_08077240: .4byte gLinkEntity
+_08077240: .4byte gPlayerEntity
 _08077244: .4byte 0x00000107
 _08077248:
 	ldrb r0, [r4, #8]
@@ -819,7 +632,7 @@ _080772C6:
 	adds r0, r4, #0
 	movs r1, #2
 	bl sub_08077E3C
-	ldr r3, _080772F8 @ =gLinkEntity
+	ldr r3, _080772F8 @ =gPlayerEntity
 	ldr r2, _080772FC @ =gUnk_0811BE16
 	ldrb r1, [r4, #0xe]
 	adds r0, r5, #0
@@ -830,23 +643,23 @@ _080772C6:
 	lsls r0, r0, #1
 	b _0807732E
 	.align 2, 0
-_080772F8: .4byte gLinkEntity
+_080772F8: .4byte gPlayerEntity
 _080772FC: .4byte gUnk_0811BE16
 _08077300:
 	adds r0, r4, #0
 	bl UpdateItemAnim
-	ldr r3, _08077310 @ =gLinkEntity
+	ldr r3, _08077310 @ =gPlayerEntity
 	ldr r2, _08077314 @ =gUnk_0811BE16
 	ldrb r1, [r4, #0xe]
 	adds r0, r5, #0
 	b _08077326
 	.align 2, 0
-_08077310: .4byte gLinkEntity
+_08077310: .4byte gPlayerEntity
 _08077314: .4byte gUnk_0811BE16
 _08077318:
 	adds r0, r4, #0
 	bl UpdateItemAnim
-	ldr r3, _0807736C @ =gLinkEntity
+	ldr r3, _0807736C @ =gPlayerEntity
 	ldr r2, _08077370 @ =gUnk_0811BE16
 	ldrb r1, [r4, #0xe]
 	movs r0, #7
@@ -857,7 +670,7 @@ _08077326:
 	ldrh r0, [r0]
 _0807732E:
 	strh r0, [r3, #0x24]
-	ldr r5, _0807736C @ =gLinkEntity
+	ldr r5, _0807736C @ =gPlayerEntity
 	ldrb r0, [r5, #0x14]
 	lsls r0, r0, #2
 	strb r0, [r5, #0x15]
@@ -886,19 +699,19 @@ _08077344:
 	strb r0, [r4, #7]
 	b _0807743E
 	.align 2, 0
-_0807736C: .4byte gLinkEntity
+_0807736C: .4byte gPlayerEntity
 _08077370: .4byte gUnk_0811BE16
 _08077374:
 	adds r0, r4, #0
 	adds r1, r6, #0
 	bl sub_08077E78
-	ldr r0, _08077388 @ =gLinkState
+	ldr r0, _08077388 @ =gPlayerState
 	adds r0, #0x3d
 	movs r1, #0
 	strb r1, [r0]
 	b _0807743E
 	.align 2, 0
-_08077388: .4byte gLinkState
+_08077388: .4byte gPlayerState
 _0807738C:
 	movs r0, #0x60
 	ands r0, r1
@@ -996,7 +809,7 @@ sub_08077448: @ 0x08077448
 	push {r4, r5, lr}
 	adds r4, r0, #0
 	adds r5, r1, #0
-	ldr r2, _08077498 @ =gLinkEntity
+	ldr r2, _08077498 @ =gPlayerEntity
 	ldrb r0, [r2, #0x14]
 	lsls r0, r0, #2
 	movs r1, #0x10
@@ -1022,7 +835,7 @@ _08077474:
 	ands r0, r1
 	cmp r0, #0
 	beq _08077494
-	ldr r0, _0807749C @ =gLinkState
+	ldr r0, _0807749C @ =gPlayerState
 	adds r0, #0x3d
 	movs r1, #0
 	strb r1, [r0]
@@ -1032,13 +845,13 @@ _08077474:
 _08077494:
 	pop {r4, r5, pc}
 	.align 2, 0
-_08077498: .4byte gLinkEntity
-_0807749C: .4byte gLinkState
+_08077498: .4byte gPlayerEntity
+_0807749C: .4byte gPlayerState
 
 	thumb_func_start sub_080774A0
 sub_080774A0: @ 0x080774A0
 	push {r4, r5, r6, r7, lr}
-	ldr r3, _080774FC @ =gLinkEntity
+	ldr r3, _080774FC @ =gPlayerEntity
 	movs r0, #0x2e
 	ldrsh r2, [r3, r0]
 	ldr r5, _08077500 @ =gUnk_0811BE1E
@@ -1083,7 +896,7 @@ _080774F6:
 	movs r0, #0
 	b _0807751A
 	.align 2, 0
-_080774FC: .4byte gLinkEntity
+_080774FC: .4byte gPlayerEntity
 _08077500: .4byte gUnk_0811BE1E
 _08077504: .4byte gRoomControls
 _08077508:
@@ -1117,7 +930,7 @@ sub_08077534: @ 0x08077534
 	push {r4, lr}
 	adds r4, r0, #0
 	bl sub_08077D38
-	ldr r0, _08077570 @ =gLinkEntity
+	ldr r0, _08077570 @ =gPlayerEntity
 	bl sub_0806F948
 	adds r0, r4, #0
 	bl sub_08077BB8
@@ -1141,7 +954,7 @@ sub_08077534: @ 0x08077534
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_08077570: .4byte gLinkEntity
+_08077570: .4byte gPlayerEntity
 _08077574: .4byte gUnk_02002A40
 _08077578: .4byte _0807757C
 _0807757C: @ jump table
@@ -1173,7 +986,7 @@ _080775D0: .4byte 0x00000614
 _080775D4:
 	movs r0, #3
 	strb r0, [r4, #4]
-	ldr r1, _080775F0 @ =gLinkEntity
+	ldr r1, _080775F0 @ =gPlayerEntity
 	movs r0, #4
 	strb r0, [r1, #0x14]
 	ldrb r2, [r1, #0x18]
@@ -1185,7 +998,7 @@ _080775D4:
 	bl sub_08077DF4
 	b _08077606
 	.align 2, 0
-_080775F0: .4byte gLinkEntity
+_080775F0: .4byte gPlayerEntity
 _080775F4: .4byte 0x000002DF
 _080775F8:
 	movs r0, #3
@@ -1195,7 +1008,7 @@ _080775F8:
 	adds r0, r4, #0
 	bl sub_08077DF4
 _08077606:
-	ldr r2, _08077614 @ =gLinkEntity
+	ldr r2, _08077614 @ =gPlayerEntity
 	ldrb r1, [r2, #0x10]
 	movs r0, #0x7f
 	ands r0, r1
@@ -1203,7 +1016,7 @@ _08077606:
 _08077610:
 	pop {r4, pc}
 	.align 2, 0
-_08077614: .4byte gLinkEntity
+_08077614: .4byte gPlayerEntity
 
 	thumb_func_start sub_08077618
 sub_08077618: @ 0x08077618
@@ -1239,7 +1052,7 @@ sub_08077640: @ 0x08077640
 	ands r0, r1
 	cmp r0, #0
 	beq _08077666
-	ldr r2, _08077668 @ =gLinkEntity
+	ldr r2, _08077668 @ =gPlayerEntity
 	ldrb r1, [r2, #0x10]
 	movs r0, #0x80
 	orrs r0, r1
@@ -1250,7 +1063,7 @@ sub_08077640: @ 0x08077640
 _08077666:
 	pop {r4, r5, pc}
 	.align 2, 0
-_08077668: .4byte gLinkEntity
+_08077668: .4byte gPlayerEntity
 
 	thumb_func_start sub_0807766C
 sub_0807766C: @ 0x0807766C
@@ -1263,7 +1076,7 @@ sub_0807766C: @ 0x0807766C
 	ands r0, r1
 	cmp r0, #0
 	beq _08077692
-	ldr r2, _08077694 @ =gLinkEntity
+	ldr r2, _08077694 @ =gPlayerEntity
 	ldrb r1, [r2, #0x10]
 	movs r0, #0x80
 	orrs r0, r1
@@ -1274,13 +1087,13 @@ sub_0807766C: @ 0x0807766C
 _08077692:
 	pop {r4, r5, pc}
 	.align 2, 0
-_08077694: .4byte gLinkEntity
+_08077694: .4byte gPlayerEntity
 
 	thumb_func_start sub_08077698
 sub_08077698: @ 0x08077698
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r2, _0807771C @ =gLinkState
+	ldr r2, _0807771C @ =gPlayerState
 	ldrb r1, [r2, #3]
 	movs r0, #0xfe
 	ands r0, r1
@@ -1342,7 +1155,7 @@ _08077712:
 	bls _08077704
 	pop {r4, r5, pc}
 	.align 2, 0
-_0807771C: .4byte gLinkState
+_0807771C: .4byte gPlayerState
 _08077720: .4byte gUnk_02002A40
 _08077724: .4byte gUnk_03000B80
 
@@ -1376,7 +1189,7 @@ _08077754: .4byte gUnk_02002A40
 sub_08077758: @ 0x08077758
 	push {lr}
 	adds r3, r0, #0
-	ldr r2, _08077794 @ =gLinkState
+	ldr r2, _08077794 @ =gPlayerState
 	ldr r1, [r2, #0x30]
 	movs r0, #0x80
 	lsls r0, r0, #7
@@ -1405,7 +1218,7 @@ sub_08077758: @ 0x08077758
 	movs r0, #1
 	b _0807779E
 	.align 2, 0
-_08077794: .4byte gLinkState
+_08077794: .4byte gPlayerState
 _08077798:
 	bl sub_0807A108
 _0807779C:
@@ -1416,7 +1229,7 @@ _0807779E:
 	thumb_func_start sub_080777A0
 sub_080777A0: @ 0x080777A0
 	push {r4, lr}
-	ldr r3, _080777D0 @ =gLinkState
+	ldr r3, _080777D0 @ =gPlayerState
 	adds r0, r3, #0
 	adds r0, #0x92
 	ldrh r1, [r0]
@@ -1440,7 +1253,7 @@ _080777CC:
 	movs r0, #1
 	b _0807787C
 	.align 2, 0
-_080777D0: .4byte gLinkState
+_080777D0: .4byte gPlayerState
 _080777D4:
 	ldr r2, _080777F4 @ =gArea
 	ldrb r0, [r2, #0x18]
@@ -1465,13 +1278,13 @@ _080777FC:
 	ldrb r0, [r2, #0x1a]
 	cmp r0, #0
 	bne _080777CC
-	ldr r1, _0807780C @ =gLinkEntity
+	ldr r1, _0807780C @ =gPlayerEntity
 	ldrb r0, [r1, #0xd]
 	adds r0, #1
 	strb r0, [r1, #0xd]
 	b _080777CC
 	.align 2, 0
-_0807780C: .4byte gLinkEntity
+_0807780C: .4byte gPlayerEntity
 _08077810:
 	ldrb r0, [r2, #0x1a]
 	cmp r0, #0
@@ -1479,7 +1292,7 @@ _08077810:
 	ands r1, r4
 	cmp r1, #0
 	beq _0807787A
-	ldr r0, _08077834 @ =gLinkEntity
+	ldr r0, _08077834 @ =gPlayerEntity
 	ldrb r1, [r0, #0xd]
 	adds r1, #1
 	strb r1, [r0, #0xd]
@@ -1491,7 +1304,7 @@ _08077810:
 	bl sub_0805E4E0
 	b _080777CC
 	.align 2, 0
-_08077834: .4byte gLinkEntity
+_08077834: .4byte gPlayerEntity
 _08077838:
 	ldrb r0, [r2, #0x12]
 	cmp r0, #0x11
@@ -1576,13 +1389,13 @@ _080778C8: .4byte gUnk_03004010
 	thumb_func_start sub_080778CC
 sub_080778CC: @ 0x080778CC
 	push {lr}
-	ldr r2, _08077920 @ =gLinkState
+	ldr r2, _08077920 @ =gPlayerState
 	ldr r0, [r2, #0x30]
 	ldr r1, _08077924 @ =0x000400A0
 	ands r0, r1
 	cmp r0, #0
 	bne _0807791C
-	ldr r0, _08077928 @ =gLinkEntity
+	ldr r0, _08077928 @ =gPlayerEntity
 	adds r0, #0x79
 	ldrb r0, [r0]
 	cmp r0, #0
@@ -1602,7 +1415,7 @@ _080778FA:
 	bl sub_080789A8
 	cmp r0, #0
 	bne _08077910
-	ldr r0, _08077920 @ =gLinkState
+	ldr r0, _08077920 @ =gPlayerState
 	adds r0, #0x90
 	ldrh r1, [r0]
 	ldr r0, _0807792C @ =0x00000F03
@@ -1619,9 +1432,9 @@ _0807791C:
 	movs r0, #0
 	b _08077940
 	.align 2, 0
-_08077920: .4byte gLinkState
+_08077920: .4byte gPlayerState
 _08077924: .4byte 0x000400A0
-_08077928: .4byte gLinkEntity
+_08077928: .4byte gPlayerEntity
 _0807792C: .4byte 0x00000F03
 _08077930:
 	movs r0, #0x1b
@@ -1642,7 +1455,7 @@ _08077948: .4byte 0x00000145
 sub_0807794C: @ 0x0807794C
 	push {lr}
 	adds r2, r0, #0
-	ldr r0, _080779B8 @ =gLinkState
+	ldr r0, _080779B8 @ =gPlayerState
 	ldrb r1, [r0, #0xc]
 	adds r3, r0, #0
 	cmp r1, #0x18
@@ -1662,7 +1475,7 @@ _0807796E:
 	ldrb r0, [r3, #2]
 	cmp r0, #0
 	bne _0807797C
-	ldr r0, _080779BC @ =gLinkEntity
+	ldr r0, _080779BC @ =gPlayerEntity
 	ldr r0, [r0, #0x34]
 	cmp r0, #0
 	beq _08077980
@@ -1700,8 +1513,8 @@ _080779B2:
 	movs r0, #0
 	b _080779DE
 	.align 2, 0
-_080779B8: .4byte gLinkState
-_080779BC: .4byte gLinkEntity
+_080779B8: .4byte gPlayerState
+_080779BC: .4byte gPlayerEntity
 _080779C0: .4byte gUnk_0811BE48
 _080779C4:
 	ldr r1, _080779E0 @ =gUnk_0811BE48
@@ -1759,7 +1572,7 @@ _08077A16:
 sub_08077A18: @ 0x08077A18
 	push {lr}
 	adds r1, r0, #0
-	ldr r0, _08077A3C @ =gLinkState
+	ldr r0, _08077A3C @ =gPlayerState
 	ldrb r0, [r0, #5]
 	cmp r0, #0
 	bne _08077A44
@@ -1775,7 +1588,7 @@ sub_08077A18: @ 0x08077A18
 	bl sub_080779EC
 	b _08077A46
 	.align 2, 0
-_08077A3C: .4byte gLinkState
+_08077A3C: .4byte gPlayerState
 _08077A40: .4byte gUnk_03000B80
 _08077A44:
 	movs r0, #0
@@ -1786,7 +1599,7 @@ _08077A46:
 sub_08077A48: @ 0x08077A48
 	push {r4, r5, r6, lr}
 	adds r2, r0, #0
-	ldr r6, _08077A88 @ =gLinkState
+	ldr r6, _08077A88 @ =gPlayerState
 	ldrb r0, [r6, #5]
 	cmp r0, #0
 	bne _08077A94
@@ -1816,7 +1629,7 @@ sub_08077A48: @ 0x08077A48
 	adds r0, r5, #0
 	b _08077A96
 	.align 2, 0
-_08077A88: .4byte gLinkState
+_08077A88: .4byte gPlayerState
 _08077A8C: .4byte gUnk_0811BE48
 _08077A90: .4byte gUnk_03000B80
 _08077A94:
@@ -1832,7 +1645,7 @@ sub_08077A98: @ 0x08077A98
 	ldrb r0, [r0]
 	cmp r0, #0
 	beq _08077AC4
-	ldr r0, _08077ABC @ =gLinkState
+	ldr r0, _08077ABC @ =gPlayerState
 	ldrb r0, [r0, #5]
 	cmp r0, #0
 	bne _08077AC4
@@ -1844,7 +1657,7 @@ sub_08077A98: @ 0x08077A98
 	b _08077AC6
 	.align 2, 0
 _08077AB8: .4byte gUnk_02002A40
-_08077ABC: .4byte gLinkState
+_08077ABC: .4byte gPlayerState
 _08077AC0: .4byte gUnk_03000B80
 _08077AC4:
 	movs r0, #0
@@ -1881,13 +1694,13 @@ sub_08077AEC: @ 0x08077AEC
 	ldr r0, _08077B14 @ =gUnk_03000BD4
 	movs r1, #3
 	bl sub_08077E78
-	ldr r2, _08077B18 @ =gLinkState
+	ldr r2, _08077B18 @ =gPlayerState
 	ldr r0, [r2, #0x30]
 	ldr r1, _08077B1C @ =0xFF7FFFFF
 	ands r0, r1
 	str r0, [r2, #0x30]
 	movs r0, #0x10
-	bl sub_0805436C
+	bl IsItemEquipped
 	adds r1, r0, #0
 	cmp r1, #2
 	beq _08077B12
@@ -1897,12 +1710,12 @@ _08077B12:
 	pop {pc}
 	.align 2, 0
 _08077B14: .4byte gUnk_03000BD4
-_08077B18: .4byte gLinkState
+_08077B18: .4byte gPlayerState
 _08077B1C: .4byte 0xFF7FFFFF
 
 	thumb_func_start sub_08077B20
 sub_08077B20: @ 0x08077B20
 	push {lr}
-	bl sub_08077B2C
+	bl ResetPlayer
 	bl sub_08077AEC
 	pop {pc}

asm/code_0807B9B8.s

@@ -503,7 +503,7 @@ _0807BD90:
 _0807BD96:
 	strh r0, [r2, #4]
 _0807BD98:
-	ldr r2, _0807BDB0 @ =gLinkEntity
+	ldr r2, _0807BDB0 @ =gPlayerEntity
 	ldrb r1, [r2, #0x11]
 	movs r0, #0x10
 	rsbs r0, r0, #0
@@ -515,7 +515,7 @@ _0807BD98:
 	movs r0, #1
 	b _0807BDB6
 	.align 2, 0
-_0807BDB0: .4byte gLinkEntity
+_0807BDB0: .4byte gPlayerEntity
 _0807BDB4:
 	movs r0, #0
 _0807BDB6:
@@ -822,14 +822,14 @@ sub_0807BFD0: @ 0x0807BFD0
 	adds r0, r7, #0
 	adds r1, r6, #0
 	mov r2, r8
-	bl sub_0801D5EC
+	bl _DmaFill16
 	movs r5, #0
 	strh r5, [r6]
 	ldr r4, _0807C0C0 @ =gUnk_02010654
 	adds r0, r7, #0
 	adds r1, r4, #0
 	mov r2, r8
-	bl sub_0801D5EC
+	bl _DmaFill16
 	strh r5, [r4]
 	ldr r2, _0807C0C4 @ =gRoomControls
 	ldr r0, _0807C0C8 @ =gArea
@@ -846,7 +846,7 @@ _0807C01C:
 	ldr r0, [r4]
 	ldr r0, [r0, #0x10]
 	bl sub_080197D4
-	ldr r1, _0807C0D0 @ =gUnk_020176A0
+	ldr r1, _0807C0D0 @ =gPaletteBuffer
 	adds r0, r1, #0
 	adds r0, #0x60
 	movs r2, #0xa8
@@ -854,7 +854,7 @@ _0807C01C:
 	adds r1, r1, r2
 	movs r2, #0x20
 	bl sub_0801D66C
-	ldr r2, _0807C0D4 @ =gUnk_0200B644
+	ldr r2, _0807C0D4 @ =gUsedPalettes
 	ldr r0, [r2]
 	movs r1, #0x80
 	lsls r1, r1, #0xe
@@ -873,7 +873,7 @@ _0807C04E:
 	adds r0, r7, #0
 	adds r1, r6, #0
 	mov r2, r8
-	bl sub_0801D5EC
+	bl _DmaFill16
 	movs r2, #0
 	ldr r3, _0807C0D8 @ =0x000007FF
 	adds r4, r7, #0
@@ -899,7 +899,7 @@ _0807C078:
 	ldr r4, _0807C0B8 @ =0x0000FFFF
 	adds r0, r4, #0
 	adds r1, r6, #0
-	bl sub_0801D5EC
+	bl _DmaFill16
 	movs r2, #0
 	ldr r3, _0807C0D8 @ =0x000007FF
 _0807C096:
@@ -927,8 +927,8 @@ _0807C0C0: .4byte gUnk_02010654
 _0807C0C4: .4byte gRoomControls
 _0807C0C8: .4byte gArea
 _0807C0CC: .4byte 0x0000085C
-_0807C0D0: .4byte gUnk_020176A0
-_0807C0D4: .4byte gUnk_0200B644
+_0807C0D0: .4byte gPaletteBuffer
+_0807C0D4: .4byte gUsedPalettes
 _0807C0D8: .4byte 0x000007FF
 
 	thumb_func_start sub_0807C0DC
@@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC
 	lsls r6, r6, #6
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 	adds r0, r5, r6
 	movs r1, #0x80
 	lsls r1, r1, #5
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0807C160 @ =gUnk_02019EE0
 	movs r4, #0x80
 	lsls r4, r4, #8
 	adds r1, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0807C164 @ =gUnk_02002F00
 	adds r1, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0807C168 @ =gArea
 	ldr r1, _0807C16C @ =0x0000085C
 	adds r0, r0, r1
@@ -999,11 +999,11 @@ _0807C174: .4byte 0x0000FFFF
 _0807C178:
 	adds r0, r2, #4
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 	movs r3, #1
 	mov sb, r3
 _0807C184:
-	ldr r0, _0807C1B0 @ =gUnk_030010A0
+	ldr r0, _0807C1B0 @ =gScreenTransition
 	adds r0, #0x2d
 	ldrb r0, [r0]
 	cmp r0, #0
@@ -1024,7 +1024,7 @@ _0807C184:
 	bl sub_0801D66C
 	b _0807C26C
 	.align 2, 0
-_0807C1B0: .4byte gUnk_030010A0
+_0807C1B0: .4byte gScreenTransition
 _0807C1B4: .4byte gUnk_02025EB4
 _0807C1B8: .4byte gUnk_0200B654
 _0807C1BC:
@@ -1167,7 +1167,7 @@ _0807C2E4:
 	bl sub_0807C5F4
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r4, _0807C350 @ =gUnk_02002F00
 	adds r5, r4, r6
 	adds r0, r4, #0
@@ -1179,7 +1179,7 @@ _0807C2E4:
 	bl sub_0807C5F4
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 _0807C326:
 	mov r1, sb
 	cmp r1, #0
@@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8
 	movs r4, #0x80
 	lsls r4, r4, #8
 	adds r1, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r0, _0807C59C @ =gUnk_02002F00
 	adds r1, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r5, _0807C5A0 @ =gUnk_02022830
 	ldr r0, _0807C5A4 @ =gArea
 	ldr r1, _0807C5A8 @ =0x0000085C
@@ -1455,7 +1455,7 @@ _0807C54A:
 	bl sub_0807C5F4
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r4, _0807C59C @ =gUnk_02002F00
 	adds r5, r4, r6
 	adds r0, r4, #0
@@ -1467,7 +1467,7 @@ _0807C54A:
 	bl sub_0807C5F4
 	adds r0, r5, #0
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 _0807C592:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
@@ -1694,7 +1694,7 @@ _0807C710:
 _0807C726:
 	adds r0, r4, #0
 	movs r1, #0x40
-	bl sub_0801D630
+	bl _DmaZero
 	adds r4, #0x40
 	adds r5, #1
 	cmp r5, r7
@@ -1807,7 +1807,7 @@ _0807C7C2:
 	movs r1, #1
 	strb r1, [r0]
 	ldr r0, [r4, #0x30]
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _0807C7FC:
 	ldrb r1, [r4, #0xf]
 	movs r0, #0xfb
@@ -1823,7 +1823,7 @@ sub_0807C810: @ 0x0807C810
 	push {r4, r5, r6, lr}
 	bl sub_0807BFD0
 	ldr r2, _0807C850 @ =gUnk_03004030
-	ldr r6, _0807C854 @ =gLinkEntity
+	ldr r6, _0807C854 @ =gPlayerEntity
 	ldr r4, _0807C858 @ =gRoomControls
 	ldr r3, [r2]
 	ldrh r1, [r3, #6]
@@ -1852,14 +1852,14 @@ sub_0807C810: @ 0x0807C810
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 _0807C850: .4byte gUnk_03004030
-_0807C854: .4byte gLinkEntity
+_0807C854: .4byte gPlayerEntity
 _0807C858: .4byte gRoomControls
 _0807C85C: .4byte gUnk_02000070
 
 	thumb_func_start sub_0807C860
 sub_0807C860: @ 0x0807C860
 	push {r4, lr}
-	ldr r0, _0807C88C @ =gUnk_030010A0
+	ldr r0, _0807C88C @ =gScreenTransition
 	adds r0, #0x2d
 	movs r1, #1
 	strb r1, [r0]
@@ -1879,14 +1879,14 @@ sub_0807C860: @ 0x0807C860
 	bl sub_0801D66C
 	pop {r4, pc}
 	.align 2, 0
-_0807C88C: .4byte gUnk_030010A0
+_0807C88C: .4byte gScreenTransition
 _0807C890: .4byte gUnk_02025EB4
 _0807C894: .4byte gUnk_0200B654
 
 	thumb_func_start sub_0807C898
 sub_0807C898: @ 0x0807C898
 	push {r4, r5, lr}
-	ldr r4, _0807C8AC @ =gUnk_030010A0
+	ldr r4, _0807C8AC @ =gScreenTransition
 	adds r4, #0x2d
 	movs r5, #0
 	movs r0, #2
@@ -1895,7 +1895,7 @@ sub_0807C898: @ 0x0807C898
 	strb r5, [r4]
 	pop {r4, r5, pc}
 	.align 2, 0
-_0807C8AC: .4byte gUnk_030010A0
+_0807C8AC: .4byte gScreenTransition
 
 	thumb_func_start sub_0807C8B0
 sub_0807C8B0: @ 0x0807C8B0
@@ -1984,7 +1984,7 @@ _0807C92E:
 _0807C946:
 	adds r0, r4, #0
 	movs r1, #0x80
-	bl sub_0801D630
+	bl _DmaZero
 	adds r4, #0x80
 	adds r5, #1
 	cmp r5, r6
@@ -1994,35 +1994,4 @@ _0807C956:
 	mov r8, r3
 	mov sb, r4
 	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0807C960
-sub_0807C960: @ 0x0807C960
-	push {lr}
-	adds r2, r0, #0
-	movs r0, #1
-	rsbs r0, r0, #0
-	cmp r1, r0
-	beq _0807C994
-	ldr r0, _0807C984 @ =0x7FFFFFFF
-	ands r0, r1
-	ldr r1, _0807C988 @ =gUnk_08324AE4
-	adds r1, r0, r1
-	lsrs r0, r2, #0x18
-	cmp r0, #6
-	bne _0807C98C
-	adds r0, r1, #0
-	adds r1, r2, #0
-	bl LZ77UnCompVram
-	b _0807C994
-	.align 2, 0
-_0807C984: .4byte 0x7FFFFFFF
-_0807C988: .4byte gUnk_08324AE4
-_0807C98C:
-	adds r0, r1, #0
-	adds r1, r2, #0
-	bl LZ77UnCompWram
-_0807C994:
-	pop {pc}
-	.align 2, 0
-	
+	.align 2, 0

asm/code_080A29BC.s

@@ -4,125 +4,6 @@
 	.syntax unified
 
 	.text
-	
-	thumb_func_start sub_080A29BC
-sub_080A29BC: @ 0x080A29BC
-	push {lr}
-	movs r1, #2
-	movs r2, #0
-	bl CreateFx
-	pop {pc}
-
-	thumb_func_start sub_080A29C8
-sub_080A29C8: @ 0x080A29C8
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r5, r1, #0
-	adds r6, r2, #0
-	movs r0, #0xf
-	movs r1, #2
-	movs r2, #0
-	bl CreateObject
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _080A29F4
-	ldr r1, _080A29F8 @ =gRoomControls
-	ldrh r0, [r1, #6]
-	adds r0, r0, r4
-	strh r0, [r2, #0x2e]
-	ldrh r0, [r1, #8]
-	adds r0, r0, r5
-	strh r0, [r2, #0x32]
-	adds r0, r2, #0
-	adds r0, #0x38
-	strb r6, [r0]
-_080A29F4:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A29F8: .4byte gRoomControls
-
-	thumb_func_start sub_080A29FC
-sub_080A29FC: @ 0x080A29FC
-	push {lr}
-	movs r1, #0x11
-	movs r2, #0
-	bl CreateFx
-	pop {pc}
-
-	thumb_func_start sub_080A2A08
-sub_080A2A08: @ 0x080A2A08
-	push {lr}
-	movs r1, #6
-	movs r2, #0
-	bl CreateFx
-	pop {pc}
-
-	thumb_func_start sub_080A2A14
-sub_080A2A14: @ 0x080A2A14
-	push {lr}
-	movs r1, #0xb
-	movs r2, #0
-	bl CreateFx
-	pop {pc}
-
-	thumb_func_start sub_080A2A20
-sub_080A2A20: @ 0x080A2A20
-	push {r4, lr}
-	adds r4, r1, #0
-	adds r3, r2, #0
-	movs r1, #0
-	adds r2, r4, #0
-	bl CreateObjectWithParent
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _080A2A38
-	movs r0, #5
-	strb r0, [r1, #0xe]
-_080A2A38:
-	adds r0, r1, #0
-	pop {r4, pc}
-
-	thumb_func_start sub_080A2A3C
-sub_080A2A3C: @ 0x080A2A3C
-	push {r4, r5, r6, lr}
-	adds r4, r1, #0
-	adds r5, r2, #0
-	adds r6, r3, #0
-	movs r1, #0
-	adds r2, r4, #0
-	adds r3, r5, #0
-	bl CreateObjectWithParent
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _080A2A5E
-	movs r0, #5
-	strb r0, [r1, #0xe]
-	adds r0, r1, #0
-	adds r0, #0x86
-	strh r6, [r0]
-_080A2A5E:
-	adds r0, r1, #0
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080A2A64
-sub_080A2A64: @ 0x080A2A64
-	push {lr}
-	movs r1, #0x20
-	movs r2, #0
-	bl CreateFx
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _080A2A80
-	adds r3, r2, #0
-	adds r3, #0x29
-	ldrb r0, [r3]
-	movs r1, #7
-	orrs r0, r1
-	strb r0, [r3]
-_080A2A80:
-	adds r0, r2, #0
-	pop {pc}
 
 	thumb_func_start sub_080A2A84
 sub_080A2A84: @ 0x080A2A84
@@ -341,13 +222,13 @@ _080A2C0E:
 	beq _080A2CBA
 	cmp r6, #0
 	beq _080A2CBA
-	ldr r0, _080A2C38 @ =gLinkEntity
+	ldr r0, _080A2C38 @ =gPlayerEntity
 	lsls r1, r1, #8
 	movs r2, #0
 	bl sub_080044AE
 	b _080A2CBA
 	.align 2, 0
-_080A2C38: .4byte gLinkEntity
+_080A2C38: .4byte gPlayerEntity
 _080A2C3C:
 	ldrh r5, [r4, #0x2e]
 	adds r0, r4, #0
@@ -362,13 +243,13 @@ _080A2C3C:
 	beq _080A2CBA
 	cmp r6, #0
 	beq _080A2CBA
-	ldr r0, _080A2C64 @ =gLinkEntity
+	ldr r0, _080A2C64 @ =gPlayerEntity
 	lsls r1, r1, #8
 	movs r2, #8
 	bl sub_080044AE
 	b _080A2CBA
 	.align 2, 0
-_080A2C64: .4byte gLinkEntity
+_080A2C64: .4byte gPlayerEntity
 _080A2C68:
 	ldrh r5, [r4, #0x32]
 	adds r0, r4, #0
@@ -383,13 +264,13 @@ _080A2C68:
 	beq _080A2CBA
 	cmp r6, #0
 	beq _080A2CBA
-	ldr r0, _080A2C90 @ =gLinkEntity
+	ldr r0, _080A2C90 @ =gPlayerEntity
 	lsls r1, r1, #8
 	movs r2, #0x10
 	bl sub_080044AE
 	b _080A2CBA
 	.align 2, 0
-_080A2C90: .4byte gLinkEntity
+_080A2C90: .4byte gPlayerEntity
 _080A2C94:
 	ldrh r5, [r4, #0x2e]
 	adds r0, r4, #0
@@ -404,14 +285,14 @@ _080A2C94:
 	beq _080A2CBA
 	cmp r6, #0
 	beq _080A2CBA
-	ldr r0, _080A2CBC @ =gLinkEntity
+	ldr r0, _080A2CBC @ =gPlayerEntity
 	lsls r1, r1, #8
 	movs r2, #0x18
 	bl sub_080044AE
 _080A2CBA:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_080A2CBC: .4byte gLinkEntity
+_080A2CBC: .4byte gPlayerEntity
 
 	thumb_func_start sub_080A2CC0
 sub_080A2CC0: @ 0x080A2CC0
@@ -541,7 +422,7 @@ _080A2D94: .4byte gUnk_081271D4
 sub_080A2D98: @ 0x080A2D98
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _080A2DD0 @ =gLinkState
+	ldr r0, _080A2DD0 @ =gPlayerState
 	str r4, [r0, #0x2c]
 	movs r2, #0
 	movs r0, #1
@@ -568,12 +449,12 @@ sub_080A2D98: @ 0x080A2D98
 	str r1, [r4, #0x7c]
 	b _080A2DDA
 	.align 2, 0
-_080A2DD0: .4byte gLinkState
+_080A2DD0: .4byte gPlayerState
 _080A2DD4: .4byte gUnk_081271DC
 _080A2DD8:
 	str r2, [r4, #0x70]
 _080A2DDA:
-	ldr r0, _080A2DFC @ =gLinkEntity
+	ldr r0, _080A2DFC @ =gPlayerEntity
 	ldrb r1, [r0, #0x14]
 	movs r0, #0xe
 	ands r0, r1
@@ -588,13 +469,13 @@ _080A2DDA:
 	bl sub_080A2E00
 	pop {r4, pc}
 	.align 2, 0
-_080A2DFC: .4byte gLinkEntity
+_080A2DFC: .4byte gPlayerEntity
 
 	thumb_func_start sub_080A2E00
 sub_080A2E00: @ 0x080A2E00
 	push {r4, r5, r6, r7, lr}
 	adds r4, r0, #0
-	ldr r0, _080A2E90 @ =gLinkEntity
+	ldr r0, _080A2E90 @ =gPlayerEntity
 	mov ip, r0
 	mov r1, ip
 	adds r1, #0x3d
@@ -626,7 +507,7 @@ _080A2E1A:
 	strb r2, [r3]
 	strb r2, [r5]
 _080A2E40:
-	ldr r0, _080A2E94 @ =gLinkState
+	ldr r0, _080A2E94 @ =gPlayerState
 	ldrb r3, [r0, #3]
 	adds r7, r0, #0
 	cmp r3, #0
@@ -646,7 +527,7 @@ _080A2E40:
 	adds r0, r0, r1
 	ldr r0, [r0]
 	str r0, [r4, #0x48]
-	ldr r0, _080A2E90 @ =gLinkEntity
+	ldr r0, _080A2E90 @ =gPlayerEntity
 	adds r0, #0x3c
 	ldrb r0, [r0]
 	adds r0, #1
@@ -666,8 +547,8 @@ _080A2E40:
 	bl sub_080176E4
 	b _080A2F30
 	.align 2, 0
-_080A2E90: .4byte gLinkEntity
-_080A2E94: .4byte gLinkState
+_080A2E90: .4byte gPlayerEntity
+_080A2E94: .4byte gPlayerState
 _080A2E98: .4byte gUnk_08127240
 _080A2E9C:
 	adds r0, r4, #0
@@ -697,7 +578,7 @@ _080A2E9C:
 	movs r0, #0x15
 	movs r1, #0
 	movs r2, #0
-	bl sub_08077CB8
+	bl CreatePlayerItem
 	adds r1, r0, #0
 	str r1, [r4, #0x54]
 	cmp r1, #0
@@ -745,7 +626,7 @@ _080A2F20:
 _080A2F2C:
 	bl DeleteThisEntity
 _080A2F30:
-	ldr r6, _080A301C @ =gLinkEntity
+	ldr r6, _080A301C @ =gPlayerEntity
 	ldrh r0, [r6, #0x12]
 	cmp r0, #1
 	beq _080A2F3E
@@ -808,7 +689,7 @@ _080A2FA2:
 	ldrb r0, [r5]
 	cmp r0, #0xe
 	bne _080A303E
-	ldr r0, _080A301C @ =gLinkEntity
+	ldr r0, _080A301C @ =gPlayerEntity
 	adds r0, #0x5a
 	ldrb r1, [r0]
 	movs r0, #0x7f
@@ -827,7 +708,7 @@ _080A2FA2:
 	ldr r1, [r4, #0x7c]
 	adds r2, r1, r0
 	ldrb r0, [r2]
-	ldr r7, _080A3020 @ =gLinkState
+	ldr r7, _080A3020 @ =gPlayerState
 	cmp r0, #0xff
 	bne _080A2FEC
 	ldrb r1, [r7, #3]
@@ -854,7 +735,7 @@ _080A2FEC:
 	ands r0, r1
 	cmp r0, #0
 	beq _080A3028
-	ldr r0, _080A301C @ =gLinkEntity
+	ldr r0, _080A301C @ =gPlayerEntity
 	adds r0, #0x5a
 	ldrb r0, [r0]
 	movs r1, #0x7f
@@ -867,11 +748,11 @@ _080A2FEC:
 	bl sub_080042D0
 	b _080A303E
 	.align 2, 0
-_080A301C: .4byte gLinkEntity
-_080A3020: .4byte gLinkState
+_080A301C: .4byte gPlayerEntity
+_080A3020: .4byte gPlayerState
 _080A3024: .4byte gUnk_081271DC
 _080A3028:
-	ldr r0, _080A3060 @ =gLinkEntity
+	ldr r0, _080A3060 @ =gPlayerEntity
 	adds r0, #0x5a
 	ldrb r0, [r0]
 	movs r1, #0x7f
@@ -882,7 +763,7 @@ _080A3028:
 	adds r0, r4, #0
 	bl sub_080042D0
 _080A303E:
-	ldr r1, _080A3060 @ =gLinkEntity
+	ldr r1, _080A3060 @ =gPlayerEntity
 	adds r0, r1, #0
 	adds r0, #0x5a
 	ldrb r0, [r0]
@@ -898,7 +779,7 @@ _080A303E:
 	bl sub_08078E84
 	b _080A3068
 	.align 2, 0
-_080A3060: .4byte gLinkEntity
+_080A3060: .4byte gPlayerEntity
 _080A3064:
 	movs r0, #0xff
 	strb r0, [r4, #0x1e]
@@ -938,7 +819,7 @@ sub_080A3084: @ 0x080A3084
 	ldrb r0, [r4, #0xa]
 	cmp r0, #0
 	bne _080A30F8
-	ldr r0, _080A30EC @ =gLinkEntity
+	ldr r0, _080A30EC @ =gPlayerEntity
 	adds r0, #0x3c
 	ldrb r0, [r0]
 	adds r0, #1
@@ -970,7 +851,7 @@ _080A30CC:
 	bl PlaySFX
 	b _080A30FC
 	.align 2, 0
-_080A30EC: .4byte gLinkEntity
+_080A30EC: .4byte gPlayerEntity
 _080A30F0: .4byte gUnk_08127278
 _080A30F4: .4byte 0x0000013F
 _080A30F8:
@@ -1039,7 +920,7 @@ _080A315C:
 	ands r1, r3
 	lsls r1, r1, #6
 	orrs r0, r1
-	ldr r1, _080A31F4 @ =gLinkEntity
+	ldr r1, _080A31F4 @ =gPlayerEntity
 	adds r1, #0x38
 	ldrb r1, [r1]
 	movs r2, #0x80
@@ -1085,7 +966,7 @@ _080A31D6:
 	movs r0, #0x15
 	movs r1, #1
 	movs r2, #0
-	bl sub_08077CB8
+	bl CreatePlayerItem
 	str r0, [r4, #0x54]
 	cmp r0, #0
 	beq _080A3200
@@ -1093,7 +974,7 @@ _080A31D6:
 	b _080A3200
 	.align 2, 0
 _080A31F0: .4byte gRoomControls
-_080A31F4: .4byte gLinkEntity
+_080A31F4: .4byte gPlayerEntity
 _080A31F8: .4byte gUnk_08003E44
 _080A31FC:
 	bl DeleteThisEntity
@@ -1114,7 +995,7 @@ sub_080A3210: @ 0x080A3210
 	ldr r4, _080A3230 @ =gUnk_02021EE0
 	adds r0, r4, #0
 	movs r1, #0x18
-	bl sub_0801D630
+	bl _DmaZero
 	bl sub_080A35C8
 	movs r0, #0x80
 	lsls r0, r0, #1

asm/code_080A3480.s

@@ -201,10 +201,10 @@ sub_080A35C8: @ 0x080A35C8
 	.align 2, 0
 _080A35DC: .4byte gUnk_02021EE0
 
-	thumb_func_start sub_080A35E0
-sub_080A35E0: @ 0x080A35E0
+	thumb_func_start HandleCreditsScreen
+HandleCreditsScreen: @ 0x080A35E0
 	push {lr}
-	ldr r1, _080A35FC @ =gUnk_030010A0
+	ldr r1, _080A35FC @ =gScreenTransition
 	ldr r0, [r1]
 	adds r0, #1
 	str r0, [r1]
@@ -217,7 +217,7 @@ sub_080A35E0: @ 0x080A35E0
 	bl _call_via_r0
 	pop {pc}
 	.align 2, 0
-_080A35FC: .4byte gUnk_030010A0
+_080A35FC: .4byte gScreenTransition
 _080A3600: .4byte gUnk_08127D00
 _080A3604: .4byte gUnk_03001000
 
@@ -232,7 +232,7 @@ sub_080A3608: @ 0x080A3608
 	bl SetGlobalFlag
 	ldr r0, _080A3644 @ =gUnk_03001000
 	strb r4, [r0, #3]
-	ldr r2, _080A3648 @ =gUnk_02000080
+	ldr r2, _080A3648 @ =gMenu
 	strb r5, [r2, #5]
 	movs r1, #0
 	movs r0, #0xb4
@@ -252,7 +252,7 @@ sub_080A3608: @ 0x080A3608
 	.align 2, 0
 _080A3640: .4byte gUnk_02002A40
 _080A3644: .4byte gUnk_03001000
-_080A3648: .4byte gUnk_02000080
+_080A3648: .4byte gMenu
 _080A364C: .4byte gUnk_08127998
 _080A3650:
 	cmp r0, #1
@@ -268,9 +268,9 @@ _080A365E:
 	movs r0, #0
 	bl sub_0801DA90
 	movs r0, #0xb
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 	movs r0, #0xc
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 	movs r0, #0
 	movs r1, #0
 	bl sub_0801D79C
@@ -307,7 +307,7 @@ _080A36BC: .4byte 0x00001E4D
 sub_080A36C0: @ 0x080A36C0
 	push {lr}
 	ldr r1, _080A36D4 @ =gUnk_08127D10
-	ldr r0, _080A36D8 @ =gUnk_02000080
+	ldr r0, _080A36D8 @ =gMenu
 	ldrb r0, [r0, #5]
 	lsls r0, r0, #2
 	adds r0, r0, r1
@@ -316,12 +316,12 @@ sub_080A36C0: @ 0x080A36C0
 	pop {pc}
 	.align 2, 0
 _080A36D4: .4byte gUnk_08127D10
-_080A36D8: .4byte gUnk_02000080
+_080A36D8: .4byte gMenu
 
 	thumb_func_start sub_080A36DC
 sub_080A36DC: @ 0x080A36DC
 	push {lr}
-	ldr r1, _080A36F4 @ =gUnk_02000080
+	ldr r1, _080A36F4 @ =gMenu
 	ldrh r0, [r1, #8]
 	subs r0, #1
 	strh r0, [r1, #8]
@@ -332,29 +332,29 @@ sub_080A36DC: @ 0x080A36DC
 _080A36F0:
 	pop {pc}
 	.align 2, 0
-_080A36F4: .4byte gUnk_02000080
+_080A36F4: .4byte gMenu
 
 	thumb_func_start sub_080A36F8
 sub_080A36F8: @ 0x080A36F8
 	push {r4, r5, lr}
-	ldr r0, _080A3754 @ =gUnk_03000FD0
+	ldr r0, _080A3754 @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _080A3752
-	ldr r5, _080A3758 @ =gUnk_02000080
+	ldr r5, _080A3758 @ =gMenu
 	movs r0, #0x10
 	ldrsh r4, [r5, r0]
 	lsls r4, r4, #1
 	ldr r0, _080A375C @ =gUnk_08127CEC
 	adds r4, r4, r0
 	ldrb r0, [r4]
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 	ldrb r0, [r4, #1]
-	bl sub_0801D7EC
+	bl LoadGfxGroup
 	ldr r0, _080A3760 @ =gUnk_02021F30
 	movs r1, #0x80
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r1, _080A3764 @ =gScreen
 	movs r2, #0
 	movs r0, #1
@@ -380,8 +380,8 @@ _080A374A:
 _080A3752:
 	pop {r4, r5, pc}
 	.align 2, 0
-_080A3754: .4byte gUnk_03000FD0
-_080A3758: .4byte gUnk_02000080
+_080A3754: .4byte gFadeControl
+_080A3758: .4byte gMenu
 _080A375C: .4byte gUnk_08127CEC
 _080A3760: .4byte gUnk_02021F30
 _080A3764: .4byte gScreen
@@ -389,7 +389,7 @@ _080A3764: .4byte gScreen
 	thumb_func_start sub_080A3768
 sub_080A3768: @ 0x080A3768
 	push {r4, lr}
-	ldr r4, _080A377C @ =gUnk_02000080
+	ldr r4, _080A377C @ =gMenu
 	ldrb r1, [r4, #6]
 	cmp r1, #1
 	beq _080A37C4
@@ -399,7 +399,7 @@ sub_080A3768: @ 0x080A3768
 	beq _080A378A
 	b _080A384C
 	.align 2, 0
-_080A377C: .4byte gUnk_02000080
+_080A377C: .4byte gMenu
 _080A3780:
 	cmp r1, #2
 	beq _080A3804
@@ -410,7 +410,7 @@ _080A378A:
 	ldr r0, _080A37B8 @ =gUnk_02021F30
 	movs r1, #0x80
 	lsls r1, r1, #4
-	bl sub_0801D630
+	bl _DmaZero
 	movs r1, #0x10
 	ldrsh r0, [r4, r1]
 	ldr r2, _080A37BC @ =gUnk_081272E0
@@ -433,11 +433,11 @@ _080A37B8: .4byte gUnk_02021F30
 _080A37BC: .4byte gUnk_081272E0
 _080A37C0: .4byte gScreen
 _080A37C4:
-	ldr r0, _080A37F8 @ =gUnk_03000FD0
+	ldr r0, _080A37F8 @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _080A385E
-	ldr r0, _080A37FC @ =gUnk_030010A0
+	ldr r0, _080A37FC @ =gScreenTransition
 	ldr r0, [r0]
 	ands r0, r1
 	cmp r0, #0
@@ -460,8 +460,8 @@ _080A37C4:
 	bls _080A385E
 	b _080A383C
 	.align 2, 0
-_080A37F8: .4byte gUnk_03000FD0
-_080A37FC: .4byte gUnk_030010A0
+_080A37F8: .4byte gFadeControl
+_080A37FC: .4byte gScreenTransition
 _080A3800: .4byte gScreen
 _080A3804:
 	ldrh r0, [r4, #8]
@@ -472,7 +472,7 @@ _080A3804:
 	bne _080A385E
 	b _080A383C
 _080A3812:
-	ldr r0, _080A3844 @ =gUnk_030010A0
+	ldr r0, _080A3844 @ =gScreenTransition
 	ldr r0, [r0]
 	movs r1, #1
 	ands r0, r1
@@ -499,10 +499,10 @@ _080A383C:
 	strb r0, [r4, #6]
 	b _080A385E
 	.align 2, 0
-_080A3844: .4byte gUnk_030010A0
+_080A3844: .4byte gScreenTransition
 _080A3848: .4byte gScreen
 _080A384C:
-	ldr r1, _080A3860 @ =gUnk_03000FD0
+	ldr r1, _080A3860 @ =gFadeControl
 	ldrb r0, [r1]
 	cmp r0, #0
 	bne _080A385E
@@ -513,12 +513,12 @@ _080A384C:
 _080A385E:
 	pop {r4, pc}
 	.align 2, 0
-_080A3860: .4byte gUnk_03000FD0
+_080A3860: .4byte gFadeControl
 
 	thumb_func_start sub_080A3864
 sub_080A3864: @ 0x080A3864
 	push {lr}
-	ldr r1, _080A3884 @ =gUnk_02000080
+	ldr r1, _080A3884 @ =gMenu
 	ldrh r0, [r1, #8]
 	subs r0, #1
 	strh r0, [r1, #8]
@@ -532,26 +532,26 @@ sub_080A3864: @ 0x080A3864
 _080A3880:
 	pop {pc}
 	.align 2, 0
-_080A3884: .4byte gUnk_02000080
+_080A3884: .4byte gMenu
 
 	thumb_func_start sub_080A3888
 sub_080A3888: @ 0x080A3888
 	push {lr}
-	ldr r1, _080A38A8 @ =gUnk_03000FD0
+	ldr r1, _080A38A8 @ =gFadeControl
 	ldr r0, _080A38AC @ =0xFFFF7FFF
 	str r0, [r1, #4]
 	movs r0, #5
 	movs r1, #4
 	bl DoFade
-	ldr r0, _080A38B0 @ =gUnk_02000080
+	ldr r0, _080A38B0 @ =gMenu
 	ldrh r0, [r0, #8]
 	bl sub_08050038
 	bl sub_080A3954
 	pop {pc}
 	.align 2, 0
-_080A38A8: .4byte gUnk_03000FD0
+_080A38A8: .4byte gFadeControl
 _080A38AC: .4byte 0xFFFF7FFF
-_080A38B0: .4byte gUnk_02000080
+_080A38B0: .4byte gMenu
 
 	thumb_func_start sub_080A38B4
 sub_080A38B4: @ 0x080A38B4
@@ -559,20 +559,20 @@ sub_080A38B4: @ 0x080A38B4
 	movs r0, #4
 	movs r1, #4
 	bl DoFade
-	ldr r0, _080A38CC @ =gUnk_02000080
+	ldr r0, _080A38CC @ =gMenu
 	ldrh r0, [r0, #8]
 	bl sub_08050038
 	bl sub_080A3954
 	pop {pc}
 	.align 2, 0
-_080A38CC: .4byte gUnk_02000080
+_080A38CC: .4byte gMenu
 
 	thumb_func_start sub_080A38D0
 sub_080A38D0: @ 0x080A38D0
 	push {r4, r5, r6, lr}
 	mov r6, r8
 	push {r6}
-	ldr r0, _080A391C @ =gUnk_03000FD0
+	ldr r0, _080A391C @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _080A3914
@@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0
 	movs r6, #0x80
 	lsls r6, r6, #4
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 	ldr r4, _080A3924 @ =gScreen
 	movs r0, #0
 	mov r8, r0
@@ -588,13 +588,13 @@ sub_080A38D0: @ 0x080A38D0
 	strh r5, [r4, #0x1a]
 	ldr r0, _080A3928 @ =gUnk_020344B0
 	adds r1, r6, #0
-	bl sub_0801D630
+	bl _DmaZero
 	strh r5, [r4, #0x26]
 	adds r4, #0x68
 	movs r0, #0x80
 	lsls r0, r0, #5
 	strh r0, [r4]
-	ldr r0, _080A392C @ =gUnk_02000080
+	ldr r0, _080A392C @ =gMenu
 	mov r1, r8
 	strb r1, [r0, #5]
 	movs r0, #4
@@ -605,16 +605,16 @@ _080A3914:
 	mov r8, r3
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_080A391C: .4byte gUnk_03000FD0
+_080A391C: .4byte gFadeControl
 _080A3920: .4byte gUnk_02021F30
 _080A3924: .4byte gScreen
 _080A3928: .4byte gUnk_020344B0
-_080A392C: .4byte gUnk_02000080
+_080A392C: .4byte gMenu
 
 	thumb_func_start sub_080A3930
 sub_080A3930: @ 0x080A3930
 	push {lr}
-	ldr r0, _080A394C @ =gUnk_03000FD0
+	ldr r0, _080A394C @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _080A3948
@@ -627,12 +627,12 @@ sub_080A3930: @ 0x080A3930
 _080A3948:
 	pop {pc}
 	.align 2, 0
-_080A394C: .4byte gUnk_03000FD0
+_080A394C: .4byte gFadeControl
 _080A3950: .4byte gUnk_03001000
 
 	thumb_func_start sub_080A3954
 sub_080A3954: @ 0x080A3954
-	ldr r2, _080A397C @ =gUnk_02000080
+	ldr r2, _080A397C @ =gMenu
 	ldr r1, [r2, #0xc]
 	ldrb r0, [r1]
 	movs r3, #0
@@ -652,25 +652,25 @@ sub_080A3954: @ 0x080A3954
 	str r1, [r2, #0xc]
 	bx lr
 	.align 2, 0
-_080A397C: .4byte gUnk_02000080
+_080A397C: .4byte gMenu
 
 	thumb_func_start sub_080A3980
 sub_080A3980: @ 0x080A3980
 	push {lr}
-	ldr r0, _080A3990 @ =gUnk_03000FD0
+	ldr r0, _080A3990 @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _080A398E
-	bl sub_080560A8
+	bl DoSoftReset
 _080A398E:
 	pop {pc}
 	.align 2, 0
-_080A3990: .4byte gUnk_03000FD0
+_080A3990: .4byte gFadeControl
 
 	thumb_func_start sub_080A3994
 sub_080A3994: @ 0x080A3994
 	push {r4, r5, lr}
-	ldr r0, _080A39AC @ =gUnk_02000080
+	ldr r0, _080A39AC @ =gMenu
 	ldrb r1, [r0, #6]
 	adds r2, r0, #0
 	cmp r1, #4
@@ -683,7 +683,7 @@ _080A39A2:
 	ldr r0, [r0]
 	mov pc, r0
 	.align 2, 0
-_080A39AC: .4byte gUnk_02000080
+_080A39AC: .4byte gMenu
 _080A39B0: .4byte _080A39B4
 _080A39B4: @ jump table
 	.4byte _080A39C8 @ case 0
@@ -703,16 +703,16 @@ _080A39C8:
 	bl sub_080A3210
 	bl sub_080A4D34
 	movs r0, #0xa
-	bl LoadPalettesByPaletteGroupIndex
+	bl LoadPaletteGroup
 	movs r0, #0
 	movs r1, #0
 	bl sub_0801D79C
 	movs r0, #4
-	bl sub_0801D7EC
+	bl LoadGfxGroup
 	movs r0, #0xc0
 	lsls r0, r0, #0x13
 	movs r1, #0x20
-	bl sub_0801D630
+	bl _DmaZero
 	movs r0, #0
 	movs r1, #0
 	bl sub_08052418
@@ -737,7 +737,7 @@ _080A3A2C: .4byte gScreen
 _080A3A30: .4byte 0x00001C01
 _080A3A34: .4byte 0x00001D05
 _080A3A38:
-	ldr r0, _080A3A50 @ =gUnk_03000FD0
+	ldr r0, _080A3A50 @ =gFadeControl
 	ldrb r0, [r0]
 	cmp r0, #0
 	beq _080A3A42
@@ -750,7 +750,7 @@ _080A3A42:
 	strh r0, [r2, #8]
 	b _080A3B36
 	.align 2, 0
-_080A3A50: .4byte gUnk_03000FD0
+_080A3A50: .4byte gFadeControl
 _080A3A54:
 	ldrb r4, [r2, #3]
 	ldr r0, _080A3A68 @ =gUnk_03000FF0
@@ -785,14 +785,14 @@ _080A3A82:
 	bl sub_08050318
 	movs r0, #2
 _080A3A8C:
-	ldr r1, _080A3AB4 @ =gUnk_02000080
+	ldr r1, _080A3AB4 @ =gMenu
 	strb r0, [r1, #6]
 	movs r0, #0x3c
 	strh r0, [r1, #8]
 	movs r0, #0x6a
 	bl PlaySFX
 _080A3A9A:
-	ldr r1, _080A3AB4 @ =gUnk_02000080
+	ldr r1, _080A3AB4 @ =gMenu
 	ldrb r0, [r1, #3]
 	cmp r0, r4
 	beq _080A3B36
@@ -804,12 +804,12 @@ _080A3A9A:
 	bl PlaySFX
 	b _080A3B36
 	.align 2, 0
-_080A3AB4: .4byte gUnk_02000080
+_080A3AB4: .4byte gMenu
 _080A3AB8:
 	movs r0, #0
 	bl sub_0807CDA4
 	adds r1, r0, #0
-	ldr r4, _080A3AD8 @ =gUnk_02000080
+	ldr r4, _080A3AD8 @ =gMenu
 	strb r1, [r4]
 	movs r0, #1
 	rsbs r0, r0, #0
@@ -821,7 +821,7 @@ _080A3AB8:
 	strb r0, [r4, #6]
 	b _080A3B36
 	.align 2, 0
-_080A3AD8: .4byte gUnk_02000080
+_080A3AD8: .4byte gMenu
 _080A3ADC:
 	movs r0, #0x3c
 	strh r0, [r4, #8]
@@ -865,7 +865,7 @@ _080A3B14:
 	ldr r1, _080A3B40 @ =gUnk_03001000
 	movs r0, #3
 	strb r0, [r1, #3]
-	ldr r0, _080A3B44 @ =gUnk_02000080
+	ldr r0, _080A3B44 @ =gMenu
 	strb r4, [r0, #6]
 _080A3B36:
 	pop {r4, r5, pc}
@@ -873,7 +873,7 @@ _080A3B36:
 _080A3B38: .4byte gScreen
 _080A3B3C: .4byte 0x0000FDFF
 _080A3B40: .4byte gUnk_03001000
-_080A3B44: .4byte gUnk_02000080
+_080A3B44: .4byte gMenu
 
 	thumb_func_start sub_080A3B48
 sub_080A3B48: @ 0x080A3B48
@@ -902,10 +902,10 @@ _080A3B70: .4byte 0x0000012B
 
 	thumb_func_start sub_080A3B74
 sub_080A3B74: @ 0x080A3B74
-	ldr r0, _080A3B80 @ =gUnk_02000080
+	ldr r0, _080A3B80 @ =gMenu
 	adds r0, #0x2f
 	movs r1, #0
 	strb r1, [r0]
 	bx lr
 	.align 2, 0
-_080A3B80: .4byte gUnk_02000080
+_080A3B80: .4byte gMenu

asm/code_080AD90C.s

@@ -95,7 +95,7 @@ _080AD9AC: .4byte 0x00000427
 sub_080AD9B0: @ 0x080AD9B0
 	push {lr}
 	ldr r2, _080AD9F4 @ =gUnk_03000000
-	ldr r0, _080AD9F8 @ =gUnk_030010A0
+	ldr r0, _080AD9F8 @ =gScreenTransition
 	adds r0, #0x2f
 	ldrb r0, [r0]
 	movs r1, #0
@@ -129,7 +129,7 @@ _080AD9C2:
 	pop {pc}
 	.align 2, 0
 _080AD9F4: .4byte gUnk_03000000
-_080AD9F8: .4byte gUnk_030010A0
+_080AD9F8: .4byte gScreenTransition
 _080AD9FC: .4byte gRoomControls
 _080ADA00: .4byte gUnk_03006164
 
@@ -160,7 +160,7 @@ _080ADA2C: .4byte gUnk_03001010
 sub_080ADA30: @ 0x080ADA30
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r1, _080ADA60 @ =gLinkState
+	ldr r1, _080ADA60 @ =gPlayerState
 	ldr r0, [r1, #0x2c]
 	cmp r0, r4
 	bne _080ADA42
@@ -177,14 +177,14 @@ _080ADA46:
 	ldr r1, [r0]
 	adds r0, r4, #0
 	bl _call_via_r1
-	ldr r1, _080ADA68 @ =gLinkEntity
+	ldr r1, _080ADA68 @ =gPlayerEntity
 	adds r0, r4, #0
 	bl sub_08078E84
 	pop {r4, pc}
 	.align 2, 0
-_080ADA60: .4byte gLinkState
+_080ADA60: .4byte gPlayerState
 _080ADA64: .4byte gUnk_08132700
-_080ADA68: .4byte gLinkEntity
+_080ADA68: .4byte gPlayerEntity
 
 	thumb_func_start sub_080ADA6C
 sub_080ADA6C: @ 0x080ADA6C
@@ -244,7 +244,7 @@ _080ADAD2:
 sub_080ADAD4: @ 0x080ADAD4
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r3, _080ADAF4 @ =gLinkState
+	ldr r3, _080ADAF4 @ =gPlayerState
 	ldrb r1, [r3, #0x1c]
 	adds r0, r1, #0
 	cmp r0, #3
@@ -252,20 +252,20 @@ sub_080ADAD4: @ 0x080ADAD4
 	ldrb r0, [r4, #0xc]
 	adds r0, #1
 	strb r0, [r4, #0xc]
-	ldr r0, _080ADAF8 @ =gLinkEntity
+	ldr r0, _080ADAF8 @ =gPlayerEntity
 	ldrb r1, [r0, #0x14]
 	lsrs r1, r1, #1
 	adds r1, #8
 	b _080ADB0C
 	.align 2, 0
-_080ADAF4: .4byte gLinkState
-_080ADAF8: .4byte gLinkEntity
+_080ADAF4: .4byte gPlayerState
+_080ADAF8: .4byte gPlayerEntity
 _080ADAFC:
 	cmp r0, #6
 	bne _080ADB18
 	movs r0, #4
 	strb r0, [r4, #0xc]
-	ldr r0, _080ADB14 @ =gLinkEntity
+	ldr r0, _080ADB14 @ =gPlayerEntity
 	ldrb r1, [r0, #0x14]
 	lsrs r1, r1, #1
 	adds r1, #4
@@ -274,7 +274,7 @@ _080ADB0C:
 	bl InitAnimationForceUpdate
 	b _080ADC08
 	.align 2, 0
-_080ADB14: .4byte gLinkEntity
+_080ADB14: .4byte gPlayerEntity
 _080ADB18:
 	movs r5, #0
 	ldrb r0, [r4, #0xa]
@@ -366,7 +366,7 @@ _080ADBB0:
 	movs r2, #1
 	movs r5, #0xe7
 _080ADBCA:
-	ldr r0, _080ADC0C @ =gLinkState
+	ldr r0, _080ADC0C @ =gPlayerState
 	ldrb r1, [r0, #0x1c]
 	movs r0, #0xf
 	ands r0, r1
@@ -391,7 +391,7 @@ _080ADBF2:
 	movs r0, #0xf
 	strb r0, [r4, #0xf]
 _080ADBF6:
-	ldr r2, _080ADC10 @ =gLinkEntity
+	ldr r2, _080ADC10 @ =gPlayerEntity
 	adds r0, r2, #0
 	adds r0, #0x5a
 	ldrb r0, [r0]
@@ -403,14 +403,14 @@ _080ADBF6:
 _080ADC08:
 	pop {r4, r5, pc}
 	.align 2, 0
-_080ADC0C: .4byte gLinkState
-_080ADC10: .4byte gLinkEntity
+_080ADC0C: .4byte gPlayerState
+_080ADC10: .4byte gPlayerEntity
 
 	thumb_func_start sub_080ADC14
 sub_080ADC14: @ 0x080ADC14
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _080ADC40 @ =gLinkState
+	ldr r0, _080ADC40 @ =gPlayerState
 	ldrb r0, [r0, #0x1c]
 	movs r1, #0xf
 	ands r1, r0
@@ -421,7 +421,7 @@ sub_080ADC14: @ 0x080ADC14
 	ldrb r0, [r4, #0xc]
 	adds r0, #1
 	strb r0, [r4, #0xc]
-	ldr r0, _080ADC44 @ =gLinkEntity
+	ldr r0, _080ADC44 @ =gPlayerEntity
 	ldrb r1, [r0, #0x14]
 	lsrs r1, r1, #1
 	adds r1, #4
@@ -429,8 +429,8 @@ sub_080ADC14: @ 0x080ADC14
 	bl InitAnimationForceUpdate
 	b _080ADC5C
 	.align 2, 0
-_080ADC40: .4byte gLinkState
-_080ADC44: .4byte gLinkEntity
+_080ADC40: .4byte gPlayerState
+_080ADC44: .4byte gPlayerEntity
 _080ADC48:
 	adds r0, r4, #0
 	movs r1, #0
@@ -469,7 +469,7 @@ _080ADC82:
 
 	thumb_func_start sub_080ADC84
 sub_080ADC84: @ 0x080ADC84
-	ldr r1, _080ADC9C @ =gLinkEntity
+	ldr r1, _080ADC9C @ =gPlayerEntity
 	ldrb r1, [r1, #0x18]
 	movs r2, #0x40
 	ands r2, r1
@@ -481,13 +481,13 @@ sub_080ADC84: @ 0x080ADC84
 	strb r1, [r0, #0x18]
 	bx lr
 	.align 2, 0
-_080ADC9C: .4byte gLinkEntity
+_080ADC9C: .4byte gPlayerEntity
 
 	thumb_func_start sub_080ADCA0
 sub_080ADCA0: @ 0x080ADCA0
 	push {r4, lr}
 	ldr r3, _080ADCD4 @ =gUnk_08132714
-	ldr r2, _080ADCD8 @ =gLinkEntity
+	ldr r2, _080ADCD8 @ =gPlayerEntity
 	ldrb r2, [r2, #0x14]
 	lsrs r2, r2, #1
 	adds r1, r1, r2
@@ -512,7 +512,7 @@ sub_080ADCA0: @ 0x080ADCA0
 	pop {r4, pc}
 	.align 2, 0
 _080ADCD4: .4byte gUnk_08132714
-_080ADCD8: .4byte gLinkEntity
+_080ADCD8: .4byte gPlayerEntity
 
 	thumb_func_start sub_080ADCDC
 sub_080ADCDC: @ 0x080ADCDC
@@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30
 	movs r1, #0x85
 	lsls r1, r1, #2
 	adds r0, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	movs r5, #0
 	adds r4, #4
 	movs r0, #0x10
@@ -660,7 +660,7 @@ sub_080ADDD8: @ 0x080ADDD8
 	adds r3, r1, r0
 	ldr r0, _080ADE00 @ =0x00FFFFFC
 	ands r0, r2
-	ldr r1, _080ADE04 @ =gUnk_085A2E80
+	ldr r1, _080ADE04 @ =gGlobalGfxAndPalettes
 	adds r0, r0, r1
 	str r0, [r3, #8]
 	movs r0, #1
@@ -672,7 +672,7 @@ sub_080ADDD8: @ 0x080ADDD8
 	.align 2, 0
 _080ADDFC: .4byte gUnk_02024494
 _080ADE00: .4byte 0x00FFFFFC
-_080ADE04: .4byte gUnk_085A2E80
+_080ADE04: .4byte gGlobalGfxAndPalettes
 _080ADE08: .4byte 0x0000FFFF
 _080ADE0C:
 	movs r0, #0xfe
@@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494
 _080ADE58:
 	adds r0, r1, #0
 	movs r1, #0xc
-	bl sub_0801D630
+	bl _DmaZero
 _080ADE60:
 	adds r5, #0xc
 	adds r4, #1
@@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104
 	adds r1, r1, r5
 	lsls r1, r1, #2
 	adds r0, r4, #0
-	bl sub_0801D630
+	bl _DmaZero
 	strb r5, [r4, #1]
 	strh r6, [r4, #4]
 	adds r0, r4, #0
@@ -1253,7 +1253,7 @@ sub_080AE218: @ 0x080AE218
 	movs r4, #0
 	ldr r6, _080AE310 @ =gUnk_020000C0
 	mov sb, r6
-	ldr r0, _080AE314 @ =gLinkEntity
+	ldr r0, _080AE314 @ =gPlayerEntity
 	adds r2, r0, #0
 	adds r2, #0x26
 	adds r5, r0, #0
@@ -1359,7 +1359,7 @@ _080AE2F8:
 	.align 2, 0
 _080AE30C: .4byte gUnk_02024490
 _080AE310: .4byte gUnk_020000C0
-_080AE314: .4byte gLinkEntity
+_080AE314: .4byte gPlayerEntity
 _080AE318: .4byte 0xFFFFFC00
 _080AE31C: .4byte gUnk_03000000
 _080AE320: .4byte 0x000003FF
@@ -1396,7 +1396,7 @@ _080AE350:
 	stm r0!, {r2, r3, r7}
 	adds r0, r6, #0
 	movs r1, #0xc
-	bl sub_0801D630
+	bl _DmaZero
 	adds r6, #0xc
 	adds r5, #0xc
 	movs r0, #0xc

asm/createBowEntity.s

@@ -5,6 +5,19 @@
 	.syntax unified
 
 	.text
+	
+	thumb_func_start sub_08018FCC
+sub_08018FCC: @ 0x08018FCC
+	push {lr}
+	ldr r2, _08018FE0 @ =gUnk_080B3E30
+	ldrb r1, [r0, #0xc]
+	lsls r1, r1, #2
+	adds r1, r1, r2
+	ldr r1, [r1]
+	bl _call_via_r1
+	pop {pc}
+	.align 2, 0
+_08018FE0: .4byte gUnk_080B3E30
 
 	thumb_func_start sub_08018FE4
 sub_08018FE4: @ 0x08018FE4
@@ -50,7 +63,7 @@ _0801902A:
 	ldrb r0, [r4, #0x14]
 	lsls r0, r0, #2
 	strb r0, [r4, #0x15]
-	ldr r2, _0801905C @ =gLinkEntity
+	ldr r2, _0801905C @ =gPlayerEntity
 	adds r0, r2, #0
 	adds r0, #0x3c
 	ldrb r0, [r0]
@@ -72,7 +85,7 @@ _0801902A:
 	movs r0, #1
 	b _08019062
 	.align 2, 0
-_0801905C: .4byte gLinkEntity
+_0801905C: .4byte gPlayerEntity
 _08019060:
 	movs r0, #0
 _08019062:
@@ -177,7 +190,7 @@ _080190FC:
 	ands r0, r2
 	orrs r0, r1
 	strb r0, [r4, #0x18]
-	ldr r0, _0801916C @ =gLinkState
+	ldr r0, _0801916C @ =gPlayerState
 	str r4, [r0, #0x2c]
 	adds r0, r4, #0
 	movs r1, #1
@@ -204,7 +217,7 @@ _080190FC:
 	b _08019172
 	.align 2, 0
 _08019168: .4byte gUnk_080B3E40
-_0801916C: .4byte gLinkState
+_0801916C: .4byte gPlayerState
 _08019170:
 	str r5, [r4, #0x78]
 _08019172:

asm/crenalBeanSprout.s

@@ -60,7 +60,7 @@ _08096368:
 	bl CheckGlobalFlag
 	cmp r0, #0
 	bne _080963A4
-	ldr r0, _0809639C @ =gLinkEntity
+	ldr r0, _0809639C @ =gPlayerEntity
 	movs r3, #0x80
 	lsls r3, r3, #9
 	adds r1, r5, #0
@@ -74,7 +74,7 @@ _08096368:
 	bl SetTile
 	b _0809650A
 	.align 2, 0
-_0809639C: .4byte gLinkEntity
+_0809639C: .4byte gPlayerEntity
 _080963A0: .4byte 0x00004022
 _080963A4:
 	ldrb r0, [r5, #0xb]
@@ -127,7 +127,7 @@ _080963FC:
 	bl CheckGlobalFlag
 	cmp r0, #0
 	bne _0809644C
-	ldr r0, _08096444 @ =gLinkEntity
+	ldr r0, _08096444 @ =gPlayerEntity
 	adds r1, r0, #0
 	adds r1, #0x29
 	ldrb r2, [r1]
@@ -153,7 +153,7 @@ _080963FC:
 	bl PositionRelative
 	b _08096450
 	.align 2, 0
-_08096444: .4byte gLinkEntity
+_08096444: .4byte gPlayerEntity
 _08096448: .4byte 0xFFE80000
 _0809644C:
 	bl DeleteThisEntity
@@ -289,7 +289,7 @@ _0809653C:
 _0809655C: .4byte 0xFFE40000
 _08096560: .4byte 0xFFD80000
 _08096564:
-	ldr r0, _0809657C @ =gLinkState
+	ldr r0, _0809657C @ =gPlayerState
 	ldrb r1, [r0, #0xd]
 	movs r0, #0x80
 	ands r0, r1
@@ -301,7 +301,7 @@ _08096570:
 	bl InitializeAnimation
 	b _08096586
 	.align 2, 0
-_0809657C: .4byte gLinkState
+_0809657C: .4byte gPlayerState
 _08096580:
 	adds r0, r6, #0
 	bl GetNextFrame
@@ -347,7 +347,7 @@ _080965C8:
 	bl sub_0805EC9C
 	b _080966F6
 _080965D6:
-	ldr r1, _080965FC @ =gLinkState
+	ldr r1, _080965FC @ =gPlayerState
 	ldrb r2, [r1, #0x1a]
 	movs r0, #0x80
 	orrs r0, r2
@@ -366,12 +366,12 @@ _080965D6:
 	bl InitializeAnimation
 	b _08096606
 	.align 2, 0
-_080965FC: .4byte gLinkState
+_080965FC: .4byte gPlayerState
 _08096600:
 	adds r0, r6, #0
 	bl GetNextFrame
 _08096606:
-	ldr r0, _08096664 @ =gLinkEntity
+	ldr r0, _08096664 @ =gPlayerEntity
 	ldrb r0, [r0, #0x14]
 	movs r1, #6
 	ands r1, r0
@@ -417,7 +417,7 @@ _08096606:
 	strb r1, [r0]
 	b _08096676
 	.align 2, 0
-_08096664: .4byte gLinkEntity
+_08096664: .4byte gPlayerEntity
 _08096668: .4byte gUnk_08123184
 _0809666C: .4byte gUnk_0200AF00
 _08096670:
@@ -425,7 +425,7 @@ _08096670:
 	adds r0, #0x2f
 	strb r7, [r0]
 _08096676:
-	ldr r0, _080966FC @ =gLinkEntity
+	ldr r0, _080966FC @ =gPlayerEntity
 	movs r3, #0x80
 	lsls r3, r3, #9
 	adds r1, r6, #0
@@ -441,7 +441,7 @@ _08096676:
 	adds r0, r6, #0
 	bl sub_08096A78
 _0809669C:
-	ldr r2, _08096700 @ =gLinkState
+	ldr r2, _08096700 @ =gPlayerState
 	adds r0, r2, #0
 	adds r0, #0x92
 	ldrh r1, [r0]
@@ -488,8 +488,8 @@ _080966F6:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _080966F8: .4byte gUnk_0200AF00
-_080966FC: .4byte gLinkEntity
-_08096700: .4byte gLinkState
+_080966FC: .4byte gPlayerEntity
+_08096700: .4byte gPlayerState
 
 	thumb_func_start sub_08096704
 sub_08096704: @ 0x08096704
@@ -581,7 +581,7 @@ sub_08096780: @ 0x08096780
 	bne _080967DC
 	adds r0, r5, #0
 	bl GetNextFrame
-	ldr r2, _080967D8 @ =gLinkState
+	ldr r2, _080967D8 @ =gPlayerState
 	ldrb r0, [r2, #0xb]
 	movs r1, #0x80
 	orrs r0, r1
@@ -607,7 +607,7 @@ sub_08096780: @ 0x08096780
 	b _080967E0
 	.align 2, 0
 _080967D4: .4byte gUnk_0812319C
-_080967D8: .4byte gLinkState
+_080967D8: .4byte gPlayerState
 _080967DC:
 	movs r0, #0xc0
 	strb r0, [r5, #0xe]
@@ -807,7 +807,7 @@ sub_08096904: @ 0x08096904
 	ldrb r1, [r5, #0xf]
 	cmp r0, r1
 	bne _08096980
-	ldr r2, _0809697C @ =gLinkState
+	ldr r2, _0809697C @ =gPlayerState
 	ldrb r1, [r2, #0xb]
 	movs r0, #0x7f
 	ands r0, r1
@@ -820,7 +820,7 @@ sub_08096904: @ 0x08096904
 	.align 2, 0
 _08096974: .4byte gUnk_081231AE
 _08096978: .4byte gRoomControls
-_0809697C: .4byte gLinkState
+_0809697C: .4byte gPlayerState
 _08096980:
 	movs r0, #0xf
 _08096982:

asm/crow.s

@@ -220,7 +220,7 @@ sub_08032928: @ 0x08032928
 	adds r1, #0x7a
 	strh r0, [r1]
 	adds r0, r6, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r6, #0
 	bl sub_08032AF4
 	pop {r4, r5, r6, pc}
@@ -368,7 +368,7 @@ sub_08032A48: @ 0x08032A48
 	movs r0, #3
 	strb r0, [r1]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	adds r0, r4, #0
 	bl sub_08032AF4
 _08032AAE:

asm/cucco.s

@@ -241,7 +241,7 @@ sub_0806E65C: @ 0x0806E65C
 	ldrsb r2, [r0, r2]
 	cmp r2, #0
 	beq _0806E6A6
-	ldr r0, _0806E688 @ =gLinkState
+	ldr r0, _0806E688 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -255,7 +255,7 @@ sub_0806E65C: @ 0x0806E65C
 	bl sub_0806F118
 	b _0806E698
 	.align 2, 0
-_0806E688: .4byte gLinkState
+_0806E688: .4byte gPlayerState
 _0806E68C:
 	adds r0, r4, #0
 	bl sub_0806E6A8

asm/cuccoAggr.s

@@ -240,7 +240,7 @@ sub_08038E18: @ 0x08038E18
 	adds r0, r4, #0
 	bl sub_080AEF88
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 _08038E70:
 	ldrb r0, [r4, #0xe]
 	subs r0, #1
@@ -355,9 +355,9 @@ _08038F42:
 sub_08038F44: @ 0x08038F44
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _08038F8C @ =gLinkEntity
+	ldr r0, _08038F8C @ =gPlayerEntity
 	adds r1, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 	adds r0, r4, #0
 	bl sub_080390F8
@@ -383,7 +383,7 @@ sub_08038F44: @ 0x08038F44
 	bl sub_08039120
 	b _08038F9E
 	.align 2, 0
-_08038F8C: .4byte gLinkEntity
+_08038F8C: .4byte gPlayerEntity
 _08038F90:
 	movs r0, #0x1f
 	ands r2, r0
@@ -420,9 +420,9 @@ _08038FB8:
 	ands r0, r1
 	cmp r0, #0
 	bne _08038FE0
-	ldr r1, _08038FF8 @ =gLinkEntity
+	ldr r1, _08038FF8 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r1, r0, #0
 	adds r0, r4, #0
 	bl sub_08004596
@@ -436,7 +436,7 @@ _08038FE0:
 	b _08039018
 	.align 2, 0
 _08038FF4: .4byte 0x0000FFFF
-_08038FF8: .4byte gLinkEntity
+_08038FF8: .4byte gPlayerEntity
 _08038FFC:
 	adds r0, r4, #0
 	bl sub_0806F69C
@@ -612,9 +612,9 @@ sub_08039140: @ 0x08039140
 	strb r0, [r4, #0xc]
 	bl Random
 	strb r0, [r4, #0xe]
-	ldr r1, _08039174 @ =gLinkEntity
+	ldr r1, _08039174 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 	ldr r0, _08039178 @ =0x0000FFFC
 	strh r0, [r4, #0x36]
@@ -629,7 +629,7 @@ sub_08039140: @ 0x08039140
 	bl InitializeAnimation
 	pop {r4, pc}
 	.align 2, 0
-_08039174: .4byte gLinkEntity
+_08039174: .4byte gPlayerEntity
 _08039178: .4byte 0x0000FFFC
 
 	thumb_func_start sub_0803917C

asm/cuccoChick.s

@@ -170,7 +170,7 @@ sub_0806E838: @ 0x0806E838
 	ldrsb r2, [r0, r2]
 	cmp r2, #0
 	beq _0806E882
-	ldr r0, _0806E864 @ =gLinkState
+	ldr r0, _0806E864 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -184,7 +184,7 @@ sub_0806E838: @ 0x0806E838
 	bl sub_0806F118
 	b _0806E874
 	.align 2, 0
-_0806E864: .4byte gLinkState
+_0806E864: .4byte gPlayerState
 _0806E868:
 	adds r0, r4, #0
 	bl sub_0806E884

asm/cuccoChickAggr.s

@@ -297,14 +297,14 @@ sub_08022B20: @ 0x08022B20
 	bl sub_08049DF4
 	cmp r0, #0
 	beq _08022B40
-	ldr r1, _08022B3C @ =gLinkEntity
+	ldr r1, _08022B3C @ =gPlayerEntity
 	adds r0, r4, #0
 	movs r2, #0x24
 	movs r3, #0x24
 	bl sub_080041A0
 	b _08022B42
 	.align 2, 0
-_08022B3C: .4byte gLinkEntity
+_08022B3C: .4byte gPlayerEntity
 _08022B40:
 	movs r0, #0
 _08022B42:
@@ -317,9 +317,9 @@ sub_08022B44: @ 0x08022B44
 	movs r0, #0xc0
 	lsls r0, r0, #8
 	str r0, [r4, #0x20]
-	ldr r1, _08022B84 @ =gLinkEntity
+	ldr r1, _08022B84 @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r1, r0, #0
 	strb r1, [r4, #0x15]
 	movs r0, #0xf
@@ -343,4 +343,4 @@ _08022B7A:
 	bl sub_08004488
 	pop {r4, pc}
 	.align 2, 0
-_08022B84: .4byte gLinkEntity
+_08022B84: .4byte gPlayerEntity

asm/darkNut.s

@@ -433,7 +433,7 @@ sub_08020E98: @ 0x08020E98
 	bne _08020ECA
 	ldr r0, [r5]
 	adds r1, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 	adds r0, r4, #0
 	bl sub_080AEF88
@@ -471,7 +471,7 @@ _08020EF6:
 _08020F08: .4byte gUnk_020000B0
 _08020F0C:
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r4, #0x15]
 	adds r0, r4, #0
 	bl sub_080AEF88
@@ -1177,7 +1177,7 @@ sub_08021424: @ 0x08021424
 	ldr r0, _08021450 @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r5, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r1, r0, #0
 	ldrb r0, [r5, #0x14]
 	bl sub_08021274
@@ -1293,7 +1293,7 @@ sub_080214FC: @ 0x080214FC
 	ldr r0, _08021538 @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r2, r0, #0
 	adds r0, r4, #0
 	adds r0, #0x5a

asm/deathFx.s

@@ -42,7 +42,7 @@ sub_08081634: @ 0x08081634
 	adds r0, #0x38
 	strb r1, [r0]
 	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
+	bl UpdateSpriteForCollisionLayer
 	ldrb r0, [r4, #0x19]
 	movs r1, #3
 	orrs r0, r1

asm/din.s

@@ -52,16 +52,16 @@ _080647C2:
 	ldrb r1, [r0]
 	adds r0, #0x10
 	strb r1, [r0]
-	ldr r1, _080647FC @ =gLinkEntity
+	ldr r1, _080647FC @ =gPlayerEntity
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	bl sub_0806F5A4
 	adds r1, r0, #0
 	adds r0, r4, #0
 	bl InitAnimationForceUpdate
 	b _08064824
 	.align 2, 0
-_080647FC: .4byte gLinkEntity
+_080647FC: .4byte gPlayerEntity
 _08064800:
 	adds r0, r4, #0
 	movs r1, #0

asm/dog.s

@@ -100,7 +100,7 @@ _08069BD2:
 	ldrb r0, [r5, #0xa]
 	cmp r0, #0
 	bne _08069BF2
-	ldr r0, _08069C34 @ =gLinkState
+	ldr r0, _08069C34 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -145,7 +145,7 @@ _08069BF2:
 _08069C30:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08069C34: .4byte gLinkState
+_08069C34: .4byte gPlayerState
 _08069C38: .4byte 0x00004072
 _08069C3C: .4byte gRoomControls
 
@@ -158,7 +158,7 @@ sub_08069C40: @ 0x08069C40
 	bl sub_08069F90
 	cmp r0, #0
 	beq _08069C80
-	ldr r0, _08069C68 @ =gLinkState
+	ldr r0, _08069C68 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -168,10 +168,10 @@ sub_08069C40: @ 0x08069C40
 	bl sub_08069CB8
 	b _08069C7A
 	.align 2, 0
-_08069C68: .4byte gLinkState
+_08069C68: .4byte gPlayerState
 _08069C6C:
 	adds r0, r4, #0
-	bl sub_0806EDC4
+	bl GetAnimationState
 	strb r0, [r4, #0x14]
 	adds r0, r4, #0
 	bl sub_08069D00
@@ -211,8 +211,8 @@ _08069CB4: .4byte gUnk_08111DA8
 sub_08069CB8: @ 0x08069CB8
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r1, _08069CF8 @ =gLinkEntity
-	bl sub_080045C4
+	ldr r1, _08069CF8 @ =gPlayerEntity
+	bl GetFacingDirection
 	ldr r2, _08069CFC @ =gUnk_08111DB0
 	ldrb r1, [r4, #0x14]
 	lsls r1, r1, #5
@@ -240,7 +240,7 @@ sub_08069CB8: @ 0x08069CB8
 _08069CF6:
 	pop {r4, r5, pc}
 	.align 2, 0
-_08069CF8: .4byte gLinkEntity
+_08069CF8: .4byte gPlayerEntity
 _08069CFC: .4byte gUnk_08111DB0
 
 	thumb_func_start sub_08069D00
@@ -426,7 +426,7 @@ sub_08069E44: @ 0x08069E44
 sub_08069E50: @ 0x08069E50
 	push {r4, r5, r6, r7, lr}
 	adds r4, r0, #0
-	bl sub_0806EDC4
+	bl GetAnimationState
 	strb r0, [r4, #0x14]
 	adds r5, r4, #0
 	adds r5, #0x6b
@@ -605,7 +605,7 @@ sub_08069F90: @ 0x08069F90
 	movs r0, #1
 	b _08069FB4
 _08069FA8:
-	ldr r1, _08069FB8 @ =gLinkEntity
+	ldr r1, _08069FB8 @ =gPlayerEntity
 	adds r0, r4, #0
 	movs r2, #0x14
 	movs r3, #0x14
@@ -613,13 +613,13 @@ _08069FA8:
 _08069FB4:
 	pop {r4, pc}
 	.align 2, 0
-_08069FB8: .4byte gLinkEntity
+_08069FB8: .4byte gPlayerEntity
 
 	thumb_func_start sub_08069FBC
 sub_08069FBC: @ 0x08069FBC
 	push {lr}
 	adds r2, r0, #0
-	ldr r0, _08069FE4 @ =gLinkState
+	ldr r0, _08069FE4 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -640,13 +640,13 @@ _08069FDA:
 _08069FE0:
 	pop {pc}
 	.align 2, 0
-_08069FE4: .4byte gLinkState
+_08069FE4: .4byte gPlayerState
 
 	thumb_func_start sub_08069FE8
 sub_08069FE8: @ 0x08069FE8
 	push {r4, r5, lr}
 	adds r4, r0, #0
-	ldr r0, _0806A010 @ =gLinkState
+	ldr r0, _0806A010 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -663,7 +663,7 @@ sub_08069FE8: @ 0x08069FE8
 	bl sub_08078778
 	b _0806A020
 	.align 2, 0
-_0806A010: .4byte gLinkState
+_0806A010: .4byte gPlayerState
 _0806A014:
 	adds r0, r4, #0
 	adds r0, #0x74
@@ -685,7 +685,7 @@ sub_0806A028: @ 0x0806A028
 	ldrsb r2, [r0, r2]
 	cmp r2, #0
 	beq _0806A07E
-	ldr r0, _0806A054 @ =gLinkState
+	ldr r0, _0806A054 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -699,7 +699,7 @@ sub_0806A028: @ 0x0806A028
 	bl sub_0806F118
 	b _0806A076
 	.align 2, 0
-_0806A054: .4byte gLinkState
+_0806A054: .4byte gPlayerState
 _0806A058:
 	adds r0, r4, #0
 	bl sub_0806A080
@@ -743,7 +743,7 @@ _0806A0A0: .4byte gUnk_08111E34
 sub_0806A0A4: @ 0x0806A0A4
 	push {r4, r5, r6, lr}
 	adds r4, r0, #0
-	ldr r0, _0806A0F8 @ =gLinkState
+	ldr r0, _0806A0F8 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -780,7 +780,7 @@ sub_0806A0A4: @ 0x0806A0A4
 	bl sub_0807BA8C
 	b _0806A120
 	.align 2, 0
-_0806A0F8: .4byte gLinkState
+_0806A0F8: .4byte gPlayerState
 _0806A0FC: .4byte gRoomControls
 _0806A100:
 	movs r5, #2
@@ -818,7 +818,7 @@ sub_0806A144: @ 0x0806A144
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	movs r4, #4
-	ldr r0, _0806A18C @ =gLinkState
+	ldr r0, _0806A18C @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	ands r0, r1
@@ -848,7 +848,7 @@ _0806A17A:
 	bl TextboxNoOverlap
 	pop {r4, r5, pc}
 	.align 2, 0
-_0806A18C: .4byte gLinkState
+_0806A18C: .4byte gPlayerState
 _0806A190: .4byte gUnk_08111FD8
 
 	thumb_func_start Dog_Fusion

asm/drawKinstoneMenu.s

@@ -1,37 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-	
-	thumb_func_start sub_080A3B84
-sub_080A3B84: @ 0x080A3B84
-	push {r4, r5, lr}
-	ldr r4, _080A3BC4 @ =gUnk_030010A0
-	adds r4, #0x2c
-	movs r5, #0
-	movs r0, #2
-	strb r0, [r4]
-	bl sub_080AD90C
-	ldr r1, _080A3BC8 @ =gUnk_081280C4
-	ldr r0, _080A3BCC @ =gUnk_02000080
-	ldrb r0, [r0, #5]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	bl _call_via_r0
-	bl sub_080A3B74
-	bl sub_080A4054
-	bl sub_0801C1D4
-	bl sub_0801C208
-	bl sub_0805E5C0
-	bl sub_080AD9B0
-	bl sub_080AD918
-	strb r5, [r4]
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A3BC4: .4byte gUnk_030010A0
-_080A3BC8: .4byte gUnk_081280C4
-_080A3BCC: .4byte gUnk_02000080

asm/dust.s

@@ -282,7 +282,7 @@ sub_08044310: @ 0x08044310
 	adds r5, r0, #0
 	movs r4, #0xff
 	movs r6, #0xff
-	ldr r0, _08044334 @ =gLinkEntity
+	ldr r0, _08044334 @ =gPlayerEntity
 	ldrb r0, [r0, #0x14]
 	lsrs r1, r0, #1
 	movs r0, #3
@@ -295,7 +295,7 @@ sub_08044310: @ 0x08044310
 	beq _08044342
 	b _080443EA
 	.align 2, 0
-_08044334: .4byte gLinkEntity
+_08044334: .4byte gPlayerEntity
 _08044338:
 	cmp r1, #2
 	beq _08044392
@@ -492,7 +492,7 @@ _08044492:
 sub_08044498: @ 0x08044498
 	push {r4, r5, r6, lr}
 	mov ip, r0
-	ldr r6, _08044538 @ =gLinkEntity
+	ldr r6, _08044538 @ =gPlayerEntity
 	movs r1, #0x2e
 	ldrsh r0, [r6, r1]
 	ldr r3, _0804453C @ =gRoomControls
@@ -509,7 +509,7 @@ sub_08044498: @ 0x08044498
 	ands r0, r2
 	lsls r0, r0, #6
 	orrs r4, r0
-	ldr r0, _08044540 @ =gLinkState
+	ldr r0, _08044540 @ =gPlayerState
 	adds r0, #0x92
 	ldrh r0, [r0]
 	movs r1, #0xf0
@@ -567,13 +567,13 @@ _0804450C:
 	adds r1, r0, #0
 	cmp r1, #0
 	beq _0804454C
-	ldr r0, _08044538 @ =gLinkEntity
+	ldr r0, _08044538 @ =gPlayerEntity
 	bl CopyPosition
 	b _0804454C
 	.align 2, 0
-_08044538: .4byte gLinkEntity
+_08044538: .4byte gPlayerEntity
 _0804453C: .4byte gRoomControls
-_08044540: .4byte gLinkState
+_08044540: .4byte gPlayerState
 _08044544:
 	adds r2, #5
 	adds r3, #1
@@ -587,7 +587,7 @@ _0804454C:
 sub_08044550: @ 0x08044550
 	push {r4, r5, r6, r7, lr}
 	adds r6, r0, #0
-	ldr r0, _080445A8 @ =gLinkState
+	ldr r0, _080445A8 @ =gPlayerState
 	ldrb r1, [r0, #0x1c]
 	movs r0, #0xf
 	ands r0, r1
@@ -602,7 +602,7 @@ sub_08044550: @ 0x08044550
 	adds r0, #0x10
 	strh r0, [r6, #0x24]
 _08044570:
-	ldr r5, _080445AC @ =gLinkEntity
+	ldr r5, _080445AC @ =gPlayerEntity
 	ldrb r0, [r5, #0x14]
 	movs r4, #0xe
 	ands r4, r0
@@ -629,8 +629,8 @@ _08044570:
 	bl sub_0806F69C
 	b _080445BE
 	.align 2, 0
-_080445A8: .4byte gLinkState
-_080445AC: .4byte gLinkEntity
+_080445A8: .4byte gPlayerState
+_080445AC: .4byte gPlayerEntity
 _080445B0: .4byte gUnk_08126EE4
 _080445B4:
 	adds r0, r6, #0

asm/enemy49.s

@@ -291,7 +291,7 @@ _0803D08A:
 	ldr r0, _0803D0A8 @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	strb r0, [r5, #0x15]
 	b _0803D0AE
 	.align 2, 0

asm/enemy4D.s

@@ -134,7 +134,7 @@ sub_0803EBB4: @ 0x0803EBB4
 	ldr r0, _0803EC10 @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r0, #4
 	movs r1, #0x18
 	ands r0, r1
@@ -649,7 +649,7 @@ sub_0803EF74: @ 0x0803EF74
 	beq _0803EFA8
 	adds r0, r4, #0
 	adds r1, r5, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	ldrb r1, [r4, #0x15]
 	subs r1, r1, r0
 	adds r1, #2

asm/enemy50.s

@@ -352,14 +352,14 @@ sub_08040DC8: @ 0x08040DC8
 	strb r1, [r0, #0xd]
 	movs r1, #0x3c
 	strb r1, [r0, #0x1d]
-	ldr r1, _08040DE0 @ =gLinkEntity
+	ldr r1, _08040DE0 @ =gPlayerEntity
 	ldrb r1, [r1, #0x14]
 	lsrs r1, r1, #2
 	adds r1, #5
 	bl InitializeAnimation
 	pop {pc}
 	.align 2, 0
-_08040DE0: .4byte gLinkEntity
+_08040DE0: .4byte gPlayerEntity
 
 	thumb_func_start sub_08040DE4
 sub_08040DE4: @ 0x08040DE4
@@ -627,7 +627,7 @@ _08040FB2:
 	ldr r0, _08041008 @ =gUnk_020000B0
 	ldr r1, [r0]
 	adds r0, r4, #0
-	bl sub_080045C4
+	bl GetFacingDirection
 	adds r1, r0, #0
 	adds r0, r4, #0
 	bl sub_08004596
@@ -723,7 +723,7 @@ _08041094:
 	adds r0, #8
 	strh r0, [r1]
 _080410A6:
-	ldr r2, _08041100 @ =gLinkEntity
+	ldr r2, _08041100 @ =gPlayerEntity
 	adds r0, r2, #0
 	adds r0, #0x45
 	ldrb r0, [r0]
@@ -768,7 +768,7 @@ _080410B6:
 	bl sub_0803F6EC
 	b _0804110A
 	.align 2, 0
-_08041100: .4byte gLinkEntity
+_08041100: .4byte gPlayerEntity
 _08041104:
 	adds r0, r4, #0
 	bl sub_0803F738
@@ -912,7 +912,7 @@ _08041200:
 	movs r0, #1
 	b _08041224
 _08041204:
-	ldr r0, _08041214 @ =gLinkState
+	ldr r0, _08041214 @ =gPlayerState
 	ldr r0, [r0, #0x30]
 	movs r1, #0x80
 	lsls r1, r1, #0x10
@@ -921,7 +921,7 @@ _08041204:
 	beq _08041222
 	b _08041200
 	.align 2, 0
-_08041214: .4byte gLinkState
+_08041214: .4byte gPlayerState
 _08041218:
 	ldr r0, _08041228 @ =gArea
 	movs r1, #0xa

asm/enemy5F.s

@@ -32,7 +32,7 @@ _080482E8: .4byte gUnk_080D1D48
 sub_080482EC: @ 0x080482EC
 	push {r4, lr}
 	adds r4, r0, #0
-	ldr r0, _08048310 @ =gUnk_030010A0
+	ldr r0, _08048310 @ =gScreenTransition
 	adds r0, #0x38
 	ldrb r1, [r0]
 	movs r2, #1
@@ -47,7 +47,7 @@ sub_080482EC: @ 0x080482EC
 	bl InitializeAnimation
 	b _08048326
 	.align 2, 0
-_08048310: .4byte gUnk_030010A0
+_08048310: .4byte gScreenTransition
 _08048314:
 	strb r2, [r4, #0xc]
 	adds r0, r4, #0
@@ -90,7 +90,7 @@ sub_0804835C: @ 0x0804835C
 	push {r4, lr}
 	adds r4, r0, #0
 	bl sub_080485D8
-	ldr r0, _08048384 @ =gUnk_030010A0
+	ldr r0, _08048384 @ =gScreenTransition
 	adds r0, #0x39
 	ldrb r1, [r0]
 	movs r2, #3
@@ -108,7 +108,7 @@ sub_0804835C: @ 0x0804835C
 _08048382:
 	pop {r4, pc}
 	.align 2, 0
-_08048384: .4byte gUnk_030010A0
+_08048384: .4byte gScreenTransition
 
 	thumb_func_start sub_08048388
 sub_08048388: @ 0x08048388