foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-23 06:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename joypad registers.

Browse source
This commit is contained in:
yenatch 2014-05-25 10:51:53 -07:00
parent 1ee8de792b
commit 031e33957d
73 changed files with 306 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/battle/core.asm
View file

@ -6677,7 +6677,7 @@ asm_3ef23: ; 3ef23 (f:6f23)
ld a, [$d732] ld a, [$d732]
bit 1, a bit 1, a
jr z, .asm_3ef2f jr z, .asm_3ef2f
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
bit 1, a bit 1, a
ret nz ret nz
.asm_3ef2f .asm_3ef2f

2
engine/hidden_object_functions7.asm
View file

@ -94,7 +94,7 @@ asm_1e9b0: ; 1e9b0 (7:69b0)
PrintSafariGameOverText: ; 1e9ed (7:69ed) PrintSafariGameOverText: ; 1e9ed (7:69ed)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, SafariGameOverText ld hl, SafariGameOverText
jp PrintText jp PrintText

2
engine/intro.asm
View file

@ -1,6 +1,6 @@
PlayIntro: ; 41682 (10:5682) PlayIntro: ; 41682 (10:5682)
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
inc a inc a
ld [H_AUTOBGTRANSFERENABLED], a ld [H_AUTOBGTRANSFERENABLED], a
call PlayShootingStar call PlayShootingStar

4
engine/items/items.asm
View file

@ -530,7 +530,7 @@ ItemUseBicycle: ; d977 (3:5977)
jp nc,NoCyclingAllowedHere jp nc,NoCyclingAllowedHere
call ItemUseReloadOverworldData call ItemUseReloadOverworldData
xor a ; no keys pressed xor a ; no keys pressed
ld [H_CURRENTPRESSEDBUTTONS],a ; current joypad state ld [hJoyHeld],a ; current joypad state
inc a inc a
ld [$d700],a ; change player state to bicycling ld [$d700],a ; change player state to bicycling
ld hl,GotOnBicycleText ld hl,GotOnBicycleText
@ -593,7 +593,7 @@ ItemUseSurfboard: ; d9b4 (3:59b4)
xor a xor a
ld [$d700],a ; change player state to walking ld [$d700],a ; change player state to walking
dec a dec a
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
call Func_2307 ; play walking music call Func_2307 ; play walking music
jp LoadWalkingPlayerSpriteGraphics jp LoadWalkingPlayerSpriteGraphics
; uses a simulated button press to make the player move forward ; uses a simulated button press to make the player move forward

2
engine/menu/league_pc.asm
View file

@ -54,7 +54,7 @@ Func_765e5: ; 765e5 (1d:65e5)
push bc push bc
call Func_76610 call Func_76610
call WaitForTextScrollButtonPress call WaitForTextScrollButtonPress
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
bit 1, a bit 1, a
jr nz, .fifth jr nz, .fifth
ld hl, $CC6B ld hl, $CC6B

12
engine/menu/main_menu.asm
View file

@ -97,11 +97,11 @@ MainMenu: ; 5af2 (1:5af2)
set 5,[hl] set 5,[hl]
.next6 .next6
xor a xor a
ld [H_NEWLYPRESSEDBUTTONS],a ld [hJoyPressed],a
ld [H_NEWLYRELEASEDBUTTONS],a ld [hJoyReleased],a
ld [H_CURRENTPRESSEDBUTTONS],a ld [hJoyHeld],a
call GetJoypadState call GetJoypadState
ld a,[H_CURRENTPRESSEDBUTTONS] ld a,[hJoyHeld]
bit 0,a bit 0,a
jr nz,.next5 jr nz,.next5
bit 1,a bit 1,a
@ -315,8 +315,8 @@ Func_5d52: ; 5d52 (1:5d52)
Func_5d5f: ; 5d5f (1:5d5f) Func_5d5f: ; 5d5f (1:5d5f)
xor a xor a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$ffb5], a ld [$ffb5], a
ld [$d72d], a ld [$d72d], a
ld hl, $d732 ld hl, $d732

2
engine/menu/naming_screen.asm
View file

@ -134,7 +134,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
pop af pop af
ld [wCurrentMenuItem], a ; $cc26 ld [wCurrentMenuItem], a ; $cc26
call GetJoypadStateLowSensitivity call GetJoypadStateLowSensitivity
ld a, [H_NEWLYPRESSEDBUTTONS] ld a, [hJoyPressed]
and a and a
jr z, .asm_65ff jr z, .asm_65ff
ld hl, .unknownPointerTable_665e ; $665e ld hl, .unknownPointerTable_665e ; $665e

2
engine/menu/start_menu.asm
View file

@ -81,7 +81,7 @@ RedisplayStartMenu:: ; 2adf (0:2adf)
; EXIT falls through to here ; EXIT falls through to here
CloseStartMenu:: ; 2b70 (0:2b70) CloseStartMenu:: ; 2b70 (0:2b70)
call GetJoypadState call GetJoypadState
ld a,[H_NEWLYPRESSEDBUTTONS] ld a,[hJoyPressed]
bit 0,a ; was A button newly pressed? bit 0,a ; was A button newly pressed?
jr nz,CloseStartMenu jr nz,CloseStartMenu
call LoadTextBoxTilePatterns call LoadTextBoxTilePatterns

4
engine/overworld/ledges.asm
View file

@ -38,11 +38,11 @@ HandleLedges: ; 1a672 (6:6672)
inc hl inc hl
jr .asm_1a691 jr .asm_1a691
.asm_1a6a9 .asm_1a6a9
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
and e and e
ret z ret z
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d736 ld hl, $d736
set 6, [hl] set 6, [hl]
call Func_3486 call Func_3486

4
engine/overworld/npc_movement.asm
View file

@ -4,7 +4,7 @@ Func_1a3e0: ; 1a3e0 (6:63e0)
call HandleDoors call HandleDoors
jr nc, .asm_1a406 jr nc, .asm_1a406
ld a, $fc ld a, $fc
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d736 ld hl, $d736
set 1, [hl] set 1, [hl]
ld a, $1 ld a, $1
@ -76,7 +76,7 @@ Func_1a44c: ; 1a44c (6:644c)
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
set 1, [hl] set 1, [hl]
ld a, $fc ld a, $fc
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
Func_1a485: ; 1a485 (6:6485) Func_1a485: ; 1a485 (6:6485)

8
engine/overworld/player_animations.asm
View file

@ -503,16 +503,16 @@ _HandleMidJump: ; 7087e (1c:487e)
call UpdateSprites call UpdateSprites
call Delay3 call Delay3
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_NEWLYRELEASEDBUTTONS], a ld [hJoyReleased], a
ld [$d714], a ld [$d714], a
ld hl, $d736 ld hl, $d736
res 6, [hl] res 6, [hl]
ld hl, $d730 ld hl, $d730
res 7, [hl] res 7, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
PlayerJumpingYScreenCoords: ; 708ba (1c:48ba) PlayerJumpingYScreenCoords: ; 708ba (1c:48ba)

4
engine/play_time.asm
View file

@ -56,6 +56,6 @@ Func_18e36: ; 18e36 (6:4e36)
ld [$d730], a ld [$d730], a
ret z ret z
xor a xor a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ret ret

2
engine/titlescreen.asm
View file

@ -238,7 +238,7 @@ ENDC
call Func_4533 call Func_4533
call Delay3 call Delay3
call LoadGBPal call LoadGBPal
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
ld b, a ld b, a
and $46 and $46
cp $46 cp $46

84
home.asm
View file

@ -150,7 +150,7 @@ ReadJoypad::
and %1111 and %1111
or b or b
ld [H_JOYPADSTATE], a ld [hJoyInput], a
ld a, 1 << 4 + 1 << 5 ; deselect keys ld a, 1 << 4 + 1 << 5 ; deselect keys
ld [rJOYP], a ld [rJOYP], a
@ -158,9 +158,9 @@ ReadJoypad::
GetJoypadState:: GetJoypadState::
; Update the joypad state variables: ; Update the joypad state variables:
; [H_NEWLYRELEASEDBUTTONS] keys released since last time ; [hJoyReleased] keys released since last time
; [H_NEWLYPRESSEDBUTTONS] keys pressed since last time ; [hJoyPressed] keys pressed since last time
; [H_CURRENTPRESSEDBUTTONS] currently pressed keys ; [hJoyHeld] currently pressed keys
homecall _GetJoypadState homecall _GetJoypadState
ret ret
@ -177,7 +177,7 @@ HandleMidJump::
EnterMap:: EnterMap::
; Load a new map. ; Load a new map.
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call LoadMapData call LoadMapData
callba Func_c335 ; initialize map variables callba Func_c335 ; initialize map variables
ld hl, $d72c ld hl, $d72c
@ -207,7 +207,7 @@ EnterMap::
set 5, [hl] set 5, [hl]
set 6, [hl] set 6, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
OverworldLoop:: OverworldLoop::
call DelayFrame call DelayFrame
@ -238,10 +238,10 @@ OverworldLoopLessDelay::
ld a,[$d730] ld a,[$d730]
bit 7,a ; are we simulating button presses? bit 7,a ; are we simulating button presses?
jr z,.notSimulating jr z,.notSimulating
ld a,[H_CURRENTPRESSEDBUTTONS] ld a,[hJoyHeld]
jr .checkIfStartIsPressed jr .checkIfStartIsPressed
.notSimulating .notSimulating
ld a,[H_NEWLYPRESSEDBUTTONS] ld a,[hJoyPressed]
.checkIfStartIsPressed .checkIfStartIsPressed
bit 3,a ; start button bit 3,a ; start button
jr z,.startButtonNotPressed jr z,.startButtonNotPressed
@ -317,7 +317,7 @@ OverworldLoopLessDelay::
ld [$d528],a ; zero the direction ld [$d528],a ; zero the direction
jp OverworldLoop jp OverworldLoop
.checkIfDownButtonIsPressed .checkIfDownButtonIsPressed
ld a,[H_CURRENTPRESSEDBUTTONS] ; current joypad state ld a,[hJoyHeld] ; current joypad state
bit 7,a ; down button bit 7,a ; down button
jr z,.checkIfUpButtonIsPressed jr z,.checkIfUpButtonIsPressed
ld a,$01 ld a,$01
@ -489,7 +489,7 @@ OverworldLoopLessDelay::
set 5,[hl] set 5,[hl]
set 6,[hl] set 6,[hl]
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS],a ; clear joypad state ld [hJoyHeld],a ; clear joypad state
ld a,[W_CURMAP] ld a,[W_CURMAP]
cp a,CINNABAR_GYM cp a,CINNABAR_GYM
jr nz,.notCinnabarGym jr nz,.notCinnabarGym
@ -541,7 +541,7 @@ BikeSpeedup:: ; 06a0 (0:06a0)
ld a,[W_CURMAP] ld a,[W_CURMAP]
cp a,ROUTE_17 ; Cycling Road cp a,ROUTE_17 ; Cycling Road
jr nz,.goFaster jr nz,.goFaster
ld a,[H_CURRENTPRESSEDBUTTONS] ; current joypad state ld a,[hJoyHeld] ; current joypad state
and a,%01110000 ; bit mask for up, left, right buttons and a,%01110000 ; bit mask for up, left, right buttons
ret nz ret nz
.goFaster .goFaster
@ -591,7 +591,7 @@ CheckWarpsNoCollisionLoop:: ; 06cc (0:06cc)
call GetJoypadState call GetJoypadState
pop bc pop bc
pop de pop de
ld a,[H_CURRENTPRESSEDBUTTONS] ; current joypad state ld a,[hJoyHeld] ; current joypad state
and a,%11110000 ; bit mask for directional buttons and a,%11110000 ; bit mask for directional buttons
jr z,CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp jr z,CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp
jr WarpFound1 jr WarpFound1
@ -2018,17 +2018,17 @@ GetJoypadStateOverworld:: ; 0f4d (0:0f4d)
ld a,[W_CURMAP] ld a,[W_CURMAP]
cp a,ROUTE_17 ; Cycling Road cp a,ROUTE_17 ; Cycling Road
jr nz,.notForcedDownwards jr nz,.notForcedDownwards
ld a,[H_CURRENTPRESSEDBUTTONS] ; current joypad state ld a,[hJoyHeld] ; current joypad state
and a,%11110011 ; bit mask for all directions and A/B and a,%11110011 ; bit mask for all directions and A/B
jr nz,.notForcedDownwards jr nz,.notForcedDownwards
ld a,%10000000 ; down pressed ld a,%10000000 ; down pressed
ld [H_CURRENTPRESSEDBUTTONS],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press
.notForcedDownwards .notForcedDownwards
ld a,[$d730] ld a,[$d730]
bit 7,a bit 7,a
ret z ret z
; if simulating button presses ; if simulating button presses
ld a,[H_CURRENTPRESSEDBUTTONS] ; current joypad state ld a,[hJoyHeld] ; current joypad state
ld b,a ld b,a
ld a,[$cd3b] ; bit mask for button presses that override simulated ones ld a,[$cd3b] ; bit mask for button presses that override simulated ones
and b and b
@ -2046,11 +2046,11 @@ GetJoypadStateOverworld:: ; 0f4d (0:0f4d)
inc h inc h
.noCarry .noCarry
ld a,[hl] ld a,[hl]
ld [H_CURRENTPRESSEDBUTTONS],a ; store simulated button press in joypad state ld [hJoyHeld],a ; store simulated button press in joypad state
and a and a
ret nz ret nz
ld [H_NEWLYPRESSEDBUTTONS],a ld [hJoyPressed],a
ld [H_NEWLYRELEASEDBUTTONS],a ld [hJoyReleased],a
ret ret
; if done simulating button presses ; if done simulating button presses
.doneSimulating .doneSimulating
@ -2058,8 +2058,8 @@ GetJoypadStateOverworld:: ; 0f4d (0:0f4d)
ld [$cd3a],a ld [$cd3a],a
ld [$cd38],a ld [$cd38],a
ld [$ccd3],a ld [$ccd3],a
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
ld [H_CURRENTPRESSEDBUTTONS],a ld [hJoyHeld],a
ld hl,$d736 ld hl,$d736
ld a,[hl] ld a,[hl]
and a,$f8 and a,$f8
@ -2598,7 +2598,7 @@ CheckForUserInterruption:: ; 12f8 (0:12f8)
push bc push bc
call GetJoypadStateLowSensitivity call GetJoypadStateLowSensitivity
pop bc pop bc
ld a,[H_CURRENTPRESSEDBUTTONS] ; currently pressed buttons ld a,[hJoyHeld] ; currently pressed buttons
cp a,%01000110 ; Up, Select button, B button cp a,%01000110 ; Up, Select button, B button
jr z,.setCarry ; if all three keys are pressed jr z,.setCarry ; if all three keys are pressed
ld a,[$ffb5] ; either newly pressed buttons or currently pressed buttons at low sampling rate ld a,[$ffb5] ; either newly pressed buttons or currently pressed buttons at low sampling rate
@ -4226,7 +4226,7 @@ TextCommand09:: ; 1bff (0:1bff)
TextCommand0A:: ; 1c1d (0:1c1d) TextCommand0A:: ; 1c1d (0:1c1d)
push bc push bc
call GetJoypadState call GetJoypadState
ld a,[H_CURRENTPRESSEDBUTTONS] ld a,[hJoyHeld]
and a,%00000011 ; A and B buttons and a,%00000011 ; A and B buttons
jr nz,.skipDelay jr nz,.skipDelay
ld c,30 ld c,30
@ -4304,7 +4304,7 @@ TextCommand0C:: ; 1c78 (0:1c78)
push de push de
call GetJoypadState call GetJoypadState
pop de pop de
ld a,[H_CURRENTPRESSEDBUTTONS] ; joypad state ld a,[hJoyHeld] ; joypad state
and a,%00000011 ; is A or B button pressed? and a,%00000011 ; is A or B button pressed?
jr nz,.skipDelay ; if so, skip the delay jr nz,.skipDelay ; if so, skip the delay
ld c,10 ld c,10
@ -4945,8 +4945,8 @@ rLCDC_DEFAULT EQU %11100011
ld a, rLCDC_DEFAULT ld a, rLCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld a, $10 ld a, 16
ld [H_SOFTRESETCOUNTER], a ld [hSoftReset], a
call StopAllSounds call StopAllSounds
ei ei
@ -6514,7 +6514,7 @@ AfterDisplayingTextID:: ; 29d6 (0:29d6)
; loop to hold the dialogue box open as long as the player keeps holding down the A button ; loop to hold the dialogue box open as long as the player keeps holding down the A button
HoldTextDisplayOpen:: ; 29df (0:29df) HoldTextDisplayOpen:: ; 29df (0:29df)
call GetJoypadState call GetJoypadState
ld a,[H_CURRENTPRESSEDBUTTONS] ld a,[hJoyHeld]
bit 0,a ; is the A button being pressed? bit 0,a ; is the A button being pressed?
jr nz,HoldTextDisplayOpen jr nz,HoldTextDisplayOpen
@ -6954,7 +6954,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
jp .incrementQuantity jp .incrementQuantity
.waitForKeyPressLoop .waitForKeyPressLoop
call GetJoypadStateLowSensitivity call GetJoypadStateLowSensitivity
ld a,[H_NEWLYPRESSEDBUTTONS] ; newly pressed buttons ld a,[hJoyPressed] ; newly pressed buttons
bit 0,a ; was the A button pressed? bit 0,a ; was the A button pressed?
jp nz,.buttonAPressed jp nz,.buttonAPressed
bit 1,a ; was the B button pressed? bit 1,a ; was the B button pressed?
@ -7725,7 +7725,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219)
ld a, $4c ld a, $4c
call Predef call Predef
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
xor a xor a
ldh [$b4], a ldh [$b4], a
call TrainerWalkUpToPlayer_Bank0 call TrainerWalkUpToPlayer_Bank0
@ -7737,14 +7737,14 @@ Func_324c:: ; 324c (0:324c)
ld a, [$d730] ld a, [$d730]
and $1 and $1
ret nz ret nz
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [$cf13] ld a, [$cf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
Func_325d:: ; 325d (0:325d) Func_325d:: ; 325d (0:325d)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call InitBattleEnemyParameters call InitBattleEnemyParameters
ld hl, $d72d ld hl, $d72d
set 6, [hl] set 6, [hl]
@ -7792,10 +7792,10 @@ EndTrainerBattle:: ; 3275 (0:3275)
ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1) ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_NEWLYRELEASEDBUTTONS], a ld [hJoyReleased], a
ld [W_CURMAPSCRIPT], a ; reset battle status ld [W_CURMAPSCRIPT], a ; reset battle status
ret ret
@ -8440,7 +8440,7 @@ MoveSprite_:: ; 363d (0:363d)
ld [$CD3B],a ld [$CD3B],a
ld [$CCD3],a ld [$CCD3],a
dec a dec a
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
ld [$CD3A],a ld [$CD3A],a
ret ret
@ -8764,7 +8764,7 @@ CopyString:: ; 3829 (0:3829)
; there are esentially three modes of operation ; there are esentially three modes of operation
; 1. Get newly pressed buttons only ; 1. Get newly pressed buttons only
; ([$ffb7] == 0, [$ffb6] == any) ; ([$ffb7] == 0, [$ffb6] == any)
; Just copies [H_NEWLYPRESSEDBUTTONS] to [$ffb5]. ; Just copies [hJoyPressed] to [$ffb5].
; 2. Get currently pressed buttons at low sample rate with delay ; 2. Get currently pressed buttons at low sample rate with delay
; ([$ffb7] == 1, [$ffb6] != 0) ; ([$ffb7] == 1, [$ffb6] != 0)
; If the user holds down buttons for more than half a second, ; If the user holds down buttons for more than half a second,
@ -8777,12 +8777,12 @@ GetJoypadStateLowSensitivity:: ; 3831 (0:3831)
call GetJoypadState call GetJoypadState
ld a,[$ffb7] ; flag ld a,[$ffb7] ; flag
and a ; get all currently pressed buttons or only newly pressed buttons? and a ; get all currently pressed buttons or only newly pressed buttons?
ld a,[H_NEWLYPRESSEDBUTTONS] ; newly pressed buttons ld a,[hJoyPressed] ; newly pressed buttons
jr z,.storeButtonState jr z,.storeButtonState
ld a,[H_CURRENTPRESSEDBUTTONS] ; all currently pressed buttons ld a,[hJoyHeld] ; all currently pressed buttons
.storeButtonState .storeButtonState
ld [$ffb5],a ld [$ffb5],a
ld a,[H_NEWLYPRESSEDBUTTONS] ; newly pressed buttons ld a,[hJoyPressed] ; newly pressed buttons
and a ; have any buttons been newly pressed since last check? and a ; have any buttons been newly pressed since last check?
jr z,.noNewlyPressedButtons jr z,.noNewlyPressedButtons
.newlyPressedButtons .newlyPressedButtons
@ -8799,7 +8799,7 @@ GetJoypadStateLowSensitivity:: ; 3831 (0:3831)
ret ret
.delayOver .delayOver
; if [$ffb6] = 0 and A or B is pressed, report no buttons as pressed ; if [$ffb6] = 0 and A or B is pressed, report no buttons as pressed
ld a,[H_CURRENTPRESSEDBUTTONS] ld a,[hJoyHeld]
and a,%00000011 ; A and B buttons and a,%00000011 ; A and B buttons
jr z,.setShortDelay jr z,.setShortDelay
ld a,[$ffb6] ; flag ld a,[$ffb6] ; flag
@ -8923,7 +8923,7 @@ PrintLetterDelay:: ; 38d3 (0:38d3)
ld [H_FRAMECOUNTER],a ld [H_FRAMECOUNTER],a
.checkButtons .checkButtons
call GetJoypadState call GetJoypadState
ld a,[H_CURRENTPRESSEDBUTTONS] ld a,[hJoyHeld]
.checkAButton .checkAButton
bit 0,a ; is the A button pressed? bit 0,a ; is the A button pressed?
jr z,.checkBButton jr z,.checkBButton
@ -10042,7 +10042,7 @@ Func_3ead:: ; 3ead (0:3ead)
Func_3eb5:: ; 3eb5 (0:3eb5) Func_3eb5:: ; 3eb5 (0:3eb5)
ld a, [H_LOADEDROMBANK] ld a, [H_LOADEDROMBANK]
push af push af
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
bit 0, a bit 0, a
jr z, .asm_3eea jr z, .asm_3eea
ld a, Bank(Func_469a0) ld a, Bank(Func_469a0)

16
hram.asm
View file

@ -4,7 +4,11 @@ H_SPRITEINTERLACECOUNTER EQU $FF8B
H_SPRITEHEIGHT EQU $FF8C ; in bytes H_SPRITEHEIGHT EQU $FF8C ; in bytes
H_SPRITEOFFSET EQU $FF8D H_SPRITEOFFSET EQU $FF8D
H_SOFTRESETCOUNTER EQU $FF8A ; initialized to 16, decremented each input iteration if the user presses the reset sequence (A+B+S+s). Soft reset when 0 is reached. hSoftReset EQU $FF8A
; Initialized to 16.
; Decremented each input iteration if the player
; presses the reset sequence (A+B+SEL+START).
; Soft reset when 0 is reached.
; counters for blinking down arrow ; counters for blinking down arrow
H_DOWNARROWBLINKCNT1 EQU $FF8B H_DOWNARROWBLINKCNT1 EQU $FF8B
@ -28,10 +32,10 @@ H_NUMTOPRINT EQU $FF96 ; 3 bytes, big endian order
H_POWEROFTEN EQU $FF99 ; 3 bytes, big endian order H_POWEROFTEN EQU $FF99 ; 3 bytes, big endian order
H_SAVEDNUMTOPRINT EQU $FF9C ; 3 bytes, big endian order (to back out of a subtraction) H_SAVEDNUMTOPRINT EQU $FF9C ; 3 bytes, big endian order (to back out of a subtraction)
H_OLDPRESSEDBUTTONS EQU $FFB1 hJoyHeldLast EQU $FFB1
H_NEWLYRELEASEDBUTTONS EQU $FFB2 hJoyReleased EQU $FFB2
H_NEWLYPRESSEDBUTTONS EQU $FFB3 hJoyPressed EQU $FFB3
H_CURRENTPRESSEDBUTTONS EQU $FFB4 hJoyHeld EQU $FFB4
H_LOADEDROMBANK EQU $FFB8 H_LOADEDROMBANK EQU $FFB8
@ -112,5 +116,5 @@ H_CURRENTSPRITEOFFSET EQU $FFDA ; multiple of $10
H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn
H_JOYPADSTATE EQU $FFF8 hJoyInput EQU $FFF8

61
main.asm
View file

@ -70,7 +70,7 @@ Func_40b0: ; 40b0 (1:40b0)
ld [W_ISINBATTLE], a ; $d057 ld [W_ISINBATTLE], a ; $d057
ld [$d35d], a ld [$d35d], a
ld [$cf10], a ld [$cf10], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$cc57], a ld [$cc57], a
ld [wFlags_0xcd60], a ld [wFlags_0xcd60], a
ld [$ff9f], a ld [$ff9f], a
@ -103,7 +103,7 @@ Func_40b0: ; 40b0 (1:40b0)
res 3, [hl] res 3, [hl]
set 6, [hl] set 6, [hl]
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $7 ld a, $7
jp Predef ; indirect jump to HealParty (f6a5 (3:76a5)) jp Predef ; indirect jump to HealParty (f6a5 (3:76a5))
@ -3076,52 +3076,53 @@ Func_7c18: ; 7c18 (1:7c18)
SECTION "bank3",ROMX,BANK[$3] SECTION "bank3",ROMX,BANK[$3]
_GetJoypadState:: _GetJoypadState::
ld a, [H_JOYPADSTATE] ld a, [hJoyInput]
cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset
jp z, HandleJoypadResetButtons jp z, TrySoftReset
ld b, a ld b, a
ld a, [H_OLDPRESSEDBUTTONS] ld a, [hJoyHeldLast]
ld e, a ld e, a
xor b xor b
ld d, a ld d, a
and e and e
ld [H_NEWLYRELEASEDBUTTONS], a ld [hJoyReleased], a
ld a, d ld a, d
and b and b
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld a, b ld a, b
ld [H_OLDPRESSEDBUTTONS], a ld [hJoyHeldLast], a
ld a, [$d730] ld a, [$d730]
bit 5, a bit 5, a
jr nz, DiscardButtonPresses jr nz, DiscardButtonPresses
ld a, [H_OLDPRESSEDBUTTONS] ld a, [hJoyHeldLast]
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, [wJoypadForbiddenButtonsMask] ld a, [wJoyIgnore]
and a and a
ret z ret z
cpl cpl
ld b, a ld b, a
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
and b and b
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, [H_NEWLYPRESSEDBUTTONS] ld a, [hJoyPressed]
and b and b
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ret ret
; clears all button presses DiscardButtonPresses:
DiscardButtonPresses: ; c034 (3:4034)
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_NEWLYRELEASEDBUTTONS], a ld [hJoyReleased], a
ret ret
HandleJoypadResetButtons: ; c03c (3:403c) TrySoftReset:
call DelayFrame call DelayFrame
; reset joypad (to make sure the
; player is really trying to reset)
ld a, $30 ld a, $30
ld [rJOYP], a ; reset joypad state (to enusre the user really intends to reset) ld [rJOYP], a
ld hl, H_SOFTRESETCOUNTER ld hl, hSoftReset
dec [hl] dec [hl]
jp z, SoftReset jp z, SoftReset
jp GetJoypadState jp GetJoypadState
@ -3138,9 +3139,9 @@ Func_c335: ; c335 (3:4335)
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld [$d13b], a ld [$d13b], a
ld [W_LONEATTACKNO], a ; $d05c ld [W_LONEATTACKNO], a ; $d05c
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_NEWLYRELEASEDBUTTONS], a ld [hJoyReleased], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$cd6a], a ld [$cd6a], a
ld [$d5a3], a ld [$d5a3], a
ld hl, $d73f ld hl, $d73f
@ -3665,7 +3666,7 @@ Func_c69c: ; c69c (3:469c)
ld hl, W_PARTYMON1NAME ; $d2b5 ld hl, W_PARTYMON1NAME ; $d2b5
call GetPartyMonName call GetPartyMonName
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, $d0 ld a, $d0
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
@ -4548,7 +4549,7 @@ Func_f225: ; f225 (3:7225)
bit 6, [hl] bit 6, [hl]
set 6, [hl] set 6, [hl]
ret z ret z
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
and $f0 and $f0
ret z ret z
ld a, $5a ld a, $5a
@ -4556,7 +4557,7 @@ Func_f225: ; f225 (3:7225)
ld a, [$d71c] ld a, [$d71c]
and a and a
jp nz, Func_f2dd jp nz, Func_f2dd
ld a, [H_CURRENTPRESSEDBUTTONS] ld a, [hJoyHeld]
ld b, a ld b, a
ld a, [$c109] ld a, [$c109]
cp $4 cp $4
@ -4609,7 +4610,7 @@ Func_f2b5: ; f2b5 (3:72b5)
ret nz ret nz
callab Func_79f54 callab Func_79f54
call DiscardButtonPresses call DiscardButtonPresses
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call Func_f2dd call Func_f2dd
set 7, [hl] set 7, [hl]
ld a, [$d718] ld a, [$d718]

6
scripts/agatha.asm
View file

@ -63,8 +63,8 @@ AgathaScript0: ; 76490 (1d:6490)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$ccd3], a ld [$ccd3], a
ld [$cd38], a ld [$cd38], a
ld a, [wWhichTrade] ; $cd3d ld a, [wWhichTrade] ; $cd3d
@ -101,7 +101,7 @@ AgathaScript3: ; 764da (1d:64da)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_AGATHACURSCRIPT], a ld [W_AGATHACURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

6
scripts/billshouse.asm
View file

@ -46,7 +46,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
ld hl, $d7f2 ld hl, $d7f2
set 6, [hl] set 6, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $3 ld a, $3
ld [W_BILLSHOUSECURSCRIPT], a ld [W_BILLSHOUSECURSCRIPT], a
ret ret
@ -56,7 +56,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
bit 3, a bit 3, a
ret z ret z
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $2 ld a, $2
ld [$cf13], a ld [$cf13], a
ld a, $c ld a, $c
@ -90,7 +90,7 @@ BillsHouseScript4: ; 1e80d (7:680d)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d7f2 ld hl, $d7f2
set 5, [hl] set 5, [hl]
ld hl, $d7f1 ld hl, $d7f1

6
scripts/bruno.asm
View file

@ -63,8 +63,8 @@ BrunoScript0: ; 76339 (1d:6339)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$ccd3], a ld [$ccd3], a
ld [$cd38], a ld [$cd38], a
ld a, [wWhichTrade] ; $cd3d ld a, [wWhichTrade] ; $cd3d
@ -101,7 +101,7 @@ BrunoScript3: ; 76383 (1d:6383)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_BRUNOCURSCRIPT], a ld [W_BRUNOCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

6
scripts/celadongamecorner.asm
View file

@ -39,7 +39,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) CeladonGameCornerScript_48c07: ; 48c07 (12:4c07)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_CELADONGAMECORNERCURSCRIPT], a ld [W_CELADONGAMECORNERCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -57,7 +57,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19)
cp $ff cp $ff
jp z, CeladonGameCornerScript_48c07 jp z, CeladonGameCornerScript_48c07
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $d ld a, $d
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
call DisplayTextID call DisplayTextID
@ -94,7 +94,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $46 ld a, $46
ld [$cc4d], a ld [$cc4d], a
ld a, $11 ld a, $11

4
scripts/celadongym.asm
View file

@ -24,7 +24,7 @@ Gym4LeaderName: ; 4893d (12:493d)
CeladonGymText_48943: ; 48943 (12:4943) CeladonGymText_48943: ; 48943 (12:4943)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_CELADONGYMCURSCRIPT], a ld [W_CELADONGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -40,7 +40,7 @@ CeladonGymScript3: ; 48956 (12:4956)
cp $ff cp $ff
jp z, CeladonGymText_48943 jp z, CeladonGymText_48943
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
CeladonGymText_48963: ; 48963 (12:4963) CeladonGymText_48963: ; 48963 (12:4963)
ld a, $9 ld a, $9

18
scripts/ceruleancity.asm
View file

@ -6,7 +6,7 @@ CeruleanCityScript: ; 19480 (6:5480)
CeruleanCityScript_1948c: ; 1948c (6:548c) CeruleanCityScript_1948c: ; 1948c (6:548c)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a
ld a, $5 ld a, $5
ld [$cc4d], a ld [$cc4d], a
@ -25,14 +25,14 @@ CeruleanCityScript4: ; 194a7 (6:54a7)
cp $ff cp $ff
jp z, CeruleanCityScript_1948c jp z, CeruleanCityScript_1948c
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d75b ld hl, $d75b
set 7, [hl] set 7, [hl]
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a
ret ret
@ -76,9 +76,9 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld a, MUSIC_MEET_RIVAL ld a, MUSIC_MEET_RIVAL
call PlayMusic call PlayMusic
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [W_XCOORD] ld a, [W_XCOORD]
cp $14 cp $14
jr z, .asm_19535 ; 0x19526 $d jr z, .asm_19535 ; 0x19526 $d
@ -126,7 +126,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -156,7 +156,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
ld [W_TRAINERNO], a ld [W_TRAINERNO], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
call CeruleanCityScript_1955d call CeruleanCityScript_1955d
ld a, $2 ld a, $2
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a
@ -168,7 +168,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
jp z, CeruleanCityScript_1948c jp z, CeruleanCityScript_1948c
call CeruleanCityScript_1955d call CeruleanCityScript_1955d
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d75a ld hl, $d75a
set 0, [hl] set 0, [hl]
ld a, $1 ld a, $1
@ -211,7 +211,7 @@ CeruleanCityScript3: ; 19610 (6:5610)
ld a, $11 ld a, $11
call Predef call Predef
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call Func_2307 call Func_2307
ld a, $0 ld a, $0
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a

4
scripts/ceruleangym.asm
View file

@ -24,7 +24,7 @@ Gym2LeaderName: ; 5c6e7 (17:46e7)
CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_CERULEANGYMCURSCRIPT], a ld [W_CERULEANGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -40,7 +40,7 @@ CeruleanGymScript3: ; 5c700 (17:4700)
cp $ff cp $ff
jp z, CeruleanGymScript_5c6ed jp z, CeruleanGymScript_5c6ed
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
CeruleanGymScript_5c70d: ; 5c70d (17:470d) CeruleanGymScript_5c70d: ; 5c70d (17:470d)
ld a, $5 ld a, $5

8
scripts/cinnabargym.asm
View file

@ -30,7 +30,7 @@ Gym7LeaderName: ; 7578b (1d:578b)
CinnabarGymScript_75792: ; 75792 (1d:5792) CinnabarGymScript_75792: ; 75792 (1d:5792)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_CINNABARGYMCURSCRIPT], a ld [W_CINNABARGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ld [$da38], a ld [$da38], a
@ -80,7 +80,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [$da38] ld a, [$da38]
ld [wTrainerHeaderFlagBit], a ld [wTrainerHeaderFlagBit], a
ld [$ff8c], a ld [$ff8c], a
@ -122,7 +122,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
call CinnabarGymScript_757f1 call CinnabarGymScript_757f1
call Func_3ead call Func_3ead
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [$da38], a ld [$da38], a
ld a, $0 ld a, $0
ld [W_CINNABARGYMCURSCRIPT], a ld [W_CINNABARGYMCURSCRIPT], a
@ -134,7 +134,7 @@ CinnabarGymScript3: ; 7584a (1d:584a)
cp $ff cp $ff
jp z, CinnabarGymScript_75792 jp z, CinnabarGymScript_75792
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
CinnabarGymScript3_75857: ; 75857 (1d:5857) CinnabarGymScript3_75857: ; 75857 (1d:5857)
ld a, $a ld a, $a
ld [$ff8c], a ld [$ff8c], a

4
scripts/cinnabarisland.asm
View file

@ -30,7 +30,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [$cd38], a ld [$cd38], a
ld a, $80 ld a, $80
@ -38,7 +38,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
call Func_3486 call Func_3486
xor a xor a
ld [$c109], a ld [$c109], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [W_CINNABARISLANDCURSCRIPT], a ld [W_CINNABARISLANDCURSCRIPT], a
ret ret

2
scripts/fightingdojo.asm
View file

@ -32,7 +32,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
bit 1, a bit 1, a
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$cf0d], a ld [$cf0d], a
ld a, [W_YCOORD] ld a, [W_YCOORD]
cp $3 cp $3

4
scripts/fuchsiagym.asm
View file

@ -25,7 +25,7 @@ Gym5LeaderName: ; 75472 (1d:5472)
FuchsiaGymScript_75477: ; 75477 (1d:5477) FuchsiaGymScript_75477: ; 75477 (1d:5477)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_FUCHSIAGYMCURSCRIPT], a ld [W_FUCHSIAGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -41,7 +41,7 @@ FuchsiaGymScript3: ; 7548a (1d:548a)
cp $ff cp $ff
jp z, FuchsiaGymScript_75477 jp z, FuchsiaGymScript_75477
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
FuchsiaGymScript3_75497: ; 75497 (1d:5497) FuchsiaGymScript3_75497: ; 75497 (1d:5497)
ld a, $9 ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c

18
scripts/gary.asm
View file

@ -6,7 +6,7 @@ GaryScript: ; 75f1d (1d:5f1d)
GaryScript_75f29: ; 75f29 (1d:5f29) GaryScript_75f29: ; 75f29 (1d:5f29)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
@ -28,7 +28,7 @@ GaryScript0: ; 75f47 (1d:5f47)
GaryScript1: ; 75f48 (1d:5f48) GaryScript1: ; 75f48 (1d:5f48)
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $ccd3 ld hl, $ccd3
ld de, RLEMovement75f63 ld de, RLEMovement75f63
call DecodeRLEList call DecodeRLEList
@ -51,7 +51,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d355 ld hl, $d355
res 7, [hl] res 7, [hl]
ld a, $1 ld a, $1
@ -84,7 +84,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
ld [W_TRAINERNO], a ld [W_TRAINERNO], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $3 ld a, $3
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
@ -97,7 +97,7 @@ GaryScript3: ; 75fbb (1d:5fbb)
ld hl, $d867 ld hl, $d867
set 1, [hl] set 1, [hl]
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call GaryScript_760c8 call GaryScript_760c8
@ -201,7 +201,7 @@ GaryScript8: ; 76083 (1d:6083)
GaryScript9: ; 76099 (1d:6099) GaryScript9: ; 76099 (1d:6099)
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $ccd3 ld hl, $ccd3
ld de, RLEMovement760b4 ld de, RLEMovement760b4
call DecodeRLEList call DecodeRLEList
@ -222,17 +222,17 @@ GaryScript10: ; 760b9 (1d:60b9)
and a and a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
GaryScript_760c8 ; 760c8 (1d:60c8) GaryScript_760c8 ; 760c8 (1d:60c8)
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
GaryTextPointers: ; 760d6 (1d:60d6) GaryTextPointers: ; 760d6 (1d:60d6)

10
scripts/halloffameroom.asm
View file

@ -6,7 +6,7 @@ HallofFameRoomScript: ; 5a49e (16:649e)
HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_HALLOFFAMEROOMCURSCRIPT], a ld [W_HALLOFFAMEROOMCURSCRIPT], a
ret ret
@ -24,7 +24,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
ld a, [$d358] ld a, [$d358]
push af push af
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $55 ld a, $55
call Predef call Predef
pop af pop af
@ -62,7 +62,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
HallofFameRoomScript0: ; 5a50d (16:650d) HallofFameRoomScript0: ; 5a50d (16:650d)
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $ccd3 ld hl, $ccd3
ld de, RLEMovement5a528 ld de, RLEMovement5a528
call DecodeRLEList call DecodeRLEList
@ -91,14 +91,14 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
call Func_34a6 call Func_34a6
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
inc a inc a
ld [$d528], a ld [$d528], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $8 ld a, $8
ld [$cc4d], a ld [$cc4d], a
ld a, $11 ld a, $11

6
scripts/lance.asm
View file

@ -60,7 +60,7 @@ LanceScript0: ; 5a305 (16:6305)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, [wWhichTrade] ; $cd3d ld a, [wWhichTrade] ; $cd3d
cp $3 cp $3
jr nc, .asm_5a325 jr nc, .asm_5a325
@ -99,7 +99,7 @@ LanceScript2: ; 5a349 (16:6349)
LanceScript_5a35b: ; 5a35b (16:635b) LanceScript_5a35b: ; 5a35b (16:635b)
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $ccd3 ld hl, $ccd3
ld de, RLEList_5a379 ld de, RLEList_5a379
call DecodeRLEList call DecodeRLEList
@ -124,7 +124,7 @@ LanceScript3: ; 5a382 (16:6382)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_LANCECURSCRIPT], a ld [W_LANCECURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

6
scripts/lorelei.asm
View file

@ -63,8 +63,8 @@ LoreleiScript0: ; 761e2 (1d:61e2)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$ccd3], a ld [$ccd3], a
ld [$cd38], a ld [$cd38], a
ld a, [wWhichTrade] ; $cd3d ld a, [wWhichTrade] ; $cd3d
@ -101,7 +101,7 @@ LoreleiScript3: ; 7622c (1d:622c)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_LORELEICURSCRIPT], a ld [W_LORELEICURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

2
scripts/mansion1.asm
View file

@ -52,7 +52,7 @@ Mansion1Script_Switches: ; 44316 (11:4316)
cp $4 cp $4
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $4 ld a, $4
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
jp DisplayTextID jp DisplayTextID

2
scripts/mansion2.asm
View file

@ -48,7 +48,7 @@ Mansion2Script_Switches: ; 52037 (14:6037)
cp $4 cp $4
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $5 ld a, $5
ld [H_SPRITEHEIGHT], a ld [H_SPRITEHEIGHT], a
jp DisplayTextID jp DisplayTextID

2
scripts/mansion3.asm
View file

@ -78,7 +78,7 @@ Mansion3Script_Switches: ; 5227a (14:627a)
cp $4 cp $4
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp DisplayTextID jp DisplayTextID

2
scripts/mansion4.asm
View file

@ -49,7 +49,7 @@ Mansion4Script_Switches: ; 52420 (14:6420)
cp $4 cp $4
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $9 ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp DisplayTextID jp DisplayTextID

10
scripts/mtmoon3.asm
View file

@ -40,7 +40,7 @@ CoordsData_49d37: ; 49d37 (12:5d37)
MtMoon3Script_49d58: ; 49d58 (12:5d58) MtMoon3Script_49d58: ; 49d58 (12:5d58)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -64,7 +64,7 @@ MtMoon3Script0: ; 49d6f (12:5d6f)
cp $d cp $d
jp nz, MtMoon3Script_49d91 jp nz, MtMoon3Script_49d91
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp DisplayTextID jp DisplayTextID
@ -84,7 +84,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a)
ld hl, $d7f6 ld hl, $d7f6
set 1, [hl] set 1, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -136,7 +136,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
bit 0, a bit 0, a
ret nz ret nz
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [$cc3c], a ld [$cc3c], a
ld a, $a ld a, $a
@ -154,7 +154,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
ld a, $11 ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_MTMOON3CURSCRIPT], a ld [W_MTMOON3CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

4
scripts/museum1f.asm
View file

@ -23,7 +23,7 @@ Museum1FScript0: ; 5c10d (17:410d)
ret nz ret nz
.asm_5c120 .asm_5c120
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
jp DisplayTextID jp DisplayTextID
@ -73,7 +73,7 @@ Museum1FText1: ; 5c135 (17:4135)
ld [$d125], a ld [$d125], a
call DisplayTextBoxID call DisplayTextBoxID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld hl, Museum1FText_5c21f ld hl, Museum1FText_5c21f
call PrintText call PrintText
call YesNoChoice call YesNoChoice

22
scripts/oakslab.asm
View file

@ -129,7 +129,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
OaksLabScript5: ; 1cbfd (7:4bfd) OaksLabScript5: ; 1cbfd (7:4bfd)
ld a, $fc ld a, $fc
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $11 ld a, $11
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -148,7 +148,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd)
ld hl, $d74b ld hl, $d74b
set 1, [hl] set 1, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $6 ld a, $6
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -271,7 +271,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
bit 0, a bit 0, a
ret nz ret nz
ld a, $fc ld a, $fc
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
ld a, $4 ld a, $4
@ -313,7 +313,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld hl, $d74b ld hl, $d74b
set 2, [hl] set 2, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $a ld a, $a
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -389,7 +389,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $8 ld a, $8
ld [$d528], a ld [$d528], a
ld a, $c ld a, $c
@ -398,7 +398,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
OaksLabScript12: ; 1ce03 (7:4e03) OaksLabScript12: ; 1ce03 (7:4e03)
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $8 ld a, $8
ld [$d528], a ld [$d528], a
call UpdateSprites call UpdateSprites
@ -457,7 +457,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
ld a, $11 ld a, $11
call Predef call Predef
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call Func_2307 ; reset to map music call Func_2307 ; reset to map music
ld a, $12 ld a, $12
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -486,7 +486,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
OaksLabScript15: ; 1ceb0 (7:4eb0) OaksLabScript15: ; 1ceb0 (7:4eb0)
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, $ff ld a, $ff
ld [$c0ee], a ld [$c0ee], a
@ -536,7 +536,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
call Func_2307 call Func_2307
ld a, $fc ld a, $fc
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call OaksLabScript_1cefd call OaksLabScript_1cefd
ld a, $16 ld a, $16
ld [$ff8c], a ld [$ff8c], a
@ -629,7 +629,7 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
ld a, $5 ld a, $5
ld [W_PALLETTOWNCURSCRIPT], a ld [W_PALLETTOWNCURSCRIPT], a
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $12 ld a, $12
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -925,7 +925,7 @@ asm_1d1e5: ; 1d1e5 (7:51e5)
ld hl, $d72e ld hl, $d72e
set 3, [hl] set 3, [hl]
ld a, $fc ld a, $fc
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $8 ld a, $8
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
OaksLabMonChoiceEnd: ; 1d21f (7:521f) OaksLabMonChoiceEnd: ; 1d21f (7:521f)

12
scripts/pallettown.asm
View file

@ -27,7 +27,7 @@ PalletTownScript0: ; 18e81 (6:4e81)
cp 1 ; is player near north exit? cp 1 ; is player near north exit?
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS],a ld [hJoyHeld],a
ld a,4 ld a,4
ld [$D528],a ld [$D528],a
ld a,$FF ld a,$FF
@ -37,7 +37,7 @@ PalletTownScript0: ; 18e81 (6:4e81)
ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music
call PlayMusic ; plays music call PlayMusic ; plays music
ld a,$FC ld a,$FC
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
ld hl,$D74B ld hl,$D74B
set 7,[hl] set 7,[hl]
@ -53,7 +53,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2)
ld [$FF8C],a ld [$FF8C],a
call DisplayTextID call DisplayTextID
ld a,$FF ld a,$FF
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
ld a,0 ld a,0
ld [$CC4D],a ld [$CC4D],a
ld a,$15 ld a,$15
@ -89,7 +89,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
ld [$FF8C],a ld [$FF8C],a
call MoveSprite call MoveSprite
ld a,$FF ld a,$FF
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
; trigger the next script ; trigger the next script
ld a,3 ld a,3
@ -105,12 +105,12 @@ PalletTownScript3: ; 18f12 (6:4f12)
ld a,1 ld a,1
ld [$CF0D],a ld [$CF0D],a
ld a,$FC ld a,$FC
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
ld a,1 ld a,1
ld [$FF8C],a ld [$FF8C],a
call DisplayTextID call DisplayTextID
ld a,$FF ld a,$FF
ld [wJoypadForbiddenButtonsMask],a ld [wJoyIgnore],a
ld a,1 ld a,1
ld [$CF13],a ld [$CF13],a
xor a xor a

6
scripts/pewtercity.asm
View file

@ -29,7 +29,7 @@ PewterCityScript_1925e: ; 1925e (6:525e)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $5 ld a, $5
ld [$ff8c], a ld [$ff8c], a
jp DisplayTextID jp DisplayTextID
@ -102,7 +102,7 @@ PewterCityScript3: ; 192e9 (6:52e9)
ld a, $15 ld a, $15
call Predef call Predef
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
ret ret
@ -168,7 +168,7 @@ PewterCityScript6: ; 1936f (6:536f)
ld a, $15 ld a, $15
call Predef call Predef
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
ret ret

4
scripts/pewtergym.asm
View file

@ -24,7 +24,7 @@ Gym1LeaderName: ; 5c3b9 (17:43b9)
PewterGymScript_5c3bf: ; 5c3bf (17:43bf) PewterGymScript_5c3bf: ; 5c3bf (17:43bf)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_PEWTERGYMCURSCRIPT], a ld [W_PEWTERGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -40,7 +40,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2)
cp $ff cp $ff
jp z, PewterGymScript_5c3bf jp z, PewterGymScript_5c3bf
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
PewterGymScript_5c3df: ; 5c3df (17:43df) PewterGymScript_5c3df: ; 5c3df (17:43df)
ld a, $4 ld a, $4

10
scripts/pokemontower2.asm
View file

@ -6,7 +6,7 @@ PokemonTower2Script: ; 604f2 (18:44f2)
PokemonTower2Script_604fe: ; 604fe (18:44fe) PokemonTower2Script_604fe: ; 604fe (18:44fe)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_POKEMONTOWER2CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -51,8 +51,8 @@ PokemonTower2Script0: ; 6050f (18:450f)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [H_NEWLYPRESSEDBUTTONS], a ld [hJoyPressed], a
ret ret
CoordsData_6055e: ; 6055e (18:455e) CoordsData_6055e: ; 6055e (18:455e)
@ -65,7 +65,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
cp $ff cp $ff
jp z, PokemonTower2Script_604fe jp z, PokemonTower2Script_604fe
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d764 ld hl, $d764
set 7, [hl] set 7, [hl]
ld a, $1 ld a, $1
@ -104,7 +104,7 @@ PokemonTower2Script2: ; 605bb (18:45bb)
ld a, $11 ld a, $11
call Predef call Predef
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call Func_2307 call Func_2307
ld a, $0 ld a, $0
ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_POKEMONTOWER2CURSCRIPT], a

6
scripts/pokemontower5.asm
View file

@ -27,9 +27,9 @@ PokemonTower5Script0: ; 6094b (18:494b)
set 7, [hl] set 7, [hl]
ret nz ret nz
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d72e ld hl, $d72e
set 4, [hl] set 4, [hl]
ld a, $7 ld a, $7
@ -42,7 +42,7 @@ PokemonTower5Script0: ; 6094b (18:494b)
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
CoordsData_60992: ; 60992 (18:4992) CoordsData_60992: ; 60992 (18:4992)

10
scripts/pokemontower6.asm
View file

@ -9,7 +9,7 @@ PokemonTower6Script: ; 60aef (18:4aef)
Func_60b02: ; 60b02 (18:4b02) Func_60b02: ; 60b02 (18:4b02)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_POKEMONTOWER6CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -29,7 +29,7 @@ PokemonTower6Script0: ; 60b17 (18:4b17)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -50,13 +50,13 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
cp $ff cp $ff
jp z, Func_60b02 jp z, Func_60b02
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [$d72d] ld a, [$d72d]
bit 6, a bit 6, a
ret nz ret nz
call UpdateSprites call UpdateSprites
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [$cf0b] ld a, [$cf0b]
and a and a
jr nz, .asm_60b82 jr nz, .asm_60b82
@ -66,7 +66,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_POKEMONTOWER6CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

8
scripts/pokemontower7.asm
View file

@ -9,7 +9,7 @@ PokemonTower7Script: ; 60d05 (18:4d05)
PokemonTower7Script_60d18: ; 60d18 (18:4d18) PokemonTower7Script_60d18: ; 60d18 (18:4d18)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -29,7 +29,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23)
jp z, PokemonTower7Script_60d18 jp z, PokemonTower7Script_60d18
call EndTrainerBattle call EndTrainerBattle
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [$cf13] ld a, [$cf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -55,7 +55,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
ld a, $11 ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [$cf13], a ld [$cf13], a
ld [wTrainerHeaderFlagBit], a ld [wTrainerHeaderFlagBit], a
ld [$da38], a ld [$da38], a
@ -66,7 +66,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
PokemonTower7Script4: ; 60d86 (18:4d86) PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $43 ld a, $43
ld [$cc4d], a ld [$cc4d], a
ld a, $11 ld a, $11

2
scripts/redshouse2f.asm
View file

@ -10,7 +10,7 @@ RedsHouse2FScriptPointers: ; 5c0bc (17:40bc)
RedsHouse2FScript0: ; 5c0c0 (17:40c0) RedsHouse2FScript0: ; 5c0c0 (17:40c0)
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS],a ld [hJoyHeld],a
ld a,8 ld a,8
ld [$D528],a ld [$D528],a
ld a,1 ld a,1

4
scripts/rockethideout2.asm
View file

@ -28,7 +28,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42)
ld a, (SFX_02_52 - SFX_Headers_02) / 3 ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound call PlaySound
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $3 ld a, $3
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -310,7 +310,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2)
and a and a
jr nz, LoadSpinnerArrowTiles jr nz, LoadSpinnerArrowTiles
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d736 ld hl, $d736
res 7, [hl] res 7, [hl]
ld a, $0 ld a, $0

4
scripts/rockethideout3.asm
View file

@ -28,7 +28,7 @@ RocketHideout3Script0: ; 45240 (11:5240)
ld a, (SFX_02_52 - SFX_Headers_02) / 3 ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound call PlaySound
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $3 ld a, $3
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -140,7 +140,7 @@ RocketHideout3Script3 ; 452e4 (11:452e4)
and a and a
jp nz, LoadSpinnerArrowTiles jp nz, LoadSpinnerArrowTiles
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d736 ld hl, $d736
res 7, [hl] res 7, [hl]
ld a, $0 ld a, $0

6
scripts/rockethideout4.asm
View file

@ -36,7 +36,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473)
RocketHideout4Script_454a3: ; 454a3 (11:54a3) RocketHideout4Script_454a3: ; 454a3 (11:54a3)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_ROCKETHIDEOUT4CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -53,7 +53,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
jp z, RocketHideout4Script_454a3 jp z, RocketHideout4Script_454a3
call UpdateSprites call UpdateSprites
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d81b ld hl, $d81b
set 7, [hl] set 7, [hl]
ld a, $a ld a, $a
@ -71,7 +71,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
call UpdateSprites call UpdateSprites
call GBFadeOut1 call GBFadeOut1
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d126 ld hl, $d126
set 5, [hl] set 5, [hl]
ld a, $0 ld a, $0

2
scripts/route12.asm
View file

@ -9,7 +9,7 @@ Route12Script: ; 595f3 (16:55f3)
Route12Script_59606: ; 59606 (16:5606) Route12Script_59606: ; 59606 (16:5606)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE12CURSCRIPT], a ld [W_ROUTE12CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

2
scripts/route16.asm
View file

@ -9,7 +9,7 @@ Route16Script: ; 59933 (16:5933)
Func_59946: ; 59946 (16:5946) Func_59946: ; 59946 (16:5946)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE16CURSCRIPT], a ld [W_ROUTE16CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

6
scripts/route16gate.asm
View file

@ -22,7 +22,7 @@ Route16GateScript0: ; 496d7 (12:56d7)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, [$cd3d] ld a, [$cd3d]
cp $1 cp $1
jr z, .asm_4970e ; 0x496f1 $1b jr z, .asm_4970e ; 0x496f1 $1b
@ -55,7 +55,7 @@ Route16GateScript1: ; 4971d (12:571d)
and a and a
ret nz ret nz
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
Route16GateScript2: ; 49727 (12:5727) Route16GateScript2: ; 49727 (12:5727)
ld a, $1 ld a, $1
@ -75,7 +75,7 @@ Route16GateScript3: ; 49741 (12:5741)
and a and a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d730 ld hl, $d730
res 7, [hl] res 7, [hl]
ld a, $0 ld a, $0

6
scripts/route18gate.asm
View file

@ -22,7 +22,7 @@ Route18GateScript0: ; 4988f (12:588f)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, [$cd3d] ld a, [$cd3d]
cp $1 cp $1
jr z, .asm_498c6 ; 0x498a9 $1b jr z, .asm_498c6 ; 0x498a9 $1b
@ -55,7 +55,7 @@ Route18GateScript1: ; 498d5 (12:58d5)
and a and a
ret nz ret nz
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
Route18GateScript2: ; 498df (12:58df) Route18GateScript2: ; 498df (12:58df)
ld a, $1 ld a, $1
@ -75,7 +75,7 @@ Route18GateScript3: ; 498f9 (12:58f9)
and a and a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d730 ld hl, $d730
res 7, [hl] res 7, [hl]
ld a, $0 ld a, $0

18
scripts/route22.asm
View file

@ -16,7 +16,7 @@ Route22ScriptPointers: ; 50ebe (14:4ebe)
Route22Script_50ece: ; 50ece (14:4ece) Route22Script_50ece: ; 50ece (14:4ece)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE22CURSCRIPT], a ld [W_ROUTE22CURSCRIPT], a
Route22Script7: ; 50ed5 (14:4ed5) Route22Script7: ; 50ed5 (14:4ed5)
ret ret
@ -60,9 +60,9 @@ Route22Script0: ; 50f00 (14:4f00)
ld a, [$cd3d] ld a, [$cd3d]
ld [$cf0d], a ld [$cf0d], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $2 ld a, $2
ld [$d528], a ld [$d528], a
ld a, [$d7eb] ld a, [$d7eb]
@ -120,7 +120,7 @@ Route22Script1: ; 50f62 (14:4f62)
ld [$ff8c], a ld [$ff8c], a
call Func_34a6 call Func_34a6
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -161,7 +161,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
ld [$ff8c], a ld [$ff8c], a
call Func_34a6 call Func_34a6
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d7eb ld hl, $d7eb
set 5, [hl] set 5, [hl]
ld a, $1 ld a, $1
@ -205,7 +205,7 @@ Route22Script3: ; 5102a (14:502a)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $22 ld a, $22
ld [$cc4d], a ld [$cc4d], a
ld a, $11 ld a, $11
@ -264,7 +264,7 @@ Route22Script4: ; 51087 (14:5087)
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call Func_34a6
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $2 ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -308,7 +308,7 @@ Route22Script5: ; 510df (14:50df)
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 call Func_34a6
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d7eb ld hl, $d7eb
set 6, [hl] set 6, [hl]
ld a, $2 ld a, $2
@ -352,7 +352,7 @@ Route22Script6: ; 51151 (14:5151)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $23 ld a, $23
ld [$cc4d], a ld [$cc4d], a
ld a, $11 ld a, $11

6
scripts/route22gate.asm
View file

@ -22,7 +22,7 @@ Route22GateScript0: ; 1e6a4 (7:66a4)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
jp DisplayTextID jp DisplayTextID
@ -38,7 +38,7 @@ Route22GateScript_1e6ba: ; 1e6ba (7:66ba)
ld a, $80 ld a, $80
ld [$ccd3], a ld [$ccd3], a
ld [$c109], a ld [$c109], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
jp Func_3486 jp Func_3486
Route22GateScript1: ; 1e6cd (7:66cd) Route22GateScript1: ; 1e6cd (7:66cd)
@ -46,7 +46,7 @@ Route22GateScript1: ; 1e6cd (7:66cd)
and a and a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call Delay3 call Delay3
ld a, $0 ld a, $0
ld [W_ROUTE22GATECURSCRIPT], a ld [W_ROUTE22GATECURSCRIPT], a

4
scripts/route23.asm
View file

@ -64,7 +64,7 @@ Route23Script0: ; 51219 (14:5219)
call Route23Script_5125d call Route23Script_5125d
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ret ret
YCoordsData_51255: ; 51255 (14:5255) YCoordsData_51255: ; 51255 (14:5255)
@ -126,7 +126,7 @@ Route23Script_512d8: ; 512d8 (14:52d8)
ld [$ccd3], a ld [$ccd3], a
xor a xor a
ld [$c109], a ld [$c109], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
jp Func_3486 jp Func_3486
Route23Script1: ; 512ec (14:52ec) Route23Script1: ; 512ec (14:52ec)

10
scripts/route24.asm
View file

@ -9,7 +9,7 @@ Route24Script: ; 513ad (14:53ad)
Route24Script_513c0: ; 513c0 (14:53c0) Route24Script_513c0: ; 513c0 (14:53c0)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE24CURSCRIPT], a ld [W_ROUTE24CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -29,7 +29,7 @@ Route24Script0: ; 513d5 (14:53d5)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -66,14 +66,14 @@ Route24Script3: ; 51422 (14:5422)
jp z, Route24Script_513c0 jp z, Route24Script_513c0
call UpdateSprites call UpdateSprites
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d7ef ld hl, $d7ef
set 1, [hl] set 1, [hl]
ld a, $1 ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_ROUTE24CURSCRIPT], a ld [W_ROUTE24CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
@ -175,7 +175,7 @@ Route24Text1: ; 514a4 (14:54a4)
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $3 ld a, $3
ld [W_ROUTE24CURSCRIPT], a ld [W_ROUTE24CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

4
scripts/route5gate.asm
View file

@ -25,7 +25,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
ld a, $2 ld a, $2
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ff00+$db] ld a, [$ff00+$db]
and a and a
@ -56,7 +56,7 @@ Route5GateScript1: ; 1df94 (7:5f94)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE5GATECURSCRIPT], a ld [W_ROUTE5GATECURSCRIPT], a
ret ret

4
scripts/route6gate.asm
View file

@ -19,7 +19,7 @@ Route6GateScript0: ; 1e04e (7:604e)
ld a, $1 ld a, $1
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
@ -48,7 +48,7 @@ Route6GateScript1: ; 1e091 (7:6091)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE6GATECURSCRIPT], a ld [W_ROUTE6GATECURSCRIPT], a
ret ret

4
scripts/route7gate.asm
View file

@ -31,7 +31,7 @@ Route7GateScript0: ; 1e128 (7:6128)
ld a, $8 ld a, $8
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
@ -62,7 +62,7 @@ Route7GateScript1: ; 1e16c (7:616c)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE7GATECURSCRIPT], a ld [W_ROUTE7GATECURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret

4
scripts/route8gate.asm
View file

@ -30,7 +30,7 @@ Route8GateScript0: ; 1e1ee (7:61ee)
ld a, $2 ld a, $2
ld [$d528], a ld [$d528], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
callba RemoveGuardDrink callba RemoveGuardDrink
ld a, [$ffdb] ld a, [$ffdb]
and a and a
@ -60,7 +60,7 @@ Route8GateScript1: ; 1e231 (7:6231)
ret nz ret nz
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_ROUTE8GATECURSCRIPT], a ld [W_ROUTE8GATECURSCRIPT], a
ret ret

18
scripts/safarizoneentrance.asm
View file

@ -21,9 +21,9 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $c ld a, $c
ld [$c109], a ld [$c109], a
ld a, [$cd3d] ld a, [$cd3d]
@ -37,7 +37,7 @@ SafariZoneEntranceScript0: ; 751e7 (1d:51e7)
ld c, $1 ld c, $1
call SafariZoneEntranceScript_752a3 call SafariZoneEntranceScript_752a3
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $1 ld a, $1
ld [W_SAFARIZONEENTRANCECURSCRIPT], a ld [W_SAFARIZONEENTRANCECURSCRIPT], a
ret ret
@ -52,21 +52,21 @@ SafariZoneEntranceScript1: ; 75226 (1d:5226)
ret nz ret nz
SafariZoneEntranceScript2: ; 7522a (1d:522a) SafariZoneEntranceScript2: ; 7522a (1d:522a)
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
call UpdateSprites call UpdateSprites
ld a, $4 ld a, $4
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
SafariZoneEntranceScript3: ; 75240 (1d:5240) SafariZoneEntranceScript3: ; 75240 (1d:5240)
call SafariZoneEntranceScript_752b4 call SafariZoneEntranceScript_752b4
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $5 ld a, $5
ld [W_SAFARIZONEENTRANCECURSCRIPT], a ld [W_SAFARIZONEENTRANCECURSCRIPT], a
ret ret
@ -81,7 +81,7 @@ SafariZoneEntranceScript5: ; 7524e (1d:524e)
res 7, [hl] res 7, [hl]
call UpdateSprites call UpdateSprites
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $6 ld a, $6
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -104,7 +104,7 @@ SafariZoneEntranceScript4: ; 75287 (1d:5287)
call SafariZoneEntranceScript_752b4 call SafariZoneEntranceScript_752b4
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_SAFARIZONEENTRANCECURSCRIPT], a ld [W_SAFARIZONEENTRANCECURSCRIPT], a
ret ret

4
scripts/saffrongym.asm
View file

@ -24,7 +24,7 @@ Gym6LeaderName: ; 5d040 (17:5040)
SaffronGymText_5d048: ; 5d048 (17:5048) SaffronGymText_5d048: ; 5d048 (17:5048)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_SAFFRONGYMCURSCRIPT], a ld [W_SAFFRONGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -40,7 +40,7 @@ SaffronGymScript3: ; 5d05b (17:505b)
cp $ff cp $ff
jp z, SaffronGymText_5d048 jp z, SaffronGymText_5d048
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
SaffronGymText_5d068: ; 5d068 (17:5068) SaffronGymText_5d068: ; 5d068 (17:5068)
ld a, $a ld a, $a

4
scripts/seafoamislands5.asm
View file

@ -7,7 +7,7 @@ SeafoamIslands5Script: ; 46799 (11:6799)
SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) SeafoamIslands5Script_467a5: ; 467a5 (11:67a5)
xor a xor a
ld [W_SEAFOAMISLANDS5CURSCRIPT], a ld [W_SEAFOAMISLANDS5CURSCRIPT], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) SeafoamIslands5ScriptPointers: ; 467ad (11:67ad)
@ -66,7 +66,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807)
and a and a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_SEAFOAMISLANDS5CURSCRIPT], a ld [W_SEAFOAMISLANDS5CURSCRIPT], a
ret ret

12
scripts/silphco11.asm
View file

@ -110,7 +110,7 @@ MissableObjectIDs_6219b: ; 6219b (18:619b)
SilphCo11Script_621c4: ; 621c4 (18:61c4) SilphCo11Script_621c4: ; 621c4 (18:61c4)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
SilphCo11Script_621c8: ; 621c8 (18:61c8) SilphCo11Script_621c8: ; 621c8 (18:61c8)
ld [W_SILPHCO11CURSCRIPT], a ld [W_SILPHCO11CURSCRIPT], a
@ -135,9 +135,9 @@ SilphCo11Script0: ; 621db (18:61db)
ld a, [wWhichTrade] ; $cd3d ld a, [wWhichTrade] ; $cd3d
ld [$cf0d], a ld [$cf0d], a
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $3 ld a, $3
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -181,7 +181,7 @@ SilphCo11Script5: ; 62227 (18:6227)
.asm_62240 .asm_62240
call SilphCo11Script_6221a call SilphCo11Script_6221a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $6 ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -193,7 +193,7 @@ SilphCo11Script5: ; 62227 (18:6227)
ld hl, $d838 ld hl, $d838
set 7, [hl] set 7, [hl]
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
jp SilphCo11Script_621c8 jp SilphCo11Script_621c8
SilphCo11Script3: ; 6226a (18:626a) SilphCo11Script3: ; 6226a (18:626a)
@ -230,7 +230,7 @@ SilphCo11Script4: ; 62293 (18:6293)
call EngageMapTrainer call EngageMapTrainer
call InitBattleEnemyParameters call InitBattleEnemyParameters
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $5 ld a, $5
jp SilphCo11Script_621c8 jp SilphCo11Script_621c8

12
scripts/silphco7.asm
View file

@ -104,7 +104,7 @@ SilphCo7Text_51bf4: ; 51bf4 (14:5bf4)
SilphCo7Text_51c0c: ; 51c0c (14:5c0c) SilphCo7Text_51c0c: ; 51c0c (14:5c0c)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
SilphCo7Text_51c10: ; 51c10 (14:5c10) SilphCo7Text_51c10: ; 51c10 (14:5c10)
ld [W_SILPHCO7CURSCRIPT], a ld [W_SILPHCO7CURSCRIPT], a
@ -127,9 +127,9 @@ SilphCo7Script0: ; 51c23 (14:5c23)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers jp nc, CheckFightingMapTrainers
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $4 ld a, $4
ld [$d528], a ld [$d528], a
ld a, $ff ld a, $ff
@ -170,7 +170,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $d ld a, $d
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID call DisplayTextID
@ -205,7 +205,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
cp $ff cp $ff
jp z, SilphCo7Text_51c0c jp z, SilphCo7Text_51c0c
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d82f ld hl, $d82f
set 0, [hl] set 0, [hl]
ld a, $4 ld a, $4
@ -250,7 +250,7 @@ SilphCo7Script5: ; 51d25 (14:5d25)
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7)) call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
call Func_2307 call Func_2307
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
jp SilphCo7Text_51c10 jp SilphCo7Text_51c10
SilphCo7TextPointers: ; 51d3f (14:5d3f) SilphCo7TextPointers: ; 51d3f (14:5d3f)

12
scripts/ssanne2.asm
View file

@ -6,7 +6,7 @@ SSAnne2Script: ; 6139f (18:539f)
SSAnne2Script_613ab: ; 613ab (18:53ab) SSAnne2Script_613ab: ; 613ab (18:53ab)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_SSANNE2CURSCRIPT], a ld [W_SSANNE2CURSCRIPT], a
ret ret
@ -41,9 +41,9 @@ SSAnne2Script0: ; 613be (18:53be)
ld [$ff8c], a ld [$ff8c], a
call SetSpriteMovementBytesToFF call SetSpriteMovementBytesToFF
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, [$ffdb] ld a, [$ffdb]
cp $2 cp $2
jr nz, .asm_61400 ; 0x613f9 $5 jr nz, .asm_61400 ; 0x613f9 $5
@ -88,7 +88,7 @@ SSAnne2Script1: ; 61430 (18:5430)
ret nz ret nz
call SSAnne2Script_61416 call SSAnne2Script_61416
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $2 ld a, $2
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -123,7 +123,7 @@ SSAnne2Script2: ; 6146d (18:546d)
jp z, SSAnne2Script_613ab jp z, SSAnne2Script_613ab
call SSAnne2Script_61416 call SSAnne2Script_61416
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $3 ld a, $3
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
@ -160,7 +160,7 @@ SSAnne2Script3: ; 614be (18:54be)
bit 0, a bit 0, a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $71 ld a, $71
ld [$cc4d], a ld [$cc4d], a
ld a, $11 ld a, $11

8
scripts/vermilioncity.asm
View file

@ -46,7 +46,7 @@ VermilionCityScript0: ; 197e6 (6:57e6)
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld [$cf0d], a ld [$cf0d], a
ld a, $3 ld a, $3
ld [$ff8c], a ld [$ff8c], a
@ -84,7 +84,7 @@ VermilionCityScript4: ; 19826 (6:5826)
VermilionCityScript2: ; 19833 (6:5833) VermilionCityScript2: ; 19833 (6:5833)
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $40 ld a, $40
ld [$ccd3], a ld [$ccd3], a
ld [$ccd4], a ld [$ccd4], a
@ -100,8 +100,8 @@ VermilionCityScript3: ; 1984e (6:584e)
and a and a
ret nz ret nz
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
ld a, $0 ld a, $0
ld [W_VERMILIONCITYCURSCRIPT], a ld [W_VERMILIONCITYCURSCRIPT], a
ret ret

6
scripts/vermiliondock.asm
View file

@ -25,7 +25,7 @@ VermilionDockScript: ; 1db52 (7:5b52)
ld [$c206], a ld [$c206], a
ld [$cd3b], a ld [$cd3b], a
dec a dec a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
.asm_1db8d .asm_1db8d
bit 5, [hl] bit 5, [hl]
@ -33,14 +33,14 @@ VermilionDockScript: ; 1db52 (7:5b52)
ld a, [$cd38] ld a, [$cd38]
and a and a
ret nz ret nz
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
set 5, [hl] set 5, [hl]
ret ret
VermilionDock_1db9b: ; 1db9b (7:5b9b) VermilionDock_1db9b: ; 1db9b (7:5b9b)
set 2, [hl] set 2, [hl]
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld c, BANK(Music_Surfing) ld c, BANK(Music_Surfing)

4
scripts/vermiliongym.asm
View file

@ -45,7 +45,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_VERMILIONGYMCURSCRIPT], a ld [W_VERMILIONGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -61,7 +61,7 @@ VermilionGymScript3: ; 5ca9d (17:4a9d)
cp $ff cp $ff
jp z, VermilionGymScript_5ca8a jp z, VermilionGymScript_5ca8a
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
VermilionGymScript_5caaa: ; 5caaa (17:4aaa) VermilionGymScript_5caaa: ; 5caaa (17:4aaa)
ld a, $6 ld a, $6

10
scripts/viridiancity.asm
View file

@ -35,7 +35,7 @@ ViridianCityScript_1900b: ; 1900b (6:500b)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
call ViridianCityScript_190cf call ViridianCityScript_190cf
ld a, $3 ld a, $3
ld [W_VIRIDIANCITYCURSCRIPT], a ld [W_VIRIDIANCITYCURSCRIPT], a
@ -55,7 +55,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d)
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [H_CURRENTPRESSEDBUTTONS], a ld [hJoyHeld], a
call ViridianCityScript_190cf call ViridianCityScript_190cf
ld a, $3 ld a, $3
ld [W_VIRIDIANCITYCURSCRIPT], a ld [W_VIRIDIANCITYCURSCRIPT], a
@ -96,13 +96,13 @@ ViridianCityScript2: ; 1908f (6:508f)
call UpdateSprites call UpdateSprites
call Delay3 call Delay3
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $f ld a, $f
ld [$ff8c], a ld [$ff8c], a
call DisplayTextID call DisplayTextID
xor a xor a
ld [W_BATTLETYPE], a ld [W_BATTLETYPE], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
ld [W_VIRIDIANCITYCURSCRIPT], a ld [W_VIRIDIANCITYCURSCRIPT], a
ret ret
@ -124,7 +124,7 @@ ViridianCityScript_190cf: ; 190cf (6:50cf)
ld [$ccd3], a ld [$ccd3], a
xor a xor a
ld [$c109], a ld [$c109], a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ret ret
ViridianCityTextPointers: ; 190e4 (6:50e4) ViridianCityTextPointers: ; 190e4 (6:50e4)

8
scripts/viridiangym.asm
View file

@ -17,7 +17,7 @@ Gym8LeaderName: ; 748cd (1d:48cd)
ViridianGymScript_748d6: ; 748d6 (1d:48d6) ViridianGymScript_748d6: ; 748d6 (1d:48d6)
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld [W_VIRIDIANGYMCURSCRIPT], a ld [W_VIRIDIANGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -44,7 +44,7 @@ ViridianGymScript0: ; 748eb (1d:48eb)
ld a, (SFX_02_52 - SFX_Headers_02) / 3 ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound call PlaySound
ld a, $ff ld a, $ff
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld a, $4 ld a, $4
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a
ret ret
@ -125,7 +125,7 @@ ViridianGymScript4: ; 7496b (1d:496b)
and a and a
jr nz, .asm_74980 jr nz, .asm_74980
xor a xor a
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ld hl, $d736 ld hl, $d736
res 7, [hl] res 7, [hl]
ld a, $0 ld a, $0
@ -141,7 +141,7 @@ ViridianGymScript3: ; 74988 (1d:4988)
cp $ff cp $ff
jp z, ViridianGymScript_748d6 jp z, ViridianGymScript_748d6
ld a, $f0 ld a, $f0
ld [wJoypadForbiddenButtonsMask], a ld [wJoyIgnore], a
ViridianGymScript3_74995: ; 74995 (1d:4995) ViridianGymScript3_74995: ; 74995 (1d:4995)
ld a, $c ld a, $c
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c

4
wram.asm
View file

@ -260,8 +260,8 @@ wFlags_0xcd60:: ; cd60
ds 10 ds 10
wJoypadForbiddenButtonsMask:: ; cd6b wJoyIgnore:: ; cd6b
; bit 1 means button presses will be ignored for that button ; Set buttons are ignored.
ds 1 ds 1
ds 21 ds 21