summaryrefslogtreecommitdiff
path: root/home/overworld.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-06 01:22:22 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-06 01:22:22 -0500
commita070bdcb21310c7d17b4fd057852f788fdfd61ca (patch)
treeca50135e03b11b93e4c20ae2313742fcd728f595 /home/overworld.asm
parent3af22139a90e9484221344ae6d34d737faa07608 (diff)
Clean up white space
Diffstat (limited to 'home/overworld.asm')
-rw-r--r--home/overworld.asm56
1 files changed, 28 insertions, 28 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 1368dc9d..22860985 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -402,7 +402,7 @@ CheckWarpsNoCollisionLoop:: ; 04d5 (0:04d5)
and D_DOWN | D_UP | D_LEFT | D_RIGHT
jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp
jr WarpFound1
-
+
CheckWarpsNoCollisionRetry1:: ; 050f (0:050f)
inc hl
CheckWarpsNoCollisionRetry2:: ; 0510 (0:0510)
@@ -413,7 +413,7 @@ ContinueCheckWarpsNoCollisionLoop:: ; 0512 (0:0512)
dec c ; decrement number of warps
jp nz, CheckWarpsNoCollisionLoop
jp CheckMapConnections
-
+
; check if the player has stepped onto a warp after having collided
CheckWarpsCollision:: ; 051a (0:051a)
ld a, [wNumberOfWarps]
@@ -767,8 +767,8 @@ HandleFlyWarpOrDungeonWarp:: ; 0794 (0:0794)
LeaveMapAnim:: ; 07bc (0:07bc)
jpba _LeaveMapAnim
-
-Func_07c4:: ; 07c4 (0:07c4)
+
+Func_07c4:: ; 07c4 (0:07c4)
ld a, [wWalkBikeSurfState]
and a
ret z
@@ -779,7 +779,7 @@ Func_07c4:: ; 07c4 (0:07c4)
ret z
call PlayDefaultMusic
ret
-
+
LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7)
; Load sprite graphics based on whether the player is standing, biking, or surfing.
@@ -797,7 +797,7 @@ LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7)
jr .startWalking
.ridingBike
- ; If the bike can't be used,
+ ; If the bike can't be used,
; start walking instead.
call IsBikeRidingAllowed
jr c, .determineGraphics
@@ -819,7 +819,7 @@ LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7)
jp LoadWalkingPlayerSpriteGraphics
IsBikeRidingAllowed:: ; 0805 (0:0805)
-; The bike can be used on Route 23 and Indigo Plateau,
+; The bike can be used on Route 23 and Indigo Plateau,
; or maps with tilesets in BikeRidingTilesets.
; Return carry if biking is allowed.
@@ -1157,7 +1157,7 @@ IsSpriteInFrontOfPlayer2:: ; 0985 (0:0985)
.dontwritetowd436
scf
ret
-
+
SignLoop:: ; 09f2 (0:09f2)
; search if a player is facing a sign
ld hl, wSignCoords ; start of sign coordinates
@@ -1480,7 +1480,7 @@ CopyToRedrawRowOrColumnSrcTiles:: ; 0baa (0:0baa)
dec c
jr nz, .loop
ret
-
+
ScheduleSouthRowRedraw:: ; 0bb6 (0:0bb6)
coord hl, 0, 16
call CopyToRedrawRowOrColumnSrcTiles
@@ -1601,7 +1601,7 @@ JoypadOverworld:: ; 0c51 (0:0c51)
call ForceBikeDown
call AreInputsSimulated
ret
-
+
ForceBikeDown:: ; 0c65 (0:0c65)
ld a, [wFlags_D733]
bit 3, a ; check if a trainer wants a challenge
@@ -1615,7 +1615,7 @@ ForceBikeDown:: ; 0c65 (0:0c65)
ld a, D_DOWN
ld [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press
ret
-
+
AreInputsSimulated:: ; 0c7b (0:0c7b)
ld a, [wd730]
bit 7, a
@@ -1634,7 +1634,7 @@ AreInputsSimulated:: ; 0c7b (0:0c7b)
ld [hJoyPressed], a
ld [hJoyReleased], a
ret
-
+
; if done simulating button presses
.doneSimulating
xor a
@@ -1650,7 +1650,7 @@ AreInputsSimulated:: ; 0c7b (0:0c7b)
ld hl, wd730
res 7, [hl]
ret
-
+
GetSimulatedInput:: ; 0cb3 (0:0cb3)
ld hl, wSimulatedJoypadStatesIndex
dec [hl]
@@ -1676,8 +1676,8 @@ GetSimulatedInput:: ; 0cb3 (0:0cb3)
; It seems that this function has a bug in it, but due to luck, it doesn't
; show up. After detecting a sprite collision, it jumps to the code that
; checks if the next tile is passable instead of just directly jumping to the
-; "collision detected" code. However, it doesn't store the next tile in c,
-; so the old value of c is used. 2429 is always called before this function,
+; "collision detected" code. However, it doesn't store the next tile in c,
+; so the old value of c is used. 2429 is always called before this function,
; and 2429 always sets c to 0xF0. There is no 0xF0 background tile, so it
; is considered impassable and it is detected as a collision.
CollisionCheckOnWater:: ; 0cca (0:0cca)
@@ -1725,7 +1725,7 @@ CollisionCheckOnWater:: ; 0cca (0:0cca)
jr .noCollision
.noCollision ; ...and they do the same mistake twice
and a
-.done
+.done
ret
; function to run the current map's script
@@ -1762,7 +1762,7 @@ LoadWalkingPlayerSpriteGraphics:: ; 0d5e (0:0d5e)
ld b, BANK(RedSprite)
ld de, RedSprite ; $4180
jr LoadPlayerSpriteGraphicsCommon
-
+
LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69)
ld a, [wd473]
and a
@@ -1779,7 +1779,7 @@ LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69)
ld b, BANK(SurfingPikachuSprite)
ld de, SurfingPikachuSprite ; 3f:6def
jr LoadPlayerSpriteGraphicsCommon
-
+
LoadSurfingPlayerSpriteGraphics:: ; 0d83 (0:0d83)
ld b, BANK(RedSprite) ; not sure, but probably same bank (5)
ld de, SeelSprite
@@ -1968,7 +1968,7 @@ CopySignData:: ; 0eb3 (0:0eb3)
dec a
jr nz, .signcopyloop
ret
-
+
; function to load map data
LoadMapData:: ; 1241 (0:1241)
ld a, [H_LOADEDROMBANK]
@@ -2032,7 +2032,7 @@ Func_0f3d:: ; 0f3d (0:0f3d)
asm_0f4d: ; 0f4d (0:0f4d)
jpab Func_f02da
ret ; useless?
-
+
ResetMapVariables:: ; 0f56 (0:0f56)
ld a, $98
ld [wMapViewVRAMPointer + 1], a
@@ -2127,9 +2127,9 @@ ForceBikeOrSurf:: ; 0fd6 (0:0fd6)
ld hl, LoadPlayerSpriteGraphics
call Bankswitch
jp PlayDefaultMusic ; update map/player state?
-
+
; Handle the player jumping down
-; a ledge in the overworld.
+; a ledge in the overworld.
HandleMidJump:: ; 0fe1 (0:0fe1)
ld a, [wd736]
bit 6, a ; jumping down a ledge?
@@ -2142,7 +2142,7 @@ IsSpinning:: ; 0ff0 (0:0ff0)
bit 7, a
ret z ; no spinning
jpba LoadSpinnerArrowTiles ; spin while moving
-
+
Func_0ffe:: ; 0ffe (0:0ffe)
jpab IsPlayerTalkingToPikachu
@@ -2214,7 +2214,7 @@ ZeroSpriteStateData:: ; 1050 (0:1050)
dec b
jr nz, .loop
ret
-
+
DisableRegularSprites:: ; 1060 (0:1060)
; initialize all C100-C1FF sprite entries to disabled (other than player's and pikachu)
ld hl, wSpriteStateData1 + 1 * $10 + 2
@@ -2226,7 +2226,7 @@ DisableRegularSprites:: ; 1060 (0:1060)
dec c
jr nz, .loop
ret
-
+
LoadSprite:: ; 106f (0:106f)
push hl
ld b, $0
@@ -2256,7 +2256,7 @@ LoadSprite:: ; 106f (0:106f)
ld [hl], a
pop hl
ret
-
+
.trainerSprite
ld a, [hli]
ld [$ff8d], a ; save trainer class
@@ -2271,7 +2271,7 @@ LoadSprite:: ; 106f (0:106f)
ld [hl], a ; store trainer number in byte 1 of the entry
pop hl
ret
-
+
.itemBallSprite
ld a, [hli]
ld [$ff8d], a ; save item number
@@ -2283,4 +2283,4 @@ LoadSprite:: ; 106f (0:106f)
xor a
ld [hl], a ; zero byte 1, since it is not used
pop hl
- ret ; end of home/overworld.asm = 10b9 (0:10b9)
+ ret ; end of home/overworld.asm = 10b9 (0:10b9)