Leahnaya/pokered
1
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2026-04-25 07:32:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use combined hardware constants

Browse Source
This commit is contained in:
Rangi42 2025-06-30 13:30:57 -04:00 committed by Rangi
parent 56c405de09
commit 78e44a8fb1
49 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/battle/core.asm
View File

@ -18,7 +18,7 @@ SlidePlayerAndEnemySilhouettesOnScreen:
call LoadFontTilePatterns
call LoadHudAndHpBarAndStatusTilePatterns
ld hl, vBGMap0
ld bc, TILEMAP_WIDTH * TILEMAP_HEIGHT
ld bc, TILEMAP_AREA
.clearBackgroundLoop
ld a, " "
ld [hli], a
@ -2561,9 +2561,9 @@ MoveSelectionMenu:
; Disable left, right, and START buttons in regular battles.
ld a, [wStatusFlags7]
bit BIT_TEST_BATTLE, a
ld b, PAD_UP | PAD_DOWN | PAD_A | PAD_B | PAD_SELECT
ld b, ~(PAD_LEFT | PAD_RIGHT | PAD_START)
jr z, .matchedkeyspicked
ld b, PAD_UP | PAD_DOWN | PAD_LEFT | PAD_RIGHT | PAD_A | PAD_B | PAD_SELECT | PAD_START
ld b, PAD_CTRL_PAD | PAD_BUTTONS
.matchedkeyspicked
ld a, b
ld [hli], a ; wMenuWatchedKeys

2
engine/events/black_out.asm
View File

@ -41,6 +41,6 @@ ResetStatusAndHalveMoneyOnBlackout::
set BIT_FLY_OR_DUNGEON_WARP, [hl]
res BIT_FLY_WARP, [hl]
set BIT_ESCAPE_WARP, [hl]
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
predef_jump HealParty

2
engine/joypad.asm
View File

@ -3,7 +3,7 @@ _Joypad::
; hJoyPressed: (hJoyLast ^ hJoyInput) & hJoyInput
ldh a, [hJoyInput]
cp PAD_A + PAD_B + PAD_SELECT + PAD_START ; soft reset
cp PAD_BUTTONS ; soft reset
jp z, TrySoftReset
ld b, a

2
engine/menus/main_menu.asm
View File

@ -487,7 +487,7 @@ DisplayOptionMenu:
call JoypadLowSensitivity
ldh a, [hJoy5]
ld b, a
and PAD_A | PAD_B | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ; any key besides select pressed?
and ~PAD_SELECT ; any key besides select pressed?
jr z, .getJoypadStateLoop
bit B_PAD_B, b
jr nz, .exitMenu

2
engine/movie/trade.asm
View File

@ -149,7 +149,7 @@ Trade_Delay80:
Trade_ClearTileMap:
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld bc, SCREEN_AREA
ld a, " "
jp FillMemory

4
engine/overworld/auto_movement.asm
View File

@ -3,7 +3,7 @@ PlayerStepOutFromDoor::
res BIT_EXITING_DOOR, [hl]
call IsPlayerStandingOnDoorTile
jr nc, .notStandingOnDoor
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wMovementFlags
set BIT_EXITING_DOOR, [hl]
@ -81,7 +81,7 @@ PalletMovementScript_OakMoveLeft:
.done
ld hl, wStatusFlags7
set BIT_NO_MAP_MUSIC, [hl]
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
ret

2
engine/overworld/ledges.asm
View File

@ -39,7 +39,7 @@ HandleLedges::
ldh a, [hJoyHeld]
and e
ret z
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wMovementFlags
set BIT_LEDGE_OR_FISHING, [hl]

2
engine/overworld/push_boulder.asm
View File

@ -28,7 +28,7 @@ TryPushingBoulder::
set BIT_TRIED_PUSH_BOULDER, [hl]
ret z ; the player must try pushing twice before the boulder will move
ldh a, [hJoyHeld]
and PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
and PAD_CTRL_PAD
ret z
predef CheckForCollisionWhenPushingBoulder
ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult]

6
home/overworld.asm
View File

@ -5,7 +5,7 @@ HandleMidJump::
EnterMap::
; Load a new map.
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
call LoadMapData
farcall ClearVariablesOnEnterMap
@ -432,7 +432,7 @@ CheckWarpsNoCollisionLoop::
pop bc
pop de
ldh a, [hJoyHeld]
and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT
and PAD_CTRL_PAD
jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp
jr WarpFound1
@ -1828,7 +1828,7 @@ JoypadOverworld::
cp ROUTE_17 ; Cycling Road
jr nz, .notForcedDownwards
ldh a, [hJoyHeld]
and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT | PAD_B | PAD_A
and PAD_CTRL_PAD | PAD_B | PAD_A
jr nz, .notForcedDownwards
ld a, PAD_DOWN
ldh [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press

8
home/tilemap.asm
View File

@ -23,7 +23,7 @@ UncompressSpriteFromDE::
SaveScreenTilesToBuffer2::
hlcoord 0, 0
ld de, wTileMapBackup2
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld bc, SCREEN_AREA
call CopyData
ret
@ -39,14 +39,14 @@ LoadScreenTilesFromBuffer2DisableBGTransfer::
ldh [hAutoBGTransferEnabled], a
ld hl, wTileMapBackup2
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld bc, SCREEN_AREA
call CopyData
ret
SaveScreenTilesToBuffer1::
hlcoord 0, 0
ld de, wTileMapBackup
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld bc, SCREEN_AREA
jp CopyData
LoadScreenTilesFromBuffer1::
@ -54,7 +54,7 @@ LoadScreenTilesFromBuffer1::
ldh [hAutoBGTransferEnabled], a
ld hl, wTileMapBackup
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld bc, SCREEN_AREA
call CopyData
ld a, 1
ldh [hAutoBGTransferEnabled], a

2
home/trainers.asm
View File

@ -149,7 +149,7 @@ ENDC
xor a ; EXCLAMATION_BUBBLE
ld [wWhichEmotionBubble], a
predef EmotionBubble
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
xor a
ldh [hJoyHeld], a

2
home/vcopy.asm
View File

@ -23,7 +23,7 @@ ClearBgMap::
jr .next
ld a, l
.next
ld de, TILEMAP_WIDTH * TILEMAP_HEIGHT
ld de, TILEMAP_AREA
ld l, e
.loop
ld [hli], a

4
ram/vram.asm
View File

@ -5,8 +5,8 @@ UNION
vChars0:: ds $80 tiles
vChars1:: ds $80 tiles
vChars2:: ds $80 tiles
vBGMap0:: ds TILEMAP_WIDTH * TILEMAP_HEIGHT
vBGMap1:: ds TILEMAP_WIDTH * TILEMAP_HEIGHT
vBGMap0:: ds TILEMAP_AREA
vBGMap1:: ds TILEMAP_AREA
NEXTU
; battle/menu

6
ram/wram.asm
View File

@ -154,13 +154,13 @@ wShadowOAMEnd::
SECTION "Tilemap", WRAM0
; buffer for tiles that are visible on screen (20 columns by 18 rows)
wTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT
wTileMap:: ds SCREEN_AREA
; This union spans 480 bytes.
UNION
; buffer for temporarily saving and restoring current screen's tiles
; (e.g. if menus are drawn on top)
wTileMapBackup:: ds SCREEN_WIDTH * SCREEN_HEIGHT
wTileMapBackup:: ds SCREEN_AREA
NEXTU
; buffer for the blocks surrounding the player (6 columns by 5 rows of 4x4-tile blocks)
@ -921,7 +921,7 @@ UNION
wSerialOtherGameboyRandomNumberListBlock:: ds $11
NEXTU
; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top)
wTileMapBackup2:: ds SCREEN_WIDTH * SCREEN_HEIGHT
wTileMapBackup2:: ds SCREEN_AREA
ENDU
; This union spans 30 bytes.

2
scripts/BillsHouse.asm
View File

@ -62,7 +62,7 @@ BillsHousePokemonEntersMachineScript:
BillsHouseBillExitsMachineScript:
CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
ret z
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, BILLSHOUSE_BILL1
ld [wSpriteIndex], a

2
scripts/CeladonGym.asm
View File

@ -40,7 +40,7 @@ CeladonGymErikaPostBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, CeladonGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
CeladonGymReceiveTM21:

6
scripts/CeruleanCity.asm
View File

@ -24,7 +24,7 @@ CeruleanCityRocketDefeatedScript:
ld a, [wIsInBattle]
cp $ff
jp z, CeruleanCityClearScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
ld a, TEXT_CERULEANCITY_ROCKET
@ -78,7 +78,7 @@ ENDC
call PlayMusic
xor a
ldh [hJoyHeld], a
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, [wXCoord]
cp 20 ; is the player standing on the right side of the bridge?
@ -170,7 +170,7 @@ CeruleanCityRivalDefeatedScript:
cp $ff
jp z, CeruleanCityClearScripts
call CeruleanCityFaceRivalScript
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_CERULEAN_RIVAL
ld a, TEXT_CERULEANCITY_RIVAL

2
scripts/CeruleanGym.asm
View File

@ -40,7 +40,7 @@ CeruleanGymMistyPostBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, CeruleanGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
CeruleanGymReceiveTM11:

10
scripts/ChampionsRoom.asm
View File

@ -28,7 +28,7 @@ ChampionsRoomDefaultScript:
ret
ChampionsRoomPlayerEntersScript:
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wSimulatedJoypadStatesEnd
ld de, RivalEntrance_RLEMovement
@ -96,7 +96,7 @@ ChampionsRoomRivalDefeatedScript:
jp z, ResetRivalScript
call UpdateSprites
SetEvent EVENT_BEAT_CHAMPION_RIVAL
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_CHAMPIONSROOM_RIVAL
ldh [hTextID], a
@ -205,7 +205,7 @@ ChampionsRoomOakExitsScript:
ret
ChampionsRoomPlayerFollowsOakScript:
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wSimulatedJoypadStatesEnd
ld de, WalkToHallOfFame_RLEMovement
@ -233,10 +233,10 @@ ChampionsRoomCleanupScript:
ret
ChampionsRoom_DisplayTextID_AllowABSelectStart:
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
call DisplayTextID
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ret

2
scripts/CinnabarGym.asm
View File

@ -140,7 +140,7 @@ CinnabarGymBlainePostBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, CinnabarGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
; fallthrough
CinnabarGymReceiveTM38:

2
scripts/FightingDojo.asm
View File

@ -68,7 +68,7 @@ FightingDojoKarateMasterPostBattleScript:
ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
.already_facing
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
ld a, TEXT_FIGHTINGDOJO_KARATE_MASTER_I_WILL_GIVE_YOU_A_POKEMON

2
scripts/FuchsiaGym.asm
View File

@ -42,7 +42,7 @@ FuchsiaGymKogaPostBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, FuchsiaGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
; fallthrough
FuchsiaGymReceiveTM06:

2
scripts/GameCorner.asm
View File

@ -55,7 +55,7 @@ GameCornerRocketBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, GameCornerReenterMapAfterPlayerLoss
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_GAMECORNER_ROCKET_AFTER_BATTLE
ldh [hTextID], a

4
scripts/HallOfFame.asm
View File

@ -58,7 +58,7 @@ HallOfFameResetEventsAndSaveScript:
jp Init
HallOfFameDefaultScript:
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wSimulatedJoypadStatesEnd
ld de, HallOfFameEntryMovement
@ -94,7 +94,7 @@ HallOfFameOakCongratulationsScript:
ld a, TEXT_HALLOFFAME_OAK
ldh [hTextID], a
call DisplayTextID
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, HS_CERULEAN_CAVE_GUY
ld [wMissableObjectIndex], a

2
scripts/LancesRoom.asm
View File

@ -95,7 +95,7 @@ LancesRoomLanceEndBattleScript:
WalkToLance:
; Moves the player down the hallway to Lance's room.
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wSimulatedJoypadStatesEnd
ld de, WalkToLance_RLEList

2
scripts/MtMoonB2F.asm
View File

@ -132,7 +132,7 @@ MtMoonB2FSuperNerdTakesOtherFossilScript:
ld a, [wStatusFlags5]
bit BIT_SCRIPTED_NPC_MOVEMENT, a
ret nz
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a

10
scripts/OaksLab.asm
View File

@ -126,7 +126,7 @@ OaksLabFollowedOakScript:
ret
OaksLabOakChooseMonSpeechScript:
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING
ldh [hTextID], a
@ -293,7 +293,7 @@ OaksLabRivalChoosesStarterScript:
ld a, [wStatusFlags5]
bit BIT_SCRIPTED_NPC_MOVEMENT, a
ret nz
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, OAKSLAB_RIVAL
ldh [hSpriteIndex], a
@ -416,7 +416,7 @@ OaksLabRivalStartBattleScript:
ret
OaksLabRivalEndBattleScript:
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
@ -557,7 +557,7 @@ OaksLabOakGivesPokedexScript:
ret nz
call EnableAutoTextBoxDrawing
call PlayDefaultMusic
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
call OaksLabRivalFaceUpOakFaceDownScript
ld a, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR
@ -931,7 +931,7 @@ OaksLabMonChoiceMenu:
call AddPartyMon
ld hl, wStatusFlags4
set BIT_GOT_STARTER, [hl]
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_OAKSLAB_CHOSE_STARTER_SCRIPT
ld [wOaksLabCurScript], a

10
scripts/PalletTown.asm
View File

@ -34,7 +34,7 @@ PalletTownDefaultScript:
ld c, a
ld a, MUSIC_MEET_PROF_OAK ; "oak appears" music
call PlayMusic
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_OAK_APPEARED_IN_PALLET
@ -49,7 +49,7 @@ PalletTownOakHeyWaitScript:
ld a, TEXT_PALLETTOWN_OAK
ldh [hTextID], a
call DisplayTextID
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, HS_PALLET_TOWN_OAK
ld [wMissableObjectIndex], a
@ -82,7 +82,7 @@ PalletTownOakWalksToPlayerScript:
ld a, PALLETTOWN_OAK
ldh [hSpriteIndex], a
call MoveSprite
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
; trigger the next script
@ -98,13 +98,13 @@ PalletTownOakNotSafeComeWithMeScript:
ld [wSpritePlayerStateData1FacingDirection], a
ld a, TRUE
ld [wOakWalkedToPlayer], a
ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_PALLETTOWN_OAK
ldh [hTextID], a
call DisplayTextID
; set up movement script that causes the player to follow Oak to his lab
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, PALLETTOWN_OAK
ld [wSpriteIndex], a

2
scripts/PewterCity.asm
View File

@ -31,7 +31,7 @@ ENDC
ld hl, PewterCityPlayerLeavingEastCoords
call ArePlayerCoordsInArray
ret nc
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_PEWTERCITY_YOUNGSTER
ldh [hTextID], a

2
scripts/PewterGym.asm
View File

@ -40,7 +40,7 @@ PewterGymBrockPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, PewterGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
; fallthrough
PewterGymScriptReceiveTM34:

2
scripts/PokemonTower2F.asm
View File

@ -67,7 +67,7 @@ PokemonTower2FDefeatedRivalScript:
ld a, [wIsInBattle]
cp $ff
jp z, PokemonTower2FResetRivalEncounter
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
ld a, TEXT_POKEMONTOWER2F_RIVAL

2
scripts/PokemonTower5F.asm
View File

@ -26,7 +26,7 @@ PokemonTower5FDefaultScript:
ret nz
xor a
ldh [hJoyHeld], a
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld hl, wStatusFlags4
set BIT_NO_BATTLES, [hl]

4
scripts/PokemonTower6F.asm
View File

@ -50,13 +50,13 @@ PokemonTower6FMarowakBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, PokemonTower6FSetDefaultScript
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, [wStatusFlags3]
bit BIT_TALKED_TO_TRAINER, a
ret nz
call UpdateSprites
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, [wBattleResult]
and a

4
scripts/PokemonTower7F.asm
View File

@ -29,7 +29,7 @@ PokemonTower7FEndBattleScript:
cp $ff
jp z, PokemonTower7FSetDefaultScript
call EndTrainerBattle
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, [wSpriteIndex]
ldh [hSpriteIndex], a
@ -65,7 +65,7 @@ PokemonTower7FHideNPCScript:
ret
PokemonTower7FWarpToMrFujiHouseScript:
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, HS_POKEMON_TOWER_7F_MR_FUJI
ld [wMissableObjectIndex], a

2
scripts/RocketHideoutB2F.asm
View File

@ -28,7 +28,7 @@ RocketHideoutB2FDefaultScript:
call StartSimulatingJoypadStates
ld a, SFX_ARROW_TILES
call PlaySound
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_ROCKETHIDEOUTB2F_PLAYER_SPINNING
ld [wCurMapScript], a

2
scripts/RocketHideoutB3F.asm
View File

@ -28,7 +28,7 @@ RocketHideoutB3FDefaultScript:
call StartSimulatingJoypadStates
ld a, SFX_ARROW_TILES
call PlaySound
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_ROCKETHIDEOUTB3F_PLAYER_SPINNING
ld [wCurMapScript], a

2
scripts/RocketHideoutB4F.asm
View File

@ -49,7 +49,7 @@ RocketHideoutB4FBeatGiovanniScript:
cp $ff
jp z, RocketHideoutB4FSetDefaultScript
call UpdateSprites
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI
ld a, TEXT_ROCKETHIDEOUTB4F_GIOVANNI_HOPE_WE_MEET_AGAIN

2
scripts/Route16Gate1F.asm
View File

@ -55,7 +55,7 @@ Route16Gate1FPlayerMovingUpScript:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
Route16Gate1FGuardScript:

2
scripts/Route18Gate1F.asm
View File

@ -55,7 +55,7 @@ Route18Gate1FPlayerMovingUpScript:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
Route18Gate1FGuardScript:

6
scripts/Route22.asm
View File

@ -65,7 +65,7 @@ Route22DefaultScript:
ld [wSavedCoordIndex], a
xor a
ldh [hJoyHeld], a
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
@ -162,7 +162,7 @@ Route22Rival1AfterBattleScript:
ld a, ROUTE22_RIVAL1
ldh [hSpriteIndex], a
call SetSpriteFacingDirectionAndDelay
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE
ld a, TEXT_ROUTE22_RIVAL1
@ -321,7 +321,7 @@ Route22Rival2AfterBattleScript:
.set_rival_facing_direction
ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE
ld a, TEXT_ROUTE22_RIVAL2

2
scripts/Route24.asm
View File

@ -64,7 +64,7 @@ Route24AfterRocketBattleScript:
cp $ff
jp z, Route24SetDefaultScript
call UpdateSprites
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_ROUTE24_ROCKET
ld a, TEXT_ROUTE24_COOLTRAINER_M1

4
scripts/SSAnne2F.asm
View File

@ -42,7 +42,7 @@ SSAnne2FDefaultScript:
call SetSpriteMovementBytesToFF
xor a
ldh [hJoyHeld], a
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ldh a, [hSavedCoordIndex]
cp $2
@ -126,7 +126,7 @@ SSAnne2FRivalAfterBattleScript:
cp $ff
jp z, SSAnne2FResetScripts
call SSAnne2FSetFacingDirectionScript
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_SSANNE2F_RIVAL_CUT_MASTER
ldh [hTextID], a

8
scripts/SafariZoneGate.asm
View File

@ -22,7 +22,7 @@ SafariZoneGateDefaultScript:
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_1
ldh [hTextID], a
call DisplayTextID
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
xor a
ldh [hJoyHeld], a
@ -38,7 +38,7 @@ SafariZoneGateDefaultScript:
ld a, PAD_RIGHT
ld c, 1
call SafariZoneEntranceAutoWalk
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_SAFARIZONEGATE_PLAYER_MOVING_RIGHT
ld [wSafariZoneGateCurScript], a
@ -60,7 +60,7 @@ SafariZoneGateWouldYouLikeToJoinScript:
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_WOULD_YOU_LIKE_TO_JOIN
ldh [hTextID], a
call DisplayTextID
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ret
@ -80,7 +80,7 @@ SafariZoneGateLeavingSafariScript:
jr z, .leaving_early
ResetEventReuseHL EVENT_IN_SAFARI_ZONE
call UpdateSprites
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_SAFARIZONEGATE_SAFARI_ZONE_WORKER1_GOOD_HAUL_COME_AGAIN
ldh [hTextID], a

2
scripts/SaffronGym.asm
View File

@ -40,7 +40,7 @@ SaffronGymSabrinaPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, SaffronGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SaffronGymSabrinaReceiveTM46Script:

4
scripts/SilphCo11F.asm
View File

@ -173,7 +173,7 @@ SilphCo11FDefaultScript:
ld [wSavedCoordIndex], a
xor a
ldh [hJoyHeld], a
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_SILPHCO11F_GIOVANNI
ldh [hTextID], a
@ -220,7 +220,7 @@ SilphCo11FGiovanniAfterBattleScript:
ld b, SPRITE_FACING_DOWN
.continue
call SilphCo11FSetPlayerAndSpriteFacingDirectionScript
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
ldh [hTextID], a

4
scripts/SilphCo7F.asm
View File

@ -127,7 +127,7 @@ SilphCo7FDefaultScript:
jp nc, CheckFightingMapTrainers
xor a
ldh [hJoyHeld], a
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
@ -207,7 +207,7 @@ SilphCo7FRivalAfterBattleScript:
ld a, [wIsInBattle]
cp $ff
jp z, SilphCo7FSetDefaultScript
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
SetEvent EVENT_BEAT_SILPH_CO_RIVAL
ld a, PLAYER_DIR_DOWN

2
scripts/VermilionCity.asm
View File

@ -81,7 +81,7 @@ VermilionCityPlayerAllowedToPassScript:
ret
VermilionCityPlayerExitShipScript:
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, PAD_UP
ld [wSimulatedJoypadStatesEnd], a

2
scripts/VermilionGym.asm
View File

@ -59,7 +59,7 @@ VermilionGymLTSurgeAfterBattleScript:
ld a, [wIsInBattle]
cp $ff ; did we lose?
jp z, VermilionGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
VermilionGymLTSurgeReceiveTM24Script:

4
scripts/ViridianGym.asm
View File

@ -45,7 +45,7 @@ ViridianGymDefaultScript:
set BIT_SPINNING, [hl]
ld a, SFX_ARROW_TILES
call PlaySound
ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_BUTTONS | PAD_CTRL_PAD
ld [wJoyIgnore], a
ld a, SCRIPT_VIRIDIANGYM_PLAYER_SPINNING
ld [wCurMapScript], a
@ -132,7 +132,7 @@ ViridianGymGiovanniPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, ViridianGymResetScripts
ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
ld a, PAD_CTRL_PAD
ld [wJoyIgnore], a
; fallthrough
ViridianGymReceiveTM27: