summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/cmd_queue.asm2
-rw-r--r--engine/overworld/events.asm3
-rw-r--r--engine/overworld/load_map_part.asm6
-rw-r--r--engine/overworld/map_objects.asm2
-rw-r--r--engine/overworld/map_setup.asm12
-rw-r--r--engine/overworld/npc_movement.asm4
-rw-r--r--engine/overworld/overworld.asm6
-rw-r--r--engine/overworld/player_object.asm2
8 files changed, 18 insertions, 19 deletions
diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm
index 29919ee7..5e29689a 100644
--- a/engine/overworld/cmd_queue.asm
+++ b/engine/overworld/cmd_queue.asm
@@ -33,7 +33,7 @@ HandleCmdQueue::
jr nz, .loop
ret
-Unreferenced_GetNthCmdQueueEntry:
+GetNthCmdQueueEntry: ; unreferenced
ld hl, wCmdQueue
ld bc, CMDQUEUE_ENTRY_SIZE
call AddNTimes
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index ea69bc3e..c55e58de 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -916,8 +916,7 @@ CountStep:
scf
ret
-; unused
-.unreferenced
+.whiteout ; unreferenced
ld a, PLAYEREVENT_WHITEOUT
scf
ret
diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm
index 2150df1c..32dc1226 100644
--- a/engine/overworld/load_map_part.asm
+++ b/engine/overworld/load_map_part.asm
@@ -35,7 +35,7 @@ _LoadMapPart::
jr nz, .loop
ret
-Unreferenced_Function153ba:
+Function153ba: ; unreferenced
decoord 2, 2
ld bc, (SURROUNDING_WIDTH + 1) * 2
add hl, bc
@@ -66,7 +66,7 @@ Unreferenced_Function153ba:
jr nz, .loop
ret
-Unreferenced_Function153dd:
+Function153dd: ; unreferenced
decoord 4, 4
ld bc, (SURROUNDING_WIDTH + 1) * 4
add hl, bc
@@ -128,7 +128,7 @@ Ureferenced_Function15400:
jr nz, .loop
ret
-Unreferenced_Function15423:
+Function15423: ; unreferenced
decoord 8, 8
ld bc, (SURROUNDING_WIDTH + 1) * 8
add hl, bc
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 25245576..d163c1d1 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -402,7 +402,7 @@ UpdatePlayerStep:
set PLAYERSTEP_CONTINUE_F, [hl]
ret
-Unreferenced_Function4732:
+Function4732: ; unreferenced
push bc
ld e, a
ld d, 0
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index 1b0a6c08..210a7b0f 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -111,13 +111,13 @@ EnableTextAcceleration:
ld [wDisableTextAcceleration], a
ret
-Unreferenced_ActivateMapAnims:
- ld a, $1
+DuplicateActivateMapAnims: ; unreferenced
+ ld a, TRUE
ldh [hMapAnims], a
ret
-Unreferenced_SuspendMapAnims:
- xor a
+DuplicateSuspendMapAnims: ; unreferenced
+ xor a ; FALSE
ldh [hMapAnims], a
ret
@@ -221,12 +221,12 @@ FadeOutMapMusic:
ret
ActivateMapAnims:
- ld a, $1
+ ld a, TRUE
ldh [hMapAnims], a
ret
SuspendMapAnims:
- xor a
+ xor a ; FALSE
ldh [hMapAnims], a
ret
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 01d49d21..cc9cf0b8 100644
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -274,7 +274,7 @@ WillObjectBumpIntoSomeoneElse:
ld e, [hl]
jr IsNPCAtCoord
-Unreferenced_Function70f4:
+Function70f4: ; unreferenced
ldh a, [hMapObjectIndexBuffer]
call GetObjectStruct
call .CheckWillBeFacingNPC
@@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen:
scf
ret
-Unreferenced_Function71f2:
+Function71f2: ; unreferenced
ld a, [wPlayerStandingMapX]
ld d, a
ld a, [wPlayerStandingMapY]
diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm
index 1a5d96db..d20c719b 100644
--- a/engine/overworld/overworld.asm
+++ b/engine/overworld/overworld.asm
@@ -436,16 +436,16 @@ endr
.done:
ret
-Unreferenced_Function1438a:
+Function1438a: ; unreferenced
ld a, c
jr GetUsedSprite
-Unreferenced_Function1438d:
+Function1438d: ; unreferenced
ld a, c
ld b, 0
jr GetUsedSprite
-Unreferenced_Function14392:
+Function14392: ; unreferenced
ld a, c
ld b, SPRITE_GFX_LIST_CAPACITY
jr GetUsedSprite
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 07cbf28b..1ebdbcfa 100644
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -113,7 +113,7 @@ RefreshPlayerCoords:
ret nz
ret
-Unreferenced_SpawnObject1:
+SpawnObject1: ; unreferenced
ld a, 1
ld hl, UnusedObject1Template
call CopyPlayerObjectTemplate