diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-03 19:20:47 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-03 19:20:47 -0400 |
| commit | 2187d8d8af1ff2372610806539c245657639cf85 (patch) | |
| tree | 469560dc74056db9ac53f04b9970c35b2da54b0d /engine/overworld | |
| parent | Attempt to make Yellow Buildable, part 5 (diff) | |
| download | pokeyellow-2187d8d8af1ff2372610806539c245657639cf85.tar.gz pokeyellow-2187d8d8af1ff2372610806539c245657639cf85.tar.xz pokeyellow-2187d8d8af1ff2372610806539c245657639cf85.zip | |
Attempt to make Yellow buildable, part 6.
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 09abf779..eb23c80c 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -29,7 +29,7 @@ AnimateHealingMachine: ; 7048b (1c:448b) ld b, a .asm_704c4 call Func_7055a - ld a, (SFX_02_4a - SFX_Headers_02) / 3 + ld a, $9e ; (SFX_02_4a - SFX_Headers_02) / 3 call PlaySound ld c, $1e call DelayFrames @@ -41,17 +41,17 @@ AnimateHealingMachine: ; 7048b (1c:448b) jr nz, .asm_704e6 call StopAllMusic call PlaySound - ld a, BANK(Music_PkmnHealed) + ld a, $2 ; BANK(Music_PkmnHealed) ld [wc0ef], a .asm_704e6 - ld a, MUSIC_PKMN_HEALED + ld a, $e8 ; MUSIC_PKMN_HEALED ld [wc0ee], a call PlaySound ld d, $28 call FlashSprite8Times .asm_704f3 ld a, [wc026] - cp MUSIC_PKMN_HEALED + cp $e8 ; MUSIC_PKMN_HEALED jr z, .asm_704f3 ld c, $20 call DelayFrames diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index bd0a52b5..43d3ec9c 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -9,7 +9,7 @@ EnterMapAnim: ; 70567 (1c:4567) bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation - ld a, (SFX_02_4c - SFX_Headers_02) / 3 + ld a, $a0 ; (SFX_02_4c - SFX_Headers_02) / 3 call PlaySound ld hl, wd732 bit 4, [hl] ; used dungeon warp? @@ -17,7 +17,7 @@ EnterMapAnim: ; 70567 (1c:4567) ;res 4, [hl] jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown - ld a, (SFX_02_4f - SFX_Headers_02) / 3 + ld a, $a3 ; (SFX_02_4f - SFX_Headers_02) / 3 call PlaySound call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -55,7 +55,7 @@ EnterMapAnim: ; 70567 (1c:4567) ;ld bc, (BANK(BirdSprite) << 8) + $0c ;call CopyVideoData call LoadBirdSpriteGraphics - ld a, (SFX_02_50 - SFX_Headers_02) / 3 + ld a, $a4 ; (SFX_02_50 - SFX_Headers_02) / 3 call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -107,7 +107,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) dec a jp nz, LeaveMapThroughHoleAnim .spinWhileMovingUp - ld a, (SFX_02_4b - SFX_Headers_02) / 3 + ld a, $9f ; (SFX_02_4b - SFX_Headers_02) / 3 call PlaySound ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY ld a, -$10 @@ -141,7 +141,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID + ld [hl], $a1 ; (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID ld hl, wcd48 call PlayerSpinInPlace jr .spinWhileMovingUp @@ -154,7 +154,7 @@ _LeaveMapAnim: ; 70615 (1c:4615) ld [hli], a ; wFlyAnimCounter ld [hl], $c ; wFlyAnimBirdSpriteImageIndex call DoFlyAnimation - ld a, (SFX_02_50 - SFX_Headers_02) / 3 + ld a, $a4 ; (SFX_02_50 - SFX_Headers_02) / 3 call PlaySound ld hl, wFlyAnimUsingCoordList xor a ; is using coord list @@ -452,7 +452,7 @@ Func_70816: ; 70816 (1c:4816) call LoadFontTilePatterns ret -Func_70842: ; 708a3 (1c:48a3) +Func_708a3: ; 708a3 (1c:48a3) ld a, [hl] xor $1 ld [hl], a |