Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-10-26 16:41:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename vBGMap0/1 to vTilemap0/1
Some checks failed
CI / build (push) Has been cancelled
Details
CI / build-macos (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Rangi
2026-10-21 11:05:38 -04:00
parent 056716accf
commit 4dfa9554c5
16 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/battle_transitions.asm
View File

@@ -65,7 +65,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
jr nz, .loop
ld de, wOverworldMapBlocks
hlbgcoord 0, 0, vBGMap0
hlbgcoord 0, 0, vTilemap0
ld b, BANK(@)
ld c, $28
call Request2bpp

4
engine/battle/start_battle.asm
View File

@@ -310,7 +310,7 @@ ClearBattleRAM:
ld hl, hBGMapAddress
xor a
ld [hli], a
ld [hl], HIGH(vBGMap0)
ld [hl], HIGH(vTilemap0)
ld a, LCDC_DEFAULT & ~LCDC_WIN_MAP
ldh [rLCDC], a
ld a, [wMapId]
@@ -490,7 +490,7 @@ InitBattleDisplay:
call DisableLCD
call LoadFont
call Call_LoadBattleFontsHPBar
ld hl, vBGMap0
ld hl, vTilemap0
lb bc, 4, 0
ld a, '　'
call ByteFill

10
engine/games/pikachu_minigame.asm
View File

@@ -1,5 +1,5 @@
PikachuMiniGame::
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress + 1], a
call .Init
call DelayFrame
@@ -8,7 +8,7 @@ PikachuMiniGame::
jr nc, .loop
; exit
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress + 1], a
ld de, MUSIC_NONE
call PlayMusic
@@ -40,7 +40,7 @@ PikachuMiniGame::
ld [wPikachuMinigameTilesPointer + 1], a
; BG map destination
ld hl, vBGMap0
ld hl, vTilemap0
ld a, l
ld [wPikachuMinigameBGMapPointer], a
ld a, h
@@ -137,7 +137,7 @@ PikachuMiniGame::
ret
PikachuMiniGame_ClearBothTilemaps:
ld hl, vBGMap1
ld hl, vTilemap1
ld bc, SCREEN_WIDTH * TILEMAP_HEIGHT
.clear_bgmap
ld [hl], 0
@@ -1142,7 +1142,7 @@ PikachuMiniGame_ScrollScene:
srl a
ld e, a
ld d, 0
ld hl, vBGMap0
ld hl, vTilemap0
add hl, de
ld a, l
ldh [hRedrawRowOrColumnDest], a

4
engine/movie/game_freak_intro.asm
View File

@@ -4,7 +4,7 @@ GameFreakIntro::
call DisableLCD
call ClearVRAM
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress + 1], a
xor a
ldh [hBGMapAddress], a
@@ -57,7 +57,7 @@ GameFreakIntro::
.Init:
call DisableLCD
ld hl, vBGMap0
ld hl, vTilemap0
ld bc, TILEMAP_WIDTH * SCREEN_HEIGHT
xor a
call ByteFill

10
engine/movie/opening_cutscene.asm
View File

@@ -91,7 +91,7 @@ IntroScene1:
ld [wIntroTilesPointer + 1], a
; Set destination BG map pointer
ld hl, vBGMap0
ld hl, vTilemap0
ld a, l
ld [wIntroBGMapPointer + 0], a
ld a, h
@@ -510,9 +510,9 @@ endr
ld [wVBCopySrc], a
ld a, h
ld [wVBCopySrc + 1], a
ld a, LOW(vBGMap0 + 15 * TILEMAP_WIDTH)
ld a, LOW(vTilemap0 + 15 * TILEMAP_WIDTH)
ld [wVBCopyDst], a
ld a, HIGH(vBGMap0 + 15 * TILEMAP_WIDTH)
ld a, HIGH(vTilemap0 + 15 * TILEMAP_WIDTH)
ld [wVBCopyDst + 1], a
ld a, 2
ld [wVBCopySize], a
@@ -607,7 +607,7 @@ IntroScene6:
ld [wIntroTilesPointer + 0], a
ld a, HIGH(Intro_GrassMeta)
ld [wIntroTilesPointer + 1], a
ld hl, vBGMap0
ld hl, vTilemap0
ld a, l
ld [wIntroBGMapPointer + 0], a
ld a, h
@@ -992,7 +992,7 @@ Intro_BlankTilemapAndBGMap:
or c
jr nz, .blank_bgmap
ld hl, vBGMap0
ld hl, vTilemap0
ld de, wOverworldMapBlocks
lb bc, BANK(@), $40
call Request2bpp

4
engine/movie/title.asm
View File

@@ -62,7 +62,7 @@ TitleSequenceInit::
farcall ClearSpriteAnims
ld hl, vChars0
ld bc, vBGMap0 - vChars0
ld bc, vTilemap0 - vChars0
.clear_loop
ld [hl], $00
@@ -109,7 +109,7 @@ TitleSequenceInit::
ld a, $00
ld [hli], a
ld hl, vBGMap0
ld hl, vTilemap0
ld bc, 128 tiles
ld a, '　'
call ByteFill

20
engine/movie/trade_animation.asm
View File

@@ -138,7 +138,7 @@ RunTradeAnimScript:
call DisableLCD
callfar ClearSpriteAnims
hlbgcoord 0, 0
ld bc, STARTOF(VRAM) + SIZEOF(VRAM) - vBGMap0
ld bc, STARTOF(VRAM) + SIZEOF(VRAM) - vTilemap0
ld a, '　'
call ByteFill
ld hl, TradeGameBoyGFX
@@ -421,7 +421,7 @@ TradeAnim_TubeToPlayer8:
call DisableLCD
callfar ClearSpriteAnims
hlbgcoord 0, 0
ld bc, STARTOF(VRAM) + SIZEOF(VRAM) - vBGMap0
ld bc, STARTOF(VRAM) + SIZEOF(VRAM) - vTilemap0
ld a, '　'
call ByteFill
xor a
@@ -524,7 +524,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim:
push af
call ClearBGPalettes
call WaitForAutoBgMapTransfer
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress + 1], a
call ClearTileMap
hlcoord 0, 0
@@ -543,7 +543,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim:
call ByteFill
call WaitBGMap
call WaitForAutoBgMapTransfer
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress + 1], a
call ClearTileMap
ret
@@ -638,7 +638,7 @@ TradeAnim_TextboxScrollStart:
TradeAnim_ScrollOutRight:
call WaitForAutoBgMapTransfer
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress + 1], a
call WaitBGMap
ld a, $7
@@ -647,7 +647,7 @@ TradeAnim_ScrollOutRight:
ldh [hWY], a
call DelayFrame
call WaitForAutoBgMapTransfer
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress + 1], a
call ClearTileMap
call TradeAnim_IncrementJumptableIndex
@@ -663,14 +663,14 @@ TradeAnim_ScrollOutRight2:
ret
.done:
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress + 1], a
call WaitBGMap
ld a, $7
ldh [hWX], a
ld a, $90
ldh [hWY], a
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress + 1], a
call TradeAnim_AdvanceScriptPointer
ret
@@ -761,7 +761,7 @@ ShowOTTrademonStats:
TrademonStats_MonTemplate:
call WaitForAutoBgMapTransfer
call TradeAnim_BlankTilemap
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress + 1], a
hlcoord 5, 0
ld b, 6
@@ -781,7 +781,7 @@ TrademonStats_MonTemplate:
TrademonStats_WaitBGMap:
call WaitBGMap
call WaitForAutoBgMapTransfer
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress + 1], a
ret

8
engine/overworld/init_map.asm
View File

@@ -10,7 +10,7 @@ ReanchorBGMap_NoOAMUpdate::
ldh [hBGMapMode], a
xor a
ldh [hBGMapAddress], a
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress+1], a
call LoadMapPart
call WaitBGMap
@@ -18,9 +18,9 @@ ReanchorBGMap_NoOAMUpdate::
ldh [hBGMapMode], a
ldh [hWY], a
call .Transfer
xor a ; LOW(vBGMap0)
xor a ; LOW(vTilemap0)
ld [wBGMapAnchor], a
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ldh [hBGMapAddress+1], a
ld [wBGMapAnchor+1], a
xor a
@@ -34,7 +34,7 @@ ReanchorBGMap_NoOAMUpdate::
ld hl, wTileMapBackup
ld bc, (SCREEN_WIDTH * 6) + 8
call ByteFill
ld hl, vBGMap0
ld hl, vTilemap0
ld c, 8
.loop
push bc

6
engine/overworld/player_step.asm
View File

@@ -229,7 +229,7 @@ ScrollOverworldMapDown:
ld a, [wBGMapAnchor + 1]
inc a
and %11
or HIGH(vBGMap0)
or HIGH(vTilemap0)
ld [wBGMapAnchor + 1], a
.no_overflow
ld hl, wMetatileNextY
@@ -260,7 +260,7 @@ ScrollOverworldMapUp:
ld a, [wBGMapAnchor+1]
dec a
and %11
or HIGH(vBGMap0)
or HIGH(vTilemap0)
ld [wBGMapAnchor+1], a
.not_underflowed
ld hl, wMetatileNextY
@@ -526,7 +526,7 @@ ENDR
.no_overflow
ld a, d
and %11
or HIGH(vBGMap0) ; equivalent of add $98
or HIGH(vTilemap0) ; equivalent of add $98
ld d, a
dec b
jr nz, .row_loop

6
home/init.asm
View File

@@ -72,9 +72,9 @@ Init::
ld a, $ff
ldh [hSerialConnectionStatus], a
ld h, HIGH(vBGMap0)
ld h, HIGH(vTilemap0)
call BlankBGMap
ld h, HIGH(vBGMap1)
ld h, HIGH(vTilemap1)
call BlankBGMap
ld a, LCDC_DEFAULT
ldh [rLCDC], a
@@ -84,7 +84,7 @@ Init::
predef CheckSGB
ld a, IE_DEFAULT
ldh [rIE], a
ld a, HIGH(vBGMap1)
ld a, HIGH(vTilemap1)
ldh [hBGMapAddress + 1], a
xor a
ldh [hBGMapAddress], a

6
home/map.asm
View File

@@ -380,15 +380,15 @@ LoadMapTimeOfDay::
ret
.ClearBGMap
ld a, HIGH(vBGMap0)
ld a, HIGH(vTilemap0)
ld [wBGMapAnchor + 1], a
xor a ; LOW(vBGMap0)
xor a ; LOW(vTilemap0)
ld [wBGMapAnchor], a
ldh [hSCY], a
ldh [hSCX], a
ld a, '■'
ld bc, vBGMap1 - vBGMap0
ld bc, vTilemap1 - vTilemap0
hlbgcoord 0, 0
call ByteFill
ret

4
home/overworld.asm
View File

@@ -104,8 +104,8 @@ ScheduleSouthRowRedraw::
add hl, bc
; the following 4 lines wrap us from bottom to top if necessary
ld a, h
and HIGH(vBGMap1 - vBGMap0 - $01)
or HIGH(vBGMap0)
and HIGH(vTilemap1 - vTilemap0 - $01)
or HIGH(vTilemap0)
ldh [hRedrawRowOrColumnDest + 1], a
ld a, l
ldh [hRedrawRowOrColumnDest], a

2
home/toolgear.asm
View File

@@ -77,7 +77,7 @@ InitToolgearBuffer::
call UpdateToolgear
ld hl, vBGMap1
ld hl, vTilemap1
ld bc, $4 ; 4 tiles = 2 rows
bgcoord de, 0, 0, wToolgearBuffer
call Get2bpp

14
home/vcopy.asm
View File

@@ -38,8 +38,8 @@ RedrawRowOrColumn::
.noCarry
; the following 4 lines wrap us from bottom to top if necessary
ld a, d
and HIGH(vBGMap1 - vBGMap0 - $01)
or HIGH(vBGMap0)
and HIGH(vTilemap1 - vTilemap0 - $01)
or HIGH(vTilemap0)
ld d, a
dec c
jr nz, .col_loop
@@ -229,8 +229,8 @@ _RedrawFlashlightColumn::
.noCarryBG
; the following 4 lines wrap us from bottom to top if necessary
ld a, d
and HIGH(vBGMap1 - vBGMap0 - $01)
or HIGH(vBGMap0)
and HIGH(vTilemap1 - vTilemap0 - $01)
or HIGH(vTilemap0)
ld d, a
dec c
jr nz, .loop
@@ -277,8 +277,8 @@ _RedrawFlashlightColumnBlack::
add hl, de
; the following 4 lines wrap us from bottom to top if necessary
ld a, h
and HIGH(vBGMap1 - vBGMap0 - $01)
or HIGH(vBGMap0)
and HIGH(vTilemap1 - vTilemap0 - $01)
or HIGH(vTilemap0)
ld h, a
dec c
jr nz, .loop
@@ -551,7 +551,7 @@ TransferToolgearRow::
ld [hSPTemp], sp
bgcoord hl, 0, 1, wToolgearBuffer
ld sp, hl
bgcoord hl, 0, 1, vBGMap1
bgcoord hl, 0, 1, vTilemap1
ld a, $01
jp TransferBgRows

6
macros/coords.asm
View File

@@ -18,7 +18,7 @@ DEF debgcoord EQUS "bgcoord de,"
MACRO? bgcoord
; register, x, y[, origin]
if _NARG < 4
ld \1, (\3) * TILEMAP_WIDTH + (\2) + vBGMap0
ld \1, (\3) * TILEMAP_WIDTH + (\2) + vTilemap0
else
ld \1, (\3) * TILEMAP_WIDTH + (\2) + \4
endc
@@ -45,7 +45,7 @@ ENDM
MACRO? ldbgcoord_a
; x, y[, origin]
if _NARG < 3
ld [(\2) * TILEMAP_WIDTH + (\1) + vBGMap0], a
ld [(\2) * TILEMAP_WIDTH + (\1) + vTilemap0], a
else
ld [(\2) * TILEMAP_WIDTH + (\1) + \3], a
endc
@@ -63,7 +63,7 @@ ENDM
MACRO? lda_bgcoord
; x, y[, origin]
if _NARG < 3
ld a, [(\2) * TILEMAP_WIDTH + (\1) + vBGMap0]
ld a, [(\2) * TILEMAP_WIDTH + (\1) + vTilemap0]
else
ld a, [(\2) * TILEMAP_WIDTH + (\1) + \3]
endc

4
ram/vram.asm
View File

@@ -31,5 +31,5 @@ vPicrossPlayArea:: ds $90 tiles
ENDU
vBGMap0:: ds TILEMAP_AREA
vBGMap1:: ds TILEMAP_AREA
vTilemap0:: ds TILEMAP_AREA
vTilemap1:: ds TILEMAP_AREA