diff options
author | mid-kid <esteve.varela@gmail.com> | 2020-02-13 18:30:13 +0100 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2020-02-13 18:31:10 +0100 |
commit | 26b8bf003e3523fee94c4c18447ea55f9eb1d429 (patch) | |
tree | 96515ae3efceb833cd71c93786150daa3348c71c /engine/battle/core.asm | |
parent | 34ceaac71d32baace82f1e6de8fd4b252fb92a84 (diff) |
Standardize on lowercase Tilemap and Attrmap
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
Diffstat (limited to 'engine/battle/core.asm')
-rw-r--r-- | engine/battle/core.asm | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index ab73c4912..1d5bbc769 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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + 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 @@ -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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap ld a, $3 ld [wMenuCursorY], a ld hl, wBattleMonSpeed @@ -5508,7 +5508,7 @@ MoveSelectionScreen: .place_textbox_start_over call StdBattleTextbox - call SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + 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 SafeLoadTempTileMapToTileMap + call SafeLoadTempTilemapToTilemap xor a ; PARTYMON ld [wMonType], a ld a, [wCurSpecies] @@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus: .finish push hl - call SafeLoadTempTileMapToTileMap + 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 |