pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #685 from mid-kid/master

Browse Source 
Moshi moshi? minoru enhansumentsu desu
This commit is contained in:
mid-kid 2020-02-21 21:11:36 +01:00 committed by GitHub
commit 9a927c1b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
108 changed files with 774 additions and 774 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

112
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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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
@ -1821,10 +1821,10 @@ SubtractHP:
GetSixteenthMaxHP: GetSixteenthMaxHP:
call GetQuarterMaxHP call GetQuarterMaxHP
; quarter result ; quarter result
srl c srl c
srl c srl c
; round up ; at least 1
ld a, c ld a, c
and a and a
jr nz, .ok jr nz, .ok
@ -1838,7 +1838,7 @@ GetEighthMaxHP:
; assumes nothing can have 1024 or more hp ; assumes nothing can have 1024 or more hp
; halve result ; halve result
srl c srl c
; round up ; at least 1
ld a, c ld a, c
and a and a
jr nz, .end jr nz, .end
@ -1857,7 +1857,7 @@ GetQuarterMaxHP:
rr c rr c
; assumes nothing can have 1024 or more hp ; assumes nothing can have 1024 or more hp
; round up ; at least 1
ld a, c ld a, c
and a and a
jr nz, .end jr nz, .end
@ -1873,7 +1873,7 @@ GetHalfMaxHP:
srl b srl b
rr c rr c
; floor = 1 ; at least 1
ld a, c ld a, c
or b or b
jr nz, .end jr nz, .end
@ -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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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 Call_LoadTempTileMapToTileMap 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/battle/used_move_text.asm
View File

@ -41,7 +41,7 @@ UsedMoveText:
.grammar .grammar
call GetMoveGrammar ; convert move id to grammar index call GetMoveGrammar ; convert move id to grammar index
; everything except 'instead' made redundant in localization ; everything except 'CheckObedience' made redundant in localization
; check obedience ; check obedience
ld a, [wAlreadyDisobeyed] ld a, [wAlreadyDisobeyed]

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

4
engine/events/celebi.asm
View File

@ -9,7 +9,7 @@ CelebiShrineEvent:
call LoadCelebiGFX call LoadCelebiGFX
depixel 0, 10, 7, 0 depixel 0, 10, 7, 0
ld a, SPRITE_ANIM_INDEX_CELEBI ld a, SPRITE_ANIM_INDEX_CELEBI
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], SPECIALCELEBIEVENT_CELEBI ld [hl], SPECIALCELEBIEVENT_CELEBI
@ -107,7 +107,7 @@ CelebiEvent_SpawnLeaf:
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $80 ld [hl], $80

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

14
engine/events/field_moves.asm
View File

@ -33,7 +33,7 @@ ShakeHeadbuttTree:
call Request2bpp call Request2bpp
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_HEADBUTT ld a, SPRITE_ANIM_INDEX_HEADBUTT
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
@ -92,7 +92,7 @@ HideHeadbuttTree:
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, $5 ld a, $05 ; grass block
ld [hli], a ld [hli], a
ld [hld], a ld [hld], a
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
@ -174,7 +174,7 @@ OWCutJumptable:
Cut_SpawnAnimateTree: Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
@ -227,7 +227,7 @@ Cut_SpawnLeaf:
push de push de
push af push af
ld a, SPRITE_ANIM_INDEX_LEAF ; leaf ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_GRASS ld [hl], FIELDMOVE_GRASS
@ -314,7 +314,7 @@ FlyFromAnim:
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 10, 10, 4, 0 depixel 10, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
@ -348,7 +348,7 @@ FlyToAnim:
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 31, 10, 4, 0 depixel 31, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
@ -447,7 +447,7 @@ FlyFunction_FrameTimer:
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_GRASS ld [hl], FIELDMOVE_GRASS

11
engine/events/misc_scripts_2.asm → engine/events/hidden_item.asm
View File

@ -1,14 +1,3 @@
RepelWoreOffScript::
opentext
writetext .RepelWoreOffText
waitbutton
closetext
end
.RepelWoreOffText:
text_far _RepelWoreOffText
text_end
HiddenItemScript:: HiddenItemScript::
opentext opentext
readmem wHiddenItemID readmem wHiddenItemID

4
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
@ -313,7 +313,7 @@ MagnetTrain_Jumptable:
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0

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/overworld.asm
View File

@ -273,7 +273,7 @@ CheckOverworldTileArrays:
INCLUDE "data/events/field_move_blocks.asm" INCLUDE "data/events/field_move_blocks.asm"
OWFlash: FlashFunction:
call .CheckUseFlash call .CheckUseFlash
and $7f and $7f
ld [wFieldMoveSucceeded], a ld [wFieldMoveSucceeded], a

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

10
engine/events/repel.asm Normal file
View File

@ -0,0 +1,10 @@
RepelWoreOffScript::
opentext
writetext .RepelWoreOffText
waitbutton
closetext
end
.RepelWoreOffText:
text_far _RepelWoreOffText
text_end

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/dummy_game.asm
View File

@ -110,7 +110,7 @@ endr
.spawn_object .spawn_object
depixel 6, 3, 4, 4 depixel 6, 3, 4, 4
ld a, SPRITE_ANIM_INDEX_DUMMY_GAME ld a, SPRITE_ANIM_INDEX_DUMMY_GAME
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, 5 ld a, 5
ld [wDummyGameNumberTriesRemaining], a ld [wDummyGameNumberTriesRemaining], a
ld hl, wJumptableIndex ld hl, wJumptableIndex

8
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
@ -1139,7 +1139,7 @@ ReelAction_InitGolem:
push af push af
depixel 12, 13 depixel 12, 13
ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0E ld hl, SPRITEANIMSTRUCT_0E
add hl, bc add hl, bc
pop af pop af
@ -1200,7 +1200,7 @@ ReelAction_InitChansey:
push bc push bc
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
pop bc pop bc
xor a xor a
ld [wSlotsDelay], a ld [wSlotsDelay], a
@ -2120,7 +2120,7 @@ Slots_AnimateChansey:
push bc push bc
depixel 12, 13, 0, 4 depixel 12, 13, 0, 4
ld a, SPRITE_ANIM_INDEX_SLOTS_EGG ld a, SPRITE_ANIM_INDEX_SLOTS_EGG
call _InitSpriteAnimStruct call InitSpriteAnimStruct
pop bc pop bc
ret ret

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

@ -113,31 +113,31 @@ _CGB_BattleColors:
call ApplyPals call ApplyPals
_CGB_FinishBattleScreenLayout: _CGB_FinishBattleScreenLayout:
call InitPartyMenuBGPal7 call InitPartyMenuBGPal7
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, PAL_BATTLE_BG_ENEMY_HP ld a, PAL_BATTLE_BG_ENEMY_HP
call ByteFill call ByteFill
hlcoord 0, 4, wAttrMap hlcoord 0, 4, wAttrmap
lb bc, 8, 10 lb bc, 8, 10
ld a, PAL_BATTLE_BG_PLAYER ld a, PAL_BATTLE_BG_PLAYER
call FillBoxCGB call FillBoxCGB
hlcoord 10, 0, wAttrMap hlcoord 10, 0, wAttrmap
lb bc, 7, 10 lb bc, 7, 10
ld a, PAL_BATTLE_BG_ENEMY ld a, PAL_BATTLE_BG_ENEMY
call FillBoxCGB call FillBoxCGB
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 4, 10 lb bc, 4, 10
ld a, PAL_BATTLE_BG_ENEMY_HP ld a, PAL_BATTLE_BG_ENEMY_HP
call FillBoxCGB call FillBoxCGB
hlcoord 10, 7, wAttrMap hlcoord 10, 7, wAttrmap
lb bc, 5, 10 lb bc, 5, 10
ld a, PAL_BATTLE_BG_PLAYER_HP ld a, PAL_BATTLE_BG_PLAYER_HP
call FillBoxCGB call FillBoxCGB
hlcoord 10, 11, wAttrMap hlcoord 10, 11, wAttrmap
lb bc, 1, 9 lb bc, 1, 9
ld a, PAL_BATTLE_BG_EXP ld a, PAL_BATTLE_BG_EXP
call FillBoxCGB call FillBoxCGB
hlcoord 0, 12, wAttrMap hlcoord 0, 12, wAttrmap
ld bc, 6 * SCREEN_WIDTH ld bc, 6 * SCREEN_WIDTH
ld a, PAL_BATTLE_BG_TEXT ld a, PAL_BATTLE_BG_TEXT
call ByteFill call ByteFill
@ -146,7 +146,7 @@ _CGB_FinishBattleScreenLayout:
ld bc, 6 palettes ld bc, 6 palettes
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyAttrMap call ApplyAttrmap
ret ret
InitPartyMenuBGPal7: InitPartyMenuBGPal7:
@ -214,34 +214,34 @@ _CGB_StatsScreenHPPals:
ld bc, 3 palettes ; pink, green, and blue page palettes ld bc, 3 palettes ; pink, green, and blue page palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call WipeAttrMap call WipeAttrmap
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 8, SCREEN_WIDTH lb bc, 8, SCREEN_WIDTH
ld a, $1 ; mon palette ld a, $1 ; mon palette
call FillBoxCGB call FillBoxCGB
hlcoord 10, 16, wAttrMap hlcoord 10, 16, wAttrmap
ld bc, 10 ld bc, 10
ld a, $2 ; exp palette ld a, $2 ; exp palette
call ByteFill call ByteFill
hlcoord 13, 5, wAttrMap hlcoord 13, 5, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $3 ; pink page palette ld a, $3 ; pink page palette
call FillBoxCGB call FillBoxCGB
hlcoord 15, 5, wAttrMap hlcoord 15, 5, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $4 ; green page palette ld a, $4 ; green page palette
call FillBoxCGB call FillBoxCGB
hlcoord 17, 5, wAttrMap hlcoord 17, 5, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $5 ; blue page palette ld a, $5 ; blue page palette
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -269,8 +269,8 @@ _CGB_Pokedex:
call GetMonPalettePointer call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black ; mon palette call LoadPalette_White_Col1_Col2_Black ; mon palette
.got_palette .got_palette
call WipeAttrMap call WipeAttrmap
hlcoord 1, 1, wAttrMap hlcoord 1, 1, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ; green question mark palette ld a, $1 ; green question mark palette
call FillBoxCGB call FillBoxCGB
@ -280,7 +280,7 @@ _CGB_Pokedex:
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -309,13 +309,13 @@ _CGB_BillsPC:
call GetPlayerOrMonPalettePointer call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
.Resume: .Resume:
call WipeAttrMap call WipeAttrmap
hlcoord 1, 4, wAttrMap hlcoord 1, 4, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -331,13 +331,13 @@ _CGB_BillsPC:
call GetPlayerOrMonPalettePointer call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
.asm_901a .asm_901a
call WipeAttrMap call WipeAttrmap
hlcoord 1, 1, wAttrMap hlcoord 1, 1, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -354,13 +354,13 @@ _CGB_PokedexUnownMode:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap call WipeAttrmap
hlcoord 7, 5, wAttrMap hlcoord 7, 5, wAttrmap
lb bc, 7, 7 lb bc, 7, 7
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -372,48 +372,48 @@ _CGB_SlotMachine:
ld bc, 16 palettes ld bc, 16 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call WipeAttrMap call WipeAttrmap
hlcoord 0, 2, wAttrMap hlcoord 0, 2, wAttrmap
lb bc, 10, 3 lb bc, 10, 3
ld a, $2 ld a, $2
call FillBoxCGB call FillBoxCGB
hlcoord 17, 2, wAttrMap hlcoord 17, 2, wAttrmap
lb bc, 10, 3 lb bc, 10, 3
ld a, $2 ld a, $2
call FillBoxCGB call FillBoxCGB
hlcoord 0, 4, wAttrMap hlcoord 0, 4, wAttrmap
lb bc, 6, 3 lb bc, 6, 3
ld a, $3 ld a, $3
call FillBoxCGB call FillBoxCGB
hlcoord 17, 4, wAttrMap hlcoord 17, 4, wAttrmap
lb bc, 6, 3 lb bc, 6, 3
ld a, $3 ld a, $3
call FillBoxCGB call FillBoxCGB
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
lb bc, 2, 3 lb bc, 2, 3
ld a, $4 ld a, $4
call FillBoxCGB call FillBoxCGB
hlcoord 17, 6, wAttrMap hlcoord 17, 6, wAttrmap
lb bc, 2, 3 lb bc, 2, 3
ld a, $4 ld a, $4
call FillBoxCGB call FillBoxCGB
hlcoord 4, 2, wAttrMap hlcoord 4, 2, wAttrmap
lb bc, 2, 12 lb bc, 2, 12
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 3, 2, wAttrMap hlcoord 3, 2, wAttrmap
lb bc, 10, 1 lb bc, 10, 1
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 16, 2, wAttrMap hlcoord 16, 2, wAttrmap
lb bc, 10, 1 lb bc, 10, 1
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 0, 12, wAttrMap hlcoord 0, 12, wAttrmap
ld bc, $78 ld bc, $78
ld a, $7 ld a, $7
call ByteFill call ByteFill
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -422,16 +422,16 @@ _CGB_SlotMachine:
_CGB_BetaTitleScreen: _CGB_BetaTitleScreen:
ld hl, PalPacket_BetaTitleScreen + 1 ld hl, PalPacket_BetaTitleScreen + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrmap
ld de, wOBPals1 ld de, wOBPals1
ld a, PREDEFPAL_PACK ld a, PREDEFPAL_PACK
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
lb bc, 12, SCREEN_WIDTH lb bc, 12, SCREEN_WIDTH
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -461,7 +461,7 @@ _CGB_GSIntro:
ld bc, 2 palettes ld bc, 2 palettes
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
call WipeAttrMap call WipeAttrmap
ret ret
.ShellderLaprasBGPalette: .ShellderLaprasBGPalette:
@ -491,7 +491,7 @@ _CGB_GSIntro:
ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
call WipeAttrMap call WipeAttrmap
ret ret
.StartersCharizardScene: .StartersCharizardScene:
@ -501,7 +501,7 @@ _CGB_GSIntro:
ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
call WipeAttrMap call WipeAttrmap
ret ret
_CGB_BetaPoker: _CGB_BetaPoker:
@ -511,8 +511,8 @@ _CGB_BetaPoker:
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
_CGB_Diploma: _CGB_Diploma:
@ -524,8 +524,8 @@ _CGB_Diploma:
ld hl, PalPacket_Diploma + 1 ld hl, PalPacket_Diploma + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
ret ret
_CGB_MapPals: _CGB_MapPals:
@ -540,7 +540,7 @@ _CGB_PartyMenu:
call InitPartyMenuBGPal0 call InitPartyMenuBGPal0
call InitPartyMenuBGPal7 call InitPartyMenuBGPal7
call InitPartyMenuOBPals call InitPartyMenuOBPals
call ApplyAttrMap call ApplyAttrmap
ret ret
_CGB_Evolution: _CGB_Evolution:
@ -570,8 +570,8 @@ _CGB_Evolution:
call FarCopyWRAM call FarCopyWRAM
.got_palette .got_palette
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -598,8 +598,8 @@ _CGB_GSTitleScreen:
_CGB0d: _CGB0d:
ld hl, PalPacket_Diploma + 1 ld hl, PalPacket_Diploma + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
ret ret
_CGB_UnownPuzzle: _CGB_UnownPuzzle:
@ -620,8 +620,8 @@ _CGB_UnownPuzzle:
ld [hl], a ld [hl], a
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
ret ret
_CGB_TrainerCard: _CGB_TrainerCard:
@ -655,7 +655,7 @@ _CGB_TrainerCard:
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
; fill screen with opposite-gender palette for the card border ; fill screen with opposite-gender palette for the card border
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, [wPlayerGender] ld a, [wPlayerGender]
and a and a
@ -665,7 +665,7 @@ _CGB_TrainerCard:
.got_gender .got_gender
call ByteFill call ByteFill
; fill trainer sprite area with same-gender palette ; fill trainer sprite area with same-gender palette
hlcoord 14, 1, wAttrMap hlcoord 14, 1, wAttrmap
lb bc, 7, 5 lb bc, 7, 5
ld a, [wPlayerGender] ld a, [wPlayerGender]
and a and a
@ -675,33 +675,33 @@ _CGB_TrainerCard:
.got_gender2 .got_gender2
call FillBoxCGB call FillBoxCGB
; top-right corner still uses the border's palette ; top-right corner still uses the border's palette
hlcoord 18, 1, wAttrMap hlcoord 18, 1, wAttrmap
ld [hl], $1 ld [hl], $1
hlcoord 2, 11, wAttrMap hlcoord 2, 11, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $1 ; falkner ld a, $1 ; falkner
call FillBoxCGB call FillBoxCGB
hlcoord 6, 11, wAttrMap hlcoord 6, 11, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $2 ; bugsy ld a, $2 ; bugsy
call FillBoxCGB call FillBoxCGB
hlcoord 10, 11, wAttrMap hlcoord 10, 11, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $3 ; whitney ld a, $3 ; whitney
call FillBoxCGB call FillBoxCGB
hlcoord 14, 11, wAttrMap hlcoord 14, 11, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $4 ; morty ld a, $4 ; morty
call FillBoxCGB call FillBoxCGB
hlcoord 2, 14, wAttrMap hlcoord 2, 14, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $5 ; chuck ld a, $5 ; chuck
call FillBoxCGB call FillBoxCGB
hlcoord 6, 14, wAttrMap hlcoord 6, 14, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $6 ; jasmine ld a, $6 ; jasmine
call FillBoxCGB call FillBoxCGB
hlcoord 10, 14, wAttrMap hlcoord 10, 14, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $7 ; pryce ld a, $7 ; pryce
call FillBoxCGB call FillBoxCGB
@ -710,7 +710,7 @@ _CGB_TrainerCard:
and a and a
push af push af
jr z, .got_gender3 jr z, .got_gender3
hlcoord 14, 14, wAttrMap hlcoord 14, 14, wAttrmap
lb bc, 2, 4 lb bc, 2, 4
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
@ -721,9 +721,9 @@ _CGB_TrainerCard:
inc c inc c
.got_gender4 .got_gender4
ld a, c ld a, c
hlcoord 18, 1, wAttrMap hlcoord 18, 1, wAttrmap
ld [hl], a ld [hl], a
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -742,12 +742,12 @@ _CGB_MoveList:
ld bc, HPBarPals ld bc, HPBarPals
add hl, bc add hl, bc
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap call WipeAttrmap
hlcoord 11, 1, wAttrMap hlcoord 11, 1, wAttrmap
lb bc, 2, 9 lb bc, 2, 9
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -756,8 +756,8 @@ _CGB_MoveList:
_CGB_BetaPikachuMinigame: _CGB_BetaPikachuMinigame:
ld hl, PalPacket_BetaPikachuMinigame + 1 ld hl, PalPacket_BetaPikachuMinigame + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -768,8 +768,8 @@ _CGB_PokedexSearchOption:
ld a, PREDEFPAL_POKEDEX ld a, PREDEFPAL_POKEDEX
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -796,28 +796,28 @@ _CGB_PackPals:
ld bc, 8 palettes ; 6 palettes? ld bc, 8 palettes ; 6 palettes?
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call WipeAttrMap call WipeAttrmap
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 1, 10 lb bc, 1, 10
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 10, 0, wAttrMap hlcoord 10, 0, wAttrmap
lb bc, 1, 10 lb bc, 1, 10
ld a, $2 ld a, $2
call FillBoxCGB call FillBoxCGB
hlcoord 7, 2, wAttrMap hlcoord 7, 2, wAttrmap
lb bc, 9, 1 lb bc, 9, 1
ld a, $3 ld a, $3
call FillBoxCGB call FillBoxCGB
hlcoord 0, 7, wAttrMap hlcoord 0, 7, wAttrmap
lb bc, 3, 5 lb bc, 3, 5
ld a, $4 ld a, $4
call FillBoxCGB call FillBoxCGB
hlcoord 0, 3, wAttrMap hlcoord 0, 3, wAttrmap
lb bc, 3, 5 lb bc, 3, 5
ld a, $5 ld a, $5
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -832,7 +832,7 @@ INCLUDE "gfx/pack/pack_f.pal"
_CGB_Pokepic: _CGB_Pokepic:
call _CGB_MapPals call _CGB_MapPals
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld a, [wMenuBorderTopCoord] ld a, [wMenuBorderTopCoord]
.loop .loop
and a and a
@ -860,22 +860,22 @@ _CGB_Pokepic:
ld c, a ld c, a
ld a, $0 ld a, $0
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
ret ret
_CGB_MagnetTrain: _CGB_MagnetTrain:
ld hl, PalPacket_MagnetTrain + 1 ld hl, PalPacket_MagnetTrain + 1
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrmap
hlcoord 0, 4, wAttrMap hlcoord 0, 4, wAttrmap
lb bc, 10, SCREEN_WIDTH lb bc, 10, SCREEN_WIDTH
ld a, $2 ld a, $2
call FillBoxCGB call FillBoxCGB
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
lb bc, 6, SCREEN_WIDTH lb bc, 6, SCREEN_WIDTH
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ld a, $1 ld a, $1
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
@ -892,8 +892,8 @@ _CGB_GamefreakLogo:
ld hl, .Palette ld hl, .Palette
ld de, wOBPals1 palette 1 ld de, wOBPals1 palette 1
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
call ApplyPals call ApplyPals
ret ret
@ -906,8 +906,8 @@ _CGB_PlayerOrMonFrontpicPals:
ld bc, wTempMonDVs ld bc, wTempMonDVs
call GetPlayerOrMonPalettePointer call GetPlayerOrMonPalettePointer
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
@ -916,8 +916,8 @@ _CGB1e:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call GetMonPalettePointer call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap call WipeAttrmap
call ApplyAttrMap call ApplyAttrmap
ret ret
_CGB_TradeTube: _CGB_TradeTube:
@ -932,7 +932,7 @@ _CGB_TradeTube:
ld a, PREDEFPAL_TRADE_TUBE ld a, PREDEFPAL_TRADE_TUBE
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
call WipeAttrMap call WipeAttrmap
ret ret
_CGB_TrainerOrMonFrontpicPals: _CGB_TrainerOrMonFrontpicPals:
@ -941,8 +941,8 @@ _CGB_TrainerOrMonFrontpicPals:
ld bc, wTempMonDVs ld bc, wTempMonDVs
call GetFrontpicPalettePointer call GetFrontpicPalettePointer
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
@ -953,28 +953,28 @@ _CGB_MysteryGift:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
call WipeAttrMap call WipeAttrmap
hlcoord 3, 7, wAttrMap hlcoord 3, 7, wAttrmap
lb bc, 8, 14 lb bc, 8, 14
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 1, 5, wAttrMap hlcoord 1, 5, wAttrmap
lb bc, 1, 18 lb bc, 1, 18
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 1, 16, wAttrMap hlcoord 1, 16, wAttrmap
lb bc, 1, 18 lb bc, 1, 18
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
lb bc, 17, 2 lb bc, 17, 2
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
hlcoord 18, 5, wAttrMap hlcoord 18, 5, wAttrmap
lb bc, 12, 1 lb bc, 12, 1
ld a, $1 ld a, $1
call FillBoxCGB call FillBoxCGB
call ApplyAttrMap call ApplyAttrmap
ret ret
.Palettes: .Palettes:

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

6
engine/gfx/mon_icons.asm
View File

@ -175,7 +175,7 @@ InitPartyMenuIcon:
ld e, $10 ld e, $10
; type is partymon icon ; type is partymon icon
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct call _InitSpriteAnimStruct
pop af pop af
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
@ -222,7 +222,7 @@ NamingScreen_InitAnimatedMonIcon:
call GetIconGFX call GetIconGFX
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct call _InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL ld [hl], SPRITE_ANIM_SEQ_NULL
@ -237,7 +237,7 @@ MoveList_InitAnimatedMonIcon:
ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4 ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4
ld e, 4 * 8 + 4 ld e, 4 * 8 + 4
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call InitSpriteAnimStruct call _InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_NULL ld [hl], SPRITE_ANIM_SEQ_NULL

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

2
engine/gfx/sprites.asm
View File

@ -109,7 +109,7 @@ DoNextFrameForFirst16Sprites:
.done .done
ret ret
InitSpriteAnimStruct:: _InitSpriteAnimStruct::
; Initialize animation a at pixel x=e, y=d ; Initialize animation a at pixel x=e, y=d
; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16 ; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16
push de push de

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]

2
engine/items/pack.asm
View File

@ -1326,7 +1326,7 @@ Pack_InterpretJoypad:
Pack_InitGFX: Pack_InitGFX:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
ld hl, PackMenuGFX ld hl, PackMenuGFX

8
engine/link/link.asm
View File

@ -1328,7 +1328,7 @@ LinkTradePartiesMenuMasterLoop:
jp LinkTradeOTPartymonMenuLoop ; OTPARTYMON jp LinkTradeOTPartymonMenuLoop ; OTPARTYMON
Function28926: Function28926:
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
push af push af
hlcoord 0, 15 hlcoord 0, 15
@ -1369,7 +1369,7 @@ Function28926:
.b_button .b_button
pop af pop af
ld [wMenuCursorY], a ld [wMenuCursorY], a
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
jp LinkTrade_PlayerPartyMenu jp LinkTrade_PlayerPartyMenu
.d_right .d_right
@ -1407,7 +1407,7 @@ Function28926:
ld [wInitListType], a ld [wInitListType], a
callfar InitList callfar InitList
farcall LinkMonStatsScreen farcall LinkMonStatsScreen
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
hlcoord 6, 1 hlcoord 6, 1
lb bc, 6, 1 lb bc, 6, 1
ld a, " " ld a, " "
@ -1844,7 +1844,7 @@ LinkTrade:
ld [wd003], a ld [wd003], a
ld c, 100 ld c, 100
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
call LoadFontsBattleExtra call LoadFontsBattleExtra
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout

2
engine/link/link_2.asm
View File

@ -31,7 +31,7 @@ LinkTextbox2:
pop hl pop hl
pop bc pop bc
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b

6
engine/link/link_trade.asm
View File

@ -18,7 +18,7 @@ Function16d42e:
Function16d43b: Function16d43b:
call LoadStandardMenuHeader call LoadStandardMenuHeader
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
farcall __LoadTradeScreenBorder ; useless to farcall farcall __LoadTradeScreenBorder ; useless to farcall
farcall Function16d42e ; useless to farcall farcall Function16d42e ; useless to farcall
@ -48,7 +48,7 @@ _LinkTextbox:
pop hl pop hl
pop bc pop bc
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b
@ -240,7 +240,7 @@ LinkTradeMenu:
ret ret
.loop2 .loop2
call RTC call UpdateTimeAndPals
call .TryAnims call .TryAnims
ret c ret c
ld a, [w2DMenuFlags1] ld a, [w2DMenuFlags1]

8
engine/link/mystery_gift.asm
View File

@ -1,5 +1,5 @@
DoMysteryGift: DoMysteryGift:
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call WaitBGMap call WaitBGMap
call InitMysteryGiftLayout call InitMysteryGiftLayout
@ -24,7 +24,7 @@ DoMysteryGift:
pop af pop af
ldh [rIE], a ldh [rIE], a
push de push de
call ClearTileMap call ClearTilemap
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
@ -1396,7 +1396,7 @@ INCBIN "gfx/mystery_gift/mystery_gift.2bpp"
.End .End
Function105688: Function105688:
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call WaitBGMap call WaitBGMap
call Function1057d7 call Function1057d7
@ -1511,7 +1511,7 @@ MysteryGiftLinkCommErrorText:
Function105777: Function105777:
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA

12
engine/menus/debug.asm
View File

@ -135,7 +135,7 @@ Function81948:
ld bc, sScratch - vTiles0 ld bc, sScratch - vTiles0
xor a xor a
call ByteFill call ByteFill
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
@ -378,15 +378,15 @@ String_81bb4: db "ノーマル@" ; normal
String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches
Function81bc0: Function81bc0:
decoord 0, 11, wAttrMap decoord 0, 11, wAttrmap
hlcoord 2, 11 hlcoord 2, 11
ld a, $1 ld a, $1
call Function81bde call Function81bde
decoord 0, 13, wAttrMap decoord 0, 13, wAttrmap
hlcoord 2, 13 hlcoord 2, 13
ld a, $2 ld a, $2
call Function81bde call Function81bde
decoord 0, 15, wAttrMap decoord 0, 15, wAttrmap
hlcoord 2, 15 hlcoord 2, 15
ld a, $3 ld a, $3
@ -1061,7 +1061,7 @@ TilesetColorTest:
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, DEBUGTEST_BLACK ld a, DEBUGTEST_BLACK
call ByteFill call ByteFill
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $7 ld a, $7
call ByteFill call ByteFill
@ -1091,7 +1091,7 @@ Function821d2:
Function821d8: Function821d8:
ld a, [wcf64] ld a, [wcf64]
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
Function821de: Function821de:
add hl, de add hl, de

2
engine/menus/init_gender.asm
View File

@ -73,7 +73,7 @@ InitGenderScreen:
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, $0 ld a, $0
call ByteFill call ByteFill
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

26
engine/menus/intro_menu.asm
View File

@ -39,10 +39,10 @@ PrintDayOfWeek:
.Day: .Day:
db "DAY@" db "DAY@"
NewGame_ClearTileMapEtc: NewGame_ClearTilemapEtc:
xor a xor a
ldh [hMapAnims], a ldh [hMapAnims], a
call ClearTileMap call ClearTilemap
call LoadFontsExtra call LoadFontsExtra
call LoadStandardFont call LoadStandardFont
call ClearWindowData call ClearWindowData
@ -62,7 +62,7 @@ NewGame:
xor a xor a
ld [wDebugFlags], a ld [wDebugFlags], a
call ResetWRAM call ResetWRAM
call NewGame_ClearTileMapEtc call NewGame_ClearTilemapEtc
call AreYouABoyOrAreYouAGirl call AreYouABoyOrAreYouAGirl
call OakSpeech call OakSpeech
call InitializeWorld call InitializeWorld
@ -359,7 +359,7 @@ Continue:
call ClearBGPalettes call ClearBGPalettes
call Continue_MobileAdapterMenu call Continue_MobileAdapterMenu
call CloseWindow call CloseWindow
call ClearTileMap call ClearTilemap
ld c, 20 ld c, 20
call DelayFrames call DelayFrames
farcall JumpRoamMons farcall JumpRoamMons
@ -627,7 +627,7 @@ Continue_DisplayGameTime:
OakSpeech: OakSpeech:
farcall InitClock farcall InitClock
call RotateFourPalettesLeft call RotateFourPalettesLeft
call ClearTileMap call ClearTilemap
ld de, MUSIC_ROUTE_30 ld de, MUSIC_ROUTE_30
call PlayMusic call PlayMusic
@ -647,7 +647,7 @@ OakSpeech:
ld hl, OakText1 ld hl, OakText1
call PrintText call PrintText
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTileMap call ClearTilemap
ld a, WOOPER ld a, WOOPER
ld [wCurSpecies], a ld [wCurSpecies], a
@ -670,7 +670,7 @@ OakSpeech:
ld hl, OakText4 ld hl, OakText4
call PrintText call PrintText
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTileMap call ClearTilemap
xor a xor a
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
@ -685,7 +685,7 @@ OakSpeech:
ld hl, OakText5 ld hl, OakText5
call PrintText call PrintText
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTileMap call ClearTilemap
xor a xor a
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
@ -752,7 +752,7 @@ NamePlayer:
farcall NamingScreen farcall NamingScreen
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTileMap call ClearTilemap
call LoadFontsExtra call LoadFontsExtra
call WaitBGMap call WaitBGMap
@ -848,7 +848,7 @@ ShrinkPlayer:
call DelayFrames call DelayFrames
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearTileMap call ClearTilemap
ret ret
Intro_RotatePalettesLeftFrontpic: Intro_RotatePalettesLeftFrontpic:
@ -1280,7 +1280,7 @@ Unreferenced_Function639b:
ld e, a ld e, a
ld d, [hl] ld d, [hl]
ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ret ret
.Data63ca: .Data63ca:
@ -1293,7 +1293,7 @@ Unreferenced_Function639b:
db 0 * 8, 0 * 8, 11 * 8 + 4, 11 * 8 db 0 * 8, 0 * 8, 11 * 8 + 4, 11 * 8
Copyright: Copyright:
call ClearTileMap call ClearTilemap
call LoadFontsExtra call LoadFontsExtra
ld de, CopyrightGFX ld de, CopyrightGFX
ld hl, vTiles2 tile $60 ld hl, vTiles2 tile $60
@ -1322,7 +1322,7 @@ GameInit::
farcall TryLoadSaveData farcall TryLoadSaveData
call ClearWindowData call ClearWindowData
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
xor a ; LOW(vBGMap0) xor a ; LOW(vBGMap0)

4
engine/menus/main_menu.asm
View File

@ -18,7 +18,7 @@ MainMenu:
call MainMenuJoypadLoop call MainMenuJoypadLoop
call CloseWindow call CloseWindow
jr c, .quit jr c, .quit
call ClearTileMap call ClearTilemap
ld a, [wMenuSelection] ld a, [wMenuSelection]
ld hl, .Jumptable ld hl, .Jumptable
rst JumpTable rst JumpTable
@ -313,7 +313,7 @@ MainMenu_PrintCurrentTimeAndDay:
Function49ed0: Function49ed0:
xor a xor a
ldh [hMapAnims], a ldh [hMapAnims], a
call ClearTileMap call ClearTilemap
call LoadFontsExtra call LoadFontsExtra
call LoadStandardFont call LoadStandardFont
call ClearWindowData call ClearWindowData

4
engine/menus/menu.asm
View File

@ -276,7 +276,7 @@ Unreferenced_Function241d5:
call Place2DMenuCursor call Place2DMenuCursor
.loop .loop
call Move2DMenuCursor call Move2DMenuCursor
call HDMATransferTileMapToWRAMBank3 ; BUG: This function is in another bank. call HDMATransferTilemapToWRAMBank3 ; BUG: This function is in another bank.
; Pointer in current bank (9) is bogus. ; Pointer in current bank (9) is bogus.
call .loop2 call .loop2
jr nc, .done jr nc, .done
@ -344,7 +344,7 @@ MenuJoypadLoop:
Do2DMenuRTCJoypad: Do2DMenuRTCJoypad:
.loopRTC .loopRTC
call RTC call UpdateTimeAndPals
call Menu_WasButtonPressed call Menu_WasButtonPressed
ret c ret c
ld a, [w2DMenuFlags1] ld a, [w2DMenuFlags1]

10
engine/menus/naming_screen.asm
View File

@ -167,7 +167,7 @@ NamingScreen:
ld [hl], a ld [hl], a
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -219,7 +219,7 @@ NamingScreen:
.not_kris .not_kris
ld a, b ld a, b
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ret ret
.StoreMonIconParams: .StoreMonIconParams:
@ -385,7 +385,7 @@ NamingScreenJoypadLoop:
ld d, 8 * 8 ld d, 8 * 8
.got_cursor_position .got_cursor_position
ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, c ld a, c
ld [wNamingScreenCursorObjectPointer], a ld [wNamingScreenCursorObjectPointer], a
ld a, b ld a, b
@ -940,7 +940,7 @@ _ComposeMailMessage:
; init mail icon ; init mail icon
depixel 3, 2 depixel 3, 2
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
@ -1068,7 +1068,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
.init_blinking_cursor .init_blinking_cursor
depixel 9, 2 depixel 9, 2
ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, c ld a, c
ld [wNamingScreenCursorObjectPointer], a ld [wNamingScreenCursorObjectPointer], a
ld a, b ld a, b

2
engine/menus/save.asm
View File

@ -670,7 +670,7 @@ TryLoadSaveData:
ld de, wOptions ld de, wOptions
ld bc, wOptionsEnd - wOptions ld bc, wOptionsEnd - wOptions
call CopyBytes call CopyBytes
call PanicResetClock call ClearClock
ret ret
INCLUDE "data/default_options.asm" INCLUDE "data/default_options.asm"

2
engine/menus/savemenu_copytilemapatonce.asm
View File

@ -20,7 +20,7 @@ SaveMenu_CopyTilemapAtOnce:
di di
ld a, BANK(vBGMap2) ld a, BANK(vBGMap2)
ldh [rVBK], a ldh [rVBK], a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
call .CopyTilemapAtOnce call .CopyTilemapAtOnce
ld a, BANK(vBGMap0) ld a, BANK(vBGMap0)
ldh [rVBK], a ldh [rVBK], a

2
engine/menus/start_menu.asm
View File

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

2
engine/menus/trainer_card.asm
View File

@ -41,7 +41,7 @@ TrainerCard:
.InitRAM: .InitRAM:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
farcall GetCardPic farcall GetCardPic

10
engine/movie/credits.asm
View File

@ -17,7 +17,7 @@ Credits::
ldh [rSVBK], a ldh [rSVBK], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld hl, wCreditsBlankFrame2bpp ld hl, wCreditsBlankFrame2bpp
@ -419,22 +419,22 @@ ConstructCreditsTilemap:
ld a, $20 ld a, $20
call DrawCreditsBorder call DrawCreditsBorder
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, 4 * SCREEN_WIDTH ld bc, 4 * SCREEN_WIDTH
xor a xor a
call ByteFill call ByteFill
hlcoord 0, 4, wAttrMap hlcoord 0, 4, wAttrmap
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
ld a, $1 ld a, $1
call ByteFill call ByteFill
hlcoord 0, 5, wAttrMap hlcoord 0, 5, wAttrmap
ld bc, 12 * SCREEN_WIDTH ld bc, 12 * SCREEN_WIDTH
ld a, $2 ld a, $2
call ByteFill call ByteFill
hlcoord 0, 17, wAttrMap hlcoord 0, 17, wAttrmap
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
ld a, $1 ld a, $1
call ByteFill call ByteFill

54
engine/movie/crystal_intro.asm
View File

@ -2,7 +2,7 @@ Copyright_GFPresents:
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
xor a ; LOW(vBGMap0) xor a ; LOW(vBGMap0)
@ -22,7 +22,7 @@ Copyright_GFPresents:
call WaitBGMap call WaitBGMap
ld c, 100 ld c, 100
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
farcall GBCOnlyScreen farcall GBCOnlyScreen
call .GetGFLogoGFX call .GetGFLogoGFX
.joy_loop .joy_loop
@ -80,7 +80,7 @@ Copyright_GFPresents:
farcall ClearSpriteAnims farcall ClearSpriteAnims
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_YOFFSET ld hl, SPRITEANIMSTRUCT_YOFFSET
add hl, bc add hl, bc
ld [hl], $a0 ld [hl], $a0
@ -106,7 +106,7 @@ Copyright_GFPresents:
.StopGamefreakAnim: .StopGamefreakAnim:
farcall ClearSpriteAnims farcall ClearSpriteAnims
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld c, 16 ld c, 16
call DelayFrames call DelayFrames
@ -363,7 +363,7 @@ CrystalIntro:
.done .done
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hSCX], a ldh [hSCX], a
ldh [hSCY], a ldh [hSCY], a
@ -440,7 +440,7 @@ IntroScene1:
; Setup the next scene. ; Setup the next scene.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -516,7 +516,7 @@ IntroScene3:
; More setup. Transition to the outdoor scene. ; More setup. Transition to the outdoor scene.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -578,7 +578,7 @@ IntroScene5:
; Go back to the Unown. ; Go back to the Unown.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
@ -676,7 +676,7 @@ IntroScene7:
; Back to the outdoor scene. ; Back to the outdoor scene.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
@ -733,7 +733,7 @@ IntroScene7:
farcall ClearSpriteAnims farcall ClearSpriteAnims
depixel 13, 27, 4, 0 depixel 13, 27, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, $f0 ld a, $f0
ld [wGlobalAnimXOffset], a ld [wGlobalAnimXOffset], a
call Intro_SetCGBPalUpdate call Intro_SetCGBPalUpdate
@ -777,7 +777,7 @@ IntroScene9:
xor a xor a
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
call ClearSprites call ClearSprites
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
; first 12 rows have palette 1 ; first 12 rows have palette 1
ld bc, 12 * SCREEN_WIDTH ld bc, 12 * SCREEN_WIDTH
ld a, $1 ld a, $1
@ -826,7 +826,7 @@ IntroScene10:
.pichu .pichu
depixel 21, 16, 1, 0 depixel 21, 16, 1, 0
ld a, SPRITE_ANIM_INDEX_INTRO_PICHU ld a, SPRITE_ANIM_INDEX_INTRO_PICHU
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_INTRO_PICHU ld de, SFX_INTRO_PICHU
call PlaySFX call PlaySFX
ret ret
@ -834,7 +834,7 @@ IntroScene10:
.wooper .wooper
depixel 22, 6 depixel 22, 6
ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_INTRO_PICHU ld de, SFX_INTRO_PICHU
call PlaySFX call PlaySFX
ret ret
@ -846,7 +846,7 @@ IntroScene11:
; Back to Unown again. ; Back to Unown again.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ldh [hLCDCPointer], a ldh [hLCDCPointer], a
@ -970,7 +970,7 @@ IntroScene13:
; Switch scenes again. ; Switch scenes again.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -1013,7 +1013,7 @@ IntroScene13:
farcall ClearSpriteAnims farcall ClearSpriteAnims
depixel 13, 11, 4, 0 depixel 13, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, MUSIC_CRYSTAL_OPENING ld de, MUSIC_CRYSTAL_OPENING
call PlayMusic call PlayMusic
xor a xor a
@ -1074,7 +1074,7 @@ IntroScene15:
; Transition to a new scene. ; Transition to a new scene.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -1124,10 +1124,10 @@ IntroScene15:
call Intro_SetCGBPalUpdate call Intro_SetCGBPalUpdate
depixel 8, 5 depixel 8, 5
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F
call _InitSpriteAnimStruct call InitSpriteAnimStruct
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
ld [wIntroSceneFrameCounter], a ld [wIntroSceneFrameCounter], a
ld [wIntroSceneTimer], a ld [wIntroSceneTimer], a
@ -1156,7 +1156,7 @@ IntroScene17:
; ... ; ...
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -1222,7 +1222,7 @@ IntroScene19:
; More setup. ; More setup.
call Intro_ClearBGPals call Intro_ClearBGPals
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -1276,7 +1276,7 @@ IntroScene19:
call Intro_SetCGBPalUpdate call Intro_SetCGBPalUpdate
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
ld [wIntroSceneFrameCounter], a ld [wIntroSceneFrameCounter], a
ld [wIntroSceneTimer], a ld [wIntroSceneTimer], a
@ -1399,7 +1399,7 @@ IntroScene26:
; Load the final scene. ; Load the final scene.
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld a, $1 ld a, $1
@ -1533,7 +1533,7 @@ INCLUDE "gfx/intro/fade.pal"
CrystalIntro_InitUnownAnim: CrystalIntro_InitUnownAnim:
push de push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $8 ld [hl], $8
@ -1543,7 +1543,7 @@ CrystalIntro_InitUnownAnim:
push de push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $18 ld [hl], $18
@ -1553,7 +1553,7 @@ CrystalIntro_InitUnownAnim:
push de push de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $28 ld [hl], $28
@ -1562,7 +1562,7 @@ CrystalIntro_InitUnownAnim:
pop de pop de
ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $38 ld [hl], $38

2
engine/movie/evolution_animation.asm
View File

@ -305,7 +305,7 @@ EvolutionAnimation:
push de push de
depixel 9, 11 depixel 9, 11
ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
ld a, [wJumptableIndex] ld a, [wJumptableIndex]

2
engine/movie/gbc_only.asm
View File

@ -6,7 +6,7 @@ GBCOnlyScreen:
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
call ClearTileMap call ClearTilemap
ld hl, GBCOnlyGFX ld hl, GBCOnlyGFX
ld de, wGBCOnlyDecompressBuffer ld de, wGBCOnlyDecompressBuffer

10
engine/movie/init_hof_credits.asm
View File

@ -1,6 +1,6 @@
InitDisplayForHallOfFame: InitDisplayForHallOfFame:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
call LoadStandardFont call LoadStandardFont
@ -9,7 +9,7 @@ InitDisplayForHallOfFame:
ld bc, vBGMap1 - vBGMap0 ld bc, vBGMap1 - vBGMap0
ld a, " " ld a, " "
call ByteFill call ByteFill
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
@ -29,7 +29,7 @@ InitDisplayForHallOfFame:
InitDisplayForRedCredits: InitDisplayForRedCredits:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
call LoadStandardFont call LoadStandardFont
@ -38,7 +38,7 @@ InitDisplayForRedCredits:
ld bc, vBGMap1 - vBGMap0 ld bc, vBGMap1 - vBGMap0
ld a, " " ld a, " "
call ByteFill call ByteFill
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
@ -65,7 +65,7 @@ ResetDisplayBetweenHallOfFameMons:
ld a, BANK(wDecompressScratch) ld a, BANK(wDecompressScratch)
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
hlbgcoord 0, 0 hlbgcoord 0, 0

2
engine/movie/title.asm
View File

@ -1,7 +1,7 @@
_TitleScreen: _TitleScreen:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
; Turn BG Map update off ; Turn BG Map update off
xor a xor a

40
engine/movie/trade_animation.asm
View File

@ -149,7 +149,7 @@ RunTradeAnimScript:
ld [wJumptableIndex], a ld [wJumptableIndex], a
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call LoadFontsBattleExtra call LoadFontsBattleExtra
callfar ClearSpriteAnims callfar ClearSpriteAnims
@ -359,7 +359,7 @@ TradeAnim_InitTubeAnim:
pop de pop de
ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
@ -368,7 +368,7 @@ TradeAnim_InitTubeAnim:
pop de pop de
ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
@ -466,7 +466,7 @@ TradeAnim_TubeToPlayer6:
TradeAnim_TubeToOT8: TradeAnim_TubeToOT8:
TradeAnim_TubeToPlayer8: TradeAnim_TubeToPlayer8:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
callfar ClearSpriteAnims callfar ClearSpriteAnims
@ -534,7 +534,7 @@ TradeAnim_TubeAnimJumptable:
.Zero: .Zero:
.Three: .Three:
call TradeAnim_BlankTileMap call TradeAnim_BlankTilemap
hlcoord 9, 3 hlcoord 9, 3
ld [hl], $5b ld [hl], $5b
inc hl inc hl
@ -546,7 +546,7 @@ TradeAnim_TubeAnimJumptable:
ret ret
.One: .One:
call TradeAnim_BlankTileMap call TradeAnim_BlankTilemap
hlcoord 0, 3 hlcoord 0, 3
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
ld a, $60 ld a, $60
@ -554,7 +554,7 @@ TradeAnim_TubeAnimJumptable:
ret ret
.Two: .Two:
call TradeAnim_BlankTileMap call TradeAnim_BlankTilemap
hlcoord 0, 3 hlcoord 0, 3
ld bc, $11 ld bc, $11
ld a, $60 ld a, $60
@ -593,7 +593,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim:
call WaitTop call WaitTop
ld a, HIGH(vBGMap1) ld a, HIGH(vBGMap1)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
call ClearTileMap call ClearTilemap
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
ld a, "─" ld a, "─"
@ -623,11 +623,11 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim:
call WaitTop call WaitTop
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
call ClearTileMap call ClearTilemap
ret ret
TradeAnim_EnterLinkTube1: TradeAnim_EnterLinkTube1:
call ClearTileMap call ClearTilemap
call WaitTop call WaitTop
ld a, $a0 ld a, $a0
ldh [hSCX], a ldh [hSCX], a
@ -671,7 +671,7 @@ TradeAnim_ExitLinkTube:
ret ret
.done .done
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hSCX], a ldh [hSCX], a
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
@ -735,7 +735,7 @@ TradeAnim_ScrollOutRight:
call WaitTop call WaitTop
ld a, HIGH(vBGMap0) ld a, HIGH(vBGMap0)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
call ClearTileMap call ClearTilemap
call TradeAnim_IncrementJumptableIndex call TradeAnim_IncrementJumptableIndex
ret ret
@ -840,7 +840,7 @@ TradeAnim_ShowFrontpic:
lb bc, 10, $31 lb bc, 10, $31
call Request2bpp call Request2bpp
call WaitTop call WaitTop
call TradeAnim_BlankTileMap call TradeAnim_BlankTilemap
hlcoord 7, 2 hlcoord 7, 2
xor a xor a
ldh [hGraphicStartTile], a ldh [hGraphicStartTile], a
@ -925,7 +925,7 @@ ShowOTTrademonStats:
TrademonStats_MonTemplate: TrademonStats_MonTemplate:
call WaitTop call WaitTop
call TradeAnim_BlankTileMap call TradeAnim_BlankTilemap
ld a, HIGH(vBGMap1) ld a, HIGH(vBGMap1)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
hlcoord 3, 0 hlcoord 3, 0
@ -945,7 +945,7 @@ TrademonStats_MonTemplate:
TrademonStats_Egg: TrademonStats_Egg:
call WaitTop call WaitTop
call TradeAnim_BlankTileMap call TradeAnim_BlankTilemap
ld a, HIGH(vBGMap1) ld a, HIGH(vBGMap1)
ldh [hBGMapAddress + 1], a ldh [hBGMapAddress + 1], a
hlcoord 3, 0 hlcoord 3, 0
@ -1012,7 +1012,7 @@ TrademonStats_PrintTrademonID:
TradeAnim_RockingBall: TradeAnim_RockingBall:
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ld a, 32 ld a, 32
ld [wFrameCounter], a ld [wFrameCounter], a
@ -1021,7 +1021,7 @@ TradeAnim_RockingBall:
TradeAnim_DropBall: TradeAnim_DropBall:
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc add hl, bc
ld [hl], $1 ld [hl], $1
@ -1036,7 +1036,7 @@ TradeAnim_DropBall:
TradeAnim_Poof: TradeAnim_Poof:
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_TRADE_POOF ld a, SPRITE_ANIM_INDEX_TRADE_POOF
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ld a, 16 ld a, 16
ld [wFrameCounter], a ld [wFrameCounter], a
@ -1049,7 +1049,7 @@ TradeAnim_BulgeThroughTube:
call DmgToCgbObjPal0 call DmgToCgbObjPal0
depixel 5, 11 depixel 5, 11
ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer
ld a, 64 ld a, 64
ld [wFrameCounter], a ld [wFrameCounter], a
@ -1277,7 +1277,7 @@ TradeAnim_Wait80Frames:
call DelayFrames call DelayFrames
ret ret
TradeAnim_BlankTileMap: TradeAnim_BlankTilemap:
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, " " ld a, " "

2
engine/movie/unused_title.asm
View File

@ -1,6 +1,6 @@
UnusedTitleScreen: UnusedTitleScreen:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
; Turn BG Map update off ; Turn BG Map update off

4
engine/overworld/init_map.asm
View File

@ -29,7 +29,7 @@ ReanchorBGMap_NoOAMUpdate::
call OverworldTextModeSwitch call OverworldTextModeSwitch
ld a, HIGH(vBGMap1) ld a, HIGH(vBGMap1)
call .LoadBGMapAddrIntoHRAM call .LoadBGMapAddrIntoHRAM
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
farcall LoadOW_BGPal7 farcall LoadOW_BGPal7
farcall ApplyPals farcall ApplyPals
ld a, $1 ld a, $1
@ -84,7 +84,7 @@ HDMATransfer_FillBGMap0WithBlack:
ld a, "■" ld a, "■"
ld hl, wDecompressScratch ld hl, wDecompressScratch
ld bc, wScratchAttrMap - wDecompressScratch ld bc, wScratchAttrmap - wDecompressScratch
call ByteFill call ByteFill
ld a, HIGH(wDecompressScratch) ld a, HIGH(wDecompressScratch)
ldh [rHDMA1], a ldh [rHDMA1], a

6
engine/overworld/player_object.asm
View File

@ -5,11 +5,11 @@ BlankScreen:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
hlcoord 0, 0 hlcoord 0, 0
ld bc, wTileMapEnd - wTileMap ld bc, wTilemapEnd - wTilemap
ld a, " " ld a, " "
call ByteFill call ByteFill
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, wAttrMapEnd - wAttrMap ld bc, wAttrmapEnd - wAttrmap
ld a, $7 ld a, $7
call ByteFill call ByteFill
call WaitBGMap2 call WaitBGMap2

2
engine/overworld/scripting.asm
View File

@ -2643,7 +2643,7 @@ Script_writeunusedbytebuffer:
Script_closetext: Script_closetext:
; script command 0x49 ; script command 0x49
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call CloseText call CloseText
ret ret

6
engine/overworld/warp_connection.asm
View File

@ -233,7 +233,7 @@ LoadMapTimeOfDay:
farcall UpdateTimeOfDayPal farcall UpdateTimeOfDayPal
call OverworldTextModeSwitch call OverworldTextModeSwitch
call .ClearBGMap call .ClearBGMap
call .PushAttrMap call .PushAttrmap
ret ret
.ClearBGMap: .ClearBGMap:
@ -264,14 +264,14 @@ LoadMapTimeOfDay:
call ByteFill call ByteFill
ret ret
.PushAttrMap: .PushAttrmap:
decoord 0, 0 decoord 0, 0
call .copy call .copy
ldh a, [hCGB] ldh a, [hCGB]
and a and a
ret z ret z
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld a, $1 ld a, $1
ldh [rVBK], a ldh [rVBK], a
.copy .copy

2
engine/phone/phonering_copytilemapatonce.asm
View File

@ -23,7 +23,7 @@ PhoneRing_CopyTilemapAtOnce:
di di
ld a, BANK(vBGMap2) ld a, BANK(vBGMap2)
ldh [rVBK], a ldh [rVBK], a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
call .CopyTilemapAtOnce call .CopyTilemapAtOnce
ld a, BANK(vBGMap0) ld a, BANK(vBGMap0)
ldh [rVBK], a ldh [rVBK], a

4
engine/pokedex/new_pokedex_entry.asm
View File

@ -5,7 +5,7 @@ NewPokedexEntry:
ldh [hMapAnims], a ldh [hMapAnims], a
call LowVolume call LowVolume
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call UpdateSprites call UpdateSprites
call ClearSprites call ClearSprites
ld a, [wPokedexStatus] ld a, [wPokedexStatus]
@ -34,7 +34,7 @@ NewPokedexEntry:
ret ret
.ReturnFromDexRegistration: .ReturnFromDexRegistration:
call ClearTileMap call ClearTilemap
call LoadFontsExtra call LoadFontsExtra
call LoadStandardFont call LoadStandardFont
farcall Pokedex_PlaceFrontpicTopLeftCorner farcall Pokedex_PlaceFrontpicTopLeftCorner

6
engine/pokedex/pokedex.asm
View File

@ -79,7 +79,7 @@ Pokedex:
InitPokedex: InitPokedex:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call Pokedex_LoadGFX call Pokedex_LoadGFX
ld hl, wPokedexDataStart ld hl, wPokedexDataStart
@ -219,7 +219,7 @@ Pokedex_InitMainScreen:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call ClearSprites call ClearSprites
xor a xor a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
call ByteFill call ByteFill
farcall DrawPokedexListWindow farcall DrawPokedexListWindow
@ -718,7 +718,7 @@ Pokedex_InitSearchResultsScreen:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
xor a xor a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
call Pokedex_SetBGMapMode4 call Pokedex_SetBGMapMode4

2
engine/pokedex/pokedex_3.asm
View File

@ -140,7 +140,7 @@ DrawDexEntryScreenRightEdge:
ld [hl], $3c ld [hl], $3c
xor a xor a
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT
hlcoord 19, 0, wAttrMap hlcoord 19, 0, wAttrmap
call Bank77_FillColumn call Bank77_FillColumn
call WaitBGMap2 call WaitBGMap2
pop hl pop hl

24
engine/pokegear/pokegear.asm
View File

@ -72,7 +72,7 @@ PokeGear:
.InitTilemap: .InitTilemap:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
xor a xor a
@ -165,7 +165,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp"
InitPokegearModeIndicatorArrow: InitPokegearModeIndicatorArrow:
depixel 4, 2, 4, 0 depixel 4, 2, 4, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -671,7 +671,7 @@ PokegearMap_InitPlayerIcon:
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ld b, SPRITE_ANIM_INDEX_BLUE_WALK
.got_gender .got_gender
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $10 ld [hl], $10
@ -692,7 +692,7 @@ PokegearMap_InitCursor:
push af push af
depixel 0, 0 depixel 0, 0
ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $04 ld [hl], $04
@ -750,7 +750,7 @@ PokegearRadio_Init:
call InitPokegearTilemap call InitPokegearTilemap
depixel 4, 10, 4, 4 depixel 4, 10, 4, 4
ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $08 ld [hl], $08
@ -1783,7 +1783,7 @@ _TownMap:
ld [wVramState], a ld [wVramState], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
call Pokegear_LoadGFX call Pokegear_LoadGFX
@ -2035,7 +2035,7 @@ PokegearMap:
_FlyMap: _FlyMap:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld hl, hInMenu ld hl, hInMenu
ld a, [hl] ld a, [hl]
@ -2497,7 +2497,7 @@ Pokedex_GetArea:
.GetAndPlaceNest: .GetAndPlaceNest:
ld [wTownMapCursorLandmark], a ld [wTownMapCursorLandmark], a
ld e, a ld e, a
farcall FindNest ; load nest landmarks into wTileMap[0,0] farcall FindNest ; load nest landmarks into wTilemap[0,0]
decoord 0, 0 decoord 0, 0
ld hl, wVirtualOAMSprite00 ld hl, wVirtualOAMSprite00
.nestloop .nestloop
@ -2675,7 +2675,7 @@ FillTownMap:
TownMapPals: TownMapPals:
; Assign palettes based on tile ids ; Assign palettes based on tile ids
hlcoord 0, 0 hlcoord 0, 0
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
.loop .loop
; Current tile ; Current tile
@ -2743,7 +2743,7 @@ TownMapMon:
; Animation/palette ; Animation/palette
depixel 0, 0 depixel 0, 0
ld a, SPRITE_ANIM_INDEX_PARTY_MON ld a, SPRITE_ANIM_INDEX_PARTY_MON
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $08 ld [hl], $08
@ -2778,7 +2778,7 @@ TownMapPlayerIcon:
ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female
.got_gender .got_gender
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $10 ld [hl], $10
@ -2817,7 +2817,7 @@ Unreferenced_Function92311:
xor a xor a
ld [wTownMapPlayerIconLandmark], a ld [wTownMapPlayerIconLandmark], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld hl, hInMenu ld hl, hInMenu
ld a, [hl] ld a, [hl]

4
engine/pokemon/bills_pc.asm
View File

@ -774,7 +774,7 @@ _MovePKMNWithoutMail:
BillsPC_InitRAM: BillsPC_InitRAM:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call BillsPC_InitGFX call BillsPC_InitGFX
ld hl, wBillsPCData ld hl, wBillsPCData
ld bc, wBillsPCDataEnd - wBillsPCData ld bc, wBillsPCDataEnd - wBillsPCData
@ -2457,7 +2457,7 @@ BillsPC_ChangeBoxSubmenu:
ld b, NAME_BOX ld b, NAME_BOX
ld de, wd002 ld de, wd002
farcall NamingScreen farcall NamingScreen
call ClearTileMap call ClearTilemap
call LoadStandardFont call LoadStandardFont
call LoadFontsBattleExtra call LoadFontsBattleExtra
ld a, [wMenuSelection] ld a, [wMenuSelection]

4
engine/pokemon/breeding.asm
View File

@ -782,7 +782,7 @@ EggHatch_CrackShell:
ld d, a ld d, a
ld e, 11 * 8 ld e, 11 * 8
ld a, SPRITE_ANIM_INDEX_EGG_CRACK ld a, SPRITE_ANIM_INDEX_EGG_CRACK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
@ -810,7 +810,7 @@ Hatch_InitShellFragments:
push bc push bc
ld a, SPRITE_ANIM_INDEX_EGG_HATCH ld a, SPRITE_ANIM_INDEX_EGG_HATCH
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc

4
engine/pokemon/evolve.asm
View File

@ -253,7 +253,7 @@ EvolveAfterBattle_MasterLoop:
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
call UpdateSpeciesNameIfNotNicknamed call UpdateSpeciesNameIfNotNicknamed
call GetBaseData call GetBaseData
@ -379,7 +379,7 @@ UpdateSpeciesNameIfNotNicknamed:
CancelEvolution: CancelEvolution:
ld hl, StoppedEvolvingText ld hl, StoppedEvolvingText
call PrintText call PrintText
call ClearTileMap call ClearTilemap
pop hl pop hl
jp EvolveAfterBattle_MasterLoop jp EvolveAfterBattle_MasterLoop

4
engine/pokemon/learn.asm
View File

@ -1,5 +1,5 @@
LearnMove: LearnMove:
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNick
@ -166,7 +166,7 @@ ForgetMove:
ld [w2DMenuCursorOffsets], a ld [w2DMenuCursorOffsets], a
call StaticMenuJoypad call StaticMenuJoypad
push af push af
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
pop af pop af
pop hl pop hl
bit 1, a bit 1, a

2
engine/pokemon/mail_2.asm
View File

@ -9,7 +9,7 @@ ReadAnyMail:
push de push de
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call LoadFontsExtra call LoadFontsExtra
pop de pop de

8
engine/pokemon/mon_menu.asm
View File

@ -631,7 +631,7 @@ MonMenu_Fly:
ret ret
MonMenu_Flash: MonMenu_Flash:
farcall OWFlash farcall FlashFunction
ld a, [wFieldMoveSucceeded] ld a, [wFieldMoveSucceeded]
cp $1 cp $1
jr nz, .Fail jr nz, .Fail
@ -844,7 +844,7 @@ ChooseMoveToDelete:
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
res 6, [hl] res 6, [hl]
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
pop af pop af
ret ret
@ -1075,7 +1075,7 @@ MoveScreenLoop:
ld hl, w2DMenuFlags1 ld hl, w2DMenuFlags1
res 6, [hl] res 6, [hl]
call ClearSprites call ClearSprites
jp ClearTileMap jp ClearTilemap
MoveScreenAttributes: MoveScreenAttributes:
db 3, 1 db 3, 1
@ -1089,7 +1089,7 @@ String_MoveWhere:
SetUpMoveScreenBG: SetUpMoveScreenBG:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a

12
engine/pokemon/stats_screen.asm
View File

@ -37,13 +37,13 @@ StatsScreenInit_gotaddress:
push bc push bc
push hl push hl
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call UpdateSprites call UpdateSprites
farcall StatsScreen_LoadFont farcall StatsScreen_LoadFont
pop hl pop hl
call _hl_ call _hl_
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
pop bc pop bc
; restore old values ; restore old values
@ -129,7 +129,7 @@ StatsScreen_WaitAnim:
.finish .finish
ld hl, wcf64 ld hl, wcf64
res 5, [hl] res 5, [hl]
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
ret ret
StatsScreen_SetJumptableIndex: StatsScreen_SetJumptableIndex:
@ -148,8 +148,8 @@ MonStatsInit:
ld hl, wcf64 ld hl, wcf64
res 6, [hl] res 6, [hl]
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call StatsScreen_CopyToTempMon call StatsScreen_CopyToTempMon
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
cp EGG cp EGG
@ -989,7 +989,7 @@ EggStatsScreen:
call DelayFrame call DelayFrame
hlcoord 0, 0 hlcoord 0, 0
call PrepMonFrontpic call PrepMonFrontpic
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call StatsScreen_AnimateEgg call StatsScreen_AnimateEgg
ld a, [wTempMonHappiness] ld a, [wTempMonHappiness]

32
engine/printer/print_party.asm
View File

@ -2,28 +2,28 @@ PRINTPARTY_HP EQU "◀" ; $71
PrintPage1: PrintPage1:
hlcoord 0, 0 hlcoord 0, 0
decoord 0, 0, wPrinterTileMapBuffer decoord 0, 0, wPrinterTilemapBuffer
ld bc, 17 * SCREEN_WIDTH ld bc, 17 * SCREEN_WIDTH
call CopyBytes call CopyBytes
hlcoord 17, 1, wPrinterTileMapBuffer hlcoord 17, 1, wPrinterTilemapBuffer
ld a, $62 ld a, $62
ld [hli], a ld [hli], a
inc a inc a
ld [hl], a ld [hl], a
hlcoord 17, 2, wPrinterTileMapBuffer hlcoord 17, 2, wPrinterTilemapBuffer
ld a, $64 ld a, $64
ld [hli], a ld [hli], a
inc a inc a
ld [hl], a ld [hl], a
hlcoord 1, 9, wPrinterTileMapBuffer hlcoord 1, 9, wPrinterTilemapBuffer
ld a, " " ld a, " "
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
hlcoord 1, 10, wPrinterTileMapBuffer hlcoord 1, 10, wPrinterTilemapBuffer
ld a, $61 ld a, $61
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
hlcoord 2, 11, wPrinterTileMapBuffer hlcoord 2, 11, wPrinterTilemapBuffer
lb bc, 5, 18 lb bc, 5, 18
call ClearBox call ClearBox
ld a, [wTempSpecies] ld a, [wTempSpecies]
@ -36,9 +36,9 @@ PrintPage1:
farcall GetDexEntryPagePointer farcall GetDexEntryPagePointer
pop af pop af
ld a, b ld a, b
hlcoord 1, 11, wPrinterTileMapBuffer hlcoord 1, 11, wPrinterTilemapBuffer
call nz, FarString call nz, FarString
hlcoord 19, 0, wPrinterTileMapBuffer hlcoord 19, 0, wPrinterTilemapBuffer
ld [hl], $35 ld [hl], $35
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
add hl, de add hl, de
@ -52,26 +52,26 @@ PrintPage1:
ret ret
PrintPage2: PrintPage2:
hlcoord 0, 0, wPrinterTileMapBuffer hlcoord 0, 0, wPrinterTilemapBuffer
ld bc, 8 * SCREEN_WIDTH ld bc, 8 * SCREEN_WIDTH
ld a, " " ld a, " "
call ByteFill call ByteFill
hlcoord 0, 0, wPrinterTileMapBuffer hlcoord 0, 0, wPrinterTilemapBuffer
ld a, $36 ld a, $36
ld b, 6 ld b, 6
call .FillColumn call .FillColumn
hlcoord 19, 0, wPrinterTileMapBuffer hlcoord 19, 0, wPrinterTilemapBuffer
ld a, $37 ld a, $37
ld b, 6 ld b, 6
call .FillColumn call .FillColumn
hlcoord 0, 6, wPrinterTileMapBuffer hlcoord 0, 6, wPrinterTilemapBuffer
ld [hl], $38 ld [hl], $38
inc hl inc hl
ld a, $39 ld a, $39
ld bc, SCREEN_HEIGHT ld bc, SCREEN_HEIGHT
call ByteFill call ByteFill
ld [hl], $3a ld [hl], $3a
hlcoord 0, 7, wPrinterTileMapBuffer hlcoord 0, 7, wPrinterTilemapBuffer
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
ld a, $32 ld a, $32
call ByteFill call ByteFill
@ -84,7 +84,7 @@ PrintPage2:
ld c, 2 ; get page 2 ld c, 2 ; get page 2
farcall GetDexEntryPagePointer farcall GetDexEntryPagePointer
pop af pop af
hlcoord 1, 1, wPrinterTileMapBuffer hlcoord 1, 1, wPrinterTilemapBuffer
ld a, b ld a, b
call nz, FarString call nz, FarString
ret ret
@ -132,7 +132,7 @@ GBPrinterString_PrinterError4:
PrintPartyMonPage1: PrintPartyMonPage1:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
@ -231,7 +231,7 @@ PrintPartyMonPage1:
PrintPartyMonPage2: PrintPartyMonPage2:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a

56
engine/printer/printer.asm
View File

@ -26,12 +26,12 @@ Printer_CleanUpAfterSend:
ld [wPrinterOpcode], a ld [wPrinterOpcode], a
ret ret
Printer_PrepareTileMapForPrint: Printer_PrepareTilemapForPrint:
push af push af
call Printer_StartTransmission call Printer_StartTransmission
pop af pop af
ld [wPrinterMargins], a ld [wPrinterMargins], a
call Printer_CopyTileMapToBuffer call Printer_CopyTilemapToBuffer
ret ret
Printer_ExitPrinter: Printer_ExitPrinter:
@ -63,7 +63,7 @@ PrintDexEntry:
ln a, 1, 0 ln a, 1, 0
ld [wPrinterMargins], a ld [wPrinterMargins], a
farcall PrintPage1 farcall PrintPage1
call ClearTileMap call ClearTilemap
ld a, %11100100 ld a, %11100100
call DmgToCgbBGPals call DmgToCgbBGPals
call DelayFrame call DelayFrame
@ -146,13 +146,13 @@ PrintPCBox:
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
push af push af
ld [hl], 4 ld [hl], $4
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call PrintPCBox_Page1 call PrintPCBox_Page1
ln a, 1, 0 ; to be loaded to wPrinterMargins ln a, 1, 0 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Printer_ResetRegistersAndStartDataSend call Printer_ResetRegistersAndStartDataSend
jr c, .cancel jr c, .cancel
@ -163,7 +163,7 @@ PrintPCBox:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call PrintPCBox_Page2 call PrintPCBox_Page2
ln a, 0, 0 ; to be loaded to wPrinterMargins ln a, 0, 0 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Printer_ResetRegistersAndStartDataSend call Printer_ResetRegistersAndStartDataSend
jr c, .cancel jr c, .cancel
@ -175,7 +175,7 @@ PrintPCBox:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call PrintPCBox_Page3 call PrintPCBox_Page3
ln a, 0, 0 ; to be loaded to wPrinterMargins ln a, 0, 0 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Printer_ResetRegistersAndStartDataSend call Printer_ResetRegistersAndStartDataSend
jr c, .cancel jr c, .cancel
@ -187,7 +187,7 @@ PrintPCBox:
ldh [hBGMapMode], a ldh [hBGMapMode], a
call PrintPCBox_Page4 call PrintPCBox_Page4
ln a, 0, 3 ; to be loaded to wPrinterMargins ln a, 0, 3 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Printer_ResetRegistersAndStartDataSend call Printer_ResetRegistersAndStartDataSend
.cancel .cancel
pop af pop af
@ -227,11 +227,11 @@ PrintUnownStamp:
ld [hl], $4 ld [hl], $4
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
farcall PlaceUnownPrinterFrontpic farcall PlaceUnownPrinterFrontpic
ln a, 0, 0 ; to be loaded to wPrinterMargins ln a, 0, 0 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
call Printer_ResetJoypadRegisters call Printer_ResetJoypadRegisters
ld a, 18 / 2 ld a, 18 / 2
ld [wPrinterQueueLength], a ld [wPrinterQueueLength], a
@ -259,7 +259,7 @@ PrintUnownStamp:
pop af pop af
ldh [hVBlank], a ldh [hVBlank], a
call Printer_CleanUpAfterSend call Printer_CleanUpAfterSend
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
xor a xor a
ldh [rIF], a ldh [rIF], a
pop af pop af
@ -291,11 +291,11 @@ PrintMail:
ldh [hBGMapMode], a ldh [hBGMapMode], a
ln a, 1, 3 ; to be loaded to wPrinterMargins ln a, 1, 3 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
push af push af
ld [hl], %0100 ld [hl], $4
ld a, 18 / 2 ld a, 18 / 2
ld [wPrinterQueueLength], a ld [wPrinterQueueLength], a
@ -304,7 +304,7 @@ PrintMail:
pop af pop af
ldh [hVBlank], a ldh [hVBlank], a
call Printer_CleanUpAfterSend call Printer_CleanUpAfterSend
call Printer_CopyBufferToTileMap call Printer_CopyBufferToTilemap
xor a xor a
ldh [rIF], a ldh [rIF], a
@ -333,12 +333,12 @@ PrintPartymon:
ldh [hBGMapMode], a ldh [hBGMapMode], a
farcall PrintPartyMonPage1 farcall PrintPartyMonPage1
ln a, 1, 0 ; to be loaded to wPrinterMargins ln a, 1, 0 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
push af push af
ld [hl], %0100 ld [hl], $4
ld a, 16 / 2 ld a, 16 / 2
ld [wPrinterQueueLength], a ld [wPrinterQueueLength], a
@ -354,7 +354,7 @@ PrintPartymon:
ldh [hBGMapMode], a ldh [hBGMapMode], a
farcall PrintPartyMonPage2 farcall PrintPartyMonPage2
ln a, 0, 3 ; to be loaded to wPrinterMargins ln a, 0, 3 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
ld a, 18 / 2 ld a, 18 / 2
ld [wPrinterQueueLength], a ld [wPrinterQueueLength], a
@ -365,7 +365,7 @@ PrintPartymon:
ldh [hVBlank], a ldh [hVBlank], a
call Printer_CleanUpAfterSend call Printer_CleanUpAfterSend
call Printer_CopyBufferToTileMap call Printer_CopyBufferToTilemap
xor a xor a
ldh [rIF], a ldh [rIF], a
pop af pop af
@ -396,10 +396,10 @@ _PrintDiploma:
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
push af push af
ld [hl], %0100 ld [hl], $4
ln a, 1, 0 ; to be loaded to wPrinterMargins ln a, 1, 0 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Printer_ResetJoypadRegisters call Printer_ResetJoypadRegisters
ld a, 18 / 2 ld a, 18 / 2
@ -410,15 +410,15 @@ _PrintDiploma:
ld c, 12 ld c, 12
call DelayFrames call DelayFrames
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
farcall PrintDiplomaPage2 farcall PrintDiplomaPage2
ln a, 0, 3 ; to be loaded to wPrinterMargins ln a, 0, 3 ; to be loaded to wPrinterMargins
call Printer_PrepareTileMapForPrint call Printer_PrepareTilemapForPrint
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
call Printer_ResetJoypadRegisters call Printer_ResetJoypadRegisters
ld a, 18 / 2 ld a, 18 / 2
@ -473,15 +473,15 @@ CheckCancelPrint:
scf scf
ret ret
Printer_CopyTileMapToBuffer: Printer_CopyTilemapToBuffer:
hlcoord 0, 0 hlcoord 0, 0
ld de, wPrinterTileMapBuffer ld de, wPrinterTilemapBuffer
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes call CopyBytes
ret ret
Printer_CopyBufferToTileMap: Printer_CopyBufferToTilemap:
ld hl, wPrinterTileMapBuffer ld hl, wPrinterTilemapBuffer
decoord 0, 0 decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes call CopyBytes

4
engine/printer/printer_serial.asm
View File

@ -362,14 +362,14 @@ Printer_StageHeaderForSend:
ret ret
Printer_Convert2RowsTo2bpp: Printer_Convert2RowsTo2bpp:
; de = wPrinterTileMapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex]) ; de = wPrinterTilemapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex])
ld a, [wPrinterRowIndex] ld a, [wPrinterRowIndex]
xor $ff xor $ff
ld d, a ld d, a
ld a, [wPrinterQueueLength] ld a, [wPrinterQueueLength]
inc a inc a
add d add d
ld hl, wPrinterTileMapBuffer ld hl, wPrinterTilemapBuffer
ld de, 2 * SCREEN_WIDTH ld de, 2 * SCREEN_WIDTH
.loop1 .loop1
and a and a

2
engine/rtc/restart_clock.asm
View File

@ -36,7 +36,7 @@ RestartClock:
push af push af
set NO_TEXT_SCROLL, [hl] set NO_TEXT_SCROLL, [hl]
call LoadStandardMenuHeader call LoadStandardMenuHeader
call ClearTileMap call ClearTilemap
ld hl, .ClockSetWithControlPadText ld hl, .ClockSetWithControlPadText
call PrintText call PrintText
call .SetClock call .SetClock

2
engine/rtc/timeset.asm
View File

@ -19,7 +19,7 @@ InitClock:
ld c, 8 ld c, 8
call DelayFrames call DelayFrames
call RotateFourPalettesLeft call RotateFourPalettesLeft
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout

6
engine/tilesets/map_palettes.asm
View File

@ -1,6 +1,6 @@
SwapTextboxPalettes:: _SwapTextboxPalettes::
hlcoord 0, 0 hlcoord 0, 0
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT
.loop .loop
push bc push bc
@ -44,7 +44,7 @@ SwapTextboxPalettes::
jr nz, .loop jr nz, .loop
ret ret
ScrollBGMapPalettes:: _ScrollBGMapPalettes::
ld hl, wBGMapBuffer ld hl, wBGMapBuffer
ld de, wBGMapPalBuffer ld de, wBGMapPalBuffer
.loop .loop

24
home/copy_tilemap.asm
View File

@ -1,34 +1,34 @@
LoadTileMapToTempTileMap:: LoadTilemapToTempTilemap::
; Load wTileMap into wTempTileMap ; Load wTilemap into wTempTilemap
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ld a, BANK(wTempTileMap) ld a, BANK(wTempTilemap)
ldh [rSVBK], a ldh [rSVBK], a
hlcoord 0, 0 hlcoord 0, 0
decoord 0, 0, wTempTileMap decoord 0, 0, wTempTilemap
ld bc, wTileMapEnd - wTileMap ld bc, wTilemapEnd - wTilemap
call CopyBytes call CopyBytes
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ret ret
Call_LoadTempTileMapToTileMap:: SafeLoadTempTilemapToTilemap::
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call LoadTempTileMapToTileMap call LoadTempTilemapToTilemap
ld a, 1 ld a, 1
ldh [hBGMapMode], a ldh [hBGMapMode], a
ret ret
LoadTempTileMapToTileMap:: LoadTempTilemapToTilemap::
; Load wTempTileMap into wTileMap ; Load wTempTilemap into wTilemap
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
ld a, BANK(wTempTileMap) ld a, BANK(wTempTilemap)
ldh [rSVBK], a ldh [rSVBK], a
hlcoord 0, 0, wTempTileMap hlcoord 0, 0, wTempTilemap
decoord 0, 0 decoord 0, 0
ld bc, wTileMapEnd - wTileMap ld bc, wTilemapEnd - wTilemap
call CopyBytes call CopyBytes
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a

1
home/handshake.asm
View File

@ -1,6 +1,5 @@
PrinterReceive:: PrinterReceive::
homecall _PrinterReceive homecall _PrinterReceive
ret ret
AskSerial:: AskSerial::

5
home/joypad.asm
View File

@ -14,6 +14,7 @@ ClearJoypad::
ret ret
Joypad:: Joypad::
; This is called automatically every frame in VBlank.
; Read the joypad register and translate it to something more ; Read the joypad register and translate it to something more
; workable for use in-game. There are 8 buttons, so we can use ; workable for use in-game. There are 8 buttons, so we can use
; one byte to contain all player input. ; one byte to contain all player input.
@ -294,7 +295,7 @@ JoyWaitAorB::
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON and A_BUTTON | B_BUTTON
ret nz ret nz
call RTC call UpdateTimeAndPals
jr .loop jr .loop
WaitButton:: WaitButton::
@ -412,7 +413,7 @@ PromptButton::
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON and A_BUTTON | B_BUTTON
jr nz, .received_input jr nz, .received_input
call RTC call UpdateTimeAndPals
ld a, $1 ld a, $1
ldh [hBGMapMode], a ldh [hBGMapMode], a
call DelayFrame call DelayFrame

10
home/map.asm
View File

@ -93,7 +93,7 @@ GetMapSceneID::
OverworldTextModeSwitch:: OverworldTextModeSwitch::
call LoadMapPart call LoadMapPart
call FarCallSwapTextboxPalettes call SwapTextboxPalettes
ret ret
LoadMapPart:: LoadMapPart::
@ -1157,7 +1157,7 @@ ScrollMapUp::
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapRow call BackupBGMapRow
ld c, 2 * SCREEN_WIDTH ld c, 2 * SCREEN_WIDTH
call FarCallScrollBGMapPalettes call ScrollBGMapPalettes
ld a, [wBGMapAnchor] ld a, [wBGMapAnchor]
ld e, a ld e, a
ld a, [wBGMapAnchor + 1] ld a, [wBGMapAnchor + 1]
@ -1172,7 +1172,7 @@ ScrollMapDown::
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapRow call BackupBGMapRow
ld c, 2 * SCREEN_WIDTH ld c, 2 * SCREEN_WIDTH
call FarCallScrollBGMapPalettes call ScrollBGMapPalettes
ld a, [wBGMapAnchor] ld a, [wBGMapAnchor]
ld l, a ld l, a
ld a, [wBGMapAnchor + 1] ld a, [wBGMapAnchor + 1]
@ -1195,7 +1195,7 @@ ScrollMapLeft::
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapColumn call BackupBGMapColumn
ld c, 2 * SCREEN_HEIGHT ld c, 2 * SCREEN_HEIGHT
call FarCallScrollBGMapPalettes call ScrollBGMapPalettes
ld a, [wBGMapAnchor] ld a, [wBGMapAnchor]
ld e, a ld e, a
ld a, [wBGMapAnchor + 1] ld a, [wBGMapAnchor + 1]
@ -1210,7 +1210,7 @@ ScrollMapRight::
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapColumn call BackupBGMapColumn
ld c, 2 * SCREEN_HEIGHT ld c, 2 * SCREEN_HEIGHT
call FarCallScrollBGMapPalettes call ScrollBGMapPalettes
ld a, [wBGMapAnchor] ld a, [wBGMapAnchor]
ld e, a ld e, a
and %11100000 and %11100000

6
home/menu_window.asm
View File

@ -194,7 +194,7 @@ MenuBoxCoord2Tile::
ld b, a ld b, a
Coord2Tile:: Coord2Tile::
; Return the address of wTileMap(c, b) in hl. ; Return the address of wTilemap(c, b) in hl.
xor a xor a
ld h, a ld h, a
ld l, b ld l, b
@ -221,7 +221,7 @@ MenuBoxCoord2Attr::
ld b, a ld b, a
Coord2Attr:: Coord2Attr::
; Return the address of wAttrMap(c, b) in hl. ; Return the address of wAttrmap(c, b) in hl.
xor a xor a
ld h, a ld h, a
ld l, b ld l, b
@ -237,6 +237,6 @@ Coord2Attr::
xor a xor a
ld b, a ld b, a
add hl, bc add hl, bc
bccoord 0, 0, wAttrMap bccoord 0, 0, wAttrmap
add hl, bc add hl, bc
ret ret

6
home/mobile.asm
View File

@ -140,7 +140,7 @@ Unreferenced_Function3ed7::
Function3eea:: Function3eea::
push hl push hl
push bc push bc
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b
@ -165,7 +165,7 @@ Unreferenced_Function3efd::
.fill_attr .fill_attr
push hl push hl
push bc push bc
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b
@ -178,7 +178,7 @@ Unreferenced_Function3efd::
ret ret
Function3f20:: Function3f20::
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld b, 6 ld b, 6
ld c, 20 ld c, 20
call Function3f35 call Function3f35

22
home/names.asm
View File

@ -125,10 +125,10 @@ GetPokemonName::
ld e, a ld e, a
ld h, 0 ld h, 0
ld l, a ld l, a
add hl, hl ; hl = hl * 4 add hl, hl
add hl, hl ; hl = hl * 4 add hl, hl
add hl, de ; hl = (hl*4) + de add hl, de
add hl, hl ; hl = (5*hl) + (5*hl) add hl, hl
ld de, PokemonNames ld de, PokemonNames
add hl, de add hl, de
@ -185,13 +185,13 @@ GetTMHMName::
ld hl, .HMText ld hl, .HMText
ld bc, .HMTextEnd - .HMText ld bc, .HMTextEnd - .HMText
jr .asm_34a1 jr .copy
.TM: .TM:
ld hl, .TMText ld hl, .TMText
ld bc, .TMTextEnd - .TMText ld bc, .TMTextEnd - .TMText
.asm_34a1 .copy
ld de, wStringBuffer1 ld de, wStringBuffer1
call CopyBytes call CopyBytes
@ -205,20 +205,20 @@ GetTMHMName::
; HM numbers start from 51, not 1 ; HM numbers start from 51, not 1
pop af pop af
ld a, c ld a, c
jr c, .asm_34b9 jr c, .not_hm
sub NUM_TMS sub NUM_TMS
.asm_34b9 .not_hm
; Divide and mod by 10 to get the top and bottom digits respectively ; Divide and mod by 10 to get the top and bottom digits respectively
ld b, "0" ld b, "0"
.mod10 .mod10
sub 10 sub 10
jr c, .asm_34c2 jr c, .done_mod
inc b inc b
jr .mod10 jr .mod10
.asm_34c2
add 10
.done_mod
add 10
push af push af
ld a, b ld a, b
ld [de], a ld [de], a

8
home/palettes.asm
View File

@ -319,10 +319,10 @@ ReloadSpritesNoPalettes::
call DelayFrame call DelayFrame
ret ret
FarCallSwapTextboxPalettes:: SwapTextboxPalettes::
homecall SwapTextboxPalettes homecall _SwapTextboxPalettes
ret ret
FarCallScrollBGMapPalettes:: ScrollBGMapPalettes::
homecall ScrollBGMapPalettes homecall _ScrollBGMapPalettes
ret ret

2
home/rtc.asm
View File

@ -1,4 +1,4 @@
RTC:: UpdateTimeAndPals::
; update time and time-sensitive palettes ; update time and time-sensitive palettes
; rtc enabled? ; rtc enabled?

6
home/serial.asm
View File

@ -273,13 +273,13 @@ Serial_ExchangeLinkMenuSelection::
ret ret
Serial_PrintWaitingTextAndSyncAndExchangeNybble:: Serial_PrintWaitingTextAndSyncAndExchangeNybble::
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
callfar PlaceWaitingText callfar PlaceWaitingText
call WaitLinkTransfer call WaitLinkTransfer
jp Call_LoadTempTileMapToTileMap jp SafeLoadTempTilemapToTilemap
Serial_SyncAndExchangeNybble:: Serial_SyncAndExchangeNybble::
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
callfar PlaceWaitingText callfar PlaceWaitingText
jp WaitLinkTransfer jp WaitLinkTransfer

6
home/sprite_anims.asm
View File

@ -17,16 +17,16 @@ PushLYOverrides::
ld [wRequested2bpp], a ld [wRequested2bpp], a
ret ret
_InitSpriteAnimStruct:: InitSpriteAnimStruct::
ld [wSpriteAnimIDBuffer], a ld [wSpriteAnimIDBuffer], a
ldh a, [hROMBank] ldh a, [hROMBank]
push af push af
ld a, BANK(InitSpriteAnimStruct) ld a, BANK(_InitSpriteAnimStruct)
rst Bankswitch rst Bankswitch
ld a, [wSpriteAnimIDBuffer] ld a, [wSpriteAnimIDBuffer]
call InitSpriteAnimStruct call _InitSpriteAnimStruct
pop af pop af
rst Bankswitch rst Bankswitch

14
home/text.asm
View File

@ -19,12 +19,12 @@ FillBoxWithByte::
jr nz, .row jr nz, .row
ret ret
ClearTileMap:: ClearTilemap::
; Fill wTileMap with blank tiles. ; Fill wTilemap with blank tiles.
hlcoord 0, 0 hlcoord 0, 0
ld a, " " ld a, " "
ld bc, wTileMapEnd - wTileMap ld bc, wTilemapEnd - wTilemap
call ByteFill call ByteFill
; Update the BG Map. ; Update the BG Map.
@ -35,10 +35,10 @@ ClearTileMap::
ClearScreen:: ClearScreen::
ld a, PAL_BG_TEXT ld a, PAL_BG_TEXT
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
jr ClearTileMap jr ClearTilemap
Textbox:: Textbox::
; Draw a text box at hl with room for b lines of c characters each. ; Draw a text box at hl with room for b lines of c characters each.
@ -99,7 +99,7 @@ TextboxBorder::
TextboxPalette:: TextboxPalette::
; Fill text box width c height b at hl with pal 7 ; Fill text box width c height b at hl with pal 7
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b
@ -422,7 +422,7 @@ LineFeedChar::
CarriageReturnChar:: CarriageReturnChar::
pop hl pop hl
push de push de
ld bc, -wTileMap + $10000 ld bc, -wTilemap + $10000
add hl, bc add hl, bc
ld de, -SCREEN_WIDTH ld de, -SCREEN_WIDTH
ld c, 1 ld c, 1

4
home/tilemap.asm
View File

@ -61,7 +61,7 @@ CopyTilemapAtOnce::
jr .CopyTilemapAtOnce jr .CopyTilemapAtOnce
; unused ; unused
farcall HDMATransferAttrMapAndTileMapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret ret
.CopyTilemapAtOnce: .CopyTilemapAtOnce:
@ -83,7 +83,7 @@ CopyTilemapAtOnce::
di di
ld a, BANK(vTiles3) ld a, BANK(vTiles3)
ldh [rVBK], a ldh [rVBK], a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
call .StackPointerMagic call .StackPointerMagic
ld a, BANK(vTiles0) ld a, BANK(vTiles0)
ldh [rVBK], a ldh [rVBK], a

4
home/time.asm
View File

@ -1,6 +1,6 @@
; Functions relating to the timer interrupt and the real-time-clock. ; Functions relating to the timer interrupt and the real-time-clock.
AskTimer:: Unreferenced_Timer::
push af push af
ldh a, [hMobile] ldh a, [hMobile]
and a and a
@ -195,7 +195,7 @@ InitTime::
farcall _InitTime farcall _InitTime
ret ret
PanicResetClock:: ClearClock::
call .ClearhRTC call .ClearhRTC
call SetClock call SetClock
ret ret

6
home/video.asm
View File

@ -114,7 +114,7 @@ WaitTop::
ret ret
UpdateBGMap:: UpdateBGMap::
; Update the BG Map, in thirds, from wTileMap and wAttrMap. ; Update the BG Map, in thirds, from wTilemap and wAttrmap.
ldh a, [hBGMapMode] ldh a, [hBGMapMode]
and a and a
@ -159,7 +159,7 @@ UpdateBGMap::
ld a, 1 ld a, 1
ldh [rVBK], a ldh [rVBK], a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
call .update call .update
ld a, 0 ld a, 0
@ -234,7 +234,7 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
; Rows of tiles in a third ; Rows of tiles in a third
ld a, SCREEN_HEIGHT / 3 ld a, SCREEN_HEIGHT / 3
; Discrepancy between wTileMap and BGMap ; Discrepancy between wTilemap and BGMap
ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1) ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1)
.row .row

10
home/window.asm
View File

@ -6,7 +6,7 @@ RefreshScreen::
rst Bankswitch rst Bankswitch
call ReanchorBGMap_NoOAMUpdate call ReanchorBGMap_NoOAMUpdate
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call LoadFonts_NoOAMUpdate call LoadFonts_NoOAMUpdate
pop af pop af
@ -32,7 +32,7 @@ CloseText::
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call OverworldTextModeSwitch call OverworldTextModeSwitch
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call SafeUpdateSprites call SafeUpdateSprites
@ -52,20 +52,20 @@ OpenText::
call ReanchorBGMap_NoOAMUpdate ; clear bgmap call ReanchorBGMap_NoOAMUpdate ; clear bgmap
call SpeechTextbox call SpeechTextbox
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap
call LoadFonts_NoOAMUpdate ; load font call LoadFonts_NoOAMUpdate ; load font
pop af pop af
rst Bankswitch rst Bankswitch
ret ret
_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap::
ldh a, [hOAMUpdate] ldh a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
ldh [hOAMUpdate], a ldh [hOAMUpdate], a
farcall OpenAndCloseMenu_HDMATransferTileMapAndAttrMap farcall OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
pop af pop af
ldh [hOAMUpdate], a ldh [hOAMUpdate], a

8
macros/coords.asm
View File

@ -5,7 +5,7 @@ decoord EQUS "coord de,"
coord: MACRO coord: MACRO
; register, x, y[, origin] ; register, x, y[, origin]
if _NARG < 4 if _NARG < 4
ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap ld \1, (\3) * SCREEN_WIDTH + (\2) + wTilemap
else else
ld \1, (\3) * SCREEN_WIDTH + (\2) + \4 ld \1, (\3) * SCREEN_WIDTH + (\2) + \4
endc endc
@ -27,7 +27,7 @@ ENDM
dwcoord: MACRO dwcoord: MACRO
; x, y ; x, y
rept _NARG / 2 rept _NARG / 2
dw (\2) * SCREEN_WIDTH + (\1) + wTileMap dw (\2) * SCREEN_WIDTH + (\1) + wTilemap
shift shift
shift shift
endr endr
@ -36,7 +36,7 @@ ENDM
ldcoord_a: MACRO ldcoord_a: MACRO
; x, y[, origin] ; x, y[, origin]
if _NARG < 3 if _NARG < 3
ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a ld [(\2) * SCREEN_WIDTH + (\1) + wTilemap], a
else else
ld [(\2) * SCREEN_WIDTH + (\1) + \3], a ld [(\2) * SCREEN_WIDTH + (\1) + \3], a
endc endc
@ -45,7 +45,7 @@ ENDM
lda_coord: MACRO lda_coord: MACRO
; x, y[, origin] ; x, y[, origin]
if _NARG < 3 if _NARG < 3
ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap] ld a, [(\2) * SCREEN_WIDTH + (\1) + wTilemap]
else else
ld a, [(\2) * SCREEN_WIDTH + (\1) + \3] ld a, [(\2) * SCREEN_WIDTH + (\1) + \3]
endc endc

3
main.asm
View File

@ -61,7 +61,8 @@ INCLUDE "engine/pokemon/mon_menu.asm"
INCLUDE "engine/overworld/select_menu.asm" INCLUDE "engine/overworld/select_menu.asm"
INCLUDE "engine/events/elevator.asm" INCLUDE "engine/events/elevator.asm"
INCLUDE "engine/events/bug_contest/contest.asm" INCLUDE "engine/events/bug_contest/contest.asm"
INCLUDE "engine/events/misc_scripts_2.asm" INCLUDE "engine/events/repel.asm"
INCLUDE "engine/events/hidden_item.asm"
INCLUDE "engine/events/std_collision.asm" INCLUDE "engine/events/std_collision.asm"
INCLUDE "engine/events/bug_contest/judging.asm" INCLUDE "engine/events/bug_contest/judging.asm"
INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm" INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm"

12
maps/FastShipB1F.asm
View File

@ -28,7 +28,7 @@ FastShipB1F_MapScripts:
FastShipB1FSailorBlocksLeft: FastShipB1FSailorBlocksLeft:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
iftrue FastShipB1FAlreadyBlocked iftrue FastShipB1FAlreadyBlocked
applymovement FASTSHIPB1F_SAILOR2, FashShipB1FSailorBlocksLeftMovement applymovement FASTSHIPB1F_SAILOR2, FastShipB1FSailorBlocksLeftMovement
moveobject FASTSHIPB1F_SAILOR1, 30, 6 moveobject FASTSHIPB1F_SAILOR1, 30, 6
appear FASTSHIPB1F_SAILOR1 appear FASTSHIPB1F_SAILOR1
pause 5 pause 5
@ -38,7 +38,7 @@ FastShipB1FSailorBlocksLeft:
FastShipB1FSailorBlocksRight: FastShipB1FSailorBlocksRight:
checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT
iftrue FastShipB1FAlreadyBlocked iftrue FastShipB1FAlreadyBlocked
applymovement FASTSHIPB1F_SAILOR1, FashShipB1FSailorBlocksRightMovement applymovement FASTSHIPB1F_SAILOR1, FastShipB1FSailorBlocksRightMovement
moveobject FASTSHIPB1F_SAILOR2, 31, 6 moveobject FASTSHIPB1F_SAILOR2, 31, 6
appear FASTSHIPB1F_SAILOR2 appear FASTSHIPB1F_SAILOR2
pause 5 pause 5
@ -201,17 +201,17 @@ TrainerSchoolboyRicky:
closetext closetext
end end
FashShipB1FTrashcan: FastShipB1FTrashcan:
jumpstd trashcan jumpstd trashcan
FashShipB1FSailorBlocksRightMovement: FastShipB1FSailorBlocksRightMovement:
fix_facing fix_facing
big_step RIGHT big_step RIGHT
remove_fixed_facing remove_fixed_facing
turn_head DOWN turn_head DOWN
step_end step_end
FashShipB1FSailorBlocksLeftMovement: FastShipB1FSailorBlocksLeftMovement:
fix_facing fix_facing
big_step LEFT big_step LEFT
remove_fixed_facing remove_fixed_facing
@ -458,7 +458,7 @@ FastShipB1F_MapEvents:
coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight
db 1 ; bg events db 1 ; bg events
bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan
db 12 ; object events db 12 ; object events
object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT

28
mobile/fixed_words.asm
View File

@ -413,11 +413,11 @@ EZChat_MasterLoop:
.SpawnObjects: .SpawnObjects:
depixel 3, 1, 2, 5 depixel 3, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
depixel 8, 1, 2, 5 depixel 8, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $1 ld a, $1
@ -425,7 +425,7 @@ EZChat_MasterLoop:
depixel 9, 2, 2, 0 depixel 9, 2, 2, 0
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $3 ld a, $3
@ -433,7 +433,7 @@ EZChat_MasterLoop:
depixel 10, 16 depixel 10, 16
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $4 ld a, $4
@ -441,7 +441,7 @@ EZChat_MasterLoop:
depixel 10, 4 depixel 10, 4
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $5 ld a, $5
@ -449,7 +449,7 @@ EZChat_MasterLoop:
depixel 10, 2 depixel 10, 2
ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, $2 ld a, $2
@ -696,11 +696,11 @@ Function11c4a5:
Function11c4be: Function11c4be:
ld a, $1 ld a, $1
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
ld bc, $a0 ld bc, $a0
call ByteFill call ByteFill
ld a, $7 ld a, $7
hlcoord 0, 14, wAttrMap hlcoord 0, 14, wAttrmap
ld bc, $28 ld bc, $28
call ByteFill call ByteFill
farcall ReloadMapPart farcall ReloadMapPart
@ -895,7 +895,7 @@ EZChat_PlaceCategoryNames:
Function11c618: Function11c618:
ld a, $2 ld a, $2
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
ld bc, $c8 ld bc, $c8
call ByteFill call ByteFill
farcall ReloadMapPart farcall ReloadMapPart
@ -1495,7 +1495,7 @@ Function11c992:
Function11c9ab: Function11c9ab:
ld a, $7 ld a, $7
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
ld bc, $c8 ld bc, $c8
call ByteFill call ByteFill
farcall ReloadMapPart farcall ReloadMapPart
@ -1552,7 +1552,7 @@ Function11c9c3:
ret ret
Function11ca01: Function11ca01:
hlcoord 14, 7, wAttrMap hlcoord 14, 7, wAttrmap
ld de, $14 ld de, $14
ld a, $5 ld a, $5
ld c, a ld c, a
@ -1571,7 +1571,7 @@ Function11ca01:
jr nz, .asm_11ca0a jr nz, .asm_11ca0a
Function11ca19: Function11ca19:
hlcoord 0, 12, wAttrMap hlcoord 0, 12, wAttrmap
ld de, $14 ld de, $14
ld a, $6 ld a, $6
ld c, a ld c, a
@ -1993,11 +1993,11 @@ Function11cd54:
Function11cdaa: Function11cdaa:
ld a, $2 ld a, $2
hlcoord 0, 6, wAttrMap hlcoord 0, 6, wAttrmap
ld bc, 6 * SCREEN_WIDTH ld bc, 6 * SCREEN_WIDTH
call ByteFill call ByteFill
ld a, $7 ld a, $7
hlcoord 0, 12, wAttrMap hlcoord 0, 12, wAttrmap
ld bc, 4 * SCREEN_WIDTH ld bc, 4 * SCREEN_WIDTH
call ByteFill call ByteFill
farcall ReloadMapPart farcall ReloadMapPart

10
mobile/mobile_12.asm
View File

@ -144,7 +144,7 @@ asm_4815f:
call ClearBGPalettes call ClearBGPalettes
call Function48d30 call Function48d30
pop bc pop bc
call ClearTileMap call ClearTilemap
ld a, $ff ld a, $ff
ret ret
@ -254,7 +254,7 @@ Function4820d:
call ClearBGPalettes call ClearBGPalettes
call Function48d30 call Function48d30
pop bc pop bc
call ClearTileMap call ClearTilemap
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
ld hl, wd479 ld hl, wd479
@ -354,7 +354,7 @@ Function48304:
ld a, $29 ld a, $29
.asm_4833f .asm_4833f
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
.asm_48348 .asm_48348
call ScrollingMenu call ScrollingMenu
ld de, $629 ld de, $629
@ -380,7 +380,7 @@ Function48304:
ld [wd003], a ld [wd003], a
.asm_48377 .asm_48377
call Function48187 call Function48187
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
jp Function4840c jp Function4840c
Function48383: Function48383:
@ -1662,7 +1662,7 @@ Function48cdc:
call Function48cfd call Function48cfd
pop hl pop hl
pop bc pop bc
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b

54
mobile/mobile_22.asm
View File

@ -123,7 +123,7 @@ Function891d3:
Function891de: Function891de:
call Mobile22_SetBGMapMode0 call Mobile22_SetBGMapMode0
call ClearPalettes call ClearPalettes
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld a, $7 ld a, $7
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
@ -155,7 +155,7 @@ Function8920f:
Function89215: Function89215:
push hl push hl
push bc push bc
ld bc, wAttrMap - wTileMap ld bc, wAttrmap - wTilemap
add hl, bc add hl, bc
ld [hl], a ld [hl], a
pop bc pop bc
@ -794,7 +794,7 @@ Palette_895de:
Function895e6: Function895e6:
ld a, 7 ld a, 7
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
ret ret
@ -802,7 +802,7 @@ Function895e6:
Function895f2: Function895f2:
push bc push bc
xor a xor a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
call Function89605 call Function89605
@ -811,7 +811,7 @@ Function895f2:
ret ret
Function89605: Function89605:
hlcoord 19, 2, wAttrMap hlcoord 19, 2, wAttrmap
ld a, 1 ld a, 1
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
ld c, 14 ld c, 14
@ -828,7 +828,7 @@ Function89605:
jr nz, .loop jr nz, .loop
.done .done
hlcoord 0, 16, wAttrMap hlcoord 0, 16, wAttrmap
ld c, 10 ld c, 10
ld a, 2 ld a, 2
.loop2 .loop2
@ -838,7 +838,7 @@ Function89605:
inc a inc a
dec c dec c
jr nz, .loop2 jr nz, .loop2
hlcoord 1, 11, wAttrMap hlcoord 1, 11, wAttrmap
ld a, 4 ld a, 4
ld bc, 4 ld bc, 4
call ByteFill call ByteFill
@ -848,7 +848,7 @@ Function89605:
ret ret
Function8963d: Function8963d:
hlcoord 12, 3, wAttrMap hlcoord 12, 3, wAttrmap
ld a, 6 ld a, 6
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
lb bc, 7, 7 lb bc, 7, 7
@ -866,7 +866,7 @@ Function8963d:
ret ret
Function89655: Function89655:
hlcoord 1, 12, wAttrMap hlcoord 1, 12, wAttrmap
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
ld a, 5 ld a, 5
ld b, 4 ld b, 4
@ -1164,7 +1164,7 @@ Function897d5:
push bc push bc
call Function8934a call Function8934a
jr nc, .asm_897f3 jr nc, .asm_897f3
hlcoord 12, 3, wAttrMap hlcoord 12, 3, wAttrmap
xor a xor a
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
lb bc, 7, 7 lb bc, 7, 7
@ -2098,7 +2098,7 @@ Function89d75:
push hl push hl
call Mobile22_SetBGMapMode0 call Mobile22_SetBGMapMode0
call _hl_ call _hl_
farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
pop hl pop hl
jr asm_89d90 jr asm_89d90
@ -2256,10 +2256,10 @@ Function89e6f:
hlcoord 7, 4 hlcoord 7, 4
call Function8a58d call Function8a58d
ld a, $5 ld a, $5
hlcoord 7, 4, wAttrMap hlcoord 7, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ld a, $6 ld a, $6
hlcoord 10, 4, wAttrMap hlcoord 10, 4, wAttrmap
call Function8a5a3 call Function8a5a3
call Function891ab call Function891ab
call SetPalettes call SetPalettes
@ -2291,10 +2291,10 @@ Function89eb9:
hlcoord 7, 4 hlcoord 7, 4
call Function8a58d call Function8a58d
ld a, $5 ld a, $5
hlcoord 7, 4, wAttrMap hlcoord 7, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ld a, $6 ld a, $6
hlcoord 10, 4, wAttrMap hlcoord 10, 4, wAttrmap
call Function8a5a3 call Function8a5a3
call Function891ab call Function891ab
call SetPalettes call SetPalettes
@ -2471,10 +2471,10 @@ Function89fa5:
Function89fce: Function89fce:
call Function8a5b6 call Function8a5b6
ld a, $5 ld a, $5
hlcoord 7, 4, wAttrMap hlcoord 7, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ld a, $6 ld a, $6
hlcoord 10, 4, wAttrMap hlcoord 10, 4, wAttrmap
call Function8a5a3 call Function8a5a3
call Function89448 call Function89448
call SetPalettes call SetPalettes
@ -2554,11 +2554,11 @@ Function8a055:
hlcoord 12, 4 hlcoord 12, 4
call Function8a58d call Function8a58d
ld a, $5 ld a, $5
hlcoord 12, 4, wAttrMap hlcoord 12, 4, wAttrmap
call Function8a5a3 call Function8a5a3
pop hl pop hl
ld a, $6 ld a, $6
hlcoord 15, 4, wAttrMap hlcoord 15, 4, wAttrmap
call Function8a5a3 call Function8a5a3
call CGBOnly_CopyTilemapAtOnce call CGBOnly_CopyTilemapAtOnce
jp Function89e36 jp Function89e36
@ -2586,7 +2586,7 @@ Function8a0a1:
Function8a0c1: Function8a0c1:
push hl push hl
ld bc, wAttrMap - wTileMap ld bc, wAttrmap - wTilemap
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
pop hl pop hl
@ -2612,7 +2612,7 @@ Function8a0c9:
Function8a0de: Function8a0de:
call Function8a0c9 call Function8a0c9
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
ret ret
@ -2814,10 +2814,10 @@ Function8a262:
hlcoord 12, 4 hlcoord 12, 4
call Function8a58d call Function8a58d
ld a, $5 ld a, $5
hlcoord 12, 4, wAttrMap hlcoord 12, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ld a, $6 ld a, $6
hlcoord 15, 4, wAttrMap hlcoord 15, 4, wAttrmap
call Function8a5a3 call Function8a5a3
xor a xor a
ld [wd02e], a ld [wd02e], a
@ -3080,18 +3080,18 @@ Function8a4d3:
cp $1 cp $1
jr nz, .asm_8a4eb jr nz, .asm_8a4eb
ld a, $5 ld a, $5
hlcoord 12, 4, wAttrMap hlcoord 12, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ld a, $7 ld a, $7
hlcoord 15, 4, wAttrMap hlcoord 15, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ret ret
.asm_8a4eb .asm_8a4eb
ld a, $7 ld a, $7
hlcoord 12, 4, wAttrMap hlcoord 12, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ld a, $6 ld a, $6
hlcoord 15, 4, wAttrMap hlcoord 15, 4, wAttrmap
call Function8a5a3 call Function8a5a3
ret ret

10
mobile/mobile_22_2.asm
View File

@ -615,11 +615,11 @@ Palette_8b6d5:
RGB 00, 00, 00 RGB 00, 00, 00
Function8b6ed: Function8b6ed:
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, $012c ld bc, $012c
xor a xor a
call ByteFill call ByteFill
hlcoord 0, 14, wAttrMap hlcoord 0, 14, wAttrmap
ld bc, $0050 ld bc, $0050
ld a, $7 ld a, $7
call ByteFill call ByteFill
@ -675,7 +675,7 @@ Function8b73e:
ret ret
Function8b744: Function8b744:
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b
@ -743,10 +743,10 @@ Function8b788:
ret ret
Function8b79e: Function8b79e:
hlcoord 0, 1, wAttrMap hlcoord 0, 1, wAttrmap
ld a, $1 ld a, $1
ld [hli], a ld [hli], a
hlcoord 9, 1, wAttrMap hlcoord 9, 1, wAttrmap
ld e, $b ld e, $b
.asm_8b7a9 .asm_8b7a9
ld a, $2 ld a, $2

44
mobile/mobile_40.asm
View File

@ -195,7 +195,7 @@ Function100144:
ret z ret z
res 2, [hl] res 2, [hl]
res 6, [hl] res 6, [hl]
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
ret ret
Function100163: Function100163:
@ -430,7 +430,7 @@ Function100320:
ret ret
Function100327: Function100327:
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
ret ret
Function10032e: Function10032e:
@ -1436,7 +1436,7 @@ Function100970:
hlcoord 0, 0 hlcoord 0, 0
ld de, w3_dc00 ld de, w3_dc00
call Function1009a5 call Function1009a5
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld de, w3_dd68 ld de, w3_dd68
call Function1009a5 call Function1009a5
call Function1009d2 call Function1009d2
@ -1450,7 +1450,7 @@ Function100989:
call Function1009ae call Function1009ae
farcall ReloadMapPart farcall ReloadMapPart
ld hl, w3_dd68 ld hl, w3_dd68
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
call Function1009a5 call Function1009a5
ret ret
@ -1467,7 +1467,7 @@ Function1009ae:
ldh [rSVBK], a ldh [rSVBK], a
ld hl, w3_d800 ld hl, w3_d800
decoord 0, 0, wAttrMap decoord 0, 0, wAttrmap
ld c, SCREEN_WIDTH ld c, SCREEN_WIDTH
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT
.loop_row .loop_row
@ -1715,7 +1715,7 @@ Function100b45:
call Mobile_SetOverworldDelay call Mobile_SetOverworldDelay
farcall MobileMenuJoypad farcall MobileMenuJoypad
push bc push bc
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call Function100e2d call Function100e2d
pop bc pop bc
jr c, .asm_100b6b jr c, .asm_100b6b
@ -1773,7 +1773,7 @@ MobileMoveSelectionScreen:
call Mobile_SetOverworldDelay call Mobile_SetOverworldDelay
farcall MobileMenuJoypad farcall MobileMenuJoypad
push bc push bc
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call Function100e2d call Function100e2d
pop bc pop bc
jr c, .b_button jr c, .b_button
@ -1857,7 +1857,7 @@ MobileMoveSelectionScreen:
.print_text .print_text
call StdBattleTextbox call StdBattleTextbox
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
jp .GetMoveSelection jp .GetMoveSelection
Function100c74: Function100c74:
@ -1904,7 +1904,7 @@ Mobile_PartyMenuSelect:
farcall MobileMenuJoypad farcall MobileMenuJoypad
push bc push bc
farcall PlaySpriteAnimations farcall PlaySpriteAnimations
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call MobileComms_CheckInactivityTimer call MobileComms_CheckInactivityTimer
pop bc pop bc
jr c, .done jr c, .done
@ -1957,7 +1957,7 @@ MobileBattleMonMenu:
farcall MobileMenuJoypad farcall MobileMenuJoypad
push bc push bc
farcall PlaySpriteAnimations farcall PlaySpriteAnimations
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
call MobileComms_CheckInactivityTimer call MobileComms_CheckInactivityTimer
pop bc pop bc
jr c, .asm_100d54 jr c, .asm_100d54
@ -2918,7 +2918,7 @@ Function1013c0:
ret ret
Function1013d6: Function1013d6:
farcall HDMATransferAttrMapAndTileMapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret ret
Function1013dd: Function1013dd:
@ -3785,7 +3785,7 @@ _StartMobileBattle:
farcall Function100846 farcall Function100846
ld c, 120 ld c, 120
call DelayFrames call DelayFrames
farcall ClearTileMap farcall ClearTilemap
call .CopyOTDetails call .CopyOTDetails
call StartMobileBattle call StartMobileBattle
ld a, [wcd2b] ld a, [wcd2b]
@ -4907,14 +4907,14 @@ Function102274:
Function102283: Function102283:
ld a, $01 ld a, $01
ld [wAttrMapEnd], a ld [wAttrmapEnd], a
ld hl, wcd4b ld hl, wcd4b
set 0, [hl] set 0, [hl]
ret ret
Function10228e: Function10228e:
xor a xor a
ld [wAttrMapEnd], a ld [wAttrmapEnd], a
ld hl, wcd4b ld hl, wcd4b
res 0, [hl] res 0, [hl]
ret ret
@ -4945,7 +4945,7 @@ Function102298:
.asm_1022c1 .asm_1022c1
call Function10304f call Function10304f
ld a, $01 ld a, $01
ld [wAttrMapEnd], a ld [wAttrmapEnd], a
ret ret
Function1022ca: Function1022ca:
@ -6415,10 +6415,10 @@ Function102d9a:
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
ld a, $07 ld a, $07
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
farcall HDMATransferAttrMapAndTileMapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret ret
Function102db7: Function102db7:
@ -6691,7 +6691,7 @@ String_10302e:
Function10304f: Function10304f:
xor a xor a
ld [wAttrMapEnd], a ld [wAttrmapEnd], a
ld [wcf42], a ld [wcf42], a
ld [wcf44], a ld [wcf44], a
ld [wcf45], a ld [wcf45], a
@ -6699,7 +6699,7 @@ Function10304f:
Function10305d: Function10305d:
nop nop
ld a, [wAttrMapEnd] ld a, [wAttrmapEnd]
and a and a
ret z ret z
call Function10307f call Function10307f
@ -6958,7 +6958,7 @@ Function103309:
ld [wd1ee], a ld [wd1ee], a
call Function1034be call Function1034be
call UpdateSprites call UpdateSprites
farcall HDMATransferAttrMapAndTileMapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ld a, $01 ld a, $01
ld [wd1f0], a ld [wd1f0], a
call Function10339a call Function10339a
@ -6971,7 +6971,7 @@ Function103362:
call Function1033af call Function1033af
call Function10339a call Function10339a
call Function10342c call Function10342c
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
ld a, [wBuffer2] ld a, [wBuffer2]
bit 7, a bit 7, a
jr z, .asm_103362 jr z, .asm_103362
@ -7179,7 +7179,7 @@ Function1034e0:
push hl push hl
call ClearBox call ClearBox
pop hl pop hl
ld bc, wAttrMap - wTileMap ld bc, wAttrmap - wTilemap
add hl, bc add hl, bc
pop bc pop bc
ld a, $06 ld a, $06

48
mobile/mobile_42.asm
View File

@ -140,7 +140,7 @@ Function1080b7:
ld [wJumptableIndex], a ld [wJumptableIndex], a
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call MobileTradeAnim_ClearTiles call MobileTradeAnim_ClearTiles
call MobileTradeAnim_ClearBGMap call MobileTradeAnim_ClearBGMap
@ -215,7 +215,7 @@ Function108157:
ld [wJumptableIndex], a ld [wJumptableIndex], a
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call MobileTradeAnim_ClearTiles call MobileTradeAnim_ClearTiles
call MobileTradeAnim_ClearBGMap call MobileTradeAnim_ClearBGMap
@ -421,7 +421,7 @@ Function1082db:
.loop .loop
farcall PlaySpriteAnimations farcall PlaySpriteAnimations
farcall SetUpPokeAnim farcall SetUpPokeAnim
farcall HDMATransferTileMapToWRAMBank3 farcall HDMATransferTilemapToWRAMBank3
jr nc, .loop jr nc, .loop
ret ret
@ -500,7 +500,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent:
call Function108bec call Function108bec
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_BALL_POOF ld de, SFX_BALL_POOF
call PlaySFX call PlaySFX
hlcoord 0, 0 hlcoord 0, 0
@ -515,7 +515,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent:
MobileTradeAnim_ShowOTMonFromTrade: MobileTradeAnim_ShowOTMonFromTrade:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call MobileTradeAnim_ClearBGMap call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
@ -534,7 +534,7 @@ MobileTradeAnim_ShowOTMonFromTrade:
ldh [hWY], a ldh [hWY], a
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call Function108b45 call Function108b45
ld a, $1 ld a, $1
call Function108b98 call Function108b98
@ -633,7 +633,7 @@ MobileTradeAnim_ShowPlayerMonForGTS:
call Function108c2b call Function108c2b
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_BALL_POOF ld de, SFX_BALL_POOF
call PlaySFX call PlaySFX
hlcoord 0, 0 hlcoord 0, 0
@ -648,7 +648,7 @@ MobileTradeAnim_ShowPlayerMonForGTS:
MobileTradeAnim_ShowOTMonFromGTS: MobileTradeAnim_ShowOTMonFromGTS:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call MobileTradeAnim_ClearBGMap call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
@ -676,7 +676,7 @@ MobileTradeAnim_ShowOTMonFromGTS:
ldh [hWY], a ldh [hWY], a
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call Function108b45 call Function108b45
ld a, $1 ld a, $1
call Function108b98 call Function108b98
@ -716,7 +716,7 @@ MobileTradeAnim_ShowOTMonFromGTS:
MobileTradeAnim_GetOddEgg: MobileTradeAnim_GetOddEgg:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call MobileTradeAnim_ClearBGMap call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
@ -744,7 +744,7 @@ MobileTradeAnim_GetOddEgg:
ldh [hWY], a ldh [hWY], a
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call Function108b45 call Function108b45
ld a, $1 ld a, $1
call Function108b98 call Function108b98
@ -784,7 +784,7 @@ MobileTradeAnim_02:
farcall DeinitializeAllSprites farcall DeinitializeAllSprites
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call DisableLCD call DisableLCD
@ -819,7 +819,7 @@ MobileTradeAnim_10:
farcall DeinitializeAllSprites farcall DeinitializeAllSprites
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call DisableLCD call DisableLCD
@ -863,7 +863,7 @@ MobileTradeAnim_10:
MobileTradeAnim_11: MobileTradeAnim_11:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call DisableLCD call DisableLCD
@ -926,7 +926,7 @@ MobileTradeAnim_GiveTrademon1:
jr nz, .next jr nz, .next
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
.next .next
ld c, 1 ld c, 1
@ -951,7 +951,7 @@ MobileTradeAnim_GiveTrademon1:
.init .init
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
call Function108ad4 call Function108ad4
jr .next2 jr .next2
@ -981,7 +981,7 @@ MobileTradeAnim_GiveTrademon2:
call Function108b5a call Function108b5a
depixel 9, 10, 2, 0 depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_FORESIGHT ld de, SFX_FORESIGHT
call PlaySFX call PlaySFX
ld c, 10 ld c, 10
@ -990,7 +990,7 @@ MobileTradeAnim_GiveTrademon2:
ld [wcf64], a ld [wcf64], a
depixel 9, 10, 2, 0 depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
.loop .loop
ldh a, [hSCY] ldh a, [hSCY]
cp $90 cp $90
@ -1016,7 +1016,7 @@ MobileTradeAnim_05:
call WaitMobileTradeSpriteAnims call WaitMobileTradeSpriteAnims
depixel 30, 10, 2, 0 depixel 30, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call GetMobileTradeAnimByte call GetMobileTradeAnimByte
ld de, SFX_THROW_BALL ld de, SFX_THROW_BALL
call PlaySFX call PlaySFX
@ -1037,7 +1037,7 @@ MobileTradeAnim_07:
call DelayFrames call DelayFrames
depixel 30, 10, 2, 0 depixel 30, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
call GetMobileTradeAnimByte call GetMobileTradeAnimByte
ld de, SFX_THROW_BALL ld de, SFX_THROW_BALL
call PlaySFX call PlaySFX
@ -1060,7 +1060,7 @@ MobileTradeAnim_GetTrademon1:
farcall DeinitializeAllSprites farcall DeinitializeAllSprites
depixel 9, 10, 2, 0 depixel 9, 10, 2, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld de, SFX_GLASS_TING_2 ld de, SFX_GLASS_TING_2
call PlaySFX call PlaySFX
call Function108af4 call Function108af4
@ -1095,13 +1095,13 @@ MobileTradeAnim_GetTrademon2:
.asm_1088c5 .asm_1088c5
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
jr .asm_1088e7 jr .asm_1088e7
.asm_1088cf .asm_1088cf
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE
call _InitSpriteAnimStruct call InitSpriteAnimStruct
xor a xor a
call Function108ad4 call Function108ad4
jr .asm_1088e7 jr .asm_1088e7
@ -1149,7 +1149,7 @@ MobileTradeAnim_0f:
farcall DeinitializeAllSprites farcall DeinitializeAllSprites
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
call DisableLCD call DisableLCD
call MobileTradeAnim_ClearTiles call MobileTradeAnim_ClearTiles
call MobileTradeAnim_ClearBGMap call MobileTradeAnim_ClearBGMap

8
mobile/mobile_45_stadium.asm
View File

@ -106,14 +106,14 @@ Function117738:
farcall Function171ccd farcall Function171ccd
depixel 6, 3 depixel 6, 3
ld a, $1d ld a, $1d
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, $c ld hl, $c
add hl, bc add hl, bc
ld a, $6 ld a, $6
ld [hl], a ld [hl], a
depixel 9, 4 depixel 9, 4
ld a, $1d ld a, $1d
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, $c ld hl, $c
add hl, bc add hl, bc
ld a, $7 ld a, $7
@ -519,7 +519,7 @@ Function117a94:
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
farcall Function172e78 farcall Function172e78
farcall HDMATransferAttrMapAndTileMapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
ret ret
Function117ab4: Function117ab4:
@ -536,7 +536,7 @@ Function117acd:
bit 7, a bit 7, a
jr nz, .asm_117ae2 jr nz, .asm_117ae2
call Function117ae9 call Function117ae9
farcall HDMATransferAttrMapAndTileMapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
jr Function117acd jr Function117acd
.asm_117ae2 .asm_117ae2

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