diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/cmd_queue.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 5 | ||||
| -rw-r--r-- | engine/overworld/map_objects.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/map_setup.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/npc_movement.asm | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm index 414281565..e482f789b 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 @@ -158,7 +158,7 @@ CmdQueue_Null: ret CmdQueue_Type1: - call ret_2f3e + call Function2f3e ret CmdQueue_Type4: diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index f78635cb7..0606f64b1 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -399,7 +399,7 @@ SetMinTwoStepWildEncounterCooldown: Dummy_CheckScriptFlags3Bit5: call CheckBit5_ScriptFlags3 ret z - call ret_2f3e + call Function2f3e ret RunSceneScript: @@ -928,8 +928,7 @@ CountStep: scf ret -; unused -.unreferenced +.whiteout ; unreferenced ld a, PLAYEREVENT_WHITEOUT scf ret diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index ebc4b8688..7c83f4fea 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_Function4759: +Function4759: ; unreferenced push bc ld e, a ld d, 0 diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 92e706ab3..a767dc5e7 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -113,12 +113,12 @@ EnableTextAcceleration: 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 d6b02fc45..1dc8b6fbd 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -274,7 +274,7 @@ WillObjectBumpIntoSomeoneElse: ld e, [hl] jr IsNPCAtCoord -Unreferenced_Function7015: +Function7015: ; unreferenced ldh a, [hMapObjectIndexBuffer] call GetObjectStruct call .CheckWillBeFacingNPC @@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen: scf ret -Unreferenced_Function7113: +Function7113: ; unreferenced ld a, [wPlayerStandingMapX] ld d, a ld a, [wPlayerStandingMapY] |