diff options
108 files changed, 774 insertions, 774 deletions
diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 4b1ffadfe..23504c8b3 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -65,7 +65,7 @@ SpecialsPointers:: add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 - add_special ClearTileMap ; bank 0 + add_special ClearTilemap ; bank 0 add_special UpdateSprites ; bank 0 add_special ReplaceKrisSprite ; $38 ; bank 0 add_special GameCornerPrizeMonCheckDex diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index a9dd50e4e..a11286268 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -585,7 +585,7 @@ StartTrainerBattle_LoadPokeBallGraphics: xor a ldh [hBGMapMode], a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH inc b inc c diff --git a/engine/battle/core.asm b/engine/battle/core.asm index dcf68fedc..f8d99b24e 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -46,12 +46,12 @@ DoBattle: call DelayFrames .player_2 - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call CheckPlayerPartyForFitMon ld a, d and a jp z, LostBattle - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap ld a, [wBattleType] cp BATTLETYPE_DEBUG jp z, .tutorial_debug @@ -82,7 +82,7 @@ DoBattle: hlcoord 1, 5 ld a, 9 call SlideBattlePicOut - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call ResetBattleParticipants call InitBattleMon call ResetPlayerStatLevels @@ -91,7 +91,7 @@ DoBattle: call BreakAttraction call SendOutPlayerMon call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call SetPlayerTurn call SpikesDamage ld a, [wLinkMode] @@ -116,7 +116,7 @@ DoBattle: jp BattleMenu WildFled_EnemyFled_LinkBattleCanceled: - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap ld a, [wBattleResult] and BATTLERESULT_BITMASK add DRAW @@ -291,7 +291,7 @@ HandleBetweenTurnEffects: call HandleStatBoostingHeldItems call HandleHealingItems call UpdateBattleMonInParty - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap jp HandleEncore CheckFaint_PlayerThenEnemy: @@ -624,7 +624,7 @@ ParsePlayerAction: ld [wFXAnimID], a call MoveSelectionScreen push af - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap call UpdateBattleHuds ld a, [wCurPlayerMove] cp STRUGGLE @@ -862,7 +862,7 @@ GetMoveEffect: ret Battle_EnemyFirst: - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call TryEnemyFlee jp c, WildFled_EnemyFled_LinkBattleCanceled call SetEnemyTurn @@ -930,7 +930,7 @@ Battle_PlayerFirst: call RefreshBattleHuds pop af jr c, .switched_or_used_item - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call TryEnemyFlee jp c, WildFled_EnemyFled_LinkBattleCanceled call EnemyTurn_EndOpponentProtectEndureDestinyBond @@ -1821,10 +1821,10 @@ SubtractHP: GetSixteenthMaxHP: call GetQuarterMaxHP - ; quarter result +; quarter result srl c srl c - ; round up +; at least 1 ld a, c and a jr nz, .ok @@ -1838,7 +1838,7 @@ GetEighthMaxHP: ; assumes nothing can have 1024 or more hp ; halve result srl c -; round up +; at least 1 ld a, c and a jr nz, .end @@ -1857,7 +1857,7 @@ GetQuarterMaxHP: rr c ; assumes nothing can have 1024 or more hp -; round up +; at least 1 ld a, c and a jr nz, .end @@ -1873,7 +1873,7 @@ GetHalfMaxHP: srl b rr c -; floor = 1 +; at least 1 ld a, c or b jr nz, .end @@ -2082,7 +2082,7 @@ DoubleSwitch: ld a, $1 call EnemyPartyMonEntrance call ClearSprites - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap pop af ld [wCurPartyMon], a call PlayerPartyMonEntrance @@ -2142,7 +2142,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: dec a call z, PlayVictoryMusic call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ld a, [wBattleResult] and BATTLERESULT_BITMASK ld [wBattleResult], a ; WIN @@ -2303,7 +2303,7 @@ HandleEnemySwitch: cp BATTLEACTION_FORFEIT ret z - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap .not_linked ld hl, wBattleMonHP @@ -2401,7 +2401,7 @@ WinTrainerBattle: inc hl or [hl] ret nz - call ClearTileMap + call ClearTilemap call ClearBGPalettes ret @@ -2682,7 +2682,7 @@ UpdateFaintedPlayerMon: AskUseNextPokemon: call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ; We don't need to be here if we're in a Trainer battle, ; as that decision is made for us. ld a, [wBattleMode] @@ -2735,7 +2735,7 @@ ForcePlayerMonChoice: call ClearBGPalettes call _LoadHPBar call ExitMenu - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call WaitBGMap call GetMemSGBLayout call SetPalettes @@ -2763,7 +2763,7 @@ ForcePlayerMonChoice: call BreakAttraction call SendOutPlayerMon call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call SetPlayerTurn call SpikesDamage ld a, $1 @@ -2784,7 +2784,7 @@ PlayerPartyMonEntrance: call BreakAttraction call SendOutPlayerMon call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call SetPlayerTurn jp SpikesDamage @@ -2942,7 +2942,7 @@ LostBattle: ld c, BATTLETOWERTEXT_WIN_TEXT farcall BattleTowerText call WaitPressAorB_BlinkCursor - call ClearTileMap + call ClearTilemap call ClearBGPalettes ret @@ -3141,7 +3141,7 @@ EnemySwitch: ld [wBattlePlayerAction], a inc a ld [wEnemyIsSwitching], a - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap jp PlayerSwitch EnemySwitch_SetMode: @@ -3726,7 +3726,7 @@ TryToRunAwayFromBattle: ldh [hEnemyMonSpeed + 0], a ld a, [de] ldh [hEnemyMonSpeed + 1], a - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap ld de, hMultiplicand + 1 ld hl, hEnemyMonSpeed ld c, 2 @@ -3791,7 +3791,7 @@ TryToRunAwayFromBattle: call StdBattleTextbox ld a, TRUE ld [wFailedToFlee], a - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap and a ret @@ -3800,7 +3800,7 @@ TryToRunAwayFromBattle: and a ld a, DRAW jr z, .fled - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap xor a ; BATTLEPLAYERACTION_USEMOVE ld [wBattlePlayerAction], a ld a, $f @@ -3808,7 +3808,7 @@ TryToRunAwayFromBattle: xor a ld [wCurPlayerMove], a call LinkBattleSendReceiveAction - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap call CheckMobileBattleError jr c, .mobile @@ -3833,7 +3833,7 @@ TryToRunAwayFromBattle: ld hl, BattleText_GotAwaySafely call StdBattleTextbox call WaitSFX - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap scf ret @@ -3847,7 +3847,7 @@ TryToRunAwayFromBattle: .skip_link_error call WaitSFX - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap scf ret @@ -4001,7 +4001,7 @@ SwitchPlayerMon: call BreakAttraction call SendOutPlayerMon call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ld hl, wEnemyMonHP ld a, [hli] or [hl] @@ -4860,7 +4860,7 @@ ret_3e138: BattleMenu: xor a ldh [hBGMapMode], a - call LoadTempTileMapToTileMap + call LoadTempTilemapToTilemap ld a, [wBattleType] cp BATTLETYPE_DEBUG @@ -4870,7 +4870,7 @@ BattleMenu: call EmptyBattleTextbox call UpdateBattleHuds call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap .ok .loop @@ -4907,7 +4907,7 @@ BattleMenu: BattleMenu_Fight: xor a ld [wNumFleeAttempts], a - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap and a ret @@ -4984,7 +4984,7 @@ BattleMenu_Pack: call ExitMenu call WaitBGMap call FinishBattleAnim - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap jp BattleMenu .ItemsCantBeUsed: @@ -5019,7 +5019,7 @@ BattleMenu_Pack: call ExitMenu call UpdateBattleHUDs call WaitBGMap - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call ClearWindowData call FinishBattleAnim and a @@ -5080,7 +5080,7 @@ BattleMenuPKMN_Loop: call DelayFrame call _LoadHPBar call CloseWindow - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call GetMemSGBLayout call SetPalettes jp BattleMenu @@ -5254,7 +5254,7 @@ BattleMonEntrance: call BreakAttraction call SendOutPlayerMon call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call SetPlayerTurn call SpikesDamage ld a, $2 @@ -5278,12 +5278,12 @@ PassedBattleMonEntrance: call ApplyStatLevelMultiplierOnAllStats call SendOutPlayerMon call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap call SetPlayerTurn jp SpikesDamage BattleMenu_Run: - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap ld a, $3 ld [wMenuCursorY], a ld hl, wBattleMonSpeed @@ -5508,7 +5508,7 @@ MoveSelectionScreen: .place_textbox_start_over call StdBattleTextbox - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap jp MoveSelectionScreen .string_3e61c @@ -5771,11 +5771,11 @@ ParseEnemyAction: and a jr z, .not_linked call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ld a, [wBattlePlayerAction] and a ; BATTLEPLAYERACTION_USEMOVE? call z, LinkBattleSendReceiveAction - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap ld a, [wBattleAction] cp BATTLEACTION_STRUGGLE jp z, .struggle @@ -7117,7 +7117,7 @@ GiveExperiencePoints: pop bc call AnimateExpBar push bc - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap pop bc ld hl, MON_EXP + 2 add hl, bc @@ -7270,7 +7270,7 @@ GiveExperiencePoints: callfar BadgeStatBoosts callfar UpdatePlayerHUD call EmptyBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ld a, $1 ldh [hBGMapMode], a @@ -7286,7 +7286,7 @@ GiveExperiencePoints: call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel call StdBattleTextbox - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap .skip_exp_bar_animation xor a ; PARTYMON @@ -7302,7 +7302,7 @@ GiveExperiencePoints: ld c, 30 call DelayFrames call WaitPressAorB_BlinkCursor - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap xor a ; PARTYMON ld [wMonType], a ld a, [wCurSpecies] @@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus: .finish push hl - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap pop hl jp StdBattleTextbox @@ -8342,7 +8342,7 @@ CheckPayDay: ld a, [wInBattleTowerBattle] bit 0, a ret z - call ClearTileMap + call ClearTilemap call ClearBGPalettes ret @@ -8354,7 +8354,7 @@ ShowLinkBattleParticipantsAfterEnd: call GetPartyLocation ld a, [wEnemyMonStatus] ld [hl], a - call ClearTileMap + call ClearTilemap farcall _ShowLinkBattleParticipants ret @@ -8409,13 +8409,13 @@ DisplayLinkBattleResult: call IsMobileBattle2 jr z, .mobile call WaitPressAorB_BlinkCursor - call ClearTileMap + call ClearTilemap ret .mobile ld c, 200 call DelayFrames - call ClearTileMap + call ClearTilemap ret .Win: @@ -8431,7 +8431,7 @@ DisplayLinkBattleResult: call PlaceString ld c, 200 call DelayFrames - call ClearTileMap + call ClearTilemap ret .Invalid: @@ -8449,7 +8449,7 @@ _DisplayLinkRecord: call ReadAndPrintLinkBattleRecord call CloseSRAM - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap xor a ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill @@ -8463,7 +8463,7 @@ _DisplayLinkRecord: ret ReadAndPrintLinkBattleRecord: - call ClearTileMap + call ClearTilemap call ClearSprites call .PrintBattleRecord hlcoord 0, 8 @@ -8949,7 +8949,7 @@ InitBattleDisplay: ldh [rSVBK], a ld hl, wDecompressScratch - ld bc, wScratchAttrMap - wDecompressScratch + ld bc, wScratchAttrmap - wDecompressScratch ld a, " " call ByteFill diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index 0aff780c9..fd138ae67 100644 --- a/engine/battle/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm @@ -1,6 +1,6 @@ _ReturnToBattle_UseBall: call ClearBGPalettes - call ClearTileMap + call ClearTilemap ld a, [wBattleType] cp BATTLETYPE_TUTORIAL jr z, .gettutorialbackpic diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 12d657e39..d71c4bc95 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -8,7 +8,7 @@ ShowLinkBattleParticipants: farcall _ShowLinkBattleParticipants ld c, 150 call DelayFrames - call ClearTileMap + call ClearTilemap call ClearSprites ret @@ -38,7 +38,7 @@ FindFirstAliveMonAndStartBattle: ld a, 1 ldh [hBGMapMode], a call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ldh [hWY], a diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 9fb05ae06..94cec8398 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -41,7 +41,7 @@ UsedMoveText: .grammar call GetMoveGrammar ; convert move id to grammar index -; everything except 'instead' made redundant in localization +; everything except 'CheckObedience' made redundant in localization ; check obedience ld a, [wAlreadyDisobeyed] diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index dc5518594..e35852479 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -1,6 +1,6 @@ DisplayCaughtContestMonStats: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call LoadFontsBattleExtra diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index cf37eec49..21070cc56 100644 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -9,7 +9,7 @@ CelebiShrineEvent: call LoadCelebiGFX depixel 0, 10, 7, 0 ld a, SPRITE_ANIM_INDEX_CELEBI - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], SPECIALCELEBIEVENT_CELEBI @@ -107,7 +107,7 @@ CelebiEvent_SpawnLeaf: ld d, a ld e, $0 ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $80 diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 099598f81..7cb982de5 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -5,7 +5,7 @@ _Diploma: PlaceDiplomaOnScreen: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD ld hl, DiplomaGFX diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index baba3c7a1..c898c6690 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -33,7 +33,7 @@ ShakeHeadbuttTree: call Request2bpp call Cut_Headbutt_GetPixelFacing ld a, SPRITE_ANIM_INDEX_HEADBUTT - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], FIELDMOVE_TREE @@ -92,7 +92,7 @@ HideHeadbuttTree: ld h, [hl] ld l, a - ld a, $5 + ld a, $05 ; grass block ld [hli], a ld [hld], a ld bc, SCREEN_WIDTH @@ -174,7 +174,7 @@ OWCutJumptable: Cut_SpawnAnimateTree: call Cut_Headbutt_GetPixelFacing ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], FIELDMOVE_TREE @@ -227,7 +227,7 @@ Cut_SpawnLeaf: push de push af ld a, SPRITE_ANIM_INDEX_LEAF ; leaf - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], FIELDMOVE_GRASS @@ -314,7 +314,7 @@ FlyFromAnim: call FlyFunction_InitGFX depixel 10, 10, 4, 0 ld a, SPRITE_ANIM_INDEX_RED_WALK - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], FIELDMOVE_FLY @@ -348,7 +348,7 @@ FlyToAnim: call FlyFunction_InitGFX depixel 31, 10, 4, 0 ld a, SPRITE_ANIM_INDEX_RED_WALK - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], FIELDMOVE_FLY @@ -447,7 +447,7 @@ FlyFunction_FrameTimer: ld d, a ld e, $0 ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], FIELDMOVE_GRASS diff --git a/engine/events/misc_scripts_2.asm b/engine/events/hidden_item.asm index 3d01c3250..b61a62054 100644 --- a/engine/events/misc_scripts_2.asm +++ b/engine/events/hidden_item.asm @@ -1,14 +1,3 @@ -RepelWoreOffScript:: - opentext - writetext .RepelWoreOffText - waitbutton - closetext - end - -.RepelWoreOffText: - text_far _RepelWoreOffText - text_end - HiddenItemScript:: opentext readmem wHiddenItemID diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 0c6110b7a..068e2670f 100644 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -70,7 +70,7 @@ MagnetTrain: ld [wRequested2bppDest], a ld [wRequested2bppDest + 1], a ld [wRequested2bpp], a - call ClearTileMap + call ClearTilemap pop af ldh [hSCY], a @@ -313,7 +313,7 @@ MagnetTrain_Jumptable: pop af ldh [rSVBK], a ld a, b - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], 0 diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index b2edcb990..f345c49ed 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -135,7 +135,7 @@ InitMapNameFrame: hlcoord 0, 0 ld b, 2 ld c, 18 - call InitMapSignAttrMap + call InitMapSignAttrmap call PlaceMapNameFrame ret @@ -171,8 +171,8 @@ PlaceMapNameCenterAlign: pop hl ret -InitMapSignAttrMap: - ld de, wAttrMap - wTileMap +InitMapSignAttrmap: + ld de, wAttrmap - wTilemap add hl, de inc b inc b diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 09fc92aa7..1009177ff 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -273,7 +273,7 @@ CheckOverworldTileArrays: INCLUDE "data/events/field_move_blocks.asm" -OWFlash: +FlashFunction: call .CheckUseFlash and $7f ld [wFieldMoveSucceeded], a diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 176a8725c..f90d225fb 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -15,7 +15,7 @@ _UnownPrinter: set NO_TEXT_SCROLL, a ld [wOptions], a call ClearBGPalettes - call ClearTileMap + call ClearTilemap ld de, UnownDexATile ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A diff --git a/engine/events/repel.asm b/engine/events/repel.asm new file mode 100644 index 000000000..e324239cf --- /dev/null +++ b/engine/events/repel.asm @@ -0,0 +1,10 @@ +RepelWoreOffScript:: + opentext + writetext .RepelWoreOffText + waitbutton + closetext + end + +.RepelWoreOffText: + text_far _RepelWoreOffText + text_end diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 28020c960..3934943f4 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -139,7 +139,7 @@ DisplayUnownWords: jr nz, .loop2 .copy call _DisplayUnownWords_CopyWord - ld bc, wAttrMap - wTileMap + ld bc, wAttrmap - wTilemap add hl, bc call _DisplayUnownWords_FillAttr call WaitBGMap2 diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 54d729dfa..c130b470a 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -14,7 +14,7 @@ _CardFlip: ld hl, wOptions set NO_TEXT_SCROLL, [hl] call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites ld de, MUSIC_NONE call PlayMusic @@ -457,7 +457,7 @@ CardFlip_DisplayCardFaceUp: ret z ; Set the attributes - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de ld a, [wCardFlipFaceUpCard] and 3 @@ -1558,32 +1558,32 @@ CardFlip_InitAttrPals: and a ret z - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH xor a call ByteFill - hlcoord 12, 1, wAttrMap + hlcoord 12, 1, wAttrmap lb bc, 2, 2 ld a, $1 call CardFlip_FillBox - hlcoord 14, 1, wAttrMap + hlcoord 14, 1, wAttrmap lb bc, 2, 2 ld a, $2 call CardFlip_FillBox - hlcoord 16, 1, wAttrMap + hlcoord 16, 1, wAttrmap lb bc, 2, 2 ld a, $3 call CardFlip_FillBox - hlcoord 18, 1, wAttrMap + hlcoord 18, 1, wAttrmap lb bc, 2, 2 ld a, $4 call CardFlip_FillBox - hlcoord 9, 0, wAttrMap + hlcoord 9, 0, wAttrmap lb bc, 12, 1 ld a, $1 call CardFlip_FillBox diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 6e435191b..d3360ff3f 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -110,7 +110,7 @@ endr .spawn_object depixel 6, 3, 4, 4 ld a, SPRITE_ANIM_INDEX_DUMMY_GAME - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld a, 5 ld [wDummyGameNumberTriesRemaining], a ld hl, wJumptableIndex diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 25f9166ee..2765dd870 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -96,7 +96,7 @@ _SlotMachine: .InitGFX: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites ld de, MUSIC_NONE call PlayMusic @@ -1139,7 +1139,7 @@ ReelAction_InitGolem: push af depixel 12, 13 ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0E add hl, bc pop af @@ -1200,7 +1200,7 @@ ReelAction_InitChansey: push bc depixel 12, 0 ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY - call _InitSpriteAnimStruct + call InitSpriteAnimStruct pop bc xor a ld [wSlotsDelay], a @@ -2120,7 +2120,7 @@ Slots_AnimateChansey: push bc depixel 12, 13, 0, 4 ld a, SPRITE_ANIM_INDEX_SLOTS_EGG - call _InitSpriteAnimStruct + call InitSpriteAnimStruct pop bc ret diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm index 4dfebb9b0..98100629e 100644 --- a/engine/games/unown_puzzle.asm +++ b/engine/games/unown_puzzle.asm @@ -9,7 +9,7 @@ _UnownPuzzle: ld a, $1 ldh [hInMenu], a call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites xor a ldh [hBGMapMode], a @@ -83,7 +83,7 @@ _UnownPuzzle: pop af ldh [hInMenu], a call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites ld a, LCDC_DEFAULT ldh [rLCDC], a diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 06e060443..a41456fd6 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -113,31 +113,31 @@ _CGB_BattleColors: call ApplyPals _CGB_FinishBattleScreenLayout: call InitPartyMenuBGPal7 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, PAL_BATTLE_BG_ENEMY_HP call ByteFill - hlcoord 0, 4, wAttrMap + hlcoord 0, 4, wAttrmap lb bc, 8, 10 ld a, PAL_BATTLE_BG_PLAYER call FillBoxCGB - hlcoord 10, 0, wAttrMap + hlcoord 10, 0, wAttrmap lb bc, 7, 10 ld a, PAL_BATTLE_BG_ENEMY call FillBoxCGB - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 4, 10 ld a, PAL_BATTLE_BG_ENEMY_HP call FillBoxCGB - hlcoord 10, 7, wAttrMap + hlcoord 10, 7, wAttrmap lb bc, 5, 10 ld a, PAL_BATTLE_BG_PLAYER_HP call FillBoxCGB - hlcoord 10, 11, wAttrMap + hlcoord 10, 11, wAttrmap lb bc, 1, 9 ld a, PAL_BATTLE_BG_EXP call FillBoxCGB - hlcoord 0, 12, wAttrMap + hlcoord 0, 12, wAttrmap ld bc, 6 * SCREEN_WIDTH ld a, PAL_BATTLE_BG_TEXT call ByteFill @@ -146,7 +146,7 @@ _CGB_FinishBattleScreenLayout: ld bc, 6 palettes ld a, BANK(wOBPals1) call FarCopyWRAM - call ApplyAttrMap + call ApplyAttrmap ret InitPartyMenuBGPal7: @@ -214,34 +214,34 @@ _CGB_StatsScreenHPPals: ld bc, 3 palettes ; pink, green, and blue page palettes ld a, BANK(wBGPals1) call FarCopyWRAM - call WipeAttrMap + call WipeAttrmap - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 8, SCREEN_WIDTH ld a, $1 ; mon palette call FillBoxCGB - hlcoord 10, 16, wAttrMap + hlcoord 10, 16, wAttrmap ld bc, 10 ld a, $2 ; exp palette call ByteFill - hlcoord 13, 5, wAttrMap + hlcoord 13, 5, wAttrmap lb bc, 2, 2 ld a, $3 ; pink page palette call FillBoxCGB - hlcoord 15, 5, wAttrMap + hlcoord 15, 5, wAttrmap lb bc, 2, 2 ld a, $4 ; green page palette call FillBoxCGB - hlcoord 17, 5, wAttrMap + hlcoord 17, 5, wAttrmap lb bc, 2, 2 ld a, $5 ; blue page palette call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -269,8 +269,8 @@ _CGB_Pokedex: call GetMonPalettePointer call LoadPalette_White_Col1_Col2_Black ; mon palette .got_palette - call WipeAttrMap - hlcoord 1, 1, wAttrMap + call WipeAttrmap + hlcoord 1, 1, wAttrmap lb bc, 7, 7 ld a, $1 ; green question mark palette call FillBoxCGB @@ -280,7 +280,7 @@ _CGB_Pokedex: ld bc, 1 palettes ld a, BANK(wOBPals1) call FarCopyWRAM - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -309,13 +309,13 @@ _CGB_BillsPC: call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black .Resume: - call WipeAttrMap - hlcoord 1, 4, wAttrMap + call WipeAttrmap + hlcoord 1, 4, wAttrmap lb bc, 7, 7 ld a, $1 call FillBoxCGB call InitPartyMenuOBPals - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -331,13 +331,13 @@ _CGB_BillsPC: call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black .asm_901a - call WipeAttrMap - hlcoord 1, 1, wAttrMap + call WipeAttrmap + hlcoord 1, 1, wAttrmap lb bc, 7, 7 ld a, $1 call FillBoxCGB call InitPartyMenuOBPals - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -354,13 +354,13 @@ _CGB_PokedexUnownMode: ld a, [wCurPartySpecies] call GetMonPalettePointer call LoadPalette_White_Col1_Col2_Black - call WipeAttrMap - hlcoord 7, 5, wAttrMap + call WipeAttrmap + hlcoord 7, 5, wAttrmap lb bc, 7, 7 ld a, $1 call FillBoxCGB call InitPartyMenuOBPals - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -372,48 +372,48 @@ _CGB_SlotMachine: ld bc, 16 palettes ld a, BANK(wBGPals1) call FarCopyWRAM - call WipeAttrMap - hlcoord 0, 2, wAttrMap + call WipeAttrmap + hlcoord 0, 2, wAttrmap lb bc, 10, 3 ld a, $2 call FillBoxCGB - hlcoord 17, 2, wAttrMap + hlcoord 17, 2, wAttrmap lb bc, 10, 3 ld a, $2 call FillBoxCGB - hlcoord 0, 4, wAttrMap + hlcoord 0, 4, wAttrmap lb bc, 6, 3 ld a, $3 call FillBoxCGB - hlcoord 17, 4, wAttrMap + hlcoord 17, 4, wAttrmap lb bc, 6, 3 ld a, $3 call FillBoxCGB - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap lb bc, 2, 3 ld a, $4 call FillBoxCGB - hlcoord 17, 6, wAttrMap + hlcoord 17, 6, wAttrmap lb bc, 2, 3 ld a, $4 call FillBoxCGB - hlcoord 4, 2, wAttrMap + hlcoord 4, 2, wAttrmap lb bc, 2, 12 ld a, $1 call FillBoxCGB - hlcoord 3, 2, wAttrMap + hlcoord 3, 2, wAttrmap lb bc, 10, 1 ld a, $1 call FillBoxCGB - hlcoord 16, 2, wAttrMap + hlcoord 16, 2, wAttrmap lb bc, 10, 1 ld a, $1 call FillBoxCGB - hlcoord 0, 12, wAttrMap + hlcoord 0, 12, wAttrmap ld bc, $78 ld a, $7 call ByteFill - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -422,16 +422,16 @@ _CGB_SlotMachine: _CGB_BetaTitleScreen: ld hl, PalPacket_BetaTitleScreen + 1 call CopyFourPalettes - call WipeAttrMap + call WipeAttrmap ld de, wOBPals1 ld a, PREDEFPAL_PACK call GetPredefPal call LoadHLPaletteIntoDE - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap lb bc, 12, SCREEN_WIDTH ld a, $1 call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -461,7 +461,7 @@ _CGB_GSIntro: ld bc, 2 palettes ld a, BANK(wOBPals1) call FarCopyWRAM - call WipeAttrMap + call WipeAttrmap ret .ShellderLaprasBGPalette: @@ -491,7 +491,7 @@ _CGB_GSIntro: ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB call GetPredefPal call LoadHLPaletteIntoDE - call WipeAttrMap + call WipeAttrmap ret .StartersCharizardScene: @@ -501,7 +501,7 @@ _CGB_GSIntro: ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION call GetPredefPal call LoadHLPaletteIntoDE - call WipeAttrMap + call WipeAttrmap ret _CGB_BetaPoker: @@ -511,8 +511,8 @@ _CGB_BetaPoker: ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret _CGB_Diploma: @@ -524,8 +524,8 @@ _CGB_Diploma: ld hl, PalPacket_Diploma + 1 call CopyFourPalettes - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret _CGB_MapPals: @@ -540,7 +540,7 @@ _CGB_PartyMenu: call InitPartyMenuBGPal0 call InitPartyMenuBGPal7 call InitPartyMenuOBPals - call ApplyAttrMap + call ApplyAttrmap ret _CGB_Evolution: @@ -570,8 +570,8 @@ _CGB_Evolution: call FarCopyWRAM .got_palette - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -598,8 +598,8 @@ _CGB_GSTitleScreen: _CGB0d: ld hl, PalPacket_Diploma + 1 call CopyFourPalettes - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret _CGB_UnownPuzzle: @@ -620,8 +620,8 @@ _CGB_UnownPuzzle: ld [hl], a pop af ldh [rSVBK], a - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret _CGB_TrainerCard: @@ -655,7 +655,7 @@ _CGB_TrainerCard: call LoadHLPaletteIntoDE ; 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 a, [wPlayerGender] and a @@ -665,7 +665,7 @@ _CGB_TrainerCard: .got_gender call ByteFill ; fill trainer sprite area with same-gender palette - hlcoord 14, 1, wAttrMap + hlcoord 14, 1, wAttrmap lb bc, 7, 5 ld a, [wPlayerGender] and a @@ -675,33 +675,33 @@ _CGB_TrainerCard: .got_gender2 call FillBoxCGB ; top-right corner still uses the border's palette - hlcoord 18, 1, wAttrMap + hlcoord 18, 1, wAttrmap ld [hl], $1 - hlcoord 2, 11, wAttrMap + hlcoord 2, 11, wAttrmap lb bc, 2, 4 ld a, $1 ; falkner call FillBoxCGB - hlcoord 6, 11, wAttrMap + hlcoord 6, 11, wAttrmap lb bc, 2, 4 ld a, $2 ; bugsy call FillBoxCGB - hlcoord 10, 11, wAttrMap + hlcoord 10, 11, wAttrmap lb bc, 2, 4 ld a, $3 ; whitney call FillBoxCGB - hlcoord 14, 11, wAttrMap + hlcoord 14, 11, wAttrmap lb bc, 2, 4 ld a, $4 ; morty call FillBoxCGB - hlcoord 2, 14, wAttrMap + hlcoord 2, 14, wAttrmap lb bc, 2, 4 ld a, $5 ; chuck call FillBoxCGB - hlcoord 6, 14, wAttrMap + hlcoord 6, 14, wAttrmap lb bc, 2, 4 ld a, $6 ; jasmine call FillBoxCGB - hlcoord 10, 14, wAttrMap + hlcoord 10, 14, wAttrmap lb bc, 2, 4 ld a, $7 ; pryce call FillBoxCGB @@ -710,7 +710,7 @@ _CGB_TrainerCard: and a push af jr z, .got_gender3 - hlcoord 14, 14, wAttrMap + hlcoord 14, 14, wAttrmap lb bc, 2, 4 ld a, $1 call FillBoxCGB @@ -721,9 +721,9 @@ _CGB_TrainerCard: inc c .got_gender4 ld a, c - hlcoord 18, 1, wAttrMap + hlcoord 18, 1, wAttrmap ld [hl], a - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -742,12 +742,12 @@ _CGB_MoveList: ld bc, HPBarPals add hl, bc call LoadPalette_White_Col1_Col2_Black - call WipeAttrMap - hlcoord 11, 1, wAttrMap + call WipeAttrmap + hlcoord 11, 1, wAttrmap lb bc, 2, 9 ld a, $1 call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -756,8 +756,8 @@ _CGB_MoveList: _CGB_BetaPikachuMinigame: ld hl, PalPacket_BetaPikachuMinigame + 1 call CopyFourPalettes - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -768,8 +768,8 @@ _CGB_PokedexSearchOption: ld a, PREDEFPAL_POKEDEX call GetPredefPal call LoadHLPaletteIntoDE - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -796,28 +796,28 @@ _CGB_PackPals: ld bc, 8 palettes ; 6 palettes? ld a, BANK(wBGPals1) call FarCopyWRAM - call WipeAttrMap - hlcoord 0, 0, wAttrMap + call WipeAttrmap + hlcoord 0, 0, wAttrmap lb bc, 1, 10 ld a, $1 call FillBoxCGB - hlcoord 10, 0, wAttrMap + hlcoord 10, 0, wAttrmap lb bc, 1, 10 ld a, $2 call FillBoxCGB - hlcoord 7, 2, wAttrMap + hlcoord 7, 2, wAttrmap lb bc, 9, 1 ld a, $3 call FillBoxCGB - hlcoord 0, 7, wAttrMap + hlcoord 0, 7, wAttrmap lb bc, 3, 5 ld a, $4 call FillBoxCGB - hlcoord 0, 3, wAttrMap + hlcoord 0, 3, wAttrmap lb bc, 3, 5 ld a, $5 call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -832,7 +832,7 @@ INCLUDE "gfx/pack/pack_f.pal" _CGB_Pokepic: call _CGB_MapPals ld de, SCREEN_WIDTH - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld a, [wMenuBorderTopCoord] .loop and a @@ -860,22 +860,22 @@ _CGB_Pokepic: ld c, a ld a, $0 call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap ret _CGB_MagnetTrain: ld hl, PalPacket_MagnetTrain + 1 call CopyFourPalettes - call WipeAttrMap - hlcoord 0, 4, wAttrMap + call WipeAttrmap + hlcoord 0, 4, wAttrmap lb bc, 10, SCREEN_WIDTH ld a, $2 call FillBoxCGB - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap lb bc, 6, SCREEN_WIDTH ld a, $1 call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap call ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -892,8 +892,8 @@ _CGB_GamefreakLogo: ld hl, .Palette ld de, wOBPals1 palette 1 call LoadHLPaletteIntoDE - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ret @@ -906,8 +906,8 @@ _CGB_PlayerOrMonFrontpicPals: ld bc, wTempMonDVs call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ret @@ -916,8 +916,8 @@ _CGB1e: ld a, [wCurPartySpecies] call GetMonPalettePointer call LoadPalette_White_Col1_Col2_Black - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret _CGB_TradeTube: @@ -932,7 +932,7 @@ _CGB_TradeTube: ld a, PREDEFPAL_TRADE_TUBE call GetPredefPal call LoadHLPaletteIntoDE - call WipeAttrMap + call WipeAttrmap ret _CGB_TrainerOrMonFrontpicPals: @@ -941,8 +941,8 @@ _CGB_TrainerOrMonFrontpicPals: ld bc, wTempMonDVs call GetFrontpicPalettePointer call LoadPalette_White_Col1_Col2_Black - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ret @@ -953,28 +953,28 @@ _CGB_MysteryGift: ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals - call WipeAttrMap - hlcoord 3, 7, wAttrMap + call WipeAttrmap + hlcoord 3, 7, wAttrmap lb bc, 8, 14 ld a, $1 call FillBoxCGB - hlcoord 1, 5, wAttrMap + hlcoord 1, 5, wAttrmap lb bc, 1, 18 ld a, $1 call FillBoxCGB - hlcoord 1, 16, wAttrMap + hlcoord 1, 16, wAttrmap lb bc, 1, 18 ld a, $1 call FillBoxCGB - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 17, 2 ld a, $1 call FillBoxCGB - hlcoord 18, 5, wAttrMap + hlcoord 18, 5, wAttrmap lb bc, 12, 1 ld a, $1 call FillBoxCGB - call ApplyAttrMap + call ApplyAttrmap ret .Palettes: diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 2426eba78..7f2fc8fa1 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -103,7 +103,7 @@ InitPartyMenuPalettes: ld hl, PalPacket_PartyMenu + 1 call CopyFourPalettes call InitPartyMenuOBPals - call WipeAttrMap + call WipeAttrmap ret ; SGB layout for SCGB_PARTY_MENU_HP_PALS @@ -284,7 +284,7 @@ Unreferenced_Function8bec: ld a, [wEnemyLightScreenCount] ; col ld c, a ld a, [wEnemyReflectCount] ; row - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld de, SCREEN_WIDTH .loop and a @@ -320,8 +320,8 @@ ApplyMonOrTrainerPals: .load_palettes ld de, wBGPals1 call LoadPalette_White_Col1_Col2_Black - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap call ApplyPals ret @@ -359,7 +359,7 @@ ApplyHPBarPals: .PartyMenu: ld e, c inc e - hlcoord 11, 1, wAttrMap + hlcoord 11, 1, wAttrmap ld bc, 2 * SCREEN_WIDTH ld a, [wCurPartyMon] .loop @@ -437,8 +437,8 @@ LoadMailPalettes: ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret .MailPals: @@ -453,8 +453,8 @@ Unreferenced_Function95f0: ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals - call WipeAttrMap - call ApplyAttrMap + call WipeAttrmap + call ApplyAttrmap ret .Palette: @@ -590,8 +590,8 @@ ResetBGPals: pop af ret -WipeAttrMap: - hlcoord 0, 0, wAttrMap +WipeAttrmap: + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill @@ -605,7 +605,7 @@ ApplyPals: call FarCopyWRAM ret -ApplyAttrMap: +ApplyAttrmap: ldh a, [rLCDC] bit rLCDC_ENABLE, a jr z, .UpdateVBank1 @@ -622,7 +622,7 @@ ApplyAttrMap: ret .UpdateVBank1: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap debgcoord 0, 0 ld b, SCREEN_HEIGHT ld a, $1 @@ -659,7 +659,7 @@ CGB_ApplyPartyMenuHPPals: ld a, [de] inc a ld e, a - hlcoord 11, 2, wAttrMap + hlcoord 11, 2, wAttrmap ld bc, 2 * SCREEN_WIDTH ld a, [wSGBPals] .loop diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm index 532e02152..d1ff97159 100644 --- a/engine/gfx/crystal_layouts.asm +++ b/engine/gfx/crystal_layouts.asm @@ -42,8 +42,8 @@ MG_Mobile_Layout_FillBox: jr nz, .row ret -MG_Mobile_Layout_WipeAttrMap: - hlcoord 0, 0, wAttrMap +MG_Mobile_Layout_WipeAttrmap: + hlcoord 0, 0, wAttrmap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH xor a call ByteFill @@ -64,14 +64,14 @@ MG_Mobile_Layout_LoadPals: MG_Mobile_Layout00: call MG_Mobile_Layout_LoadPals - call MG_Mobile_Layout_WipeAttrMap + call MG_Mobile_Layout_WipeAttrmap call MG_Mobile_Layout_CreatePalBoxes - farcall ApplyAttrMap + farcall ApplyAttrmap farcall ApplyPals ret MG_Mobile_Layout_CreatePalBoxes: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 4, 1 ld a, $1 call MG_Mobile_Layout_FillBox @@ -81,7 +81,7 @@ MG_Mobile_Layout_CreatePalBoxes: lb bc, 6, 1 ld a, $3 call MG_Mobile_Layout_FillBox - hlcoord 1, 0, wAttrMap + hlcoord 1, 0, wAttrmap ld a, $1 lb bc, 3, 18 call MG_Mobile_Layout_FillBox @@ -91,7 +91,7 @@ MG_Mobile_Layout_CreatePalBoxes: lb bc, 12, 18 ld a, $3 call MG_Mobile_Layout_FillBox - hlcoord 19, 0, wAttrMap + hlcoord 19, 0, wAttrmap lb bc, 4, 1 ld a, $1 call MG_Mobile_Layout_FillBox @@ -101,7 +101,7 @@ MG_Mobile_Layout_CreatePalBoxes: lb bc, 6, 1 ld a, $3 call MG_Mobile_Layout_FillBox - hlcoord 0, 12, wAttrMap + hlcoord 0, 12, wAttrmap ld bc, 6 * SCREEN_WIDTH ld a, $7 call ByteFill @@ -136,12 +136,12 @@ MG_Mobile_Layout01: ld bc, 1 palettes ld a, BANK(wBGPals1) call FarCopyWRAM - call MG_Mobile_Layout_WipeAttrMap - hlcoord 0, 0, wAttrMap + call MG_Mobile_Layout_WipeAttrmap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill - hlcoord 0, 14, wAttrMap + hlcoord 0, 14, wAttrmap ld bc, 4 * SCREEN_WIDTH ld a, $7 call ByteFill @@ -155,7 +155,7 @@ MG_Mobile_Layout01: call Function49496 .asm_49467 - farcall ApplyAttrMap + farcall ApplyAttrmap farcall ApplyPals ld a, $1 ldh [hCGBPalUpdate], a @@ -168,26 +168,26 @@ MG_Mobile_Layout01: RGB 00, 00, 00 Function49480: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 4, SCREEN_WIDTH ld a, $7 call MG_Mobile_Layout_FillBox - hlcoord 0, 2, wAttrMap + hlcoord 0, 2, wAttrmap ld a, $4 ld [hl], a - hlcoord 19, 2, wAttrMap + hlcoord 19, 2, wAttrmap ld [hl], a ret Function49496: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 2, SCREEN_WIDTH ld a, $7 call MG_Mobile_Layout_FillBox - hlcoord 0, 1, wAttrMap + hlcoord 0, 1, wAttrmap ld a, $4 ld [hl], a - hlcoord 19, 1, wAttrMap + hlcoord 19, 1, wAttrmap ld [hl], a ret @@ -200,8 +200,8 @@ MG_Mobile_Layout02: ld a, BANK(wBGPals1) call FarCopyWRAM farcall ApplyPals - call MG_Mobile_Layout_WipeAttrMap - farcall ApplyAttrMap + call MG_Mobile_Layout_WipeAttrmap + farcall ApplyAttrmap ld hl, .Palette_4973a ld de, wOBPals1 ld bc, 1 palettes @@ -234,43 +234,43 @@ Function49742: INCLUDE "gfx/unknown/49757.pal" _InitMG_Mobile_LinkTradePalMap: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap lb bc, 16, 2 ld a, $4 call MG_Mobile_Layout_FillBox ld a, $3 - ldcoord_a 0, 1, wAttrMap - ldcoord_a 0, 14, wAttrMap - hlcoord 2, 0, wAttrMap + ldcoord_a 0, 1, wAttrmap + ldcoord_a 0, 14, wAttrmap + hlcoord 2, 0, wAttrmap lb bc, 8, 18 ld a, $5 call MG_Mobile_Layout_FillBox - hlcoord 2, 8, wAttrMap + hlcoord 2, 8, wAttrmap lb bc, 8, 18 ld a, $6 call MG_Mobile_Layout_FillBox - hlcoord 0, 16, wAttrMap + hlcoord 0, 16, wAttrmap lb bc, 2, SCREEN_WIDTH ld a, $4 call MG_Mobile_Layout_FillBox ld a, $3 lb bc, 6, 1 - hlcoord 6, 1, wAttrMap + hlcoord 6, 1, wAttrmap call MG_Mobile_Layout_FillBox ld a, $3 lb bc, 6, 1 - hlcoord 17, 1, wAttrMap + hlcoord 17, 1, wAttrmap call MG_Mobile_Layout_FillBox ld a, $3 lb bc, 6, 1 - hlcoord 6, 9, wAttrMap + hlcoord 6, 9, wAttrmap call MG_Mobile_Layout_FillBox ld a, $3 lb bc, 6, 1 - hlcoord 17, 9, wAttrMap + hlcoord 17, 9, wAttrmap call MG_Mobile_Layout_FillBox ld a, $2 - hlcoord 2, 16, wAttrMap + hlcoord 2, 16, wAttrmap ld [hli], a ld a, $7 ld [hli], a @@ -278,7 +278,7 @@ _InitMG_Mobile_LinkTradePalMap: ld [hli], a ld a, $2 ld [hl], a - hlcoord 2, 17, wAttrMap + hlcoord 2, 17, wAttrmap ld a, $3 ld bc, 6 call ByteFill diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index 5c84a23ca..a3cdb6dd3 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -1,49 +1,49 @@ -HDMATransferAttrMapAndTileMapToWRAMBank3:: +HDMATransferAttrmapAndTilemapToWRAMBank3:: ld hl, .Function jp CallInSafeGFXMode .Function: - decoord 0, 0, wAttrMap - ld hl, wScratchAttrMap - call PadAttrMapForHDMATransfer + decoord 0, 0, wAttrmap + ld hl, wScratchAttrmap + call PadAttrmapForHDMATransfer decoord 0, 0 - ld hl, wScratchTileMap + ld hl, wScratchTilemap call PadTilemapForHDMATransfer ld a, $0 ldh [rVBK], a - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransferToWRAMBank3 ld a, $1 ldh [rVBK], a - ld hl, wScratchAttrMap + ld hl, wScratchAttrmap call HDMATransferToWRAMBank3 ret -HDMATransferTileMapToWRAMBank3:: +HDMATransferTilemapToWRAMBank3:: ld hl, .Function jp CallInSafeGFXMode .Function: decoord 0, 0 - ld hl, wScratchTileMap + ld hl, wScratchTilemap call PadTilemapForHDMATransfer ld a, $0 ldh [rVBK], a - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransferToWRAMBank3 ret -HDMATransferAttrMapToWRAMBank3: +HDMATransferAttrmapToWRAMBank3: ld hl, .Function jp CallInSafeGFXMode .Function: - decoord 0, 0, wAttrMap - ld hl, wScratchAttrMap - call PadAttrMapForHDMATransfer + decoord 0, 0, wAttrmap + ld hl, wScratchAttrmap + call PadAttrmapForHDMATransfer ld a, $1 ldh [rVBK], a - ld hl, wScratchAttrMap + ld hl, wScratchAttrmap call HDMATransferToWRAMBank3 ret @@ -52,11 +52,11 @@ ReloadMapPart:: jp CallInSafeGFXMode .Function: - decoord 0, 0, wAttrMap - ld hl, wScratchAttrMap - call PadAttrMapForHDMATransfer + decoord 0, 0, wAttrmap + ld hl, wScratchAttrmap + call PadAttrmapForHDMATransfer decoord 0, 0 - ld hl, wScratchTileMap + ld hl, wScratchTilemap call PadTilemapForHDMATransfer call DelayFrame @@ -65,11 +65,11 @@ ReloadMapPart:: push af ld a, $1 ldh [rVBK], a - ld hl, wScratchAttrMap + ld hl, wScratchAttrmap call HDMATransfer_Wait127Scanlines_toBGMap ld a, $0 ldh [rVBK], a - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransfer_Wait127Scanlines_toBGMap pop af ldh [rVBK], a @@ -83,11 +83,11 @@ Mobile_ReloadMapPart: jp CallInSafeGFXMode .Function: - decoord 0, 0, wAttrMap - ld hl, wScratchAttrMap - call PadAttrMapForHDMATransfer + decoord 0, 0, wAttrmap + ld hl, wScratchAttrmap + call PadAttrmapForHDMATransfer decoord 0, 0 - ld hl, wScratchTileMap + ld hl, wScratchTilemap call PadTilemapForHDMATransfer call DelayFrame @@ -96,11 +96,11 @@ Mobile_ReloadMapPart: push af ld a, $1 ldh [rVBK], a - ld hl, wScratchAttrMap + ld hl, wScratchAttrmap call HDMATransfer_NoDI ld a, $0 ldh [rVBK], a - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransfer_NoDI pop af ldh [rVBK], a @@ -144,20 +144,20 @@ Mobile_ReloadMapPart: call HDMATransferToWRAMBank3 ret -OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: +OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: ; OpenText ld hl, .Function jp CallInSafeGFXMode .Function: - ; Transfer wAttrMap and Tilemap to BGMap + ; Transfer wAttrmap and Tilemap to BGMap ; Fill vBGAttrs with $00 ; Fill vBGTiles with " " - decoord 0, 0, wAttrMap - ld hl, wScratchAttrMap - call PadAttrMapForHDMATransfer + decoord 0, 0, wAttrmap + ld hl, wScratchAttrmap + call PadAttrmapForHDMATransfer decoord 0, 0 - ld hl, wScratchTileMap + ld hl, wScratchTilemap call PadTilemapForHDMATransfer call DelayFrame @@ -166,40 +166,40 @@ OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: push af ld a, $1 ldh [rVBK], a - ld hl, wScratchAttrMap + ld hl, wScratchAttrmap call HDMATransfer_Wait123Scanlines_toBGMap ld a, $0 ldh [rVBK], a - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransfer_Wait123Scanlines_toBGMap pop af ldh [rVBK], a ei ret -Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap: +Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap: ld hl, .Function jp CallInSafeGFXMode .Function: - ; Transfer wAttrMap and Tilemap to BGMap + ; Transfer wAttrmap and Tilemap to BGMap ; Fill vBGAttrs with $00 ; Fill vBGTiles with $ff - decoord 0, 0, wAttrMap - ld hl, wScratchAttrMap - call PadAttrMapForHDMATransfer + decoord 0, 0, wAttrmap + ld hl, wScratchAttrmap + call PadAttrmapForHDMATransfer ld c, $ff decoord 0, 0 - ld hl, wScratchTileMap + ld hl, wScratchTilemap call PadMapForHDMATransfer ld a, $1 ldh [rVBK], a - ld hl, wScratchAttrMap + ld hl, wScratchAttrmap call HDMATransfer_Wait127Scanlines_toBGMap ld a, $0 ldh [rVBK], a - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransfer_Wait127Scanlines_toBGMap ret @@ -213,7 +213,7 @@ CallInSafeGFXMode: ldh [hMapAnims], a ldh a, [rSVBK] push af - ld a, BANK(wScratchTileMap) + ld a, BANK(wScratchTilemap) ldh [rSVBK], a ldh a, [rVBK] push af @@ -410,7 +410,7 @@ PadTilemapForHDMATransfer: ld c, " " jr PadMapForHDMATransfer -PadAttrMapForHDMATransfer: +PadAttrmapForHDMATransfer: ld c, $0 PadMapForHDMATransfer: @@ -455,13 +455,13 @@ _Get2bpp:: ; switch to WRAM bank 6 ldh a, [rSVBK] push af - ld a, BANK(wScratchTileMap) + ld a, BANK(wScratchTilemap) ldh [rSVBK], a push bc 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 l, c ; number of tiles ld h, $0 @@ -474,7 +474,7 @@ _Get2bpp:: ld c, l ld h, d ; address ld l, e - ld de, wScratchTileMap + ld de, wScratchTilemap call FarCopyBytes pop hl @@ -486,7 +486,7 @@ _Get2bpp:: ld d, h ld e, l - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransfer_Wait127Scanlines ; restore the previous bank @@ -523,7 +523,7 @@ _Get1bpp:: .bankswitch ldh a, [rSVBK] push af - ld a, BANK(wScratchTileMap) + ld a, BANK(wScratchTilemap) ldh [rSVBK], a push bc @@ -539,7 +539,7 @@ _Get1bpp:: ld b, h ld h, d ld l, e - ld de, wScratchTileMap + ld de, wScratchTilemap call FarCopyBytesDouble_DoubleBankSwitch pop hl @@ -551,7 +551,7 @@ _Get1bpp:: ld d, h ld e, l - ld hl, wScratchTileMap + ld hl, wScratchTilemap call HDMATransfer_Wait127Scanlines pop af @@ -563,22 +563,22 @@ HDMATransfer_OnlyTopFourRows: jp CallInSafeGFXMode .Function: - ld hl, wScratchTileMap + ld hl, wScratchTilemap decoord 0, 0 call .Copy - ld hl, wScratchTileMap + $80 - decoord 0, 0, wAttrMap + ld hl, wScratchTilemap + $80 + decoord 0, 0, wAttrmap call .Copy ld a, $1 ldh [rVBK], a ld c, $8 - ld hl, wScratchTileMap + $80 + ld hl, wScratchTilemap + $80 debgcoord 0, 0, vBGMap1 call HDMATransfer_Wait127Scanlines ld a, $0 ldh [rVBK], a ld c, $8 - ld hl, wScratchTileMap + ld hl, wScratchTilemap debgcoord 0, 0, vBGMap1 call HDMATransfer_Wait127Scanlines ret diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index ec8899a8a..ac25712d1 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -175,7 +175,7 @@ InitPartyMenuIcon: ld e, $10 ; type is partymon icon ld a, SPRITE_ANIM_INDEX_PARTY_MON - call InitSpriteAnimStruct + call _InitSpriteAnimStruct pop af ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc @@ -222,7 +222,7 @@ NamingScreen_InitAnimatedMonIcon: call GetIconGFX depixel 4, 4, 4, 0 ld a, SPRITE_ANIM_INDEX_PARTY_MON - call InitSpriteAnimStruct + call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc ld [hl], SPRITE_ANIM_SEQ_NULL @@ -237,7 +237,7 @@ MoveList_InitAnimatedMonIcon: ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4 ld e, 4 * 8 + 4 ld a, SPRITE_ANIM_INDEX_PARTY_MON - call InitSpriteAnimStruct + call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc ld [hl], SPRITE_ANIM_SEQ_NULL diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 88dc1f6d9..8eff13ad1 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -87,7 +87,7 @@ AnimateFrontpic: .loop call SetUpPokeAnim push af - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 pop af jr nc, .loop ret @@ -261,9 +261,9 @@ PokeAnim_DeinitFrames: ld a, BANK(wPokeAnimCoord) ldh [rSVBK], a call PokeAnim_PlaceGraphic - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 call PokeAnim_SetVBank0 - farcall HDMATransferAttrMapToWRAMBank3 + farcall HDMATransferAttrmapToWRAMBank3 pop af ldh [rSVBK], a ret @@ -830,13 +830,13 @@ PokeAnim_SetVBank1: xor a ldh [hBGMapMode], a call .SetFlag - farcall HDMATransferAttrMapToWRAMBank3 + farcall HDMATransferAttrmapToWRAMBank3 pop af ldh [rSVBK], a ret .SetFlag: - call PokeAnim_GetAttrMapCoord + call PokeAnim_GetAttrmapCoord ld b, 7 ld c, 7 ld de, SCREEN_WIDTH @@ -858,7 +858,7 @@ PokeAnim_SetVBank1: ret PokeAnim_SetVBank0: - call PokeAnim_GetAttrMapCoord + call PokeAnim_GetAttrmapCoord ld b, 7 ld c, 7 ld de, SCREEN_WIDTH @@ -879,12 +879,12 @@ PokeAnim_SetVBank0: jr nz, .row ret -PokeAnim_GetAttrMapCoord: +PokeAnim_GetAttrmapCoord: ld hl, wPokeAnimCoord ld a, [hli] ld h, [hl] ld l, a - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de ret diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 395ff1830..20613cc60 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -109,7 +109,7 @@ DoNextFrameForFirst16Sprites: .done ret -InitSpriteAnimStruct:: +_InitSpriteAnimStruct:: ; Initialize animation a at pixel x=e, y=d ; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16 push de diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 96e0e0047..11928cd63 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -697,7 +697,7 @@ PokeBallEffect: jr z, .toss call ClearBGPalettes - call ClearTileMap + call ClearTilemap .toss ld hl, wNumItems @@ -1761,7 +1761,7 @@ ItemActionTextWaitButton: xor a ldh [hBGMapMode], a hlcoord 0, 0 - ld bc, wTileMapEnd - wTileMap + ld bc, wTilemapEnd - wTilemap ld a, " " call ByteFill ld a, [wPartyMenuActionText] diff --git a/engine/items/pack.asm b/engine/items/pack.asm index f19539b88..1331c039f 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -1326,7 +1326,7 @@ Pack_InterpretJoypad: Pack_InitGFX: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD ld hl, PackMenuGFX diff --git a/engine/link/link.asm b/engine/link/link.asm index 077b3a9f0..31c189112 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1328,7 +1328,7 @@ LinkTradePartiesMenuMasterLoop: jp LinkTradeOTPartymonMenuLoop ; OTPARTYMON Function28926: - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ld a, [wMenuCursorY] push af hlcoord 0, 15 @@ -1369,7 +1369,7 @@ Function28926: .b_button pop af ld [wMenuCursorY], a - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap jp LinkTrade_PlayerPartyMenu .d_right @@ -1407,7 +1407,7 @@ Function28926: ld [wInitListType], a callfar InitList farcall LinkMonStatsScreen - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap hlcoord 6, 1 lb bc, 6, 1 ld a, " " @@ -1844,7 +1844,7 @@ LinkTrade: ld [wd003], a ld c, 100 call DelayFrames - call ClearTileMap + call ClearTilemap call LoadFontsBattleExtra ld b, SCGB_DIPLOMA call GetSGBLayout diff --git a/engine/link/link_2.asm b/engine/link/link_2.asm index 9406e43bb..b5fbbf6c0 100644 --- a/engine/link/link_2.asm +++ b/engine/link/link_2.asm @@ -31,7 +31,7 @@ LinkTextbox2: pop hl pop bc - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index 95be2817a..4119e48a7 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -18,7 +18,7 @@ Function16d42e: Function16d43b: call LoadStandardMenuHeader call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites farcall __LoadTradeScreenBorder ; useless to farcall farcall Function16d42e ; useless to farcall @@ -48,7 +48,7 @@ _LinkTextbox: pop hl pop bc - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b @@ -240,7 +240,7 @@ LinkTradeMenu: ret .loop2 - call RTC + call UpdateTimeAndPals call .TryAnims ret c ld a, [w2DMenuFlags1] diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 7c6ce7d7b..8479c6f61 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1,5 +1,5 @@ DoMysteryGift: - call ClearTileMap + call ClearTilemap call ClearSprites call WaitBGMap call InitMysteryGiftLayout @@ -24,7 +24,7 @@ DoMysteryGift: pop af ldh [rIE], a push de - call ClearTileMap + call ClearTilemap call EnableLCD call WaitBGMap ld b, SCGB_DIPLOMA @@ -1396,7 +1396,7 @@ INCBIN "gfx/mystery_gift/mystery_gift.2bpp" .End Function105688: - call ClearTileMap + call ClearTilemap call ClearSprites call WaitBGMap call Function1057d7 @@ -1511,7 +1511,7 @@ MysteryGiftLinkCommErrorText: Function105777: call ClearSprites - call ClearTileMap + call ClearTilemap call EnableLCD call WaitBGMap ld b, SCGB_DIPLOMA diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm index 4c8c5edc8..484556b28 100644 --- a/engine/menus/debug.asm +++ b/engine/menus/debug.asm @@ -135,7 +135,7 @@ Function81948: ld bc, sScratch - vTiles0 xor a call ByteFill - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill @@ -378,15 +378,15 @@ String_81bb4: db "ノーマル@" ; normal String_81bb9: db DEBUGTEST_A, "きりかえ▶@" ; (A) switches Function81bc0: - decoord 0, 11, wAttrMap + decoord 0, 11, wAttrmap hlcoord 2, 11 ld a, $1 call Function81bde - decoord 0, 13, wAttrMap + decoord 0, 13, wAttrmap hlcoord 2, 13 ld a, $2 call Function81bde - decoord 0, 15, wAttrMap + decoord 0, 15, wAttrmap hlcoord 2, 15 ld a, $3 @@ -1061,7 +1061,7 @@ TilesetColorTest: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, DEBUGTEST_BLACK call ByteFill - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7 call ByteFill @@ -1091,7 +1091,7 @@ Function821d2: Function821d8: ld a, [wcf64] - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap Function821de: add hl, de diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index c5cc95bf3..9ab0dd710 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -73,7 +73,7 @@ InitGenderScreen: ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld a, $0 call ByteFill - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH xor a call ByteFill diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 33c6ce759..c33ccfa4a 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -39,10 +39,10 @@ PrintDayOfWeek: .Day: db "DAY@" -NewGame_ClearTileMapEtc: +NewGame_ClearTilemapEtc: xor a ldh [hMapAnims], a - call ClearTileMap + call ClearTilemap call LoadFontsExtra call LoadStandardFont call ClearWindowData @@ -62,7 +62,7 @@ NewGame: xor a ld [wDebugFlags], a call ResetWRAM - call NewGame_ClearTileMapEtc + call NewGame_ClearTilemapEtc call AreYouABoyOrAreYouAGirl call OakSpeech call InitializeWorld @@ -359,7 +359,7 @@ Continue: call ClearBGPalettes call Continue_MobileAdapterMenu call CloseWindow - call ClearTileMap + call ClearTilemap ld c, 20 call DelayFrames farcall JumpRoamMons @@ -627,7 +627,7 @@ Continue_DisplayGameTime: OakSpeech: farcall InitClock call RotateFourPalettesLeft - call ClearTileMap + call ClearTilemap ld de, MUSIC_ROUTE_30 call PlayMusic @@ -647,7 +647,7 @@ OakSpeech: ld hl, OakText1 call PrintText call RotateThreePalettesRight - call ClearTileMap + call ClearTilemap ld a, WOOPER ld [wCurSpecies], a @@ -670,7 +670,7 @@ OakSpeech: ld hl, OakText4 call PrintText call RotateThreePalettesRight - call ClearTileMap + call ClearTilemap xor a ld [wCurPartySpecies], a @@ -685,7 +685,7 @@ OakSpeech: ld hl, OakText5 call PrintText call RotateThreePalettesRight - call ClearTileMap + call ClearTilemap xor a ld [wCurPartySpecies], a @@ -752,7 +752,7 @@ NamePlayer: farcall NamingScreen call RotateThreePalettesRight - call ClearTileMap + call ClearTilemap call LoadFontsExtra call WaitBGMap @@ -848,7 +848,7 @@ ShrinkPlayer: call DelayFrames call RotateThreePalettesRight - call ClearTileMap + call ClearTilemap ret Intro_RotatePalettesLeftFrontpic: @@ -1280,7 +1280,7 @@ Unreferenced_Function639b: ld e, a ld d, [hl] ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ret .Data63ca: @@ -1293,7 +1293,7 @@ Unreferenced_Function639b: db 0 * 8, 0 * 8, 11 * 8 + 4, 11 * 8 Copyright: - call ClearTileMap + call ClearTilemap call LoadFontsExtra ld de, CopyrightGFX ld hl, vTiles2 tile $60 @@ -1322,7 +1322,7 @@ GameInit:: farcall TryLoadSaveData call ClearWindowData call ClearBGPalettes - call ClearTileMap + call ClearTilemap ld a, HIGH(vBGMap0) ldh [hBGMapAddress + 1], a xor a ; LOW(vBGMap0) diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 9274694da..f02da0ce7 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -18,7 +18,7 @@ MainMenu: call MainMenuJoypadLoop call CloseWindow jr c, .quit - call ClearTileMap + call ClearTilemap ld a, [wMenuSelection] ld hl, .Jumptable rst JumpTable @@ -313,7 +313,7 @@ MainMenu_PrintCurrentTimeAndDay: Function49ed0: xor a ldh [hMapAnims], a - call ClearTileMap + call ClearTilemap call LoadFontsExtra call LoadStandardFont call ClearWindowData diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 544f4ade8..2a90c6f90 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -276,7 +276,7 @@ Unreferenced_Function241d5: call Place2DMenuCursor .loop 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. call .loop2 jr nc, .done @@ -344,7 +344,7 @@ MenuJoypadLoop: Do2DMenuRTCJoypad: .loopRTC - call RTC + call UpdateTimeAndPals call Menu_WasButtonPressed ret c ld a, [w2DMenuFlags1] diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 05c702cd0..5d4b98c22 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -167,7 +167,7 @@ NamingScreen: ld [hl], a depixel 4, 4, 4, 0 ld a, SPRITE_ANIM_INDEX_RED_WALK - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc ld [hl], $0 @@ -219,7 +219,7 @@ NamingScreen: .not_kris ld a, b depixel 4, 4, 4, 0 - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ret .StoreMonIconParams: @@ -385,7 +385,7 @@ NamingScreenJoypadLoop: ld d, 8 * 8 .got_cursor_position ld a, SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld a, c ld [wNamingScreenCursorObjectPointer], a ld a, b @@ -940,7 +940,7 @@ _ComposeMailMessage: ; init mail icon depixel 3, 2 ld a, SPRITE_ANIM_INDEX_PARTY_MON - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc @@ -1068,7 +1068,7 @@ INCBIN "gfx/icons/mail_big.2bpp" .init_blinking_cursor depixel 9, 2 ld a, SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld a, c ld [wNamingScreenCursorObjectPointer], a ld a, b diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 5d2138044..ef9926fe9 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -670,7 +670,7 @@ TryLoadSaveData: ld de, wOptions ld bc, wOptionsEnd - wOptions call CopyBytes - call PanicResetClock + call ClearClock ret INCLUDE "data/default_options.asm" diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index 58c269afd..51b7ea8fe 100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm @@ -20,7 +20,7 @@ SaveMenu_CopyTilemapAtOnce: di ld a, BANK(vBGMap2) ldh [rVBK], a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap call .CopyTilemapAtOnce ld a, BANK(vBGMap0) ldh [rVBK], a diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 69b1f73bf..1ca2f9991 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -33,7 +33,7 @@ StartMenu:: call DrawVariableLengthMenuBox call .DrawBugContestStatusBox call SafeUpdateSprites - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap farcall LoadFonts_NoOAMUpdate call .DrawBugContestStatus call UpdateTimePals diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 1509722ed..67adedd1d 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -41,7 +41,7 @@ TrainerCard: .InitRAM: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD farcall GetCardPic diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 2d783b962..78985c146 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -17,7 +17,7 @@ Credits:: ldh [rSVBK], a call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites ld hl, wCreditsBlankFrame2bpp @@ -419,22 +419,22 @@ ConstructCreditsTilemap: ld a, $20 call DrawCreditsBorder - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, 4 * SCREEN_WIDTH xor a call ByteFill - hlcoord 0, 4, wAttrMap + hlcoord 0, 4, wAttrmap ld bc, SCREEN_WIDTH ld a, $1 call ByteFill - hlcoord 0, 5, wAttrMap + hlcoord 0, 5, wAttrmap ld bc, 12 * SCREEN_WIDTH ld a, $2 call ByteFill - hlcoord 0, 17, wAttrMap + hlcoord 0, 17, wAttrmap ld bc, SCREEN_WIDTH ld a, $1 call ByteFill diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index 29808c86b..eeab51062 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -2,7 +2,7 @@ Copyright_GFPresents: ld de, MUSIC_NONE call PlayMusic call ClearBGPalettes - call ClearTileMap + call ClearTilemap ld a, HIGH(vBGMap0) ldh [hBGMapAddress + 1], a xor a ; LOW(vBGMap0) @@ -22,7 +22,7 @@ Copyright_GFPresents: call WaitBGMap ld c, 100 call DelayFrames - call ClearTileMap + call ClearTilemap farcall GBCOnlyScreen call .GetGFLogoGFX .joy_loop @@ -80,7 +80,7 @@ Copyright_GFPresents: farcall ClearSpriteAnims depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], $a0 @@ -106,7 +106,7 @@ Copyright_GFPresents: .StopGamefreakAnim: farcall ClearSpriteAnims - call ClearTileMap + call ClearTilemap call ClearSprites ld c, 16 call DelayFrames @@ -363,7 +363,7 @@ CrystalIntro: .done call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hSCX], a ldh [hSCY], a @@ -440,7 +440,7 @@ IntroScene1: ; Setup the next scene. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -516,7 +516,7 @@ IntroScene3: ; More setup. Transition to the outdoor scene. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -578,7 +578,7 @@ IntroScene5: ; Go back to the Unown. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ldh [hLCDCPointer], a @@ -676,7 +676,7 @@ IntroScene7: ; Back to the outdoor scene. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a @@ -733,7 +733,7 @@ IntroScene7: farcall ClearSpriteAnims depixel 13, 27, 4, 0 ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld a, $f0 ld [wGlobalAnimXOffset], a call Intro_SetCGBPalUpdate @@ -777,7 +777,7 @@ IntroScene9: xor a ldh [hLCDCPointer], a call ClearSprites - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ; first 12 rows have palette 1 ld bc, 12 * SCREEN_WIDTH ld a, $1 @@ -826,7 +826,7 @@ IntroScene10: .pichu depixel 21, 16, 1, 0 ld a, SPRITE_ANIM_INDEX_INTRO_PICHU - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_INTRO_PICHU call PlaySFX ret @@ -834,7 +834,7 @@ IntroScene10: .wooper depixel 22, 6 ld a, SPRITE_ANIM_INDEX_INTRO_WOOPER - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_INTRO_PICHU call PlaySFX ret @@ -846,7 +846,7 @@ IntroScene11: ; Back to Unown again. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ldh [hLCDCPointer], a @@ -970,7 +970,7 @@ IntroScene13: ; Switch scenes again. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -1013,7 +1013,7 @@ IntroScene13: farcall ClearSpriteAnims depixel 13, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, MUSIC_CRYSTAL_OPENING call PlayMusic xor a @@ -1074,7 +1074,7 @@ IntroScene15: ; Transition to a new scene. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -1124,10 +1124,10 @@ IntroScene15: call Intro_SetCGBPalUpdate depixel 8, 5 ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN_F - call _InitSpriteAnimStruct + call InitSpriteAnimStruct depixel 12, 0 ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY - call _InitSpriteAnimStruct + call InitSpriteAnimStruct xor a ld [wIntroSceneFrameCounter], a ld [wIntroSceneTimer], a @@ -1156,7 +1156,7 @@ IntroScene17: ; ... call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -1222,7 +1222,7 @@ IntroScene19: ; More setup. call Intro_ClearBGPals call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -1276,7 +1276,7 @@ IntroScene19: call Intro_SetCGBPalUpdate depixel 12, 0 ld a, SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY - call _InitSpriteAnimStruct + call InitSpriteAnimStruct xor a ld [wIntroSceneFrameCounter], a ld [wIntroSceneTimer], a @@ -1399,7 +1399,7 @@ IntroScene26: ; Load the final scene. call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a ld a, $1 @@ -1533,7 +1533,7 @@ INCLUDE "gfx/intro/fade.pal" CrystalIntro_InitUnownAnim: push de ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $8 @@ -1543,7 +1543,7 @@ CrystalIntro_InitUnownAnim: push de ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $18 @@ -1553,7 +1553,7 @@ CrystalIntro_InitUnownAnim: push de ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $28 @@ -1562,7 +1562,7 @@ CrystalIntro_InitUnownAnim: pop de ld a, SPRITE_ANIM_INDEX_INTRO_UNOWN - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $38 diff --git a/engine/movie/evolution_animation.asm b/engine/movie/evolution_animation.asm index 1c41935c7..ed500d1f8 100644 --- a/engine/movie/evolution_animation.asm +++ b/engine/movie/evolution_animation.asm @@ -305,7 +305,7 @@ EvolutionAnimation: push de depixel 9, 11 ld a, SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc ld a, [wJumptableIndex] diff --git a/engine/movie/gbc_only.asm b/engine/movie/gbc_only.asm index 482b9d33f..b5fdefee1 100644 --- a/engine/movie/gbc_only.asm +++ b/engine/movie/gbc_only.asm @@ -6,7 +6,7 @@ GBCOnlyScreen: ld de, MUSIC_NONE call PlayMusic - call ClearTileMap + call ClearTilemap ld hl, GBCOnlyGFX ld de, wGBCOnlyDecompressBuffer diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 7dc31ef24..11164ed79 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -1,6 +1,6 @@ InitDisplayForHallOfFame: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD call LoadStandardFont @@ -9,7 +9,7 @@ InitDisplayForHallOfFame: ld bc, vBGMap1 - vBGMap0 ld a, " " call ByteFill - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill @@ -29,7 +29,7 @@ InitDisplayForHallOfFame: InitDisplayForRedCredits: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD call LoadStandardFont @@ -38,7 +38,7 @@ InitDisplayForRedCredits: ld bc, vBGMap1 - vBGMap0 ld a, " " call ByteFill - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill @@ -65,7 +65,7 @@ ResetDisplayBetweenHallOfFameMons: ld a, BANK(wDecompressScratch) ldh [rSVBK], a ld hl, wDecompressScratch - ld bc, wScratchAttrMap - wDecompressScratch + ld bc, wScratchAttrmap - wDecompressScratch ld a, " " call ByteFill hlbgcoord 0, 0 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index a48b71e62..50c8721d0 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -1,7 +1,7 @@ _TitleScreen: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap ; Turn BG Map update off xor a diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 7868fe33e..7d858662c 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -149,7 +149,7 @@ RunTradeAnimScript: ld [wJumptableIndex], a call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call LoadFontsBattleExtra callfar ClearSpriteAnims @@ -359,7 +359,7 @@ TradeAnim_InitTubeAnim: pop de ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc @@ -368,7 +368,7 @@ TradeAnim_InitTubeAnim: pop de ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc @@ -466,7 +466,7 @@ TradeAnim_TubeToPlayer6: TradeAnim_TubeToOT8: TradeAnim_TubeToPlayer8: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD callfar ClearSpriteAnims @@ -534,7 +534,7 @@ TradeAnim_TubeAnimJumptable: .Zero: .Three: - call TradeAnim_BlankTileMap + call TradeAnim_BlankTilemap hlcoord 9, 3 ld [hl], $5b inc hl @@ -546,7 +546,7 @@ TradeAnim_TubeAnimJumptable: ret .One: - call TradeAnim_BlankTileMap + call TradeAnim_BlankTilemap hlcoord 0, 3 ld bc, SCREEN_WIDTH ld a, $60 @@ -554,7 +554,7 @@ TradeAnim_TubeAnimJumptable: ret .Two: - call TradeAnim_BlankTileMap + call TradeAnim_BlankTilemap hlcoord 0, 3 ld bc, $11 ld a, $60 @@ -593,7 +593,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: call WaitTop ld a, HIGH(vBGMap1) ldh [hBGMapAddress + 1], a - call ClearTileMap + call ClearTilemap hlcoord 0, 0 ld bc, SCREEN_WIDTH ld a, "─" @@ -623,11 +623,11 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: call WaitTop ld a, HIGH(vBGMap0) ldh [hBGMapAddress + 1], a - call ClearTileMap + call ClearTilemap ret TradeAnim_EnterLinkTube1: - call ClearTileMap + call ClearTilemap call WaitTop ld a, $a0 ldh [hSCX], a @@ -671,7 +671,7 @@ TradeAnim_ExitLinkTube: ret .done - call ClearTileMap + call ClearTilemap xor a ldh [hSCX], a call TradeAnim_AdvanceScriptPointer @@ -735,7 +735,7 @@ TradeAnim_ScrollOutRight: call WaitTop ld a, HIGH(vBGMap0) ldh [hBGMapAddress + 1], a - call ClearTileMap + call ClearTilemap call TradeAnim_IncrementJumptableIndex ret @@ -840,7 +840,7 @@ TradeAnim_ShowFrontpic: lb bc, 10, $31 call Request2bpp call WaitTop - call TradeAnim_BlankTileMap + call TradeAnim_BlankTilemap hlcoord 7, 2 xor a ldh [hGraphicStartTile], a @@ -925,7 +925,7 @@ ShowOTTrademonStats: TrademonStats_MonTemplate: call WaitTop - call TradeAnim_BlankTileMap + call TradeAnim_BlankTilemap ld a, HIGH(vBGMap1) ldh [hBGMapAddress + 1], a hlcoord 3, 0 @@ -945,7 +945,7 @@ TrademonStats_MonTemplate: TrademonStats_Egg: call WaitTop - call TradeAnim_BlankTileMap + call TradeAnim_BlankTilemap ld a, HIGH(vBGMap1) ldh [hBGMapAddress + 1], a hlcoord 3, 0 @@ -1012,7 +1012,7 @@ TrademonStats_PrintTrademonID: TradeAnim_RockingBall: depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call TradeAnim_AdvanceScriptPointer ld a, 32 ld [wFrameCounter], a @@ -1021,7 +1021,7 @@ TradeAnim_RockingBall: TradeAnim_DropBall: depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_TRADE_POKE_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc ld [hl], $1 @@ -1036,7 +1036,7 @@ TradeAnim_DropBall: TradeAnim_Poof: depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_TRADE_POOF - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call TradeAnim_AdvanceScriptPointer ld a, 16 ld [wFrameCounter], a @@ -1049,7 +1049,7 @@ TradeAnim_BulgeThroughTube: call DmgToCgbObjPal0 depixel 5, 11 ld a, SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call TradeAnim_AdvanceScriptPointer ld a, 64 ld [wFrameCounter], a @@ -1277,7 +1277,7 @@ TradeAnim_Wait80Frames: call DelayFrames ret -TradeAnim_BlankTileMap: +TradeAnim_BlankTilemap: hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " diff --git a/engine/movie/unused_title.asm b/engine/movie/unused_title.asm index bcddc0054..a459e9069 100644 --- a/engine/movie/unused_title.asm +++ b/engine/movie/unused_title.asm @@ -1,6 +1,6 @@ UnusedTitleScreen: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call DisableLCD ; Turn BG Map update off diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index fece592d0..6889eed83 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -29,7 +29,7 @@ ReanchorBGMap_NoOAMUpdate:: call OverworldTextModeSwitch ld a, HIGH(vBGMap1) call .LoadBGMapAddrIntoHRAM - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap farcall LoadOW_BGPal7 farcall ApplyPals ld a, $1 @@ -84,7 +84,7 @@ HDMATransfer_FillBGMap0WithBlack: ld a, "■" ld hl, wDecompressScratch - ld bc, wScratchAttrMap - wDecompressScratch + ld bc, wScratchAttrmap - wDecompressScratch call ByteFill ld a, HIGH(wDecompressScratch) ldh [rHDMA1], a diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 478c8f6c6..0507d98f6 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -5,11 +5,11 @@ BlankScreen: call ClearBGPalettes call ClearSprites hlcoord 0, 0 - ld bc, wTileMapEnd - wTileMap + ld bc, wTilemapEnd - wTilemap ld a, " " call ByteFill - hlcoord 0, 0, wAttrMap - ld bc, wAttrMapEnd - wAttrMap + hlcoord 0, 0, wAttrmap + ld bc, wAttrmapEnd - wAttrmap ld a, $7 call ByteFill call WaitBGMap2 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 245d8e763..bd74cfc40 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2643,7 +2643,7 @@ Script_writeunusedbytebuffer: Script_closetext: ; script command 0x49 - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call CloseText ret diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index ed3b26ef5..c08ca11d7 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -233,7 +233,7 @@ LoadMapTimeOfDay: farcall UpdateTimeOfDayPal call OverworldTextModeSwitch call .ClearBGMap - call .PushAttrMap + call .PushAttrmap ret .ClearBGMap: @@ -264,14 +264,14 @@ LoadMapTimeOfDay: call ByteFill ret -.PushAttrMap: +.PushAttrmap: decoord 0, 0 call .copy ldh a, [hCGB] and a ret z - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld a, $1 ldh [rVBK], a .copy diff --git a/engine/phone/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm index dea305af1..0ddb3c852 100644 --- a/engine/phone/phonering_copytilemapatonce.asm +++ b/engine/phone/phonering_copytilemapatonce.asm @@ -23,7 +23,7 @@ PhoneRing_CopyTilemapAtOnce: di ld a, BANK(vBGMap2) ldh [rVBK], a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap call .CopyTilemapAtOnce ld a, BANK(vBGMap0) ldh [rVBK], a diff --git a/engine/pokedex/new_pokedex_entry.asm b/engine/pokedex/new_pokedex_entry.asm index 308a22b69..844253c52 100644 --- a/engine/pokedex/new_pokedex_entry.asm +++ b/engine/pokedex/new_pokedex_entry.asm @@ -5,7 +5,7 @@ NewPokedexEntry: ldh [hMapAnims], a call LowVolume call ClearBGPalettes - call ClearTileMap + call ClearTilemap call UpdateSprites call ClearSprites ld a, [wPokedexStatus] @@ -34,7 +34,7 @@ NewPokedexEntry: ret .ReturnFromDexRegistration: - call ClearTileMap + call ClearTilemap call LoadFontsExtra call LoadStandardFont farcall Pokedex_PlaceFrontpicTopLeftCorner diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 87a2438ab..7a97d57cf 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -79,7 +79,7 @@ Pokedex: InitPokedex: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call Pokedex_LoadGFX ld hl, wPokedexDataStart @@ -219,7 +219,7 @@ Pokedex_InitMainScreen: ldh [hBGMapMode], a call ClearSprites xor a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call ByteFill farcall DrawPokedexListWindow @@ -718,7 +718,7 @@ Pokedex_InitSearchResultsScreen: xor a ldh [hBGMapMode], a xor a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill call Pokedex_SetBGMapMode4 diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm index d7829dd4b..bd909f8ff 100644 --- a/engine/pokedex/pokedex_3.asm +++ b/engine/pokedex/pokedex_3.asm @@ -140,7 +140,7 @@ DrawDexEntryScreenRightEdge: ld [hl], $3c xor a ld b, SCREEN_HEIGHT - hlcoord 19, 0, wAttrMap + hlcoord 19, 0, wAttrmap call Bank77_FillColumn call WaitBGMap2 pop hl diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index b4228f68a..3c74d3f59 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -72,7 +72,7 @@ PokeGear: .InitTilemap: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD xor a @@ -165,7 +165,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp" InitPokegearModeIndicatorArrow: depixel 4, 2, 4, 0 ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $0 @@ -671,7 +671,7 @@ PokegearMap_InitPlayerIcon: ld b, SPRITE_ANIM_INDEX_BLUE_WALK .got_gender ld a, b - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $10 @@ -692,7 +692,7 @@ PokegearMap_InitCursor: push af depixel 0, 0 ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $04 @@ -750,7 +750,7 @@ PokegearRadio_Init: call InitPokegearTilemap depixel 4, 10, 4, 4 ld a, SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $08 @@ -1783,7 +1783,7 @@ _TownMap: ld [wVramState], a call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites call DisableLCD call Pokegear_LoadGFX @@ -2035,7 +2035,7 @@ PokegearMap: _FlyMap: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites ld hl, hInMenu ld a, [hl] @@ -2497,7 +2497,7 @@ Pokedex_GetArea: .GetAndPlaceNest: ld [wTownMapCursorLandmark], 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 ld hl, wVirtualOAMSprite00 .nestloop @@ -2675,7 +2675,7 @@ FillTownMap: TownMapPals: ; Assign palettes based on tile ids hlcoord 0, 0 - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT .loop ; Current tile @@ -2743,7 +2743,7 @@ TownMapMon: ; Animation/palette depixel 0, 0 ld a, SPRITE_ANIM_INDEX_PARTY_MON - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $08 @@ -2778,7 +2778,7 @@ TownMapPlayerIcon: ld b, SPRITE_ANIM_INDEX_BLUE_WALK ; Female .got_gender ld a, b - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $10 @@ -2817,7 +2817,7 @@ Unreferenced_Function92311: xor a ld [wTownMapPlayerIconLandmark], a call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites ld hl, hInMenu ld a, [hl] diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 162c94887..dd4977f1b 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -774,7 +774,7 @@ _MovePKMNWithoutMail: BillsPC_InitRAM: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call BillsPC_InitGFX ld hl, wBillsPCData ld bc, wBillsPCDataEnd - wBillsPCData @@ -2457,7 +2457,7 @@ BillsPC_ChangeBoxSubmenu: ld b, NAME_BOX ld de, wd002 farcall NamingScreen - call ClearTileMap + call ClearTilemap call LoadStandardFont call LoadFontsBattleExtra ld a, [wMenuSelection] diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 9751a90cf..a545d9ab9 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -782,7 +782,7 @@ EggHatch_CrackShell: ld d, a ld e, 11 * 8 ld a, SPRITE_ANIM_INDEX_EGG_CRACK - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc ld [hl], $0 @@ -810,7 +810,7 @@ Hatch_InitShellFragments: push bc ld a, SPRITE_ANIM_INDEX_EGG_HATCH - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 51c47c0d6..1fbca90d5 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -253,7 +253,7 @@ EvolveAfterBattle_MasterLoop: ld c, 40 call DelayFrames - call ClearTileMap + call ClearTilemap call UpdateSpeciesNameIfNotNicknamed call GetBaseData @@ -379,7 +379,7 @@ UpdateSpeciesNameIfNotNicknamed: CancelEvolution: ld hl, StoppedEvolvingText call PrintText - call ClearTileMap + call ClearTilemap pop hl jp EvolveAfterBattle_MasterLoop diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 6722c4fe1..2c66dcd50 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -1,5 +1,5 @@ LearnMove: - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap ld a, [wCurPartyMon] ld hl, wPartyMonNicknames call GetNick @@ -166,7 +166,7 @@ ForgetMove: ld [w2DMenuCursorOffsets], a call StaticMenuJoypad push af - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap pop af pop hl bit 1, a diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index e0efb3903..8def4e57a 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -9,7 +9,7 @@ ReadAnyMail: push de call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call LoadFontsExtra pop de diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index f6fee4b9c..d25d6cc2b 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -631,7 +631,7 @@ MonMenu_Fly: ret MonMenu_Flash: - farcall OWFlash + farcall FlashFunction ld a, [wFieldMoveSucceeded] cp $1 jr nz, .Fail @@ -844,7 +844,7 @@ ChooseMoveToDelete: ld hl, w2DMenuFlags1 res 6, [hl] call ClearSprites - call ClearTileMap + call ClearTilemap pop af ret @@ -1075,7 +1075,7 @@ MoveScreenLoop: ld hl, w2DMenuFlags1 res 6, [hl] call ClearSprites - jp ClearTileMap + jp ClearTilemap MoveScreenAttributes: db 3, 1 @@ -1089,7 +1089,7 @@ String_MoveWhere: SetUpMoveScreenBG: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites xor a ldh [hBGMapMode], a diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 1d8d7da77..dd0230952 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -37,13 +37,13 @@ StatsScreenInit_gotaddress: push bc push hl call ClearBGPalettes - call ClearTileMap + call ClearTilemap call UpdateSprites farcall StatsScreen_LoadFont pop hl call _hl_ call ClearBGPalettes - call ClearTileMap + call ClearTilemap pop bc ; restore old values @@ -129,7 +129,7 @@ StatsScreen_WaitAnim: .finish ld hl, wcf64 res 5, [hl] - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 ret StatsScreen_SetJumptableIndex: @@ -148,8 +148,8 @@ MonStatsInit: ld hl, wcf64 res 6, [hl] call ClearBGPalettes - call ClearTileMap - farcall HDMATransferTileMapToWRAMBank3 + call ClearTilemap + farcall HDMATransferTilemapToWRAMBank3 call StatsScreen_CopyToTempMon ld a, [wCurPartySpecies] cp EGG @@ -989,7 +989,7 @@ EggStatsScreen: call DelayFrame hlcoord 0, 0 call PrepMonFrontpic - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 call StatsScreen_AnimateEgg ld a, [wTempMonHappiness] diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 16310d8f6..9de5a0bfb 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -2,28 +2,28 @@ PRINTPARTY_HP EQU "◀" ; $71 PrintPage1: hlcoord 0, 0 - decoord 0, 0, wPrinterTileMapBuffer + decoord 0, 0, wPrinterTilemapBuffer ld bc, 17 * SCREEN_WIDTH call CopyBytes - hlcoord 17, 1, wPrinterTileMapBuffer + hlcoord 17, 1, wPrinterTilemapBuffer ld a, $62 ld [hli], a inc a ld [hl], a - hlcoord 17, 2, wPrinterTileMapBuffer + hlcoord 17, 2, wPrinterTilemapBuffer ld a, $64 ld [hli], a inc a ld [hl], a - hlcoord 1, 9, wPrinterTileMapBuffer + hlcoord 1, 9, wPrinterTilemapBuffer ld a, " " ld [hli], a ld [hl], a - hlcoord 1, 10, wPrinterTileMapBuffer + hlcoord 1, 10, wPrinterTilemapBuffer ld a, $61 ld [hli], a ld [hl], a - hlcoord 2, 11, wPrinterTileMapBuffer + hlcoord 2, 11, wPrinterTilemapBuffer lb bc, 5, 18 call ClearBox ld a, [wTempSpecies] @@ -36,9 +36,9 @@ PrintPage1: farcall GetDexEntryPagePointer pop af ld a, b - hlcoord 1, 11, wPrinterTileMapBuffer + hlcoord 1, 11, wPrinterTilemapBuffer call nz, FarString - hlcoord 19, 0, wPrinterTileMapBuffer + hlcoord 19, 0, wPrinterTilemapBuffer ld [hl], $35 ld de, SCREEN_WIDTH add hl, de @@ -52,26 +52,26 @@ PrintPage1: ret PrintPage2: - hlcoord 0, 0, wPrinterTileMapBuffer + hlcoord 0, 0, wPrinterTilemapBuffer ld bc, 8 * SCREEN_WIDTH ld a, " " call ByteFill - hlcoord 0, 0, wPrinterTileMapBuffer + hlcoord 0, 0, wPrinterTilemapBuffer ld a, $36 ld b, 6 call .FillColumn - hlcoord 19, 0, wPrinterTileMapBuffer + hlcoord 19, 0, wPrinterTilemapBuffer ld a, $37 ld b, 6 call .FillColumn - hlcoord 0, 6, wPrinterTileMapBuffer + hlcoord 0, 6, wPrinterTilemapBuffer ld [hl], $38 inc hl ld a, $39 ld bc, SCREEN_HEIGHT call ByteFill ld [hl], $3a - hlcoord 0, 7, wPrinterTileMapBuffer + hlcoord 0, 7, wPrinterTilemapBuffer ld bc, SCREEN_WIDTH ld a, $32 call ByteFill @@ -84,7 +84,7 @@ PrintPage2: ld c, 2 ; get page 2 farcall GetDexEntryPagePointer pop af - hlcoord 1, 1, wPrinterTileMapBuffer + hlcoord 1, 1, wPrinterTilemapBuffer ld a, b call nz, FarString ret @@ -132,7 +132,7 @@ GBPrinterString_PrinterError4: PrintPartyMonPage1: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites xor a ldh [hBGMapMode], a @@ -231,7 +231,7 @@ PrintPartyMonPage1: PrintPartyMonPage2: call ClearBGPalettes - call ClearTileMap + call ClearTilemap call ClearSprites xor a ldh [hBGMapMode], a diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 588699863..e26130098 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -26,12 +26,12 @@ Printer_CleanUpAfterSend: ld [wPrinterOpcode], a ret -Printer_PrepareTileMapForPrint: +Printer_PrepareTilemapForPrint: push af call Printer_StartTransmission pop af ld [wPrinterMargins], a - call Printer_CopyTileMapToBuffer + call Printer_CopyTilemapToBuffer ret Printer_ExitPrinter: @@ -63,7 +63,7 @@ PrintDexEntry: ln a, 1, 0 ld [wPrinterMargins], a farcall PrintPage1 - call ClearTileMap + call ClearTilemap ld a, %11100100 call DmgToCgbBGPals call DelayFrame @@ -146,13 +146,13 @@ PrintPCBox: ld hl, hVBlank ld a, [hl] push af - ld [hl], 4 + ld [hl], $4 xor a ldh [hBGMapMode], a call PrintPCBox_Page1 ln a, 1, 0 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint call Printer_ResetRegistersAndStartDataSend jr c, .cancel @@ -163,7 +163,7 @@ PrintPCBox: ldh [hBGMapMode], a call PrintPCBox_Page2 ln a, 0, 0 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint call Printer_ResetRegistersAndStartDataSend jr c, .cancel @@ -175,7 +175,7 @@ PrintPCBox: ldh [hBGMapMode], a call PrintPCBox_Page3 ln a, 0, 0 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint call Printer_ResetRegistersAndStartDataSend jr c, .cancel @@ -187,7 +187,7 @@ PrintPCBox: ldh [hBGMapMode], a call PrintPCBox_Page4 ln a, 0, 3 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint call Printer_ResetRegistersAndStartDataSend .cancel pop af @@ -227,11 +227,11 @@ PrintUnownStamp: ld [hl], $4 xor a ldh [hBGMapMode], a - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap farcall PlaceUnownPrinterFrontpic ln a, 0, 0 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint - call Call_LoadTempTileMapToTileMap + call Printer_PrepareTilemapForPrint + call SafeLoadTempTilemapToTilemap call Printer_ResetJoypadRegisters ld a, 18 / 2 ld [wPrinterQueueLength], a @@ -259,7 +259,7 @@ PrintUnownStamp: pop af ldh [hVBlank], a call Printer_CleanUpAfterSend - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap xor a ldh [rIF], a pop af @@ -291,11 +291,11 @@ PrintMail: ldh [hBGMapMode], a ln a, 1, 3 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint ld hl, hVBlank ld a, [hl] push af - ld [hl], %0100 + ld [hl], $4 ld a, 18 / 2 ld [wPrinterQueueLength], a @@ -304,7 +304,7 @@ PrintMail: pop af ldh [hVBlank], a call Printer_CleanUpAfterSend - call Printer_CopyBufferToTileMap + call Printer_CopyBufferToTilemap xor a ldh [rIF], a @@ -333,12 +333,12 @@ PrintPartymon: ldh [hBGMapMode], a farcall PrintPartyMonPage1 ln a, 1, 0 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint ld hl, hVBlank ld a, [hl] push af - ld [hl], %0100 + ld [hl], $4 ld a, 16 / 2 ld [wPrinterQueueLength], a @@ -354,7 +354,7 @@ PrintPartymon: ldh [hBGMapMode], a farcall PrintPartyMonPage2 ln a, 0, 3 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint ld a, 18 / 2 ld [wPrinterQueueLength], a @@ -365,7 +365,7 @@ PrintPartymon: ldh [hVBlank], a call Printer_CleanUpAfterSend - call Printer_CopyBufferToTileMap + call Printer_CopyBufferToTilemap xor a ldh [rIF], a pop af @@ -396,10 +396,10 @@ _PrintDiploma: ld hl, hVBlank ld a, [hl] push af - ld [hl], %0100 + ld [hl], $4 ln a, 1, 0 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint + call Printer_PrepareTilemapForPrint call Printer_ResetJoypadRegisters ld a, 18 / 2 @@ -410,15 +410,15 @@ _PrintDiploma: ld c, 12 call DelayFrames - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap xor a ldh [hBGMapMode], a farcall PrintDiplomaPage2 ln a, 0, 3 ; to be loaded to wPrinterMargins - call Printer_PrepareTileMapForPrint - call Call_LoadTempTileMapToTileMap + call Printer_PrepareTilemapForPrint + call SafeLoadTempTilemapToTilemap call Printer_ResetJoypadRegisters ld a, 18 / 2 @@ -473,15 +473,15 @@ CheckCancelPrint: scf ret -Printer_CopyTileMapToBuffer: +Printer_CopyTilemapToBuffer: hlcoord 0, 0 - ld de, wPrinterTileMapBuffer + ld de, wPrinterTilemapBuffer ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyBytes ret -Printer_CopyBufferToTileMap: - ld hl, wPrinterTileMapBuffer +Printer_CopyBufferToTilemap: + ld hl, wPrinterTilemapBuffer decoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyBytes diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm index e8cec0345..d047418e0 100644 --- a/engine/printer/printer_serial.asm +++ b/engine/printer/printer_serial.asm @@ -362,14 +362,14 @@ Printer_StageHeaderForSend: ret Printer_Convert2RowsTo2bpp: - ; de = wPrinterTileMapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex]) + ; de = wPrinterTilemapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex]) ld a, [wPrinterRowIndex] xor $ff ld d, a ld a, [wPrinterQueueLength] inc a add d - ld hl, wPrinterTileMapBuffer + ld hl, wPrinterTilemapBuffer ld de, 2 * SCREEN_WIDTH .loop1 and a diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 357e69667..5dc987189 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -36,7 +36,7 @@ RestartClock: push af set NO_TEXT_SCROLL, [hl] call LoadStandardMenuHeader - call ClearTileMap + call ClearTilemap ld hl, .ClockSetWithControlPadText call PrintText call .SetClock diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index da1012ff8..cdb2c9a12 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -19,7 +19,7 @@ InitClock: ld c, 8 call DelayFrames call RotateFourPalettesLeft - call ClearTileMap + call ClearTilemap call ClearSprites ld b, SCGB_DIPLOMA call GetSGBLayout diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm index 5f943795a..ff57ac83b 100644 --- a/engine/tilesets/map_palettes.asm +++ b/engine/tilesets/map_palettes.asm @@ -1,6 +1,6 @@ -SwapTextboxPalettes:: +_SwapTextboxPalettes:: hlcoord 0, 0 - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld b, SCREEN_HEIGHT .loop push bc @@ -44,7 +44,7 @@ SwapTextboxPalettes:: jr nz, .loop ret -ScrollBGMapPalettes:: +_ScrollBGMapPalettes:: ld hl, wBGMapBuffer ld de, wBGMapPalBuffer .loop diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm index e5fbcc07e..7229a73e7 100644 --- a/home/copy_tilemap.asm +++ b/home/copy_tilemap.asm @@ -1,34 +1,34 @@ -LoadTileMapToTempTileMap:: -; Load wTileMap into wTempTileMap +LoadTilemapToTempTilemap:: +; Load wTilemap into wTempTilemap ldh a, [rSVBK] push af - ld a, BANK(wTempTileMap) + ld a, BANK(wTempTilemap) ldh [rSVBK], a hlcoord 0, 0 - decoord 0, 0, wTempTileMap - ld bc, wTileMapEnd - wTileMap + decoord 0, 0, wTempTilemap + ld bc, wTilemapEnd - wTilemap call CopyBytes pop af ldh [rSVBK], a ret -Call_LoadTempTileMapToTileMap:: +SafeLoadTempTilemapToTilemap:: xor a ldh [hBGMapMode], a - call LoadTempTileMapToTileMap + call LoadTempTilemapToTilemap ld a, 1 ldh [hBGMapMode], a ret -LoadTempTileMapToTileMap:: -; Load wTempTileMap into wTileMap +LoadTempTilemapToTilemap:: +; Load wTempTilemap into wTilemap ldh a, [rSVBK] push af - ld a, BANK(wTempTileMap) + ld a, BANK(wTempTilemap) ldh [rSVBK], a - hlcoord 0, 0, wTempTileMap + hlcoord 0, 0, wTempTilemap decoord 0, 0 - ld bc, wTileMapEnd - wTileMap + ld bc, wTilemapEnd - wTilemap call CopyBytes pop af ldh [rSVBK], a diff --git a/home/handshake.asm b/home/handshake.asm index ee01cfadb..9747713c7 100644 --- a/home/handshake.asm +++ b/home/handshake.asm @@ -1,6 +1,5 @@ PrinterReceive:: homecall _PrinterReceive - ret AskSerial:: diff --git a/home/joypad.asm b/home/joypad.asm index f562d0878..cfc94a4be 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -14,6 +14,7 @@ ClearJoypad:: ret Joypad:: +; This is called automatically every frame in VBlank. ; Read the joypad register and translate it to something more ; workable for use in-game. There are 8 buttons, so we can use ; one byte to contain all player input. @@ -294,7 +295,7 @@ JoyWaitAorB:: ldh a, [hJoyPressed] and A_BUTTON | B_BUTTON ret nz - call RTC + call UpdateTimeAndPals jr .loop WaitButton:: @@ -412,7 +413,7 @@ PromptButton:: ldh a, [hJoyPressed] and A_BUTTON | B_BUTTON jr nz, .received_input - call RTC + call UpdateTimeAndPals ld a, $1 ldh [hBGMapMode], a call DelayFrame diff --git a/home/map.asm b/home/map.asm index 5fd2fcc27..bccc2ae1c 100644 --- a/home/map.asm +++ b/home/map.asm @@ -93,7 +93,7 @@ GetMapSceneID:: OverworldTextModeSwitch:: call LoadMapPart - call FarCallSwapTextboxPalettes + call SwapTextboxPalettes ret LoadMapPart:: @@ -1157,7 +1157,7 @@ ScrollMapUp:: ld de, wBGMapBuffer call BackupBGMapRow ld c, 2 * SCREEN_WIDTH - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld e, a ld a, [wBGMapAnchor + 1] @@ -1172,7 +1172,7 @@ ScrollMapDown:: ld de, wBGMapBuffer call BackupBGMapRow ld c, 2 * SCREEN_WIDTH - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld l, a ld a, [wBGMapAnchor + 1] @@ -1195,7 +1195,7 @@ ScrollMapLeft:: ld de, wBGMapBuffer call BackupBGMapColumn ld c, 2 * SCREEN_HEIGHT - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld e, a ld a, [wBGMapAnchor + 1] @@ -1210,7 +1210,7 @@ ScrollMapRight:: ld de, wBGMapBuffer call BackupBGMapColumn ld c, 2 * SCREEN_HEIGHT - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld e, a and %11100000 diff --git a/home/menu_window.asm b/home/menu_window.asm index b72677702..d66485041 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -194,7 +194,7 @@ MenuBoxCoord2Tile:: ld b, a Coord2Tile:: -; Return the address of wTileMap(c, b) in hl. +; Return the address of wTilemap(c, b) in hl. xor a ld h, a ld l, b @@ -221,7 +221,7 @@ MenuBoxCoord2Attr:: ld b, a Coord2Attr:: -; Return the address of wAttrMap(c, b) in hl. +; Return the address of wAttrmap(c, b) in hl. xor a ld h, a ld l, b @@ -237,6 +237,6 @@ Coord2Attr:: xor a ld b, a add hl, bc - bccoord 0, 0, wAttrMap + bccoord 0, 0, wAttrmap add hl, bc ret diff --git a/home/mobile.asm b/home/mobile.asm index 727518b84..9597372fb 100644 --- a/home/mobile.asm +++ b/home/mobile.asm @@ -140,7 +140,7 @@ Unreferenced_Function3ed7:: Function3eea:: push hl push bc - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b @@ -165,7 +165,7 @@ Unreferenced_Function3efd:: .fill_attr push hl push bc - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b @@ -178,7 +178,7 @@ Unreferenced_Function3efd:: ret Function3f20:: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld b, 6 ld c, 20 call Function3f35 diff --git a/home/names.asm b/home/names.asm index 434eb17d5..e2ce8175c 100644 --- a/home/names.asm +++ b/home/names.asm @@ -125,10 +125,10 @@ GetPokemonName:: ld e, a ld h, 0 ld l, a - add hl, hl ; hl = hl * 4 - add hl, hl ; hl = hl * 4 - add hl, de ; hl = (hl*4) + de - add hl, hl ; hl = (5*hl) + (5*hl) + add hl, hl + add hl, hl + add hl, de + add hl, hl ld de, PokemonNames add hl, de @@ -185,13 +185,13 @@ GetTMHMName:: ld hl, .HMText ld bc, .HMTextEnd - .HMText - jr .asm_34a1 + jr .copy .TM: ld hl, .TMText ld bc, .TMTextEnd - .TMText -.asm_34a1 +.copy ld de, wStringBuffer1 call CopyBytes @@ -205,20 +205,20 @@ GetTMHMName:: ; HM numbers start from 51, not 1 pop af ld a, c - jr c, .asm_34b9 + jr c, .not_hm sub NUM_TMS -.asm_34b9 +.not_hm ; Divide and mod by 10 to get the top and bottom digits respectively ld b, "0" .mod10 sub 10 - jr c, .asm_34c2 + jr c, .done_mod inc b jr .mod10 -.asm_34c2 - add 10 +.done_mod + add 10 push af ld a, b ld [de], a diff --git a/home/palettes.asm b/home/palettes.asm index 6391c7c27..e687e9a89 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -319,10 +319,10 @@ ReloadSpritesNoPalettes:: call DelayFrame ret -FarCallSwapTextboxPalettes:: - homecall SwapTextboxPalettes +SwapTextboxPalettes:: + homecall _SwapTextboxPalettes ret -FarCallScrollBGMapPalettes:: - homecall ScrollBGMapPalettes +ScrollBGMapPalettes:: + homecall _ScrollBGMapPalettes ret diff --git a/home/rtc.asm b/home/rtc.asm index 0e5550485..7dc4e776a 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -1,4 +1,4 @@ -RTC:: +UpdateTimeAndPals:: ; update time and time-sensitive palettes ; rtc enabled? diff --git a/home/serial.asm b/home/serial.asm index d95d6ce49..d1b67f9b2 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -273,13 +273,13 @@ Serial_ExchangeLinkMenuSelection:: ret Serial_PrintWaitingTextAndSyncAndExchangeNybble:: - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap callfar PlaceWaitingText call WaitLinkTransfer - jp Call_LoadTempTileMapToTileMap + jp SafeLoadTempTilemapToTilemap Serial_SyncAndExchangeNybble:: - call LoadTileMapToTempTileMap + call LoadTilemapToTempTilemap callfar PlaceWaitingText jp WaitLinkTransfer diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm index 7f271575e..816849981 100644 --- a/home/sprite_anims.asm +++ b/home/sprite_anims.asm @@ -17,16 +17,16 @@ PushLYOverrides:: ld [wRequested2bpp], a ret -_InitSpriteAnimStruct:: +InitSpriteAnimStruct:: ld [wSpriteAnimIDBuffer], a ldh a, [hROMBank] push af - ld a, BANK(InitSpriteAnimStruct) + ld a, BANK(_InitSpriteAnimStruct) rst Bankswitch ld a, [wSpriteAnimIDBuffer] - call InitSpriteAnimStruct + call _InitSpriteAnimStruct pop af rst Bankswitch diff --git a/home/text.asm b/home/text.asm index f8142939e..82fdd7111 100644 --- a/home/text.asm +++ b/home/text.asm @@ -19,12 +19,12 @@ FillBoxWithByte:: jr nz, .row ret -ClearTileMap:: -; Fill wTileMap with blank tiles. +ClearTilemap:: +; Fill wTilemap with blank tiles. hlcoord 0, 0 ld a, " " - ld bc, wTileMapEnd - wTileMap + ld bc, wTilemapEnd - wTilemap call ByteFill ; Update the BG Map. @@ -35,10 +35,10 @@ ClearTileMap:: ClearScreen:: ld a, PAL_BG_TEXT - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - jr ClearTileMap + jr ClearTilemap Textbox:: ; Draw a text box at hl with room for b lines of c characters each. @@ -99,7 +99,7 @@ TextboxBorder:: TextboxPalette:: ; Fill text box width c height b at hl with pal 7 - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b @@ -422,7 +422,7 @@ LineFeedChar:: CarriageReturnChar:: pop hl push de - ld bc, -wTileMap + $10000 + ld bc, -wTilemap + $10000 add hl, bc ld de, -SCREEN_WIDTH ld c, 1 diff --git a/home/tilemap.asm b/home/tilemap.asm index 98362ec1f..914027845 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -61,7 +61,7 @@ CopyTilemapAtOnce:: jr .CopyTilemapAtOnce ; unused - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 ret .CopyTilemapAtOnce: @@ -83,7 +83,7 @@ CopyTilemapAtOnce:: di ld a, BANK(vTiles3) ldh [rVBK], a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap call .StackPointerMagic ld a, BANK(vTiles0) ldh [rVBK], a diff --git a/home/time.asm b/home/time.asm index e631fe060..b708329c5 100644 --- a/home/time.asm +++ b/home/time.asm @@ -1,6 +1,6 @@ ; Functions relating to the timer interrupt and the real-time-clock. -AskTimer:: +Unreferenced_Timer:: push af ldh a, [hMobile] and a @@ -195,7 +195,7 @@ InitTime:: farcall _InitTime ret -PanicResetClock:: +ClearClock:: call .ClearhRTC call SetClock ret diff --git a/home/video.asm b/home/video.asm index 6f90cb518..008f1057c 100644 --- a/home/video.asm +++ b/home/video.asm @@ -114,7 +114,7 @@ WaitTop:: ret UpdateBGMap:: -; Update the BG Map, in thirds, from wTileMap and wAttrMap. +; Update the BG Map, in thirds, from wTilemap and wAttrmap. ldh a, [hBGMapMode] and a @@ -159,7 +159,7 @@ UpdateBGMap:: ld a, 1 ldh [rVBK], a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap call .update ld a, 0 @@ -234,7 +234,7 @@ THIRD_HEIGHT EQU SCREEN_HEIGHT / 3 ; Rows of tiles in a third ld a, SCREEN_HEIGHT / 3 -; Discrepancy between wTileMap and BGMap +; Discrepancy between wTilemap and BGMap ld bc, BG_MAP_WIDTH - (SCREEN_WIDTH - 1) .row diff --git a/home/window.asm b/home/window.asm index 2433e28bb..f428c1a7a 100644 --- a/home/window.asm +++ b/home/window.asm @@ -6,7 +6,7 @@ RefreshScreen:: rst Bankswitch call ReanchorBGMap_NoOAMUpdate - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call LoadFonts_NoOAMUpdate pop af @@ -32,7 +32,7 @@ CloseText:: xor a ldh [hBGMapMode], a call OverworldTextModeSwitch - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap xor a ldh [hBGMapMode], a call SafeUpdateSprites @@ -52,20 +52,20 @@ OpenText:: call ReanchorBGMap_NoOAMUpdate ; clear bgmap call SpeechTextbox - call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap ; anchor bgmap + call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ; anchor bgmap call LoadFonts_NoOAMUpdate ; load font pop af rst Bankswitch ret -_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap:: +_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap:: ldh a, [hOAMUpdate] push af ld a, $1 ldh [hOAMUpdate], a - farcall OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall OpenAndCloseMenu_HDMATransferTilemapAndAttrmap pop af ldh [hOAMUpdate], a diff --git a/macros/coords.asm b/macros/coords.asm index 0833c242c..0fbf96ccd 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -5,7 +5,7 @@ decoord EQUS "coord de," coord: MACRO ; register, x, y[, origin] if _NARG < 4 - ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap + ld \1, (\3) * SCREEN_WIDTH + (\2) + wTilemap else ld \1, (\3) * SCREEN_WIDTH + (\2) + \4 endc @@ -27,7 +27,7 @@ ENDM dwcoord: MACRO ; x, y rept _NARG / 2 - dw (\2) * SCREEN_WIDTH + (\1) + wTileMap + dw (\2) * SCREEN_WIDTH + (\1) + wTilemap shift shift endr @@ -36,7 +36,7 @@ ENDM ldcoord_a: MACRO ; x, y[, origin] if _NARG < 3 - ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a + ld [(\2) * SCREEN_WIDTH + (\1) + wTilemap], a else ld [(\2) * SCREEN_WIDTH + (\1) + \3], a endc @@ -45,7 +45,7 @@ ENDM lda_coord: MACRO ; x, y[, origin] if _NARG < 3 - ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap] + ld a, [(\2) * SCREEN_WIDTH + (\1) + wTilemap] else ld a, [(\2) * SCREEN_WIDTH + (\1) + \3] endc @@ -61,7 +61,8 @@ INCLUDE "engine/pokemon/mon_menu.asm" INCLUDE "engine/overworld/select_menu.asm" INCLUDE "engine/events/elevator.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/bug_contest/judging.asm" INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm" diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 14bbdf6d3..1dd58e595 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -28,7 +28,7 @@ FastShipB1F_MapScripts: FastShipB1FSailorBlocksLeft: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue FastShipB1FAlreadyBlocked - applymovement FASTSHIPB1F_SAILOR2, FashShipB1FSailorBlocksLeftMovement + applymovement FASTSHIPB1F_SAILOR2, FastShipB1FSailorBlocksLeftMovement moveobject FASTSHIPB1F_SAILOR1, 30, 6 appear FASTSHIPB1F_SAILOR1 pause 5 @@ -38,7 +38,7 @@ FastShipB1FSailorBlocksLeft: FastShipB1FSailorBlocksRight: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue FastShipB1FAlreadyBlocked - applymovement FASTSHIPB1F_SAILOR1, FashShipB1FSailorBlocksRightMovement + applymovement FASTSHIPB1F_SAILOR1, FastShipB1FSailorBlocksRightMovement moveobject FASTSHIPB1F_SAILOR2, 31, 6 appear FASTSHIPB1F_SAILOR2 pause 5 @@ -201,17 +201,17 @@ TrainerSchoolboyRicky: closetext end -FashShipB1FTrashcan: +FastShipB1FTrashcan: jumpstd trashcan -FashShipB1FSailorBlocksRightMovement: +FastShipB1FSailorBlocksRightMovement: fix_facing big_step RIGHT remove_fixed_facing turn_head DOWN step_end -FashShipB1FSailorBlocksLeftMovement: +FastShipB1FSailorBlocksLeftMovement: fix_facing big_step LEFT remove_fixed_facing @@ -458,7 +458,7 @@ FastShipB1F_MapEvents: coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight db 1 ; bg events - bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan + bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan 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 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 2bca1cbd8..6c35b1530 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -413,11 +413,11 @@ EZChat_MasterLoop: .SpawnObjects: depixel 3, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct depixel 8, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $1 @@ -425,7 +425,7 @@ EZChat_MasterLoop: depixel 9, 2, 2, 0 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $3 @@ -433,7 +433,7 @@ EZChat_MasterLoop: depixel 10, 16 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $4 @@ -441,7 +441,7 @@ EZChat_MasterLoop: depixel 10, 4 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $5 @@ -449,7 +449,7 @@ EZChat_MasterLoop: depixel 10, 2 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $2 @@ -696,11 +696,11 @@ Function11c4a5: Function11c4be: ld a, $1 - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap ld bc, $a0 call ByteFill ld a, $7 - hlcoord 0, 14, wAttrMap + hlcoord 0, 14, wAttrmap ld bc, $28 call ByteFill farcall ReloadMapPart @@ -895,7 +895,7 @@ EZChat_PlaceCategoryNames: Function11c618: ld a, $2 - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap ld bc, $c8 call ByteFill farcall ReloadMapPart @@ -1495,7 +1495,7 @@ Function11c992: Function11c9ab: ld a, $7 - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap ld bc, $c8 call ByteFill farcall ReloadMapPart @@ -1552,7 +1552,7 @@ Function11c9c3: ret Function11ca01: - hlcoord 14, 7, wAttrMap + hlcoord 14, 7, wAttrmap ld de, $14 ld a, $5 ld c, a @@ -1571,7 +1571,7 @@ Function11ca01: jr nz, .asm_11ca0a Function11ca19: - hlcoord 0, 12, wAttrMap + hlcoord 0, 12, wAttrmap ld de, $14 ld a, $6 ld c, a @@ -1993,11 +1993,11 @@ Function11cd54: Function11cdaa: ld a, $2 - hlcoord 0, 6, wAttrMap + hlcoord 0, 6, wAttrmap ld bc, 6 * SCREEN_WIDTH call ByteFill ld a, $7 - hlcoord 0, 12, wAttrMap + hlcoord 0, 12, wAttrmap ld bc, 4 * SCREEN_WIDTH call ByteFill farcall ReloadMapPart diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index f3453328b..17f38f524 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -144,7 +144,7 @@ asm_4815f: call ClearBGPalettes call Function48d30 pop bc - call ClearTileMap + call ClearTilemap ld a, $ff ret @@ -254,7 +254,7 @@ Function4820d: call ClearBGPalettes call Function48d30 pop bc - call ClearTileMap + call ClearTilemap ld b, SCGB_DIPLOMA call GetSGBLayout ld hl, wd479 @@ -354,7 +354,7 @@ Function48304: ld a, $29 .asm_4833f ld [wMenuScrollPosition], a - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap .asm_48348 call ScrollingMenu ld de, $629 @@ -380,7 +380,7 @@ Function48304: ld [wd003], a .asm_48377 call Function48187 - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap jp Function4840c Function48383: @@ -1662,7 +1662,7 @@ Function48cdc: call Function48cfd pop hl pop bc - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index d3d88d9b1..a83803257 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -123,7 +123,7 @@ Function891d3: Function891de: call Mobile22_SetBGMapMode0 call ClearPalettes - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld a, $7 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill @@ -155,7 +155,7 @@ Function8920f: Function89215: push hl push bc - ld bc, wAttrMap - wTileMap + ld bc, wAttrmap - wTilemap add hl, bc ld [hl], a pop bc @@ -794,7 +794,7 @@ Palette_895de: Function895e6: ld a, 7 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ret @@ -802,7 +802,7 @@ Function895e6: Function895f2: push bc xor a - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill call Function89605 @@ -811,7 +811,7 @@ Function895f2: ret Function89605: - hlcoord 19, 2, wAttrMap + hlcoord 19, 2, wAttrmap ld a, 1 ld de, SCREEN_WIDTH ld c, 14 @@ -828,7 +828,7 @@ Function89605: jr nz, .loop .done - hlcoord 0, 16, wAttrMap + hlcoord 0, 16, wAttrmap ld c, 10 ld a, 2 .loop2 @@ -838,7 +838,7 @@ Function89605: inc a dec c jr nz, .loop2 - hlcoord 1, 11, wAttrMap + hlcoord 1, 11, wAttrmap ld a, 4 ld bc, 4 call ByteFill @@ -848,7 +848,7 @@ Function89605: ret Function8963d: - hlcoord 12, 3, wAttrMap + hlcoord 12, 3, wAttrmap ld a, 6 ld de, SCREEN_WIDTH lb bc, 7, 7 @@ -866,7 +866,7 @@ Function8963d: ret Function89655: - hlcoord 1, 12, wAttrMap + hlcoord 1, 12, wAttrmap ld de, SCREEN_WIDTH ld a, 5 ld b, 4 @@ -1164,7 +1164,7 @@ Function897d5: push bc call Function8934a jr nc, .asm_897f3 - hlcoord 12, 3, wAttrMap + hlcoord 12, 3, wAttrmap xor a ld de, SCREEN_WIDTH lb bc, 7, 7 @@ -2098,7 +2098,7 @@ Function89d75: push hl call Mobile22_SetBGMapMode0 call _hl_ - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap pop hl jr asm_89d90 @@ -2256,10 +2256,10 @@ Function89e6f: hlcoord 7, 4 call Function8a58d ld a, $5 - hlcoord 7, 4, wAttrMap + hlcoord 7, 4, wAttrmap call Function8a5a3 ld a, $6 - hlcoord 10, 4, wAttrMap + hlcoord 10, 4, wAttrmap call Function8a5a3 call Function891ab call SetPalettes @@ -2291,10 +2291,10 @@ Function89eb9: hlcoord 7, 4 call Function8a58d ld a, $5 - hlcoord 7, 4, wAttrMap + hlcoord 7, 4, wAttrmap call Function8a5a3 ld a, $6 - hlcoord 10, 4, wAttrMap + hlcoord 10, 4, wAttrmap call Function8a5a3 call Function891ab call SetPalettes @@ -2471,10 +2471,10 @@ Function89fa5: Function89fce: call Function8a5b6 ld a, $5 - hlcoord 7, 4, wAttrMap + hlcoord 7, 4, wAttrmap call Function8a5a3 ld a, $6 - hlcoord 10, 4, wAttrMap + hlcoord 10, 4, wAttrmap call Function8a5a3 call Function89448 call SetPalettes @@ -2554,11 +2554,11 @@ Function8a055: hlcoord 12, 4 call Function8a58d ld a, $5 - hlcoord 12, 4, wAttrMap + hlcoord 12, 4, wAttrmap call Function8a5a3 pop hl ld a, $6 - hlcoord 15, 4, wAttrMap + hlcoord 15, 4, wAttrmap call Function8a5a3 call CGBOnly_CopyTilemapAtOnce jp Function89e36 @@ -2586,7 +2586,7 @@ Function8a0a1: Function8a0c1: push hl - ld bc, wAttrMap - wTileMap + ld bc, wAttrmap - wTilemap add hl, bc ld a, [hl] pop hl @@ -2612,7 +2612,7 @@ Function8a0c9: Function8a0de: call Function8a0c9 - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de ret @@ -2814,10 +2814,10 @@ Function8a262: hlcoord 12, 4 call Function8a58d ld a, $5 - hlcoord 12, 4, wAttrMap + hlcoord 12, 4, wAttrmap call Function8a5a3 ld a, $6 - hlcoord 15, 4, wAttrMap + hlcoord 15, 4, wAttrmap call Function8a5a3 xor a ld [wd02e], a @@ -3080,18 +3080,18 @@ Function8a4d3: cp $1 jr nz, .asm_8a4eb ld a, $5 - hlcoord 12, 4, wAttrMap + hlcoord 12, 4, wAttrmap call Function8a5a3 ld a, $7 - hlcoord 15, 4, wAttrMap + hlcoord 15, 4, wAttrmap call Function8a5a3 ret .asm_8a4eb ld a, $7 - hlcoord 12, 4, wAttrMap + hlcoord 12, 4, wAttrmap call Function8a5a3 ld a, $6 - hlcoord 15, 4, wAttrMap + hlcoord 15, 4, wAttrmap call Function8a5a3 ret diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index b0fbe5918..719a1fe6b 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -615,11 +615,11 @@ Palette_8b6d5: RGB 00, 00, 00 Function8b6ed: - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, $012c xor a call ByteFill - hlcoord 0, 14, wAttrMap + hlcoord 0, 14, wAttrmap ld bc, $0050 ld a, $7 call ByteFill @@ -675,7 +675,7 @@ Function8b73e: ret Function8b744: - ld de, wAttrMap - wTileMap + ld de, wAttrmap - wTilemap add hl, de inc b inc b @@ -743,10 +743,10 @@ Function8b788: ret Function8b79e: - hlcoord 0, 1, wAttrMap + hlcoord 0, 1, wAttrmap ld a, $1 ld [hli], a - hlcoord 9, 1, wAttrMap + hlcoord 9, 1, wAttrmap ld e, $b .asm_8b7a9 ld a, $2 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1ae6ae625..cb1aec1cf 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -195,7 +195,7 @@ Function100144: ret z res 2, [hl] res 6, [hl] - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 ret Function100163: @@ -430,7 +430,7 @@ Function100320: ret Function100327: - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 ret Function10032e: @@ -1436,7 +1436,7 @@ Function100970: hlcoord 0, 0 ld de, w3_dc00 call Function1009a5 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld de, w3_dd68 call Function1009a5 call Function1009d2 @@ -1450,7 +1450,7 @@ Function100989: call Function1009ae farcall ReloadMapPart ld hl, w3_dd68 - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap call Function1009a5 ret @@ -1467,7 +1467,7 @@ Function1009ae: ldh [rSVBK], a ld hl, w3_d800 - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld c, SCREEN_WIDTH ld b, SCREEN_HEIGHT .loop_row @@ -1715,7 +1715,7 @@ Function100b45: call Mobile_SetOverworldDelay farcall MobileMenuJoypad push bc - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 call Function100e2d pop bc jr c, .asm_100b6b @@ -1773,7 +1773,7 @@ MobileMoveSelectionScreen: call Mobile_SetOverworldDelay farcall MobileMenuJoypad push bc - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 call Function100e2d pop bc jr c, .b_button @@ -1857,7 +1857,7 @@ MobileMoveSelectionScreen: .print_text call StdBattleTextbox - call Call_LoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap jp .GetMoveSelection Function100c74: @@ -1904,7 +1904,7 @@ Mobile_PartyMenuSelect: farcall MobileMenuJoypad push bc farcall PlaySpriteAnimations - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 call MobileComms_CheckInactivityTimer pop bc jr c, .done @@ -1957,7 +1957,7 @@ MobileBattleMonMenu: farcall MobileMenuJoypad push bc farcall PlaySpriteAnimations - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 call MobileComms_CheckInactivityTimer pop bc jr c, .asm_100d54 @@ -2918,7 +2918,7 @@ Function1013c0: ret Function1013d6: - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 ret Function1013dd: @@ -3785,7 +3785,7 @@ _StartMobileBattle: farcall Function100846 ld c, 120 call DelayFrames - farcall ClearTileMap + farcall ClearTilemap call .CopyOTDetails call StartMobileBattle ld a, [wcd2b] @@ -4907,14 +4907,14 @@ Function102274: Function102283: ld a, $01 - ld [wAttrMapEnd], a + ld [wAttrmapEnd], a ld hl, wcd4b set 0, [hl] ret Function10228e: xor a - ld [wAttrMapEnd], a + ld [wAttrmapEnd], a ld hl, wcd4b res 0, [hl] ret @@ -4945,7 +4945,7 @@ Function102298: .asm_1022c1 call Function10304f ld a, $01 - ld [wAttrMapEnd], a + ld [wAttrmapEnd], a ret Function1022ca: @@ -6415,10 +6415,10 @@ Function102d9a: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ld a, $07 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 ret Function102db7: @@ -6691,7 +6691,7 @@ String_10302e: Function10304f: xor a - ld [wAttrMapEnd], a + ld [wAttrmapEnd], a ld [wcf42], a ld [wcf44], a ld [wcf45], a @@ -6699,7 +6699,7 @@ Function10304f: Function10305d: nop - ld a, [wAttrMapEnd] + ld a, [wAttrmapEnd] and a ret z call Function10307f @@ -6958,7 +6958,7 @@ Function103309: ld [wd1ee], a call Function1034be call UpdateSprites - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 ld a, $01 ld [wd1f0], a call Function10339a @@ -6971,7 +6971,7 @@ Function103362: call Function1033af call Function10339a call Function10342c - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 ld a, [wBuffer2] bit 7, a jr z, .asm_103362 @@ -7179,7 +7179,7 @@ Function1034e0: push hl call ClearBox pop hl - ld bc, wAttrMap - wTileMap + ld bc, wAttrmap - wTilemap add hl, bc pop bc ld a, $06 diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 6a796f198..6bae84ccf 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -140,7 +140,7 @@ Function1080b7: ld [wJumptableIndex], a call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call MobileTradeAnim_ClearTiles call MobileTradeAnim_ClearBGMap @@ -215,7 +215,7 @@ Function108157: ld [wJumptableIndex], a call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call MobileTradeAnim_ClearTiles call MobileTradeAnim_ClearBGMap @@ -421,7 +421,7 @@ Function1082db: .loop farcall PlaySpriteAnimations farcall SetUpPokeAnim - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 jr nc, .loop ret @@ -500,7 +500,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: call Function108bec depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_BALL_POOF call PlaySFX hlcoord 0, 0 @@ -515,7 +515,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: MobileTradeAnim_ShowOTMonFromTrade: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call MobileTradeAnim_ClearBGMap ld a, [wOTTrademonSpecies] @@ -534,7 +534,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call Function108b45 ld a, $1 call Function108b98 @@ -633,7 +633,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: call Function108c2b depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_BALL_POOF call PlaySFX hlcoord 0, 0 @@ -648,7 +648,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: MobileTradeAnim_ShowOTMonFromGTS: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call MobileTradeAnim_ClearBGMap ld a, [wOTTrademonSpecies] @@ -676,7 +676,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call Function108b45 ld a, $1 call Function108b98 @@ -716,7 +716,7 @@ MobileTradeAnim_ShowOTMonFromGTS: MobileTradeAnim_GetOddEgg: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call MobileTradeAnim_ClearBGMap ld a, [wOTTrademonSpecies] @@ -744,7 +744,7 @@ MobileTradeAnim_GetOddEgg: ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call Function108b45 ld a, $1 call Function108b98 @@ -784,7 +784,7 @@ MobileTradeAnim_02: farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a call DisableLCD @@ -819,7 +819,7 @@ MobileTradeAnim_10: farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a call DisableLCD @@ -863,7 +863,7 @@ MobileTradeAnim_10: MobileTradeAnim_11: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap xor a ldh [hBGMapMode], a call DisableLCD @@ -926,7 +926,7 @@ MobileTradeAnim_GiveTrademon1: jr nz, .next depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct .next ld c, 1 @@ -951,7 +951,7 @@ MobileTradeAnim_GiveTrademon1: .init depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct xor a call Function108ad4 jr .next2 @@ -981,7 +981,7 @@ MobileTradeAnim_GiveTrademon2: call Function108b5a depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_FORESIGHT call PlaySFX ld c, 10 @@ -990,7 +990,7 @@ MobileTradeAnim_GiveTrademon2: ld [wcf64], a depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct .loop ldh a, [hSCY] cp $90 @@ -1016,7 +1016,7 @@ MobileTradeAnim_05: call WaitMobileTradeSpriteAnims depixel 30, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL call PlaySFX @@ -1037,7 +1037,7 @@ MobileTradeAnim_07: call DelayFrames depixel 30, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL call PlaySFX @@ -1060,7 +1060,7 @@ MobileTradeAnim_GetTrademon1: farcall DeinitializeAllSprites depixel 9, 10, 2, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld de, SFX_GLASS_TING_2 call PlaySFX call Function108af4 @@ -1095,13 +1095,13 @@ MobileTradeAnim_GetTrademon2: .asm_1088c5 depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct jr .asm_1088e7 .asm_1088cf depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE - call _InitSpriteAnimStruct + call InitSpriteAnimStruct xor a call Function108ad4 jr .asm_1088e7 @@ -1149,7 +1149,7 @@ MobileTradeAnim_0f: farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap call DisableLCD call MobileTradeAnim_ClearTiles call MobileTradeAnim_ClearBGMap diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm index bf194905d..ffae225b1 100644 --- a/mobile/mobile_45_stadium.asm +++ b/mobile/mobile_45_stadium.asm @@ -106,14 +106,14 @@ Function117738: farcall Function171ccd depixel 6, 3 ld a, $1d - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, $c add hl, bc ld a, $6 ld [hl], a depixel 9, 4 ld a, $1d - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, $c add hl, bc ld a, $7 @@ -519,7 +519,7 @@ Function117a94: call ClearBGPalettes call ClearSprites farcall Function172e78 - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 ret Function117ab4: @@ -536,7 +536,7 @@ Function117acd: bit 7, a jr nz, .asm_117ae2 call Function117ae9 - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 jr Function117acd .asm_117ae2 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index d4ba2fa55..6e925d025 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1144,7 +1144,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu: call MenuBox call MenuBoxCoord2Tile call ApplyTilemap - hlcoord 16, 8, wAttrMap + hlcoord 16, 8, wAttrmap ld a, $40 or [hl] ld [hl], a @@ -4998,7 +4998,7 @@ Function11a5b9: ld a, $5 ld [wMenuBorderBottomCoord], a call PushWindow - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld b, $6 ld c, $14 hlcoord 0, 0 @@ -5023,7 +5023,7 @@ Function11a5f5: ld a, $a ld [wMenuBorderBottomCoord], a call PushWindow - hlcoord 14, 6, wAttrMap + hlcoord 14, 6, wAttrmap ld b, $5 ld c, $6 hlcoord 14, 6 @@ -5615,7 +5615,7 @@ Function11acb7: Function11ad1b: call ClearBGPalettes call ClearSprites - call ClearTileMap + call ClearTilemap farcall Function17c000 ld a, [wMenuCursorY] ld [wcd82], a @@ -5680,7 +5680,7 @@ Function11ad95: hlcoord 12, 12 ld de, String_11ae40 call PlaceString - hlcoord 10, 10, wAttrMap + hlcoord 10, 10, wAttrmap lb bc, 8, 8 call Function11afd6 farcall ReloadMapPart @@ -5790,10 +5790,10 @@ Function11ae4e: hlcoord 16, 8 ld de, String_11b01b call PlaceString - hlcoord 14, 7, wAttrMap + hlcoord 14, 7, wAttrmap lb bc, 5, 6 call Function11afd6 - hlcoord 9, 12, wAttrMap + hlcoord 9, 12, wAttrmap lb bc, 6, 11 call Function11afd6 farcall ReloadMapPart @@ -5880,10 +5880,10 @@ Function11af04: hlcoord 16, 8 ld de, String_11b01b call PlaceString - hlcoord 14, 7, wAttrMap + hlcoord 14, 7, wAttrmap lb bc, 5, 6 call Function11afd6 - hlcoord 9, 12, wAttrMap + hlcoord 9, 12, wAttrmap lb bc, 6, 11 call Function11afd6 farcall ReloadMapPart diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 885d9835d..fed24a6d4 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -161,8 +161,8 @@ MobileSystemSplashScreen_InitGFX: lb bc, BANK(.Tiles), 104 call Get2bpp call .LoadPals - call .LoadTileMap - call .LoadAttrMap + call .LoadTilemap + call .LoadAttrmap hlbgcoord 0, 0 call Function16cc73 call Function16cc02 @@ -180,24 +180,24 @@ MobileSystemSplashScreen_InitGFX: farcall ApplyPals ret -.LoadTileMap: +.LoadTilemap: hlcoord 0, 0 ld bc, 20 xor a call ByteFill - ld hl, .TileMap + ld hl, .Tilemap decoord 0, 1 ld bc, $0154 call CopyBytes ret -.LoadAttrMap: - hlcoord 0, 0, wAttrMap +.LoadAttrmap: + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH xor a call ByteFill - ld hl, .AttrMap - decoord 0, 1, wAttrMap + ld hl, .Attrmap + decoord 0, 1, wAttrmap ld bc, 17 * SCREEN_WIDTH call CopyBytes ret @@ -205,10 +205,10 @@ MobileSystemSplashScreen_InitGFX: .Tiles: INCBIN "gfx/mobile/mobile_splash.2bpp" -.TileMap: +.Tilemap: INCBIN "gfx/mobile/mobile_splash.tilemap" -.AttrMap: +.Attrmap: INCBIN "gfx/mobile/mobile_splash.attrmap" UnknownMobilePalettes_16c903: @@ -710,7 +710,7 @@ Function16cc5a: ret Function16cc62: - hlcoord 0, 15, wAttrMap + hlcoord 0, 15, wAttrmap ld bc, $0028 ld a, $1 call ByteFill @@ -731,7 +731,7 @@ Function16cc73: pop hl ld a, $1 ldh [rVBK], a - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap call Function16cc90 pop af ldh [rVBK], a diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index dce1ab702..e3a93f107 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -493,7 +493,7 @@ Function171b42: Function171b4b: depixel 8, 2 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $8 @@ -501,7 +501,7 @@ Function171b4b: depixel 8, 19 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $9 @@ -509,7 +509,7 @@ Function171b4b: depixel 17, 14, 2, 0 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR - call _InitSpriteAnimStruct + call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, $a @@ -672,7 +672,7 @@ Function171c87: ld bc, $168 call CopyBytes ld hl, Attrmap_1727ed - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld bc, $168 call CopyBytes hlcoord 3, 2 @@ -744,7 +744,7 @@ Function171d2b: ld bc, $168 call CopyBytes ld hl, Attrmap_172955 - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld bc, $168 call CopyBytes hlcoord 2, 2 @@ -826,7 +826,7 @@ Function172e78: ld bc, $168 call ByteFill ld a, $7 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, $168 call ByteFill call DisableLCD @@ -840,7 +840,7 @@ Function172e78: ld bc, $168 call CopyBytes ld hl, Attrmap_173517 - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap ld bc, $168 call CopyBytes ret diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 589d9d444..a27f74d1a 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -41,7 +41,7 @@ Function17a6a8: call Function17aba0 farcall Function106464 call Function17ac0c - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 call Function17abcf farcall LoadOW_BGPal7 farcall Function49420 @@ -163,7 +163,7 @@ Function17a78f: bit 7, [hl] res 7, [hl] jr nz, .asm_17a79f - farcall HDMATransferTileMapToWRAMBank3 + farcall HDMATransferTilemapToWRAMBank3 ret .asm_17a79f @@ -656,7 +656,7 @@ Function17aaa9: call Function17aae3 ld c, a ld b, $0 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap add hl, bc push hl ld a, $4 @@ -797,10 +797,10 @@ Function17ac1d: Function17ac2a: ld hl, Tilemap_17ae3d - decoord 0, 4, wAttrMap + decoord 0, 4, wAttrmap ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH call CopyBytes - hlcoord 0, 4, wAttrMap + hlcoord 0, 4, wAttrmap ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH .loop ld a, [hl] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 3fe6ce3b8..5df8c7a6f 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -11,7 +11,7 @@ Function17c000: ld hl, HaveWantMap decoord 0, 0 - bccoord 0, 0, wAttrMap + bccoord 0, 0, wAttrmap ld a, SCREEN_HEIGHT .y @@ -718,7 +718,7 @@ Function17d48d: call CopyBytes ld hl, PokemonNewsTileAttrmap decoord 0, 0 - bccoord 0, 0, wAttrMap + bccoord 0, 0, wAttrmap ld a, $12 .asm_17d4a4 push af @@ -3486,7 +3486,7 @@ Function17e691: .asm_17e6c7 pop hl - bccoord 0, 0, wAttrMap + bccoord 0, 0, wAttrmap add hl, bc ld [hl], a pop hl @@ -3509,7 +3509,7 @@ Function17e6de: ld l, a ld a, [wc709] ld h, a - decoord 0, 0, wAttrMap + decoord 0, 0, wAttrmap add hl, de pop af ld b, $7 @@ -4250,7 +4250,7 @@ Function17f41d: push af ld l, c ld h, b - ld bc, -wTileMap + $10000 + ld bc, -wTilemap + $10000 add hl, bc ld de, -SCREEN_WIDTH ld c, $1 @@ -4480,7 +4480,7 @@ DisplayMobileError: ld a, [wc303] bit 7, a jr nz, .quit - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 jr .loop .quit @@ -4545,7 +4545,7 @@ Function17f5c3: Function17f5d2: call Function17f5e4 - farcall HDMATransferAttrMapAndTileMapToWRAMBank3 + farcall HDMATransferAttrmapAndTilemapToWRAMBank3 call SetPalettes ld a, $1 ld [wc303], a @@ -4564,7 +4564,7 @@ Function17f5e4: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ld a, $6 - hlcoord 0, 0, wAttrMap + hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill hlcoord 2, 1 diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 86c18341a..bf8560309 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -65,7 +65,7 @@ Function49f16: .b_button pop bc call ClearBGPalettes - call ClearTileMap + call ClearTilemap ld a, MUSIC_MAIN_MENU ld [wMapMusic], a ld de, MUSIC_MAIN_MENU @@ -208,7 +208,7 @@ Function4a100: call ClearBGPalettes call Function4a13b call ClearBGPalettes - call ClearTileMap + call ClearTilemap asm_4a111: pop bc @@ -271,7 +271,7 @@ Function4a149: call ClearBox hlcoord 1, 14 call PlaceString - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call SetPalettes call StaticMenuJoypad ld hl, wMenuCursorY @@ -390,7 +390,7 @@ Function4a28a: hlcoord 14, 1 ld de, String_4a34b call PlaceString - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap call Function4a118 call ScrollingMenuJoypad push af @@ -419,7 +419,7 @@ Function4a28a: ld b, 3 ld c, 4 call Textbox - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap ld hl, DeletePassword_YesNo_MenuHeader call LoadMenuHeader call VerticalMenu @@ -442,7 +442,7 @@ Function4a28a: call ExitMenu .quit call Call_ExitMenu - farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap + farcall Mobile_OpenAndCloseMenu_HDMATransferTilemapAndAttrmap xor a ret @@ -715,7 +715,7 @@ asm_4a54d: .asm_4a574 pop bc call ClearBGPalettes - call ClearTileMap + call ClearTilemap jp Function49f0a .asm_4a57e ld hl, wMenuCursorY diff --git a/tools/sort_symfile.sh b/tools/sort_symfile.sh index 4fa48deb0..a712b97c8 100755 --- a/tools/sort_symfile.sh +++ b/tools/sort_symfile.sh @@ -4,10 +4,10 @@ sed \ -e "s/^..:[0-3]/0_ROM0@&/g" \ -e "s/^..:[4-7]/1_ROMX@&/g" \ -e "s/^..:[8-9]/2_VRAM@&/g" \ - -e "s/^..:[A-B]/3_SRAM@&/g" \ - -e "s/^00:[C-D]/4_WRAM0@&/g" \ - -e "s/^..:[D-D]/5_WRAMX@&/g" \ - -e "s/^..:[F-F]/6_HRAM@&/g" \ + -e "s/^..:[A-Ba-b]/3_SRAM@&/g" \ + -e "s/^00:[C-Dc-d]/4_WRAM0@&/g" \ + -e "s/^..:[D-Dd-d]/5_WRAMX@&/g" \ + -e "s/^..:[F-Ff-f]/6_HRAM@&/g" \ $1 \ | sort \ | sed -e "s/^.*@//g" > $TEMP_FILE @@ -360,10 +360,10 @@ wVirtualOAMEnd:: SECTION "Tilemap", WRAM0 -wTileMap:: ; c4a0 +wTilemap:: ; c4a0 ; 20x18 grid of 8x8 tiles ds SCREEN_WIDTH * SCREEN_HEIGHT -wTileMapEnd:: +wTilemapEnd:: SECTION "Miscellaneous", WRAM0 @@ -967,8 +967,8 @@ wPrinterSendByteOffset:: dw wPrinterSendByteCounter:: dw ; tilemap backup? -wPrinterTileMapBuffer:: ds SCREEN_HEIGHT * SCREEN_WIDTH ; ca90 -wPrinterTileMapBufferEnd:: +wPrinterTilemapBuffer:: ds SCREEN_HEIGHT * SCREEN_WIDTH ; ca90 +wPrinterTilemapBufferEnd:: wPrinterStatus:: db ; cbf8 ds 1 ; High nibble is for margin before the image, low nibble is for after. @@ -1326,7 +1326,7 @@ wCurHPPal:: db wSGBPals:: ds 48 ; cda9 -wAttrMap:: ; cdd9 +wAttrmap:: ; cdd9 ; 20x18 grid of bg tile attributes for 8x8 tiles ; read horizontally from the top row ; bit 7: priority @@ -1336,7 +1336,7 @@ wAttrMap:: ; cdd9 ; bit 3: vram bank (cgb only) ; bit 2-0: pal # (cgb only) ds SCREEN_WIDTH * SCREEN_HEIGHT -wAttrMapEnd:: +wAttrmapEnd:: UNION ; cf41 ; addresses dealing with serial comms @@ -2970,7 +2970,7 @@ wGameDataEnd:: SECTION "Pic Animations", WRAMX -wTempTileMap:: +wTempTilemap:: ; 20x18 grid of 8x8 tiles ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360 @@ -3193,8 +3193,8 @@ w5_MobileOpponentBattleLossMessage:: ds $c ; dc3e SECTION "Scratch RAM", WRAMX UNION ; d000 -wScratchTileMap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT -wScratchAttrMap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT +wScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT +wScratchAttrmap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT NEXTU ; d000 wDecompressScratch:: ds $80 tiles |