diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 8 | ||||
| -rw-r--r-- | home/copy2.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 16 | ||||
| -rw-r--r-- | home/text.asm | 2 | ||||
| -rw-r--r-- | home/vblank.asm | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/home/audio.asm b/home/audio.asm index 0bfaee17..e33c0d68 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -24,15 +24,15 @@ asm_2188: ; 2118 (0:2118) jr z, .asm_219b call Func_21c8 jr c, .asm_21ac - ld a, MUSIC_BIKE_RIDING + ld a, $d2 ; MUSIC_BIKE_RIDING jr .asm_219d .asm_219b - ld a, MUSIC_SURFING + ld a, $d6 ; MUSIC_SURFING .asm_219d ld b, a ld a, d and a - ld a, BANK(Music_BikeRiding) + ld a, $1f ; BANK(Music_BikeRiding) jr nz, .asm_21a7 ld [wc0ef], a .asm_21a7 @@ -77,7 +77,7 @@ Func_21c8:: ; 21c8 (0:21c8) Func_21e5:: ; 21e5 (0:21e5) push bc push hl - callba Func_909d ; 2:509d + callba Music2_UpdateMusic ; 2:509d pop hl pop bc dec c diff --git a/home/copy2.asm b/home/copy2.asm index 6001557c..f5d3f796 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -69,7 +69,7 @@ CopyVideoData:: ; 15fe (0:15fe) ld [H_VBCOPYSIZE], a call DelayFrame pop af - call CommonBankswitch + call BankswitchCommon pop af ld [H_AUTOBGTRANSFERENABLED], a ret diff --git a/home/overworld.asm b/home/overworld.asm index 42da2240..d9bade65 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -25,7 +25,7 @@ EnterMap:: ; 01d7 (0:01d7) res 3, [hl] ld hl, wd72e res 4, [hl] - call Func_342a + call IsSurfingPikachuInParty .didNotEnterUsingFlyWarpOrDungeonWarp callba CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road ld hl, wd732 @@ -44,7 +44,7 @@ OverworldLoop:: ; 0242 (0:0242) call DelayFrame OverworldLoopLessDelay:: ; 0245 (0:0245) call DelayFrame - call Func_342a + call IsSurfingPikachuInParty call LoadGBPal ld a,[wWalkCounter] and a @@ -821,7 +821,7 @@ LoadPlayerSpriteGraphics:: ; 07d7 (0:07d7) dec a jp z, LoadBikePlayerSpriteGraphics dec a - jp z, LoadSurfingPlayerSpriteGraphics + jp z, LoadSurfingPlayerSpriteGraphics2 jp LoadWalkingPlayerSpriteGraphics IsBikeRidingAllowed:: ; 0805 (0:0805) @@ -862,7 +862,7 @@ LoadTilesetTilePatternData:: ; 0828 (0:0828) ld de,vTileset ld bc,$600 ld a,[W_TILESETBANK] - jp FarCopyData2 + jp FarCopyData ; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8 ; it can also load partial tile maps of connected maps into a border of length 3 around the current map @@ -1761,7 +1761,7 @@ RunMapScript:: ; 0d2c (0:0d2c) .return ret -Func_0d5e:: ; 0d5e (0:0d5e) +LoadWalkingPlayerSpriteGraphics:: ; 0d5e (0:0d5e) ; new sprite copy stuff xor a ld [wd473],a @@ -1769,7 +1769,7 @@ Func_0d5e:: ; 0d5e (0:0d5e) ld de,RedSprite ; $4180 jr LoadPlayerSpriteGraphicsCommon -Func_0d69:: ; 0d69 (0:0d69) +LoadSurfingPlayerSpriteGraphics2:: ; 0d69 (0:0d69) ld a,[wd473] and a jr z,.asm_0d75 @@ -1782,8 +1782,8 @@ Func_0d69:: ; 0d69 (0:0d69) bit 6,a jr z,LoadSurfingPlayerSpriteGraphics .asm_0d7c - ld b,BANK(Pointer_fedef) - ld de,Pointer_fedef ; 3f:6def + ld b,BANK(SurfingPikachuSprite) + ld de,SurfingPikachuSprite ; 3f:6def jr LoadPlayerSpriteGraphicsCommon LoadSurfingPlayerSpriteGraphics:: ; 0d83 (0:0d83) diff --git a/home/text.asm b/home/text.asm index b12f5adb..03da172b 100644 --- a/home/text.asm +++ b/home/text.asm @@ -299,7 +299,7 @@ Char51:: ; 1882 (0:1882) jp Next17B6 Char49:: ; 18a3 (0:18a3) - ld a,[hFlags_0xfffa] + ld a,[hFlags_0xFFFA] bit 3,a jr z,.Char49 ld a,$4e diff --git a/home/vblank.asm b/home/vblank.asm index fda0f6f5..66158e50 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -32,7 +32,7 @@ VBlank:: ; 1de5 (0:1de5) call VBlankCopyDouble call UpdateMovingBgTiles call $ff80 ; hOAMDMA - ld a, Bank(PrepareOAMData) + ld a, BANK(PrepareOAMData) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a call PrepareOAMData @@ -57,7 +57,7 @@ VBlank:: ; 1de5 (0:1de5) ld [H_FRAMECOUNTER], a .decced - call Func_28cb + call Func_27c2 ld a, $8 call BankswitchCommon |