summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-20 13:58:03 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-20 13:58:03 -0400
commitfac958b280056922a1828b71a04d84a36e1e807a (patch)
treec094adc59182b253a61defb5fb85de7a9d77b7cc /engine/overworld
parentbfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)
- Remove trailing whitespace
- Indent with single tabs, not spaces - Colons after labels - Capitalize BANK, HIGH, and LOW - dbw BANK(X), X -> dba X
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/object_collision.asm10
-rw-r--r--engine/overworld/player_movement.asm32
-rwxr-xr-xengine/overworld/spawn_points.asm2
3 files changed, 22 insertions, 22 deletions
diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm
index 5c3b0b1..31f43a8 100644
--- a/engine/overworld/object_collision.asm
+++ b/engine/overworld/object_collision.asm
@@ -91,7 +91,7 @@ _CheckObjectCollision: ; 01:77dd
.collision
scf
ret
-
+
SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX
; Sets the carry flag if the player will collide with another sprite's current or next position
@@ -102,7 +102,7 @@ _CheckPlayerObjectCollision: ; 01:7894
ld e, a
ld bc, wObjectStructs
xor a
-
+
.loop
ldh [hObjectStructIndexBuffer], a
ld hl, OBJECT_SPRITE
@@ -120,13 +120,13 @@ _CheckPlayerObjectCollision: ; 01:7894
ld a, [hl]
cp d
jr nz, .check_last_position
-
+
; skip the player sprite
ldh a, [hObjectStructIndexBuffer]
cp PLAYER_OBJECT_INDEX
jr z, .next
jr .collision
-
+
.check_last_position
ld hl, OBJECT_MAP_Y
add hl, bc
@@ -151,7 +151,7 @@ _CheckPlayerObjectCollision: ; 01:7894
jr nz, .loop
xor a
ret
-
+
.collision
scf
ret
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 2b772fa..c2975c2 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -28,7 +28,7 @@ UnusedOverworldMovementCheck:: ; 03:4003
SetPlayerIdle: ; 03:402c
ld a, NO_MOVEMENT
-
+
SetPlayerMovement: ; 03:402e
ld [wPlayerMovement], a
ld a, [wPlayerLastMapX]
@@ -58,7 +58,7 @@ _CheckMovementWalkOrBike: ; 03:4045
.idle
ld a, NO_MOVEMENT
ret
-
+
.check_right
ld a, [wPlayerLastMapX]
inc a
@@ -158,7 +158,7 @@ _CheckMovementDebug: ; 03:40f2
jr nz, .move_right
ld a, NO_MOVEMENT
ret
-
+
.move_down
ld a, [wTileDown]
cp -1
@@ -166,7 +166,7 @@ _CheckMovementDebug: ; 03:40f2
ret nz
ld a, JUMP_UP
ret
-
+
.move_up
ld a, [wTileUp]
cp -1
@@ -174,7 +174,7 @@ _CheckMovementDebug: ; 03:40f2
ret nz
ld a, JUMP_DOWN
ret
-
+
.move_left
ld a, [wTileLeft]
cp -1
@@ -182,7 +182,7 @@ _CheckMovementDebug: ; 03:40f2
ret nz
ld a, JUMP_RIGHT
ret
-
+
.move_right
ld a, [wTileRight]
cp -1
@@ -260,11 +260,11 @@ CheckSkateDown: ; 03:4177
jr z, .slow
ld a, FAST_STEP_DOWN
ret
-
+
.slow
ld a, STEP_DOWN
ret
-
+
.collision
ld a, STANDING
ld [wSkatingDirection], a
@@ -285,17 +285,17 @@ CheckSkateUp: ; 03:41ab
jr nz, .collision
ld a, FAST_JUMP_UP
ret
-
+
.can_skate
call OldIsTileCollisionGrass
jr z, .slow
ld a, FAST_STEP_UP
ret
-
+
.slow
ld a, STEP_UP
ret
-
+
.collision
ld a, STANDING
ld [wSkatingDirection], a
@@ -316,7 +316,7 @@ CheckSkateLeft: ; 03:41db
jr nz, .collision
ld a, FAST_JUMP_LEFT
ret
-
+
.can_skate
call OldIsTileCollisionGrass
jr z, .slow
@@ -326,7 +326,7 @@ CheckSkateLeft: ; 03:41db
.slow
ld a, STEP_LEFT
ret
-
+
.collision
ld a, STANDING
ld [wSkatingDirection], a
@@ -357,7 +357,7 @@ CheckSkateRight: ; 03:420b
.slow
ld a, STEP_RIGHT
ret
-
+
.collision
ld a, STANDING
ld [wSkatingDirection], a
@@ -1081,7 +1081,7 @@ GetCollisionType::
ret
SECTION "engine/overworld/player_movement.asm@Rest of Player Movement", ROMX
-
+
_UnusedReturnFalse:: ; 03:4764
xor a
ret
@@ -1152,7 +1152,7 @@ GetPlayerSprite: ; 05:400a
ld [wPlayerSprite], a
ld [wPlayerObjectSprite], a
ret
-
+
PlayerSpriteTable: ; 03:402d
; state, sprite
db PLAYER_NORMAL, SPRITE_GOLD
diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm
index 0d3b7a2..77da684 100755
--- a/engine/overworld/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
@@ -28,7 +28,7 @@ LoadSpawnPoint: ; 03:4791
pop de
pop hl
ret
-
+
IsSpawnPoint: ; 03:47b6
; Checks if the map loaded in de is a spawn point.
; Returns carry if it's a spawn point.