diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/overworld | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/cut.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/cut2.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/dust_smoke.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/healing_machine.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/player_state.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/trainer_sight.asm | 10 |
6 files changed, 14 insertions, 14 deletions
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index d26832ec..76821045 100644 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -76,7 +76,7 @@ InitCutAnimOAM: ld [wWhichAnimationOffsets], a ld a, %11100100 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 ld a, [wCutTile] cp $52 jr z, .grass diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm index 3cbd05b4..a6effff5 100644 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm @@ -18,7 +18,7 @@ AnimCut: ldh a, [rOBP1] xor $64 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 call DelayFrame pop bc dec c @@ -69,7 +69,7 @@ AnimCutGrass_UpdateOAMEntries: ldh a, [rOBP1] xor $64 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 call DelayFrame pop bc dec c diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm index 220d5794..669e1166 100644 --- a/engine/overworld/dust_smoke.asm +++ b/engine/overworld/dust_smoke.asm @@ -7,7 +7,7 @@ AnimateBoulderDust: ld [wUpdateSpritesEnabled], a ld a, %11100100 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 call LoadSmokeTileFourTimes farcall WriteCutOrBoulderDustAnimationOAMBlock ld c, 8 ; number of steps in animation @@ -22,7 +22,7 @@ AnimateBoulderDust: ldh a, [rOBP1] xor %01100100 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 call Delay3 pop bc dec c diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 3bd739b7..dfc6b97b 100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -12,7 +12,7 @@ AnimateHealingMachine: push af ld a, $e0 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 ld hl, wShadowOAMSprite33 ld de, PokeCenterOAMData call CopyHealingMachineOAM @@ -54,7 +54,7 @@ AnimateHealingMachine: call DelayFrames pop af ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 pop hl pop af ld [hl], a @@ -81,7 +81,7 @@ FlashSprite8Times: ldh a, [rOBP1] xor d ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 ld c, 10 call DelayFrames dec b diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index 1da1b36d..d29a5425 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -396,7 +396,7 @@ CheckForBoulderCollisionWithSprites: ld a, [hli] ld b, a ldh a, [hPlayerFacing] - assert BIT_FACING_DOWN == 0 + ASSERT BIT_FACING_DOWN == 0 rrca jr c, .pushingDown ; pushing up diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm index f32b558a..da845fda 100644 --- a/engine/overworld/trainer_sight.asm +++ b/engine/overworld/trainer_sight.asm @@ -97,8 +97,8 @@ TrainerWalkUpToPlayer:: swap a dec a ld c, a ; bc = steps yet to go to reach player - xor a - ld b, a ; a = direction to go to + xor a ; NPC_MOVEMENT_DOWN + ld b, a jr .writeWalkScript .facingUp ld a, [wTrainerScreenY] @@ -111,7 +111,7 @@ TrainerWalkUpToPlayer:: dec a ld c, a ; bc = steps yet to go to reach player ld b, $0 - ld a, $40 ; a = direction to go to + ld a, NPC_MOVEMENT_UP jr .writeWalkScript .facingRight ld a, [wTrainerScreenX] @@ -124,7 +124,7 @@ TrainerWalkUpToPlayer:: dec a ld c, a ; bc = steps yet to go to reach player ld b, $0 - ld a, $c0 ; a = direction to go to + ld a, NPC_MOVEMENT_RIGHT jr .writeWalkScript .facingLeft ld a, [wTrainerScreenX] @@ -137,7 +137,7 @@ TrainerWalkUpToPlayer:: dec a ld c, a ; bc = steps yet to go to reach player ld b, $0 - ld a, $80 ; a = direction to go to + ld a, NPC_MOVEMENT_LEFT .writeWalkScript ld hl, wNPCMovementDirections2 ld de, wNPCMovementDirections2 |