pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve some innacurate function names from pokecrystal

Browse Source
This commit is contained in:
xCrystal
2023-08-28 13:30:13 +02:00
parent 11db1300b2
commit fd6f02036e
18 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/debug/color_picker.asm
View File

@@ -1023,7 +1023,7 @@ TilesetColorPicker: ; unreferenced
ld [wDebugTilesetCurColor], a
ldh [hMapAnims], a
call ClearSprites
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call WaitBGMap2
xor a
ldh [hBGMapMode], a

2
engine/events/field_moves.asm
View File

@@ -58,7 +58,7 @@ ShakeHeadbuttTree:
jr .loop
.done
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call WaitBGMap
xor a
ldh [hBGMapMode], a

4
engine/events/overworld.asm
View File

@@ -220,7 +220,7 @@ CutDownTreeOrGrass:
ld [hl], a
xor a
ldh [hBGMapMode], a
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call UpdateSprites
call DelayFrame
ld a, [wCutWhirlpoolAnimationType]
@@ -1171,7 +1171,7 @@ DisappearWhirlpool:
ld [hl], a
xor a
ldh [hBGMapMode], a
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
ld a, [wCutWhirlpoolAnimationType]
ld e, a
farcall PlayWhirlpoolSound

2
engine/events/pokecenter_pc.asm
View File

@@ -212,7 +212,7 @@ _PlayersHousePC:
call _PlayersPC
and a
jr nz, .changed_deco_tiles
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call ApplyTilemap
call UpdateSprites
call PC_PlayShutdownSound

2
engine/events/pokepic.asm
View File

@@ -35,7 +35,7 @@ ClosePokepic::
call GetMemCGBLayout
xor a
ldh [hBGMapMode], a
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call ApplyTilemap
call UpdateSprites
call LoadStandardFont

45
engine/gfx/dma_transfer.asm
View File

@@ -26,11 +26,13 @@ HDMATransferAttrmapToWRAMBank3:
call HDMATransferToWRAMBank3
ret
ReloadMapPart::
HDMATransferTilemapAndAttrmap_OverworldEffect::
ld hl, .Function
jp CallInSafeGFXMode
.Function:
; Pad BG attrs with $00
; Pad BG tiles with " "
decoord 0, 0, wAttrmap
ld hl, wScratchAttrmap
call PadAttrmapForHDMATransfer
@@ -39,31 +41,31 @@ ReloadMapPart::
call PadTilemapForHDMATransfer
call DelayFrame
; Transfer Attrmap and Tilemap to BG map
di
ldh a, [rVBK]
push af
ld a, $1
ldh [rVBK], a
ld hl, wScratchAttrmap
call HDMATransfer_Wait127Scanlines_toBGMap
call HDMATransfer_EndBeforeScanline128_toBGMap
ld a, $0
ldh [rVBK], a
ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines_toBGMap
call HDMATransfer_EndBeforeScanline128_toBGMap
pop af
ldh [rVBK], a
ei
ret
OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
_HDMATransferTilemapAndAttrmap_OpenAndCloseMenu::
ld hl, .Function
jp CallInSafeGFXMode
.Function:
; Transfer wAttrmap and Tilemap to BGMap
; Fill vBGAttrs with $00
; Fill vBGTiles with " "
; Pad BG attrs with $00
; Pad BG tiles with " "
decoord 0, 0, wAttrmap
ld hl, wScratchAttrmap
call PadAttrmapForHDMATransfer
@@ -72,17 +74,18 @@ OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
call PadTilemapForHDMATransfer
call DelayFrame
; Transfer Attrmap and Tilemap to BG map
di
ldh a, [rVBK]
push af
ld a, $1
ldh [rVBK], a
ld hl, wScratchAttrmap
call HDMATransfer_Wait123Scanlines_toBGMap
call HDMATransfer_EndBeforeScanline124_toBGMap
ld a, $0
ldh [rVBK], a
ld hl, wScratchTilemap
call HDMATransfer_Wait123Scanlines_toBGMap
call HDMATransfer_EndBeforeScanline124_toBGMap
pop af
ldh [rVBK], a
ei
@@ -131,7 +134,7 @@ WaitDMATransfer:
jr nz, .loop
ret
HDMATransfer_Wait127Scanlines_toBGMap:
HDMATransfer_EndBeforeScanline128_toBGMap:
; HDMA transfer from hl to [hBGMapAddress]
; hBGMapAddress -> de
; 2 * SCREEN_HEIGHT -> c
@@ -140,9 +143,9 @@ HDMATransfer_Wait127Scanlines_toBGMap:
ldh a, [hBGMapAddress]
ld e, a
ld c, 2 * SCREEN_HEIGHT
jr HDMATransfer_Wait127Scanlines
jr HDMATransfer_EndBeforeScanline128
HDMATransfer_Wait123Scanlines_toBGMap:
HDMATransfer_EndBeforeScanline124_toBGMap:
; HDMA transfer from hl to [hBGMapAddress]
; hBGMapAddress -> de
; 2 * SCREEN_HEIGHT -> c
@@ -152,7 +155,7 @@ HDMATransfer_Wait123Scanlines_toBGMap:
ldh a, [hBGMapAddress]
ld e, a
ld c, 2 * SCREEN_HEIGHT
jr HDMATransfer_Wait123Scanlines
jr HDMATransfer_EndBeforeScanline124
HDMATransfer_NoDI:
; HDMA transfer from hl to [hBGMapAddress]
@@ -213,12 +216,12 @@ HDMATransfer_NoDI:
res 7, [hl]
ret
HDMATransfer_Wait123Scanlines:
ld b, $7b
HDMATransfer_EndBeforeScanline124:
ld b, 124 - 1
jr _continue_HDMATransfer
HDMATransfer_Wait127Scanlines:
ld b, $7f
HDMATransfer_EndBeforeScanline128:
ld b, 128 - 1
_continue_HDMATransfer:
; a lot of waiting around for hardware registers
; [rHDMA1, rHDMA2] = hl & $fff0
@@ -372,7 +375,7 @@ HDMATransfer2bpp::
ld d, h
ld e, l
ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines
call HDMATransfer_EndBeforeScanline128
; restore the previous bank
pop af
@@ -437,7 +440,7 @@ HDMATransfer1bpp::
ld d, h
ld e, l
ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines
call HDMATransfer_EndBeforeScanline128
pop af
ldh [rSVBK], a
@@ -459,13 +462,13 @@ HDMATransfer_OnlyTopFourRows:
ld c, $8
ld hl, wScratchTilemap + $80
debgcoord 0, 0, vBGMap1
call HDMATransfer_Wait127Scanlines
call HDMATransfer_EndBeforeScanline128
ld a, $0
ldh [rVBK], a
ld c, $8
ld hl, wScratchTilemap
debgcoord 0, 0, vBGMap1
call HDMATransfer_Wait127Scanlines
call HDMATransfer_EndBeforeScanline128
ret
.Copy:

2
engine/menus/menu.asm
View File

@@ -624,7 +624,7 @@ RestoreOverworldMapTiles: ; unreferenced
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
call CloseSRAM
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
xor a ; sScratch
call OpenSRAM
ld hl, sScratch

2
engine/menus/start_menu.asm
View File

@@ -33,7 +33,7 @@ StartMenu::
call DrawVariableLengthMenuBox
call .DrawBugContestStatusBox
call SafeUpdateSprites
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
farcall LoadFont_NoOAMUpdate
call .DrawBugContestStatus
call UpdateTimePals

4
engine/overworld/init_map.asm
View File

@@ -27,10 +27,10 @@ ReanchorBGMap_NoOAMUpdate::
ldh [hBGMapMode], a
ld a, $90
ldh [hWY], a
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
ld a, HIGH(vBGMap1)
call .LoadBGMapAddrIntoHRAM
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
farcall ApplyPals
ld a, TRUE
ldh [hCGBPalUpdate], a

2
engine/overworld/load_map_part.asm
View File

@@ -1,4 +1,4 @@
_LoadMapPart::
_LoadScreenTilemap::
ld hl, wSurroundingTiles
ld a, [wPlayerMetatileY]
and a

8
engine/overworld/player_step.asm
View File

@@ -124,25 +124,25 @@ UpdateOverworldMap:
.step_down
call .ScrollOverworldMapDown
call LoadMapPart
call LoadScreenTilemap
call ScrollMapDown
ret
.step_up
call .ScrollOverworldMapUp
call LoadMapPart
call LoadScreenTilemap
call ScrollMapUp
ret
.step_left
call .ScrollOverworldMapLeft
call LoadMapPart
call LoadScreenTilemap
call ScrollMapLeft
ret
.step_right
call .ScrollOverworldMapRight
call LoadMapPart
call LoadScreenTilemap
call ScrollMapRight
ret

8
engine/overworld/scripting.asm
View File

@@ -947,7 +947,7 @@ ApplyObjectFacing:
ret
.DisableTextTiles:
call LoadMapPart
call LoadScreenTilemap
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
.loop
@@ -2170,9 +2170,9 @@ Script_changeblock:
Script_reloadmappart::
xor a
ldh [hBGMapMode], a
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call GetMovementPermissions
farcall ReloadMapPart
farcall HDMATransferTilemapAndAttrmap_OverworldEffect
call UpdateSprites
ret
@@ -2212,7 +2212,7 @@ Script_writeunusedbyte:
ret
Script_closetext:
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
call CloseText
ret

2
engine/overworld/warp_connection.asm
View File

@@ -219,7 +219,7 @@ LoadMapTimeOfDay:
ld [wSpriteUpdatesEnabled], a
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal
call OverworldTextModeSwitch
call LoadScreenTilemapAndAttrmapPals
call .ClearBGMap
call .PushAttrmap
ret

2
engine/tilesets/map_palettes.asm
View File

@@ -1,4 +1,4 @@
_SwapTextboxPalettes::
_LoadScreenAttrmapPals::
hlcoord 0, 0
decoord 0, 0, wAttrmap
ld b, SCREEN_HEIGHT