diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 4 | ||||
| -rw-r--r-- | home/copy.asm | 4 | ||||
| -rw-r--r-- | home/init.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 5 | ||||
| -rw-r--r-- | home/pic.asm | 5 | ||||
| -rw-r--r-- | home/vblank.asm | 1 |
6 files changed, 10 insertions, 11 deletions
diff --git a/home/audio.asm b/home/audio.asm index 52f29b9b..21f8bb2c 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -24,7 +24,7 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) cp $2 jr z, .surfing call Func_21c8 - jr c, .asm_21ac + jr c, .walking ld a, $d2 ; MUSIC_BIKE_RIDING jr .next @@ -206,7 +206,7 @@ PlaySound:: ; 2238 (0:2238) ld [wMusicHeaderPointer], a .noFadeOut xor a - ld [wc0ee], a + ld [wNewSoundID], a call Func_22ec jr .done .fadeOut diff --git a/home/copy.asm b/home/copy.asm index e14d859c..8dc2acea 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,9 +1,9 @@ FarCopyData:: ; 009d (0:009d) ; Copy bc bytes from a:hl to de. - ld [wd122+1], a + ld [wFarCopyDataSavedROMBank], a ld a, [H_LOADEDROMBANK] push af - ld a, [wd122+1] + ld a, [wFarCopyDataSavedROMBank] call BankswitchCommon call CopyData pop af diff --git a/home/init.asm b/home/init.asm index 8d0aeab3..67d52dd2 100644 --- a/home/init.asm +++ b/home/init.asm @@ -128,7 +128,7 @@ ClearVram: ; 1dc6 (0:1dc6) StopAllSounds:: - ld a, BANK(Audio1_UpdateMusic) + ld a, $2 ld [wAudioROMBank], a ld [wAudioSavedROMBank], a xor a diff --git a/home/overworld.asm b/home/overworld.asm index 7b9fadfa..314aa1b3 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -765,6 +765,9 @@ HandleFlyWarpOrDungeonWarp:: ; 0794 (0:0794) callbs SpecialWarpIn jp SpecialEnterMap +LeaveMapAnim:: ; 07bc (0:07bc) + jpba _LeaveMapAnim + Func_07c4:: ; 07c4 (0:07c4) ld a, [wWalkBikeSurfState] and a @@ -1457,7 +1460,7 @@ AdvancePlayerSprite:: ; 0b7f (0:0b7f) ; the portion of the map that was newly exposed due to the player's movement ScheduleNorthRowRedraw:: ; 0b95 (0:0b95) - hlCoord 0, 0 + coord hl, 0, 0 call CopyToRedrawRowOrColumnSrcTiles ld a,[wMapViewVRAMPointer] ld [H_SCREENEDGEREDRAWADDR],a diff --git a/home/pic.asm b/home/pic.asm index 28ffcbc7..96cd6cd1 100644 --- a/home/pic.asm +++ b/home/pic.asm @@ -535,13 +535,8 @@ ReverseNybble:: ; 272d (0:272d) ret ; resets sprite buffer pointers to buffer 1 and 2, depending on W_SPRITELOADFLAGS -<<<<<<< HEAD ResetSpriteBufferPointers:: ; 2737 (0:2737) ld a, [W_SPRITELOADFLAGS] ; wd0a8 -======= -ResetSpriteBufferPointers:: ; 2841 (0:2841) - ld a, [W_SPRITELOADFLAGS] ->>>>>>> 1a987d1e1ab96ca9553d4253c72858057332a03a bit 0, a jr nz, .buffer2Selected ld de, S_SPRITEBUFFER1 diff --git a/home/vblank.asm b/home/vblank.asm index 8eff5bab..1df155db 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -55,6 +55,7 @@ VBlank:: ; 1de5 (0:1de5) jr z, .skipDec dec a ld [H_FRAMECOUNTER], a +.skipDec call FadeOutAudio |