diff options
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/cable_club.asm | 40 | ||||
| -rw-r--r-- | engine/link/cable_club_npc.asm | 6 |
2 files changed, 23 insertions, 23 deletions
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 2bf36f18..872e9b9c 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -110,16 +110,16 @@ CableClub_DoBattleOrTradeAgain: call Delay3 xor a ldh [hSerialSendData], a - ld a, START_TRANSFER_INTERNAL_CLOCK + ld a, SC_START | SC_INTERNAL ldh [rSC], a call DelayFrame xor a ldh [hSerialSendData], a - ld a, START_TRANSFER_INTERNAL_CLOCK + ld a, SC_START | SC_INTERNAL ldh [rSC], a .skipSendingTwoZeroBytes call Delay3 - ld a, 1 << SERIAL + ld a, IE_SERIAL ldh [rIE], a ld hl, wSerialRandomNumberListBlock ld de, wSerialOtherGameboyRandomNumberListBlock @@ -140,7 +140,7 @@ CableClub_DoBattleOrTradeAgain: ld bc, 200 vc_hook Wireless_ExchangeBytes_patch_lists call Serial_ExchangeBytes - ld a, (1 << SERIAL) | (1 << TIMER) | (1 << VBLANK) + ld a, IE_SERIAL | IE_TIMER | IE_VBLANK ldh [rIE], a ld a, SFX_STOP_ALL_MUSIC call PlaySound @@ -332,7 +332,7 @@ TradeCenter_SelectMon: ld [wMenuWatchMovingOutOfBounds], a inc a ld [wWhichTradeMonSelectionMenu], a - ld a, D_DOWN | D_LEFT | A_BUTTON + ld a, PAD_DOWN | PAD_LEFT | PAD_A ld [wMenuWatchedKeys], a ld a, [wEnemyPartyCount] ld [wMaxMenuItem], a @@ -348,7 +348,7 @@ TradeCenter_SelectMon: res BIT_DOUBLE_SPACED_MENU, [hl] and a jp z, .getNewInput - bit BIT_A_BUTTON, a + bit B_PAD_A, a jr z, .enemyMonMenu_ANotPressed ; if A button pressed ld a, [wMaxMenuItem] @@ -367,7 +367,7 @@ TradeCenter_SelectMon: call TradeCenter_DisplayStats jp .getNewInput .enemyMonMenu_ANotPressed - bit BIT_D_LEFT, a + bit B_PAD_LEFT, a jr z, .enemyMonMenu_LeftNotPressed ; if Left pressed, switch back to the player mon menu xor a ; player mon menu @@ -387,14 +387,14 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a jr .playerMonMenu .enemyMonMenu_LeftNotPressed - bit BIT_D_DOWN, a + bit B_PAD_DOWN, a jp z, .getNewInput jp .selectedCancelMenuItem ; jump if Down pressed .playerMonMenu xor a ; player mon menu ld [wWhichTradeMonSelectionMenu], a ld [wMenuWatchMovingOutOfBounds], a - ld a, D_DOWN | D_RIGHT | A_BUTTON + ld a, PAD_DOWN | PAD_RIGHT | PAD_A ld [wMenuWatchedKeys], a ld a, [wPartyCount] ld [wMaxMenuItem], a @@ -415,7 +415,7 @@ TradeCenter_SelectMon: jr nz, .playerMonMenu_SomethingPressed jp .getNewInput .playerMonMenu_SomethingPressed - bit BIT_A_BUTTON, a + bit B_PAD_A, a jr z, .playerMonMenu_ANotPressed jp .chosePlayerMon ; jump if A button pressed ; unreachable code @@ -425,7 +425,7 @@ TradeCenter_SelectMon: call TradeCenter_DisplayStats jp .getNewInput .playerMonMenu_ANotPressed - bit BIT_D_RIGHT, a + bit B_PAD_RIGHT, a jr z, .playerMonMenu_RightNotPressed ; if Right pressed, switch to the enemy mon menu ld a, $1 ; enemy mon menu @@ -447,7 +447,7 @@ TradeCenter_SelectMon: .notPastLastEnemyMon jp .enemyMonMenu .playerMonMenu_RightNotPressed - bit BIT_D_DOWN, a + bit B_PAD_DOWN, a jr z, .getNewInput jp .selectedCancelMenuItem ; jump if Down pressed .getNewInput @@ -484,14 +484,14 @@ TradeCenter_SelectMon: .selectStatsMenuItem ld a, " " ldcoord_a 11, 16 - ld a, D_RIGHT | B_BUTTON | A_BUTTON + ld a, PAD_RIGHT | PAD_B | PAD_A ld [wMenuWatchedKeys], a ld a, 1 ld [wTopMenuItemX], a call HandleMenuInput - bit BIT_D_RIGHT, a + bit B_PAD_RIGHT, a jr nz, .selectTradeMenuItem - bit BIT_B_BUTTON, a + bit B_PAD_B, a jr z, .displayPlayerMonStats .cancelPlayerMonChoice pop af @@ -501,14 +501,14 @@ TradeCenter_SelectMon: .selectTradeMenuItem ld a, " " ldcoord_a 1, 16 - ld a, D_LEFT | B_BUTTON | A_BUTTON + ld a, PAD_LEFT | PAD_B | PAD_A ld [wMenuWatchedKeys], a ld a, 11 ld [wTopMenuItemX], a call HandleMenuInput - bit BIT_D_LEFT, a + bit B_PAD_LEFT, a jr nz, .selectStatsMenuItem - bit BIT_B_BUTTON, a + bit B_PAD_B, a jr nz, .cancelPlayerMonChoice jr .choseTrade .displayPlayerMonStats @@ -557,9 +557,9 @@ TradeCenter_SelectMon: ldh a, [hJoy5] and a ; pressed anything? jr z, .cancelMenuItem_JoypadLoop - bit BIT_A_BUTTON, a + bit B_PAD_A, a jr nz, .cancelMenuItem_APressed - bit BIT_D_UP, a + bit B_PAD_UP, a jr z, .cancelMenuItem_JoypadLoop ; if Up pressed ld a, " " diff --git a/engine/link/cable_club_npc.asm b/engine/link/cable_club_npc.asm index d88538b0..19e59eca 100644 --- a/engine/link/cable_club_npc.asm +++ b/engine/link/cable_club_npc.asm @@ -26,7 +26,7 @@ CableClubNPC:: ldh [rSB], a xor a ldh [hSerialReceiveData], a - ld a, START_TRANSFER_EXTERNAL_CLOCK + ld a, SC_START | SC_EXTERNAL ; This vc_hook causes the Virtual Console to set [hSerialConnectionStatus] to ; USING_INTERNAL_CLOCK, which allows the player to proceed past the link ; receptionist's "Please wait." It assumes that hSerialConnectionStatus is at @@ -43,7 +43,7 @@ CableClubNPC:: jr z, .failedToEstablishConnection ld a, ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK ldh [rSB], a - ld a, START_TRANSFER_INTERNAL_CLOCK + ld a, SC_START | SC_INTERNAL ldh [rSC], a call DelayFrame jr .establishConnectionLoop @@ -158,6 +158,6 @@ CloseLinkConnection: ldh [rSB], a xor a ldh [hSerialReceiveData], a - ld a, START_TRANSFER_EXTERNAL_CLOCK + ld a, SC_START | SC_EXTERNAL ldh [rSC], a ret |