diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/check_player_state.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/map_sprite_functions1.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm index 5fad4fc5..b1951de0 100644 --- a/engine/overworld/check_player_state.asm +++ b/engine/overworld/check_player_state.asm @@ -210,7 +210,7 @@ IsPlayerStandingOnDoorTileOrWarpTile: push hl push de push bc - callba IsPlayerStandingOnDoorTile ; 6:6785 + callba IsPlayerStandingOnDoorTile jr c, .done ld a, [wCurMapTileset] add a diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 1dc74e2d..4648f68b 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,5 +1,5 @@ AnimateHealingMachine: - ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7 + ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles call CopyVideoData @@ -11,10 +11,10 @@ AnimateHealingMachine: ld a, [rOBP1] push af ld a, $e0 - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call UpdateGBCPal_OBP1 ld hl, wOAMBuffer + $84 - ld de, PokeCenterOAMData ; $44d7 + ld de, PokeCenterOAMData call CopyHealingMachineOAM ld a, 4 ld [wAudioFadeOutControl], a @@ -53,7 +53,7 @@ AnimateHealingMachine: ld c, 32 call DelayFrames pop af - ld [rOBP1], a ; $ff49 + ld [rOBP1], a call UpdateGBCPal_OBP1 pop hl pop af diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm index f0a718bd..2ad923fb 100644 --- a/engine/overworld/map_sprite_functions1.asm +++ b/engine/overworld/map_sprite_functions1.asm @@ -23,7 +23,7 @@ _UpdateSprites: cp $e ; test for overflow (back at $0e) jr nz, .spriteLoop ret -.updateCurrentSprite ; 4bd7 (1:4bd7) +.updateCurrentSprite ld a, [H_CURRENTSPRITEOFFSET] and a jp z, UpdatePlayerSprite diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index eea1b375..95a8cc12 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -253,12 +253,12 @@ DoFlyAnimation: ret LoadBirdSpriteGraphics: - ld de, BirdSprite ; $4d80 + ld de, BirdSprite ld b, BANK(BirdSprite) ld c, $c ld hl, vNPCSprites call CopyVideoData - ld de, BirdSprite + $c0 ; $4e40 ; moving amination sprite + ld de, BirdSprite + $c0 ; moving amination sprite ld b, BANK(BirdSprite) ld c, $0c ld hl, vNPCSprites2 @@ -394,7 +394,7 @@ FishingAnim: ld hl, wd736 set 6, [hl] ld hl, vNPCSprites - ld de, RedSprite ; $4180 + ld de, RedSprite ld b, BANK(RedSprite) ld c, $c call CopyVideoData @@ -463,7 +463,7 @@ FishingAnim: call LoadFontTilePatterns ret -.ShakePlayerSprite ; 708a3 (1c:48a3) +.ShakePlayerSprite ld a, [hl] xor $1 ld [hl], a |