summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/audio.asm10
-rw-r--r--home/copy.asm4
-rw-r--r--home/copy2.asm2
-rw-r--r--home/overworld.asm40
-rwxr-xr-xhome/pikachu.asm10
-rw-r--r--home/text.asm4
-rw-r--r--home/vblank.asm10
-rw-r--r--home/vcopy.asm4
8 files changed, 34 insertions, 50 deletions
diff --git a/home/audio.asm b/home/audio.asm
index 69e81dd8..f71aa3d0 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -136,7 +136,7 @@ PlayMusic:: ; 2211 (0:2211)
ld [wAudioSavedROMBank], a
ld a, b
jr PlaySound
-
+
Func_2223:: ; 2223 (0:2223)
xor a
ld [wChannelSoundIDs + CH4], a
@@ -145,7 +145,7 @@ Func_2223:: ; 2223 (0:2223)
ld [wChannelSoundIDs + CH7], a
ld [rNR10], a
ret
-
+
StopAllMusic:: ; 2233 (0:2233)
ld a, $FF
ld [wNewSoundID], a
@@ -232,7 +232,7 @@ InitMusicVariables:: ; 22aa (0:22aa)
pop de
pop hl
ret
-
+
InitSFXVariables:: ; 22c0 (0:22c0)
push hl
push de
@@ -242,7 +242,7 @@ InitSFXVariables:: ; 22c0 (0:22c0)
pop de
pop hl
ret
-
+
StopAllAudio:: ; 22d6 (0:22d6)
push hl
push de
@@ -252,7 +252,7 @@ StopAllAudio:: ; 22d6 (0:22d6)
pop de
pop hl
ret
-
+
DetermineAudioFunction:: ; 22ec (0:22ec)
ld a, [H_LOADEDROMBANK]
push af
diff --git a/home/copy.asm b/home/copy.asm
index 8dc2acea..d073f54c 100644
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -24,7 +24,7 @@ CopyData:: ; 00b1 (0:00b1)
dec b
jr nz,.loop
ret
-
+
.copybytes ; 00c1
ld a, [hli]
ld [de], a
@@ -52,7 +52,7 @@ CopyVideoDataAlternate:: ; 00c8 (0:00c8)
ld c,a
pop af
jp FarCopyData
-
+
CopyVideoDataDoubleAlternate:: ; 00e3 (0:00e3)
ld a, [rLCDC]
bit 7,a ; LCD enabled?
diff --git a/home/copy2.asm b/home/copy2.asm
index 5318dc35..07eeb6b2 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -148,7 +148,7 @@ FillMemory:: ; 166e (0:166e)
dec b
jr nz, .loop
ret
-
+
GetFarByte:: ; 1681 (0:1681)
; get a byte from a:hl
; and return it in a
diff --git a/home/overworld.asm b/home/overworld.asm
index de062f46..e1312df1 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -414,7 +414,6 @@ CheckWarpsNoCollisionLoop:: ; 04d5 (0:04d5)
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)
@@ -426,7 +425,6 @@ ContinueCheckWarpsNoCollisionLoop:: ; 0512 (0:0512)
jp nz, CheckWarpsNoCollisionLoop
jp CheckMapConnections
-
; check if the player has stepped onto a warp after having collided
CheckWarpsCollision:: ; 051a (0:051a)
ld a, [wNumberOfWarps]
@@ -791,8 +789,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
@@ -804,7 +802,6 @@ Func_07c4:: ; 07c4 (0:07c4)
call PlayDefaultMusic
ret
-
LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7)
; Load sprite graphics based on whether the player is standing, biking, or surfing.
@@ -822,7 +819,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
@@ -844,7 +841,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.
@@ -1187,7 +1184,6 @@ IsSpriteInFrontOfPlayer2:: ; 0985 (0:0985)
scf
ret
-
SignLoop:: ; 09f2 (0:09f2)
; search if a player is facing a sign
ld hl, wSignCoords ; start of sign coordinates
@@ -1518,7 +1514,6 @@ CopyToRedrawRowOrColumnSrcTiles:: ; 0baa (0:0baa)
jr nz, .loop
ret
-
ScheduleSouthRowRedraw:: ; 0bb6 (0:0bb6)
coord hl, 0, 16
call CopyToRedrawRowOrColumnSrcTiles
@@ -1640,7 +1635,6 @@ JoypadOverworld:: ; 0c51 (0:0c51)
call AreInputsSimulated
ret
-
ForceBikeDown:: ; 0c65 (0:0c65)
ld a, [wFlags_D733]
bit 3, a ; check if a trainer wants a challenge
@@ -1655,7 +1649,6 @@ ForceBikeDown:: ; 0c65 (0:0c65)
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
@@ -1675,7 +1668,6 @@ AreInputsSimulated:: ; 0c7b (0:0c7b)
ld [hJoyReleased], a
ret
-
; if done simulating button presses
.doneSimulating
xor a
@@ -1692,7 +1684,6 @@ AreInputsSimulated:: ; 0c7b (0:0c7b)
res 7, [hl]
ret
-
GetSimulatedInput:: ; 0cb3 (0:0cb3)
ld hl, wSimulatedJoypadStatesIndex
dec [hl]
@@ -1719,8 +1710,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)
@@ -1770,7 +1761,7 @@ CollisionCheckOnWater:: ; 0cca (0:0cca)
.noCollision ; ...and they do the same mistake twice
and a
-.done
+.done
ret
; function to run the current map's script
@@ -1808,7 +1799,6 @@ LoadWalkingPlayerSpriteGraphics:: ; 0d5e (0:0d5e)
ld de, RedSprite ; $4180
jr LoadPlayerSpriteGraphicsCommon
-
LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69)
ld a, [wd473]
and a
@@ -1826,7 +1816,6 @@ LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69)
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
@@ -2018,7 +2007,6 @@ CopySignData:: ; 0eb3 (0:0eb3)
jr nz, .signcopyloop
ret
-
; function to load map data
LoadMapData:: ; 1241 (0:1241)
ld a, [H_LOADEDROMBANK]
@@ -2083,7 +2071,7 @@ ReloadMapAfterPrinter:: ; 0f3d (0:0f3d)
asm_0f4d: ; 0f4d (0:0f4d)
jpab Func_f02da
ret ; useless?
-
+
ResetMapVariables:: ; 0f56 (0:0f56)
ld a, $98
ld [wMapViewVRAMPointer + 1], a
@@ -2178,9 +2166,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?
@@ -2193,7 +2181,7 @@ IsSpinning:: ; 0ff0 (0:0ff0)
bit 7, a
ret z ; no spinning
jpba LoadSpinnerArrowTiles ; spin while moving
-
+
Func_0ffe:: ; 0ffe (0:0ffe)
jpab IsPlayerTalkingToPikachu
@@ -2266,7 +2254,6 @@ ZeroSpriteStateData:: ; 1050 (0:1050)
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
@@ -2279,7 +2266,6 @@ DisableRegularSprites:: ; 1060 (0:1060)
jr nz, .loop
ret
-
LoadSprite:: ; 106f (0:106f)
push hl
ld b, $0
@@ -2310,7 +2296,6 @@ LoadSprite:: ; 106f (0:106f)
pop hl
ret
-
.trainerSprite
ld a, [hli]
ld [$ff8d], a ; save trainer class
@@ -2326,7 +2311,6 @@ LoadSprite:: ; 106f (0:106f)
pop hl
ret
-
.itemBallSprite
ld a, [hli]
ld [$ff8d], a ; save item number
@@ -2338,4 +2322,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)
diff --git a/home/pikachu.asm b/home/pikachu.asm
index f3ab9b8e..e79fdb1b 100755
--- a/home/pikachu.asm
+++ b/home/pikachu.asm
@@ -20,7 +20,7 @@ Func_1525:: ; 1525 (0:1525)
res 3, [hl]
pop hl
ret
-
+
Func_152d:: ; 152d (0:152d)
push hl
ld hl, wPikachuOverworldStateFlags
@@ -29,7 +29,7 @@ Func_152d:: ; 152d (0:152d)
ld [hl], $ff
pop hl
ret
-
+
DisablePikachuFollowingPlayer:: ; 153a (0:153a)
push hl
ld hl, wPikachuOverworldStateFlags
@@ -43,14 +43,14 @@ EnablePikachuFollowingPlayer:: ; 1542 (0:1542)
res 1, [hl]
pop hl
ret
-
+
CheckPikachuFollowingPlayer:: ; 154a (0:154a)
push hl
ld hl, wPikachuOverworldStateFlags
bit 1, [hl]
pop hl
ret
-
+
SpawnPikachu:: ; 1552 (0:1552)
ld a, [hl]
dec a
@@ -79,7 +79,7 @@ Pikachu_IsInArray:: ; 1568 (0:1568)
dec hl
and a
ret
-
+
GetPikachuMovementScriptByte:: ; 157c (0:157c)
push hl
push bc
diff --git a/home/text.asm b/home/text.asm
index a0e860d9..eadaf0b3 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -58,7 +58,7 @@ PlaceNextChar:: ; 1724 (0:1724)
pop hl
ret
-Char4ETest:: ; 172d (0:172d)
+Char4ETest:: ; 172d (0:172d)
cp $4E
jr nz, .next
ld bc, $0028
@@ -304,7 +304,7 @@ Char49:: ; 18a3 (0:18a3)
jr z, .Char49
ld a, $4e
jp Char4ETest
-
+
.Char49
push de
ld a, $EE
diff --git a/home/vblank.asm b/home/vblank.asm
index cab6f944..24159a4c 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -9,7 +9,7 @@ VBlank:: ; 1de5 (0:1de5)
push af
xor a
ld [rVBK], a ; reset vram bank to 0
-
+
ld a, [H_LOADEDROMBANK]
ld [wVBlankSavedROMBank], a
@@ -39,7 +39,7 @@ VBlank:: ; 1de5 (0:1de5)
; VBlank-sensitive operations end.
call TrackPlayTime ; keep track of time played
-
+
call Random
call ReadJoypad
@@ -58,10 +58,10 @@ VBlank:: ; 1de5 (0:1de5)
.skipDec
call FadeOutAudio
-
+
callbs Music_DoLowHealthAlarm
callbs Audio1_UpdateMusic
-
+
call SerialFunction
ld a, [wVBlankSavedROMBank]
@@ -70,7 +70,7 @@ VBlank:: ; 1de5 (0:1de5)
pop af
ld [rVBK],a
-
+
pop hl
pop de
pop bc
diff --git a/home/vcopy.asm b/home/vcopy.asm
index da85e3e7..464faf51 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -335,7 +335,7 @@ VBlankCopy:: ; 1c21 (0:1c21)
ld [H_VBCOPYSRC],sp
ld sp,hl
ld [H_VBCOPYDEST],sp
-
+
ld a, [H_SPTEMP]
ld l, a
ld a, [H_SPTEMP + 1]
@@ -356,7 +356,7 @@ UpdateMovingBgTiles:: ; 1c75 (0:1c75)
ld a,[rLY]
cp $90 ; check if not in vblank period??? (maybe if vblank is too long)
ret c
-
+
ld a, [hMovingBGTilesCounter1]
inc a
ld [hMovingBGTilesCounter1], a
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 06:20:05 +0000