summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-06 14:28:33 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-06 14:48:14 -0400
commit07a5cc60d0c3e37699ad5e45366cb9b093d6b7e7 (patch)
treed24dd2f6ac9f79f3247415d136b290a17766df3a /engine/overworld
parentd46fcef6bc2c8054f873d238e020d43b6f1774f2 (diff)
Add unnamed.py and update for rgbds v0.4.x before continuing.
Diffstat (limited to 'engine/overworld')
-rwxr-xr-xengine/overworld/map_object_action.asm2
-rwxr-xr-xengine/overworld/map_objects.asm12
-rwxr-xr-xengine/overworld/movement.asm8
-rwxr-xr-xengine/overworld/npc_movement.asm4
-rwxr-xr-xengine/overworld/player_object.asm4
-rwxr-xr-xengine/overworld/time.asm8
6 files changed, 19 insertions, 19 deletions
diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm
index 553243c4..f895fe15 100755
--- a/engine/overworld/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
@@ -30,7 +30,7 @@ Pointers4460:
dw Function45b3, Function44a0
dw Function45c6, Function44a0
-Function44a0
+Function44a0:
ld hl, $d
add hl, bc
ld [hl], $ff
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 392cb86e..87f422d5 100755
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -152,18 +152,18 @@ Function437c:
bit 5, [hl]
jr nz, asm_4449
ld de, Pointers4460
- jr asm_444e
+ jr _HandleObjectAction
Function4441:
ld hl, $4
add hl, bc
bit 0, [hl]
jr nz, Function44a0
-asm_4449
+asm_4449:
ld de, Pointers4460 + 2
- jr asm_444e
+ jr _HandleObjectAction
-asm_444e
+_HandleObjectAction:
INCLUDE "engine/overworld/map_object_action.asm"
CopyNextCoordsTileToStandingCoordsTile: ; 45d9 (1:45d9)
@@ -662,7 +662,7 @@ Function557f:: ; 557f (1:557f)
jr nz, .asm_5589
ret
-Function55a1
+Function55a1:
call Function55d8
ld a, $0
call Function55bc
@@ -962,7 +962,7 @@ Function5761: ; 5761 (1:5761)
Function5770: ; 5770 (1:5770)
ld a, $0
-asm_5772
+asm_5772:
ld bc, wObjectStructs
call SetSpriteDirection
ret
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index d98b47ee..39f99480 100755
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -35,7 +35,7 @@ Function4fdf: ; 4fdf (1:4fdf)
ld hl, GetMovementPerson
jp Function4fe9
-GetMovementPerson
+GetMovementPerson:
ld a, [wMovementObject]
ret
@@ -358,7 +358,7 @@ Function51e1: ; 51e1 (1:51e1)
call Function5006
jr asm_51e6
-asm_51e6
+asm_51e6:
ld hl, $a
add hl, bc
ld [hl], a
@@ -470,7 +470,7 @@ Function5289: ; 5289 (1:5289)
ld a, $c
jr asm_528d
-asm_528d
+asm_528d:
ld hl, $8
add hl, bc
ld [hl], a
@@ -690,7 +690,7 @@ Function539b: ; 539b (1:539b)
ld a, $c
jr asm_539f
-asm_539f
+asm_539f:
ld hl, $1d
add hl, bc
ld [hl], a
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 84235570..38fe15d0 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -84,7 +84,7 @@ Function700b: ; 700b (1:700b)
scf
ret
-Function701d
+Function701d:
ld hl, $e
add hl, bc
ld a, [hl]
@@ -437,7 +437,7 @@ IsPersonMovingOffEdgeOfScreen: ; 71cc (1:71cc)
scf
ret
-Function71f2
+Function71f2:
ld a, [wPlayerStandingMapX]
ld d, a
ld a, [wPlayerStandingMapY]
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index 26dbe9fd..5cde13e7 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -282,7 +282,7 @@ Function87ce:
Function87d5:
ld a, [wYCoord]
add $9
-asm_87da
+asm_87da:
ld d, a
ld a, [wXCoord]
ld e, a
@@ -337,7 +337,7 @@ Function8822:
Function8829:
ld a, [wXCoord]
add $a
-asm_882e
+asm_882e:
ld e, a
ld a, [wYCoord]
ld d, a
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm
index 01273a75..9cce323c 100755
--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@@ -78,7 +78,7 @@ Function11857: ; 11857 (4:5857)
call Function11972
ret
-asm_11867
+asm_11867:
ld hl, wDailyResetTimer
jp Function1182e
@@ -282,7 +282,7 @@ Function119b4: ; 119b4 (4:59b4)
ld a, [wDaysSince]
ret
-asm_119b8
+asm_119b8:
ld a, $ff
ret
@@ -314,7 +314,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7)
ld [hl], c
dec hl
ld [wSecsSince], a
-CalcMinsHoursDaysSince_
+CalcMinsHoursDaysSince_:
ldh a, [hMinutes]
ld c, a
sbc [hl]
@@ -324,7 +324,7 @@ CalcMinsHoursDaysSince_
ld [hl], c
dec hl
ld [wMinsSince], a
-CalcHoursDaysSince_
+CalcHoursDaysSince_:
ldh a, [hHours]
ld c, a
sbc [hl]