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

Standardize on lowercase Tilemap and Attrmap

Browse Source 
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
This commit is contained in:
mid-kid 2020-02-13 18:30:13 +01:00
parent 34ceaac71d
commit 26b8bf003e
84 changed files with 630 additions and 630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/special_pointers.asm
View File

@ -65,7 +65,7 @@ SpecialsPointers::
add_special ReloadSpritesNoPalettes ; bank 0 add_special ReloadSpritesNoPalettes ; bank 0
add_special ClearBGPalettes ; bank 0 add_special ClearBGPalettes ; bank 0
add_special UpdateTimePals ; bank 0 add_special UpdateTimePals ; bank 0
add_special ClearTileMap ; bank 0 add_special ClearTilemap ; bank 0
add_special UpdateSprites ; bank 0 add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; $38 ; bank 0 add_special ReplaceKrisSprite ; $38 ; bank 0
add_special GameCornerPrizeMonCheckDex add_special GameCornerPrizeMonCheckDex

2
engine/battle/battle_transition.asm
View File

@ -585,7 +585,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
inc b inc b
inc c inc c

102
engine/battle/core.asm
View File

@ -46,12 +46,12 @@ DoBattle:
call DelayFrames call DelayFrames
.player_2 .player_2
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call CheckPlayerPartyForFitMon call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_DEBUG cp BATTLETYPE_DEBUG
jp z, .tutorial_debug jp z, .tutorial_debug
@ -82,7 +82,7 @@ DoBattle:
hlcoord 1, 5 hlcoord 1, 5
ld a, 9 ld a, 9
call SlideBattlePicOut call SlideBattlePicOut
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call ResetBattleParticipants call ResetBattleParticipants
call InitBattleMon call InitBattleMon
call ResetPlayerStatLevels call ResetPlayerStatLevels
@ -91,7 +91,7 @@ DoBattle:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, [wLinkMode] ld a, [wLinkMode]
@ -116,7 +116,7 @@ DoBattle:
jp BattleMenu jp BattleMenu
WildFled_EnemyFled_LinkBattleCanceled: WildFled_EnemyFled_LinkBattleCanceled:
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, [wBattleResult] ld a, [wBattleResult]
and BATTLERESULT_BITMASK and BATTLERESULT_BITMASK
add DRAW add DRAW
@ -291,7 +291,7 @@ HandleBetweenTurnEffects:
call HandleStatBoostingHeldItems call HandleStatBoostingHeldItems
call HandleHealingItems call HandleHealingItems
call UpdateBattleMonInParty call UpdateBattleMonInParty
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
jp HandleEncore jp HandleEncore
CheckFaint_PlayerThenEnemy: CheckFaint_PlayerThenEnemy:
@ -624,7 +624,7 @@ ParsePlayerAction:
ld [wFXAnimID], a ld [wFXAnimID], a
call MoveSelectionScreen call MoveSelectionScreen
push af push af
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
call UpdateBattleHuds call UpdateBattleHuds
ld a, [wCurPlayerMove] ld a, [wCurPlayerMove]
cp STRUGGLE cp STRUGGLE
@ -862,7 +862,7 @@ GetMoveEffect:
ret ret
Battle_EnemyFirst: Battle_EnemyFirst:
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call TryEnemyFlee call TryEnemyFlee
jp c, WildFled_EnemyFled_LinkBattleCanceled jp c, WildFled_EnemyFled_LinkBattleCanceled
call SetEnemyTurn call SetEnemyTurn
@ -930,7 +930,7 @@ Battle_PlayerFirst:
call RefreshBattleHuds call RefreshBattleHuds
pop af pop af
jr c, .switched_or_used_item jr c, .switched_or_used_item
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call TryEnemyFlee call TryEnemyFlee
jp c, WildFled_EnemyFled_LinkBattleCanceled jp c, WildFled_EnemyFled_LinkBattleCanceled
call EnemyTurn_EndOpponentProtectEndureDestinyBond call EnemyTurn_EndOpponentProtectEndureDestinyBond
@ -2082,7 +2082,7 @@ DoubleSwitch:
ld a, $1 ld a, $1
call EnemyPartyMonEntrance call EnemyPartyMonEntrance
call ClearSprites call ClearSprites
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
pop af pop af
ld [wCurPartyMon], a ld [wCurPartyMon], a
call PlayerPartyMonEntrance call PlayerPartyMonEntrance
@ -2142,7 +2142,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint:
dec a dec a
call z, PlayVictoryMusic call z, PlayVictoryMusic
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, [wBattleResult] ld a, [wBattleResult]
and BATTLERESULT_BITMASK and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN ld [wBattleResult], a ; WIN
@ -2303,7 +2303,7 @@ HandleEnemySwitch:
cp BATTLEACTION_FORFEIT cp BATTLEACTION_FORFEIT
ret z ret z
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
.not_linked .not_linked
ld hl, wBattleMonHP ld hl, wBattleMonHP
@ -2401,7 +2401,7 @@ WinTrainerBattle:
inc hl inc hl
or [hl] or [hl]
ret nz ret nz
call ClearTileMap call ClearTilemap
call ClearBGPalettes call ClearBGPalettes
ret ret
@ -2682,7 +2682,7 @@ UpdateFaintedPlayerMon:
AskUseNextPokemon: AskUseNextPokemon:
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
; We don't need to be here if we're in a Trainer battle, ; We don't need to be here if we're in a Trainer battle,
; as that decision is made for us. ; as that decision is made for us.
ld a, [wBattleMode] ld a, [wBattleMode]
@ -2735,7 +2735,7 @@ ForcePlayerMonChoice:
call ClearBGPalettes call ClearBGPalettes
call _LoadHPBar call _LoadHPBar
call ExitMenu call ExitMenu
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call WaitBGMap call WaitBGMap
call GetMemSGBLayout call GetMemSGBLayout
call SetPalettes call SetPalettes
@ -2763,7 +2763,7 @@ ForcePlayerMonChoice:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, $1 ld a, $1
@ -2784,7 +2784,7 @@ PlayerPartyMonEntrance:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
jp SpikesDamage jp SpikesDamage
@ -2942,7 +2942,7 @@ LostBattle:
ld c, BATTLETOWERTEXT_WIN_TEXT ld c, BATTLETOWERTEXT_WIN_TEXT
farcall BattleTowerText farcall BattleTowerText
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call ClearTileMap call ClearTilemap
call ClearBGPalettes call ClearBGPalettes
ret ret
@ -3141,7 +3141,7 @@ EnemySwitch:
ld [wBattlePlayerAction], a ld [wBattlePlayerAction], a
inc a inc a
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
jp PlayerSwitch jp PlayerSwitch
EnemySwitch_SetMode: EnemySwitch_SetMode:
@ -3726,7 +3726,7 @@ TryToRunAwayFromBattle:
ldh [hEnemyMonSpeed + 0], a ldh [hEnemyMonSpeed + 0], a
ld a, [de] ld a, [de]
ldh [hEnemyMonSpeed + 1], a ldh [hEnemyMonSpeed + 1], a
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld de, hMultiplicand + 1 ld de, hMultiplicand + 1
ld hl, hEnemyMonSpeed ld hl, hEnemyMonSpeed
ld c, 2 ld c, 2
@ -3791,7 +3791,7 @@ TryToRunAwayFromBattle:
call StdBattleTextbox call StdBattleTextbox
ld a, TRUE ld a, TRUE
ld [wFailedToFlee], a ld [wFailedToFlee], a
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
and a and a
ret ret
@ -3800,7 +3800,7 @@ TryToRunAwayFromBattle:
and a and a
ld a, DRAW ld a, DRAW
jr z, .fled jr z, .fled
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
xor a ; BATTLEPLAYERACTION_USEMOVE xor a ; BATTLEPLAYERACTION_USEMOVE
ld [wBattlePlayerAction], a ld [wBattlePlayerAction], a
ld a, $f ld a, $f
@ -3808,7 +3808,7 @@ TryToRunAwayFromBattle:
xor a xor a
ld [wCurPlayerMove], a ld [wCurPlayerMove], a
call LinkBattleSendReceiveAction call LinkBattleSendReceiveAction
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
call CheckMobileBattleError call CheckMobileBattleError
jr c, .mobile jr c, .mobile
@ -3833,7 +3833,7 @@ TryToRunAwayFromBattle:
ld hl, BattleText_GotAwaySafely ld hl, BattleText_GotAwaySafely
call StdBattleTextbox call StdBattleTextbox
call WaitSFX call WaitSFX
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
scf scf
ret ret
@ -3847,7 +3847,7 @@ TryToRunAwayFromBattle:
.skip_link_error .skip_link_error
call WaitSFX call WaitSFX
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
scf scf
ret ret
@ -4001,7 +4001,7 @@ SwitchPlayerMon:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld hl, wEnemyMonHP ld hl, wEnemyMonHP
ld a, [hli] ld a, [hli]
or [hl] or [hl]
@ -4860,7 +4860,7 @@ ret_3e138:
BattleMenu: BattleMenu:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call LoadTempTileMapToTileMap call LoadTempTilemapToTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_DEBUG cp BATTLETYPE_DEBUG
@ -4870,7 +4870,7 @@ BattleMenu:
call EmptyBattleTextbox call EmptyBattleTextbox
call UpdateBattleHuds call UpdateBattleHuds
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
.ok .ok
.loop .loop
@ -4907,7 +4907,7 @@ BattleMenu:
BattleMenu_Fight: BattleMenu_Fight:
xor a xor a
ld [wNumFleeAttempts], a ld [wNumFleeAttempts], a
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
and a and a
ret ret
@ -4984,7 +4984,7 @@ BattleMenu_Pack:
call ExitMenu call ExitMenu
call WaitBGMap call WaitBGMap
call FinishBattleAnim call FinishBattleAnim
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
jp BattleMenu jp BattleMenu
.ItemsCantBeUsed: .ItemsCantBeUsed:
@ -5019,7 +5019,7 @@ BattleMenu_Pack:
call ExitMenu call ExitMenu
call UpdateBattleHUDs call UpdateBattleHUDs
call WaitBGMap call WaitBGMap
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call ClearWindowData call ClearWindowData
call FinishBattleAnim call FinishBattleAnim
and a and a
@ -5080,7 +5080,7 @@ BattleMenuPKMN_Loop:
call DelayFrame call DelayFrame
call _LoadHPBar call _LoadHPBar
call CloseWindow call CloseWindow
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call GetMemSGBLayout call GetMemSGBLayout
call SetPalettes call SetPalettes
jp BattleMenu jp BattleMenu
@ -5254,7 +5254,7 @@ BattleMonEntrance:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, $2 ld a, $2
@ -5278,12 +5278,12 @@ PassedBattleMonEntrance:
call ApplyStatLevelMultiplierOnAllStats call ApplyStatLevelMultiplierOnAllStats
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
jp SpikesDamage jp SpikesDamage
BattleMenu_Run: BattleMenu_Run:
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, $3 ld a, $3
ld [wMenuCursorY], a ld [wMenuCursorY], a
ld hl, wBattleMonSpeed ld hl, wBattleMonSpeed
@ -5508,7 +5508,7 @@ MoveSelectionScreen:
.place_textbox_start_over .place_textbox_start_over
call StdBattleTextbox call StdBattleTextbox
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
jp MoveSelectionScreen jp MoveSelectionScreen
.string_3e61c .string_3e61c
@ -5771,11 +5771,11 @@ ParseEnemyAction:
and a and a
jr z, .not_linked jr z, .not_linked
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, [wBattlePlayerAction] ld a, [wBattlePlayerAction]
and a ; BATTLEPLAYERACTION_USEMOVE? and a ; BATTLEPLAYERACTION_USEMOVE?
call z, LinkBattleSendReceiveAction call z, LinkBattleSendReceiveAction
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, [wBattleAction] ld a, [wBattleAction]
cp BATTLEACTION_STRUGGLE cp BATTLEACTION_STRUGGLE
jp z, .struggle jp z, .struggle
@ -7117,7 +7117,7 @@ GiveExperiencePoints:
pop bc pop bc
call AnimateExpBar call AnimateExpBar
push bc push bc
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
pop bc pop bc
ld hl, MON_EXP + 2 ld hl, MON_EXP + 2
add hl, bc add hl, bc
@ -7270,7 +7270,7 @@ GiveExperiencePoints:
callfar BadgeStatBoosts callfar BadgeStatBoosts
callfar UpdatePlayerHUD callfar UpdatePlayerHUD
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, $1 ld a, $1
ldh [hBGMapMode], a ldh [hBGMapMode], a
@ -7286,7 +7286,7 @@ GiveExperiencePoints:
call WaitSFX call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel ld hl, BattleText_StringBuffer1GrewToLevel
call StdBattleTextbox call StdBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
.skip_exp_bar_animation .skip_exp_bar_animation
xor a ; PARTYMON xor a ; PARTYMON
@ -7302,7 +7302,7 @@ GiveExperiencePoints:
ld c, 30 ld c, 30
call DelayFrames call DelayFrames
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
xor a ; PARTYMON xor a ; PARTYMON
ld [wMonType], a ld [wMonType], a
ld a, [wCurSpecies] ld a, [wCurSpecies]
@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
.finish .finish
push hl push hl
call SafeLoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
pop hl pop hl
jp StdBattleTextbox jp StdBattleTextbox
@ -8342,7 +8342,7 @@ CheckPayDay:
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a
ret z ret z
call ClearTileMap call ClearTilemap
call ClearBGPalettes call ClearBGPalettes
ret ret
@ -8354,7 +8354,7 @@ ShowLinkBattleParticipantsAfterEnd:
call GetPartyLocation call GetPartyLocation
ld a, [wEnemyMonStatus] ld a, [wEnemyMonStatus]
ld [hl], a ld [hl], a
call ClearTileMap call ClearTilemap
farcall _ShowLinkBattleParticipants farcall _ShowLinkBattleParticipants
ret ret
@ -8409,13 +8409,13 @@ DisplayLinkBattleResult:
call IsMobileBattle2 call IsMobileBattle2
jr z, .mobile jr z, .mobile
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call ClearTileMap call ClearTilemap
ret ret
.mobile .mobile
ld c, 200 ld c, 200
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
ret ret
.Win: .Win:
@ -8431,7 +8431,7 @@ DisplayLinkBattleResult:
call PlaceString call PlaceString
ld c, 200 ld c, 200
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
ret ret
.Invalid: .Invalid:
@ -8449,7 +8449,7 @@ _DisplayLinkRecord:
call ReadAndPrintLinkBattleRecord call ReadAndPrintLinkBattleRecord
call CloseSRAM call CloseSRAM
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
xor a xor a
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
@ -8463,7 +8463,7 @@ _DisplayLinkRecord:
ret ret
ReadAndPrintLinkBattleRecord: ReadAndPrintLinkBattleRecord:
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call .PrintBattleRecord call .PrintBattleRecord
hlcoord 0, 8 hlcoord 0, 8
@ -8949,7 +8949,7 @@ InitBattleDisplay:
ldh [rSVBK], a ldh [rSVBK], a
ld hl, wDecompressScratch ld hl, wDecompressScratch
ld bc, wScratchAttrMap - wDecompressScratch ld bc, wScratchAttrmap - wDecompressScratch
ld a, " " ld a, " "
call ByteFill call ByteFill

2
engine/battle/returntobattle_useball.asm
View File

@ -1,6 +1,6 @@
_ReturnToBattle_UseBall: _ReturnToBattle_UseBall:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic jr z, .gettutorialbackpic

4
engine/battle/start_battle.asm
View File

@ -8,7 +8,7 @@ ShowLinkBattleParticipants:
farcall _ShowLinkBattleParticipants farcall _ShowLinkBattleParticipants
ld c, 150 ld c, 150
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ret ret
@ -38,7 +38,7 @@ FindFirstAliveMonAndStartBattle:
ld a, 1 ld a, 1
ldh [hBGMapMode], a ldh [hBGMapMode], a
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ldh [hWY], a ldh [hWY], a

2
engine/events/bug_contest/display_stats.asm
View File

@ -1,6 +1,6 @@
DisplayCaughtContestMonStats: DisplayCaughtContestMonStats:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call LoadFontsBattleExtra call LoadFontsBattleExtra

2
engine/events/diploma.asm
View File

@ -5,7 +5,7 @@ _Diploma:
PlaceDiplomaOnScreen: PlaceDiplomaOnScreen:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
ld hl, DiplomaGFX ld hl, DiplomaGFX

2
engine/events/magnet_train.asm
View File

@ -70,7 +70,7 @@ MagnetTrain:
ld [wRequested2bppDest], a ld [wRequested2bppDest], a
ld [wRequested2bppDest + 1], a ld [wRequested2bppDest + 1], a
ld [wRequested2bpp], a ld [wRequested2bpp], a
call ClearTileMap call ClearTilemap
pop af pop af
ldh [hSCY], a ldh [hSCY], a

6
engine/events/map_name_sign.asm
View File

@ -135,7 +135,7 @@ InitMapNameFrame:
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
ld c, 18 ld c, 18
call InitMapSignAttrMap call InitMapSignAttrmap
call PlaceMapNameFrame call PlaceMapNameFrame
ret ret
@ -171,8 +171,8 @@ PlaceMapNameCenterAlign:
pop hl pop hl
ret ret
InitMapSignAttrMap: InitMapSignAttrmap:
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b

2
engine/events/print_unown.asm
View File

@ -15,7 +15,7 @@ _UnownPrinter:
set NO_TEXT_SCROLL, a set NO_TEXT_SCROLL, a
ld [wOptions], a ld [wOptions], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
ld de, UnownDexATile ld de, UnownDexATile
ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A

2
engine/events/unown_walls.asm
View File

@ -139,7 +139,7 @@ DisplayUnownWords:
jr nz, .loop2 jr nz, .loop2
.copy .copy
call _DisplayUnownWords_CopyWord call _DisplayUnownWords_CopyWord
ld bc, wAttrMap - wTileMap ld bc, wAttrmap - wTilemap
add hl, bc add hl, bc
call _DisplayUnownWords_FillAttr call _DisplayUnownWords_FillAttr
call WaitBGMap2 call WaitBGMap2

16
engine/games/card_flip.asm
View File

@ -14,7 +14,7 @@ _CardFlip:
ld hl, wOptions ld hl, wOptions
set NO_TEXT_SCROLL, [hl] set NO_TEXT_SCROLL, [hl]
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
@ -457,7 +457,7 @@ CardFlip_DisplayCardFaceUp:
ret z ret z
; Set the attributes ; Set the attributes
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
ld a, [wCardFlipFaceUpCard] ld a, [wCardFlipFaceUpCard]
and 3 and 3
@ -1558,32 +1558,32 @@ CardFlip_InitAttrPals:
and a and a
ret z ret z
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a xor a
call ByteFill call ByteFill
hlcoord 12, 1, wAttrMap hlcoord 12, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $1 ld a, $1
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 14, 1, wAttrMap hlcoord 14, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $2 ld a, $2
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 16, 1, wAttrMap hlcoord 16, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $3 ld a, $3
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 18, 1, wAttrMap hlcoord 18, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $4 ld a, $4
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 9, 0, wAttrMap hlcoord 9, 0, wAttrmap
lb bc, 12, 1 lb bc, 12, 1
ld a, $1 ld a, $1
call CardFlip_FillBox call CardFlip_FillBox

2
engine/games/slot_machine.asm
View File

@ -96,7 +96,7 @@ _SlotMachine:
.InitGFX: .InitGFX:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic

4
engine/games/unown_puzzle.asm
View File

@ -9,7 +9,7 @@ _UnownPuzzle:
ld a, $1 ld a, $1
ldh [hInMenu], a ldh [hInMenu], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
@ -83,7 +83,7 @@ _UnownPuzzle:
pop af pop af
ldh [hInMenu], a ldh [hInMenu], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld a, LCDC_DEFAULT ld a, LCDC_DEFAULT
ldh [rLCDC], a ldh [rLCDC], a

210
engine/gfx/cgb_layouts.asm
View File

File diff suppressed because it is too large Load Diff

28
engine/gfx/color.asm
View File

@ -103,7 +103,7 @@ InitPartyMenuPalettes:
ld hl, PalPacket_PartyMenu + 1 ld hl, PalPacket_PartyMenu + 1
call CopyFourPalettes call CopyFourPalettes
call InitPartyMenuOBPals call InitPartyMenuOBPals
call WipeAttrMap call WipeAttrmap
ret ret
; SGB layout for SCGB_PARTY_MENU_HP_PALS ; SGB layout for SCGB_PARTY_MENU_HP_PALS
@ -284,7 +284,7 @@ Unreferenced_Function8bec:
ld a, [wEnemyLightScreenCount] ; col ld a, [wEnemyLightScreenCount] ; col
ld c, a ld c, a
ld a, [wEnemyReflectCount] ; row ld a, [wEnemyReflectCount] ; row
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
.loop .loop
and a and a
@ -320,8 +320,8 @@ ApplyMonOrTrainerPals:
.load_palettes .load_palettes
ld de, wBGPals1 ld de, wBGPals1
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ret ret
@ -359,7 +359,7 @@ ApplyHPBarPals:
.PartyMenu: .PartyMenu:
ld e, c ld e, c
inc e inc e
hlcoord 11, 1, wAttrMap hlcoord 11, 1, wAttrmap
ld bc, 2 * SCREEN_WIDTH ld bc, 2 * SCREEN_WIDTH
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
.loop .loop
@ -437,8 +437,8 @@ LoadMailPalettes:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
ret ret
.MailPals: .MailPals:
@ -453,8 +453,8 @@ Unreferenced_Function95f0:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
ret ret
.Palette: .Palette:
@ -590,8 +590,8 @@ ResetBGPals:
pop af pop af
ret ret
WipeAttrMap: WipeAttrmap:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a xor a
call ByteFill call ByteFill
@ -605,7 +605,7 @@ ApplyPals:
call FarCopyWRAM call FarCopyWRAM
ret ret
ApplyAttrMap: ApplyAttrmap:
ldh a, [rLCDC] ldh a, [rLCDC]
bit rLCDC_ENABLE, a bit rLCDC_ENABLE, a
jr z, .UpdateVBank1 jr z, .UpdateVBank1
@ -622,7 +622,7 @@ ApplyAttrMap:
ret ret
.UpdateVBank1: .UpdateVBank1:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
debgcoord 0, 0 debgcoord 0, 0
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT
ld a, $1 ld a, $1
@ -659,7 +659,7 @@ CGB_ApplyPartyMenuHPPals:
ld a, [de] ld a, [de]
inc a inc a
ld e, a ld e, a
hlcoord 11, 2, wAttrMap hlcoord 11, 2, wAttrmap
ld bc, 2 * SCREEN_WIDTH ld bc, 2 * SCREEN_WIDTH
ld a, [wSGBPals] ld a, [wSGBPals]
.loop .loop

64
engine/gfx/crystal_layouts.asm
View File

@ -42,8 +42,8 @@ MG_Mobile_Layout_FillBox:
jr nz, .row jr nz, .row
ret ret
MG_Mobile_Layout_WipeAttrMap: MG_Mobile_Layout_WipeAttrmap:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a xor a
call ByteFill call ByteFill
@ -64,14 +64,14 @@ MG_Mobile_Layout_LoadPals:
MG_Mobile_Layout00: MG_Mobile_Layout00:
call MG_Mobile_Layout_LoadPals call MG_Mobile_Layout_LoadPals
call MG_Mobile_Layout_WipeAttrMap call MG_Mobile_Layout_WipeAttrmap
call MG_Mobile_Layout_CreatePalBoxes call MG_Mobile_Layout_CreatePalBoxes
farcall ApplyAttrMap farcall ApplyAttrmap
farcall ApplyPals farcall ApplyPals
ret ret
MG_Mobile_Layout_CreatePalBoxes: MG_Mobile_Layout_CreatePalBoxes:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 4, 1 lb bc, 4, 1
ld a, $1 ld a, $1
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
@ -81,7 +81,7 @@ MG_Mobile_Layout_CreatePalBoxes:
lb bc, 6, 1 lb bc, 6, 1
ld a, $3 ld a, $3
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 1, 0, wAttrMap hlcoord 1, 0, wAttrmap
ld a, $1 ld a, $1
lb bc, 3, 18 lb bc, 3, 18
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
@ -91,7 +91,7 @@ MG_Mobile_Layout_CreatePalBoxes:
lb bc, 12, 18 lb bc, 12, 18
ld a, $3 ld a, $3
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 19, 0, wAttrMap hlcoord 19, 0, wAttrmap
lb bc, 4, 1 lb bc, 4, 1
ld a, $1 ld a, $1
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
@ -101,7 +101,7 @@ MG_Mobile_Layout_CreatePalBoxes:
lb bc, 6, 1 lb bc, 6, 1
ld a, $3 ld a, $3
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 0, 12, wAttrMap hlcoord 0, 12, wAttrmap
ld bc, 6 * SCREEN_WIDTH ld bc, 6 * SCREEN_WIDTH
ld a, $7 ld a, $7
call ByteFill call ByteFill
@ -136,12 +136,12 @@ MG_Mobile_Layout01:
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call MG_Mobile_Layout_WipeAttrMap call MG_Mobile_Layout_WipeAttrmap
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a xor a
call ByteFill call ByteFill
hlcoord 0, 14, wAttrMap hlcoord 0, 14, wAttrmap
ld bc, 4 * SCREEN_WIDTH ld bc, 4 * SCREEN_WIDTH
ld a, $7 ld a, $7
call ByteFill call ByteFill
@ -155,7 +155,7 @@ MG_Mobile_Layout01:
call Function49496 call Function49496
.asm_49467 .asm_49467
farcall ApplyAttrMap farcall ApplyAttrmap
farcall ApplyPals farcall ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -168,26 +168,26 @@ MG_Mobile_Layout01:
RGB 00, 00, 00 RGB 00, 00, 00
Function49480: Function49480:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 4, SCREEN_WIDTH lb bc, 4, SCREEN_WIDTH
ld a, $7 ld a, $7
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 0, 2, wAttrMap hlcoord 0, 2, wAttrmap
ld a, $4 ld a, $4
ld [hl], a ld [hl], a
hlcoord 19, 2, wAttrMap hlcoord 19, 2, wAttrmap
ld [hl], a ld [hl], a
ret ret
Function49496: Function49496:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 2, SCREEN_WIDTH lb bc, 2, SCREEN_WIDTH
ld a, $7 ld a, $7
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 0, 1, wAttrMap hlcoord 0, 1, wAttrmap
ld a, $4 ld a, $4
ld [hl], a ld [hl], a
hlcoord 19, 1, wAttrMap hlcoord 19, 1, wAttrmap
ld [hl], a ld [hl], a
ret ret
@ -200,8 +200,8 @@ MG_Mobile_Layout02:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
farcall ApplyPals farcall ApplyPals
call MG_Mobile_Layout_WipeAttrMap call MG_Mobile_Layout_WipeAttrmap
farcall ApplyAttrMap farcall ApplyAttrmap
ld hl, .Palette_4973a ld hl, .Palette_4973a
ld de, wOBPals1 ld de, wOBPals1
ld bc, 1 palettes ld bc, 1 palettes
@ -234,43 +234,43 @@ Function49742:
INCLUDE "gfx/unknown/49757.pal" INCLUDE "gfx/unknown/49757.pal"
_InitMG_Mobile_LinkTradePalMap: _InitMG_Mobile_LinkTradePalMap:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 16, 2 lb bc, 16, 2
ld a, $4 ld a, $4
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
ld a, $3 ld a, $3
ldcoord_a 0, 1, wAttrMap ldcoord_a 0, 1, wAttrmap
ldcoord_a 0, 14, wAttrMap ldcoord_a 0, 14, wAttrmap
hlcoord 2, 0, wAttrMap hlcoord 2, 0, wAttrmap
lb bc, 8, 18 lb bc, 8, 18
ld a, $5 ld a, $5
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 2, 8, wAttrMap hlcoord 2, 8, wAttrmap
lb bc, 8, 18 lb bc, 8, 18
ld a, $6 ld a, $6
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
hlcoord 0, 16, wAttrMap hlcoord 0, 16, wAttrmap
lb bc, 2, SCREEN_WIDTH lb bc, 2, SCREEN_WIDTH
ld a, $4 ld a, $4
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 6, 1, wAttrMap hlcoord 6, 1, wAttrmap
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 17, 1, wAttrMap hlcoord 17, 1, wAttrmap
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 6, 9, wAttrMap hlcoord 6, 9, wAttrmap
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
ld a, $3 ld a, $3
lb bc, 6, 1 lb bc, 6, 1
hlcoord 17, 9, wAttrMap hlcoord 17, 9, wAttrmap
call MG_Mobile_Layout_FillBox call MG_Mobile_Layout_FillBox
ld a, $2 ld a, $2
hlcoord 2, 16, wAttrMap hlcoord 2, 16, wAttrmap
ld [hli], a ld [hli], a
ld a, $7 ld a, $7
ld [hli], a ld [hli], a
@ -278,7 +278,7 @@ _InitMG_Mobile_LinkTradePalMap:
ld [hli], a ld [hli], a
ld a, $2 ld a, $2
ld [hl], a ld [hl], a
hlcoord 2, 17, wAttrMap hlcoord 2, 17, wAttrmap
ld a, $3 ld a, $3
ld bc, 6 ld bc, 6
call ByteFill call ByteFill

114
engine/gfx/dma_transfer.asm
View File

@ -1,49 +1,49 @@
HDMATransferAttrMapAndTileMapToWRAMBank3:: HDMATransferAttrmapAndTilemapToWRAMBank3::
ld hl, .Function ld hl, .Function
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call PadAttrMapForHDMATransfer call PadAttrmapForHDMATransfer
decoord 0, 0 decoord 0, 0
ld hl, wScratchTileMap ld hl, wScratchTilemap
call PadTilemapForHDMATransfer call PadTilemapForHDMATransfer
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransferToWRAMBank3 call HDMATransferToWRAMBank3
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call HDMATransferToWRAMBank3 call HDMATransferToWRAMBank3
ret ret
HDMATransferTileMapToWRAMBank3:: HDMATransferTilemapToWRAMBank3::
ld hl, .Function ld hl, .Function
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
decoord 0, 0 decoord 0, 0
ld hl, wScratchTileMap ld hl, wScratchTilemap
call PadTilemapForHDMATransfer call PadTilemapForHDMATransfer
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransferToWRAMBank3 call HDMATransferToWRAMBank3
ret ret
HDMATransferAttrMapToWRAMBank3: HDMATransferAttrmapToWRAMBank3:
ld hl, .Function ld hl, .Function
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call PadAttrMapForHDMATransfer call PadAttrmapForHDMATransfer
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call HDMATransferToWRAMBank3 call HDMATransferToWRAMBank3
ret ret
@ -52,11 +52,11 @@ ReloadMapPart::
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call PadAttrMapForHDMATransfer call PadAttrmapForHDMATransfer
decoord 0, 0 decoord 0, 0
ld hl, wScratchTileMap ld hl, wScratchTilemap
call PadTilemapForHDMATransfer call PadTilemapForHDMATransfer
call DelayFrame call DelayFrame
@ -65,11 +65,11 @@ ReloadMapPart::
push af push af
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call HDMATransfer_Wait127Scanlines_toBGMap call HDMATransfer_Wait127Scanlines_toBGMap
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines_toBGMap call HDMATransfer_Wait127Scanlines_toBGMap
pop af pop af
ldh [rVBK], a ldh [rVBK], a
@ -83,11 +83,11 @@ Mobile_ReloadMapPart:
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call PadAttrMapForHDMATransfer call PadAttrmapForHDMATransfer
decoord 0, 0 decoord 0, 0
ld hl, wScratchTileMap ld hl, wScratchTilemap
call PadTilemapForHDMATransfer call PadTilemapForHDMATransfer
call DelayFrame call DelayFrame
@ -96,11 +96,11 @@ Mobile_ReloadMapPart:
push af push af
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call HDMATransfer_NoDI call HDMATransfer_NoDI
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransfer_NoDI call HDMATransfer_NoDI
pop af pop af
ldh [rVBK], a ldh [rVBK], a
@ -144,20 +144,20 @@ Mobile_ReloadMapPart:
call HDMATransferToWRAMBank3 call HDMATransferToWRAMBank3
ret ret
OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
; OpenText ; OpenText
ld hl, .Function ld hl, .Function
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
; Transfer wAttrMap and Tilemap to BGMap ; Transfer wAttrmap and Tilemap to BGMap
; Fill vBGAttrs with $00 ; Fill vBGAttrs with $00
; Fill vBGTiles with " " ; Fill vBGTiles with " "
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call PadAttrMapForHDMATransfer call PadAttrmapForHDMATransfer
decoord 0, 0 decoord 0, 0
ld hl, wScratchTileMap ld hl, wScratchTilemap
call PadTilemapForHDMATransfer call PadTilemapForHDMATransfer
call DelayFrame call DelayFrame
@ -166,40 +166,40 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap::
push af push af
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call HDMATransfer_Wait123Scanlines_toBGMap call HDMATransfer_Wait123Scanlines_toBGMap
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransfer_Wait123Scanlines_toBGMap call HDMATransfer_Wait123Scanlines_toBGMap
pop af pop af
ldh [rVBK], a ldh [rVBK], a
ei ei
ret ret
Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:
ld hl, .Function ld hl, .Function
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
; Transfer wAttrMap and Tilemap to BGMap ; Transfer wAttrmap and Tilemap to BGMap
; Fill vBGAttrs with $00 ; Fill vBGAttrs with $00
; Fill vBGTiles with $ff ; Fill vBGTiles with $ff
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call PadAttrMapForHDMATransfer call PadAttrmapForHDMATransfer
ld c, $ff ld c, $ff
decoord 0, 0 decoord 0, 0
ld hl, wScratchTileMap ld hl, wScratchTilemap
call PadMapForHDMATransfer call PadMapForHDMATransfer
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchAttrMap ld hl, wScratchAttrmap
call HDMATransfer_Wait127Scanlines_toBGMap call HDMATransfer_Wait127Scanlines_toBGMap
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines_toBGMap call HDMATransfer_Wait127Scanlines_toBGMap
ret ret
@ -213,7 +213,7 @@ CallInSafeGFXMode:
ldh [hMapAnims], a ldh [hMapAnims], a
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ld a, BANK(wScratchTileMap) ld a, BANK(wScratchTilemap)
ldh [rSVBK], a ldh [rSVBK], a
ldh a, [rVBK] ldh a, [rVBK]
push af push af
@ -410,7 +410,7 @@ PadTilemapForHDMATransfer:
ld c, " " ld c, " "
jr PadMapForHDMATransfer jr PadMapForHDMATransfer
PadAttrMapForHDMATransfer: PadAttrmapForHDMATransfer:
ld c, $0 ld c, $0
PadMapForHDMATransfer: PadMapForHDMATransfer:
@ -455,13 +455,13 @@ _Get2bpp::
; switch to WRAM bank 6 ; switch to WRAM bank 6
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ld a, BANK(wScratchTileMap) ld a, BANK(wScratchTilemap)
ldh [rSVBK], a ldh [rSVBK], a
push bc push bc
push hl push hl
; Copy c tiles of the 2bpp from b:de to wScratchTileMap ; Copy c tiles of the 2bpp from b:de to wScratchTilemap
ld a, b ; bank ld a, b ; bank
ld l, c ; number of tiles ld l, c ; number of tiles
ld h, $0 ld h, $0
@ -474,7 +474,7 @@ _Get2bpp::
ld c, l ld c, l
ld h, d ; address ld h, d ; address
ld l, e ld l, e
ld de, wScratchTileMap ld de, wScratchTilemap
call FarCopyBytes call FarCopyBytes
pop hl pop hl
@ -486,7 +486,7 @@ _Get2bpp::
ld d, h ld d, h
ld e, l ld e, l
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines call HDMATransfer_Wait127Scanlines
; restore the previous bank ; restore the previous bank
@ -523,7 +523,7 @@ _Get1bpp::
.bankswitch .bankswitch
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ld a, BANK(wScratchTileMap) ld a, BANK(wScratchTilemap)
ldh [rSVBK], a ldh [rSVBK], a
push bc push bc
@ -539,7 +539,7 @@ _Get1bpp::
ld b, h ld b, h
ld h, d ld h, d
ld l, e ld l, e
ld de, wScratchTileMap ld de, wScratchTilemap
call FarCopyBytesDouble_DoubleBankSwitch call FarCopyBytesDouble_DoubleBankSwitch
pop hl pop hl
@ -551,7 +551,7 @@ _Get1bpp::
ld d, h ld d, h
ld e, l ld e, l
ld hl, wScratchTileMap ld hl, wScratchTilemap
call HDMATransfer_Wait127Scanlines call HDMATransfer_Wait127Scanlines
pop af pop af
@ -563,22 +563,22 @@ HDMATransfer_OnlyTopFourRows:
jp CallInSafeGFXMode jp CallInSafeGFXMode
.Function: .Function:
ld hl, wScratchTileMap ld hl, wScratchTilemap
decoord 0, 0 decoord 0, 0
call .Copy call .Copy
ld hl, wScratchTileMap + $80 ld hl, wScratchTilemap + $80
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
call .Copy call .Copy
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
ld c, $8 ld c, $8
ld hl, wScratchTileMap + $80 ld hl, wScratchTilemap + $80
debgcoord 0, 0, vBGMap1 debgcoord 0, 0, vBGMap1
call HDMATransfer_Wait127Scanlines call HDMATransfer_Wait127Scanlines
ld a, $0 ld a, $0
ldh [rVBK], a ldh [rVBK], a
ld c, $8 ld c, $8
ld hl, wScratchTileMap ld hl, wScratchTilemap
debgcoord 0, 0, vBGMap1 debgcoord 0, 0, vBGMap1
call HDMATransfer_Wait127Scanlines call HDMATransfer_Wait127Scanlines
ret ret

16
engine/gfx/pic_animation.asm
View File

@ -87,7 +87,7 @@ AnimateFrontpic:
.loop .loop
call SetUpPokeAnim call SetUpPokeAnim
push af push af
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
pop af pop af
jr nc, .loop jr nc, .loop
ret ret
@ -261,9 +261,9 @@ PokeAnim_DeinitFrames:
ld a, BANK(wPokeAnimCoord) ld a, BANK(wPokeAnimCoord)
ldh [rSVBK], a ldh [rSVBK], a
call PokeAnim_PlaceGraphic call PokeAnim_PlaceGraphic
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call PokeAnim_SetVBank0 call PokeAnim_SetVBank0
farcall HDMATransferAttrMapToWRAMBank3 farcall HDMATransferAttrmapToWRAMBank3
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ret ret
@ -830,13 +830,13 @@ PokeAnim_SetVBank1:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call .SetFlag call .SetFlag
farcall HDMATransferAttrMapToWRAMBank3 farcall HDMATransferAttrmapToWRAMBank3
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ret ret
.SetFlag: .SetFlag:
call PokeAnim_GetAttrMapCoord call PokeAnim_GetAttrmapCoord
ld b, 7 ld b, 7
ld c, 7 ld c, 7
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
@ -858,7 +858,7 @@ PokeAnim_SetVBank1:
ret ret
PokeAnim_SetVBank0: PokeAnim_SetVBank0:
call PokeAnim_GetAttrMapCoord call PokeAnim_GetAttrmapCoord
ld b, 7 ld b, 7
ld c, 7 ld c, 7
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
@ -879,12 +879,12 @@ PokeAnim_SetVBank0:
jr nz, .row jr nz, .row
ret ret
PokeAnim_GetAttrMapCoord: PokeAnim_GetAttrmapCoord:
ld hl, wPokeAnimCoord ld hl, wPokeAnimCoord
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
ret ret

4
engine/items/item_effects.asm
View File

@ -697,7 +697,7 @@ PokeBallEffect:
jr z, .toss jr z, .toss
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
.toss .toss
ld hl, wNumItems ld hl, wNumItems
@ -1761,7 +1761,7 @@ ItemActionTextWaitButton:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 0 hlcoord 0, 0
ld bc, wTileMapEnd - wTileMap ld bc, wTilemapEnd - wTilemap
ld a, " " ld a, " "
call ByteFill call ByteFill
ld a, [wPartyMenuActionText] ld a, [wPartyMenuActionText]

Some files were not shown because too many files have changed in this diff Show More