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

Label and document hFFD7 more accurately

Browse source
This commit is contained in:
SatoMew 2020-11-29 20:17:29 +00:00
parent 6adbaefde1
commit 242b2e05cf
19 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/battle/core.asm
View file

@ -51,7 +51,7 @@ SlidePlayerAndEnemySilhouettesOnScreen:
ldh [hWY], a
ldh [rWY], a
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ldh [hSCY], a
dec a
ld [wUpdateSpritesEnabled], a
@ -6275,7 +6275,7 @@ DoBattleTransitionAndInitBattleVariables:
ldh [hAutoBGTransferEnabled], a
ldh [hWY], a
ldh [rWY], a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld hl, wPlayerStatsToDouble
ld [hli], a
ld [hli], a
@ -6866,7 +6866,7 @@ _InitBattleCommon:
pop af
ld [wMapPalOffset], a
ld a, [wSavedTilesetType]
ldh [hTilesetType], a
ldh [hTileAnimations], a
scf
ret
.emptyString

2
engine/battle/init_battle_variables.asm
View file

@ -1,5 +1,5 @@
InitBattleVariables:
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
ld [wSavedTilesetType], a
xor a
ld [wActionResultOrTookBattleTurn], a

6
engine/menus/league_pc.asm
View file

@ -6,10 +6,10 @@ PKMNLeaguePC:
push hl
ld a, [wUpdateSpritesEnabled]
push af
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld [wSpriteFlipped], a
ld [wUpdateSpritesEnabled], a
ld [wHoFTeamIndex2], a
@ -40,7 +40,7 @@ PKMNLeaguePC:
jr nz, .loop
.doneShowingTeams
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
pop af
ld [wUpdateSpritesEnabled], a
pop hl

6
engine/menus/pokedex.asm
View file

@ -410,10 +410,10 @@ ShowPokedexDataInternal:
call RunPaletteCommand
pop af
ld [wd11e], a
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
hlcoord 0, 0
ld de, 1
@ -577,7 +577,7 @@ ShowPokedexDataInternal:
and A_BUTTON | B_BUTTON
jr z, .waitForButtonPress
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
call GBPalWhiteOut
call ClearScreen
call RunDefaultPaletteCommand

4
engine/menus/save.asm
View file

@ -70,7 +70,7 @@ LoadSAV0:
ld bc, wSpriteDataEnd - wSpriteDataStart
call CopyData
ld a, [sTilesetType]
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld hl, sCurBoxData
ld de, wBoxDataStart
ld bc, wBoxDataEnd - wBoxDataStart
@ -217,7 +217,7 @@ SaveSAVtoSRAM0:
ld de, sCurBoxData
ld bc, wBoxDataEnd - wBoxDataStart
call CopyData
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
ld [sTilesetType], a
ld hl, sPlayerName
ld bc, sMainDataCheckSum - sPlayerName

6
engine/menus/start_sub_menus.asm
View file

@ -454,10 +454,10 @@ StartMenu_TrainerInfo::
call GBPalWhiteOut
call ClearScreen
call UpdateSprites
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
call DrawTrainerInfo
predef DrawBadges ; draw badges
ld b, SET_PAL_TRAINER_CARD
@ -471,7 +471,7 @@ StartMenu_TrainerInfo::
call ReloadMapData
call LoadGBPal
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
jp RedisplayStartMenu
; loads tile patterns and draws everything except for gym leader faces / badges

2
engine/movie/evolution.asm
View file

@ -19,7 +19,7 @@ EvolveMon:
call Delay3
xor a
ldh [hAutoBGTransferEnabled], a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld a, [wEvoOldSpecies]
ld [wWholeScreenPaletteMonSpecies], a
ld c, 0

2
engine/movie/hall_of_fame.asm
View file

@ -19,7 +19,7 @@ AnimateHallOfFame:
call FillMemory
xor a
ld [wUpdateSpritesEnabled], a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld [wSpriteFlipped], a
ld [wLetterPrintingDelayFlags], a ; no delay
ld [wHoFMonOrPlayer], a ; mon

2
engine/movie/oak_speech/oak_speech.asm
View file

@ -52,7 +52,7 @@ OakSpeech:
ld [wDestinationMap], a
call SpecialWarpIn
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld a, [wd732]
bit 1, a ; possibly a debug mode bit
jp nz, .skipChoosingNames

2
engine/movie/title.asm
View file

@ -26,7 +26,7 @@ DisplayTitleScreen:
ld a, $1
ldh [hAutoBGTransferEnabled], a
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ldh [hSCX], a
ld a, $40
ldh [hSCY], a

2
engine/overworld/tilesets.asm
View file

@ -23,7 +23,7 @@ LoadTilesetHeader:
dec c
jr nz, .copyTilesetHeaderLoop
ld a, [hl]
ldh [hTilesetType], a
ldh [hTileAnimations], a
xor a
ldh [hMovingBGTilesCounter1], a
pop hl

6
engine/overworld/update_map.asm
View file

@ -52,11 +52,11 @@ RedrawMapView:
ret z
ldh a, [hAutoBGTransferEnabled]
push af
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hAutoBGTransferEnabled], a
ldh [hTilesetType], a ; no flower/water BG tile animations
ldh [hTileAnimations], a ; no flower/water BG tile animations
call LoadCurrentMapView
call RunDefaultPaletteCommand
ld hl, wMapViewVRAMPointer
@ -112,7 +112,7 @@ RedrawMapView:
dec c
jr nz, .redrawRowLoop
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
pop af
ldh [hAutoBGTransferEnabled], a
ret

4
engine/pokemon/evos_moves.asm
View file

@ -11,7 +11,7 @@ TryEvolvingMon:
; this is only called after battle
; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur
EvolutionAfterBattle:
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ld [wEvolutionOccurred], a
@ -245,7 +245,7 @@ Evolution_PartyMonLoop: ; loop over party mons
pop bc
pop hl
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld a, [wLinkState]
cp LINK_STATE_TRADING
ret z

12
engine/pokemon/status_screen.asm
View file

@ -101,10 +101,10 @@ StatusScreen:
ld hl, vChars2 tile $72
lb bc, BANK(PTile), 1
call CopyVideoDataDouble ; bold P (for PP)
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
hlcoord 19, 1
lb bc, 6, 10
call DrawLineBox ; Draws the box around name, HP and status
@ -174,7 +174,7 @@ StatusScreen:
call PlayCry ; play Pokémon cry
call WaitForTextScrollButtonPress ; wait for button
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
ret
.GetStringPointer
@ -296,10 +296,10 @@ StatsText:
next "SPECIAL@"
StatusScreen2:
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ldh [hAutoBGTransferEnabled], a
ld bc, NUM_MOVES + 1
ld hl, wMoves
@ -429,7 +429,7 @@ StatusScreen2:
call Delay3
call WaitForTextScrollButtonPress ; wait for button
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
ld hl, wd72c
res 1, [hl]
ld a, $77

2
home/init.asm
View file

@ -65,7 +65,7 @@ rLCDC_DEFAULT EQU %11100011
call WriteDMACodeToHRAM
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
ldh [rSTAT], a
ldh [hSCX], a
ldh [hSCY], a

2
home/overworld.asm
View file

@ -813,7 +813,7 @@ LoadPlayerSpriteGraphics::
dec a
jr z, .ridingBike
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
and a
jr nz, .determineGraphics
jr .startWalking

10
home/pokemon.asm
View file

@ -175,10 +175,10 @@ GetCryData::
ret
DisplayPartyMenu::
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
call GBPalWhiteOutWithDelay3
call ClearSprites
call PartyMenuInit
@ -186,10 +186,10 @@ DisplayPartyMenu::
jp HandlePartyMenuInput
GoBackToPartyMenu::
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
push af
xor a
ldh [hTilesetType], a
ldh [hTileAnimations], a
call PartyMenuInit
call RedrawPartyMenu
jp HandlePartyMenuInput
@ -251,7 +251,7 @@ HandlePartyMenuInput::
and a
jp nz, .swappingPokemon
pop af
ldh [hTilesetType], a
ldh [hTileAnimations], a
bit 1, b
jr nz, .noPokemonChosen
ld a, [wPartyCount]

4
home/vcopy.asm
View file

@ -379,7 +379,7 @@ UpdateMovingBgTiles::
; Animate water and flower
; tiles in the overworld.
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
and a
ret z ; no animations if indoors (or if a menu set this to 0)
@ -417,7 +417,7 @@ UpdateMovingBgTiles::
dec c
jr nz, .left
.done
ldh a, [hTilesetType]
ldh a, [hTileAnimations]
rrca
ret nc
; if in a cave, no flower animations

10
hram.asm
View file

@ -277,11 +277,11 @@ hFrameCounter:: db ; decremented every V-blank (used for delays)
; you can detect that the V-blank handler has run since then.
hVBlankOccurred:: db
; 00 = indoor
; 01 = cave
; 02 = outdoor
; this is often set to 00 in order to turn off water and flower BG tile animations
hTilesetType:: db
; Controls whether flower and water tiles are animated.
; 00 = flowers and water are static (breaks Surf)
; 01 = flowers are static, water is animated
; 02 = flowers and water are animated
hTileAnimations:: db
hMovingBGTilesCounter1:: db