diff options
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/cut.asm | 11 | ||||
| -rw-r--r-- | engine/overworld/emotion_bubbles.asm | 11 | ||||
| -rw-r--r-- | engine/overworld/npc_movement_2.asm | 6 |
3 files changed, 17 insertions, 11 deletions
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 8cc76104..d26832ec 100644 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -120,12 +120,15 @@ LoadCutGrassAnimationTilePattern: WriteCutOrBoulderDustAnimationOAMBlock: call GetCutOrBoulderDustAnimationOffsets ld a, $9 - ld de, CutOrBoulderDustAnimationTilesAndAttributes + ld de, .OAMBlock jp WriteOAMBlock -CutOrBoulderDustAnimationTilesAndAttributes: - dbsprite 2, -1, 4, 4, $fd, OAM_OBP1 | OAM_HIGH_PALS - dbsprite 2, -1, 4, 6, $ff, OAM_OBP1 | OAM_HIGH_PALS +.OAMBlock: +; tile ID, attributes + db $fc, OAM_OBP1 | OAM_HIGH_PALS + db $fd, OAM_OBP1 | OAM_HIGH_PALS + db $fe, OAM_OBP1 | OAM_HIGH_PALS + db $ff, OAM_OBP1 | OAM_HIGH_PALS GetCutOrBoulderDustAnimationOffsets: ld hl, wSpritePlayerStateData1YPixels diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index 61bbc4f5..da9502b0 100644 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -54,7 +54,7 @@ EmotionBubble: add $8 ld c, a - ld de, EmotionBubblesOAM + ld de, EmotionBubblesOAMBlock xor a call WriteOAMBlock ld c, 60 @@ -66,9 +66,12 @@ EmotionBubble: ret -EmotionBubblesOAM: - dbsprite 0, -1, 0, 0, $f9, 0 - dbsprite 0, -1, 0, 2, $fb, 0 +EmotionBubblesOAMBlock: +; tile ID, attributes + db $f8, 0 + db $f9, 0 + db $fa, 0 + db $fb, 0 EmotionBubbles: ShockEmote: INCBIN "gfx/emotes/shock.2bpp" diff --git a/engine/overworld/npc_movement_2.asm b/engine/overworld/npc_movement_2.asm index 2ced9da6..bca9bf52 100644 --- a/engine/overworld/npc_movement_2.asm +++ b/engine/overworld/npc_movement_2.asm @@ -1,7 +1,7 @@ -FreezeEnemyTrainerSprite:: +SetEnemyTrainerToStayAndFaceAnyDirection:: ld a, [wCurMap] cp POKEMON_TOWER_7F - ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them + ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't set them ld hl, RivalIDs ld a, [wEngagedTrainerClass] ld b, a @@ -10,7 +10,7 @@ FreezeEnemyTrainerSprite:: cp -1 jr z, .notRival cp b - ret z ; the rival leaves after battling, so don't freeze him + ret z ; the rival leaves after battling, so don't set him jr .loop .notRival ld a, [wSpriteIndex] |