diff options
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 8 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 26 |
2 files changed, 17 insertions, 17 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 89d51d0b..bf43293e 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -758,15 +758,15 @@ ItemUseSurfboard: .makePlayerMoveForward ld a, [wPlayerDirection] ; direction the player is going bit PLAYER_DIR_BIT_UP, a - ld b, D_UP + ld b, PAD_UP jr nz, .storeSimulatedButtonPress bit PLAYER_DIR_BIT_DOWN, a - ld b, D_DOWN + ld b, PAD_DOWN jr nz, .storeSimulatedButtonPress bit PLAYER_DIR_BIT_LEFT, a - ld b, D_LEFT + ld b, PAD_LEFT jr nz, .storeSimulatedButtonPress - ld b, D_RIGHT + ld b, PAD_RIGHT .storeSimulatedButtonPress ld a, b ld [wSimulatedJoypadStatesEnd], a diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index d5960afd..96f6769c 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -71,13 +71,13 @@ DisplayTownMap: call JoypadLowSensitivity ldh a, [hJoy5] ld b, a - and A_BUTTON | B_BUTTON | D_UP | D_DOWN + and PAD_A | PAD_B | PAD_UP | PAD_DOWN jr z, .inputLoop ld a, SFX_TINK call PlaySound - bit BIT_D_UP, b + bit B_PAD_UP, b jr nz, .pressedUp - bit BIT_D_DOWN, b + bit B_PAD_DOWN, b jr nz, .pressedDown xor a ld [wTownMapSpriteBlinkingEnabled], a @@ -109,7 +109,7 @@ DisplayTownMap: Func_70f87: ; unreferenced ldh a, [hJoy5] - and D_DOWN | D_UP + and PAD_DOWN | PAD_UP ret z callfar PlayPikachuSoundClip ret @@ -204,15 +204,15 @@ LoadTownMap_Fly:: ldh a, [hJoy5] ld b, a pop hl - and A_BUTTON | B_BUTTON | D_UP | D_DOWN + and PAD_A | PAD_B | PAD_UP | PAD_DOWN jr z, .inputLoop - bit BIT_A_BUTTON, b + bit B_PAD_A, b jr nz, .pressedA ld a, SFX_TINK call PlaySound - bit BIT_D_UP, b + bit B_PAD_UP, b jr nz, .pressedUp - bit BIT_D_DOWN, b + bit B_PAD_DOWN, b jr nz, .pressedDown jr .pressedB .pressedA @@ -377,7 +377,7 @@ DrawPlayerOrBirdSprite: jr nz, .loop ld hl, wShadowOAM ld de, wShadowOAMBackup - ld bc, NUM_SPRITE_OAM_STRUCTS * 4 + ld bc, OAM_COUNT * 4 jp CopyData DisplayWildLocations: @@ -424,7 +424,7 @@ DisplayWildLocations: .done ld hl, wShadowOAM ld de, wShadowOAMBackup - ld bc, NUM_SPRITE_OAM_STRUCTS * 4 + ld bc, OAM_COUNT * 4 jp CopyData AreaUnknownText: @@ -520,7 +520,7 @@ WriteSymmetricMonPartySpriteOAM: ld [hli], a ; tile ld a, [wSymmetricSpriteOAMAttributes] ld [hli], a ; attributes - xor 1 << OAM_X_FLIP + xor OAM_XFLIP ld [wSymmetricSpriteOAMAttributes], a inc d ld a, 8 @@ -613,13 +613,13 @@ TownMapSpriteBlinkingAnimation:: ; show sprites when the counter reaches 50 ld hl, wShadowOAMBackup ld de, wShadowOAM - ld bc, (NUM_SPRITE_OAM_STRUCTS - 4) * 4 + ld bc, (OAM_COUNT - 4) * 4 call CopyData xor a jr .done .hideSprites ld hl, wShadowOAM - ld b, NUM_SPRITE_OAM_STRUCTS - 4 + ld b, OAM_COUNT - 4 ld de, $4 .hideSpritesLoop ld [hl], $a0 |