diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/present.asm | 2 | ||||
| -rw-r--r-- | engine/events/checksave.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/player_gfx.asm | 6 | ||||
| -rw-r--r-- | engine/menus/debug.asm | 8 | ||||
| -rw-r--r-- | engine/menus/save.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 499c21adb..654bc6da8 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -138,7 +138,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: pop hl ld de, wDecompressScratch - ld b, BANK(ConvertTrainerBattlePokeballTilesTo2bpp) ; BANK(@) + ld b, BANK(@) ld c, $28 call Request2bpp pop af diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f3e300445..3241e5022 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4157,7 +4157,7 @@ PursuitSwitch: ld a, [wLastPlayerMon] ld [wCurBattleMon], a .do_turn - ld a, BANK(DoPlayerTurn) ; and BANK(DoEnemyTurn) + ld a, BANK(DoPlayerTurn) ; aka BANK(DoEnemyTurn) rst FarCall ld a, BATTLE_VARS_MOVE @@ -4407,7 +4407,7 @@ UseHeldStatusHealingItem: .got_pointer call SwitchTurnCore - ld a, BANK(CalcPlayerStats) ; and BANK(CalcEnemyStats) + ld a, BANK(CalcPlayerStats) ; aka BANK(CalcEnemyStats) rst FarCall call SwitchTurnCore call ItemRecoveryAnim diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index 058bbad90..bfc334cc7 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -59,7 +59,7 @@ BattleCommand_Present: jr z, .got_hp_fn_pointer ld hl, AICheckEnemyMaxHP .got_hp_fn_pointer - ld a, BANK(AICheckPlayerMaxHP) ; and BANK(AICheckEnemyMaxHP) + ld a, BANK(AICheckPlayerMaxHP) ; aka BANK(AICheckEnemyMaxHP) rst FarCall jr c, .already_fully_healed diff --git a/engine/events/checksave.asm b/engine/events/checksave.asm index 1e9d18e71..67efaf9e3 100644 --- a/engine/events/checksave.asm +++ b/engine/events/checksave.asm @@ -1,5 +1,5 @@ CheckSave:: - ld a, BANK(sCheckValue1) ; BANK(sCheckValue2) + ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) call GetSRAMBank ld a, [sCheckValue1] ld b, a diff --git a/engine/gfx/player_gfx.asm b/engine/gfx/player_gfx.asm index cd1aca9d3..bd0fd0ce7 100644 --- a/engine/gfx/player_gfx.asm +++ b/engine/gfx/player_gfx.asm @@ -111,7 +111,7 @@ GetCardPic: .GotClass: ld de, vTiles2 tile $00 ld bc, $23 tiles - ld a, BANK(ChrisCardPic) ; BANK(KrisCardPic) + ld a, BANK(ChrisCardPic) ; aka BANK(KrisCardPic) call FarCopyBytes ld hl, CardGFX ld de, vTiles2 tile $23 @@ -165,7 +165,7 @@ HOF_LoadTrainerFrontpic: .GotPic: ld hl, vTiles2 - ld b, BANK(ChrisPic) ; BANK(KrisPic) + ld b, BANK(ChrisPic) ; aka BANK(KrisPic) ld c, 7 * 7 call Get2bpp call WaitBGMap @@ -194,7 +194,7 @@ DrawIntroPlayerPic: ld de, KrisPic .GotPic: ld hl, vTiles2 - ld b, BANK(ChrisPic) ; BANK(KrisPic) + ld b, BANK(ChrisPic) ; aka BANK(KrisPic) ld c, 7 * 7 ; dimensions call Get2bpp diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm index 4b951ae8d..4c8c5edc8 100644 --- a/engine/menus/debug.asm +++ b/engine/menus/debug.asm @@ -101,22 +101,22 @@ Function81911: ret Function81928: - ld a, BANK(PokemonPalettes) ; BANK(TrainerPalettes) + ld a, BANK(PokemonPalettes) ; aka BANK(TrainerPalettes) call GetFarByte ld [de], a inc de inc hl - ld a, BANK(PokemonPalettes) ; BANK(TrainerPalettes) + ld a, BANK(PokemonPalettes) ; aka BANK(TrainerPalettes) call GetFarByte ld [de], a inc de inc hl - ld a, BANK(PokemonPalettes) ; BANK(TrainerPalettes) + ld a, BANK(PokemonPalettes) ; aka BANK(TrainerPalettes) call GetFarByte ld [de], a inc de inc hl - ld a, BANK(PokemonPalettes) ; BANK(TrainerPalettes) + ld a, BANK(PokemonPalettes) ; aka BANK(TrainerPalettes) call GetFarByte ld [de], a inc de diff --git a/engine/menus/save.asm b/engine/menus/save.asm index a5ddfae47..34b38a25b 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -462,7 +462,7 @@ HallOfFame_InitSaveIfNeeded: ret ValidateSave: - ld a, BANK(sCheckValue1) ; BANK(sCheckValue2) + ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) call GetSRAMBank ld a, SAVE_CHECK_VALUE_1 ld [sCheckValue1], a @@ -524,7 +524,7 @@ SaveChecksum: ret ValidateBackupSave: - ld a, BANK(sBackupCheckValue1) ; BANK(sBackupCheckValue2) + ld a, BANK(sBackupCheckValue1) ; aka BANK(sBackupCheckValue2) call GetSRAMBank ld a, SAVE_CHECK_VALUE_1 ld [sBackupCheckValue1], a @@ -677,7 +677,7 @@ TryLoadSaveData: INCLUDE "data/default_options.asm" CheckPrimarySaveFile: - ld a, BANK(sCheckValue1) ; BANK(sCheckValue2) + ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) call GetSRAMBank ld a, [sCheckValue1] cp SAVE_CHECK_VALUE_1 @@ -698,7 +698,7 @@ CheckPrimarySaveFile: ret CheckBackupSaveFile: - ld a, BANK(sBackupCheckValue1) ; BANK(sBackupCheckValue2) + ld a, BANK(sBackupCheckValue1) ; aka BANK(sBackupCheckValue2) call GetSRAMBank ld a, [sBackupCheckValue1] cp SAVE_CHECK_VALUE_1 diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 0f040a624..b39d424a7 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -176,7 +176,7 @@ LoadWarpData: ; MOUNT_MOON_SQUARE and TIN_TOWER_ROOF are outdoor maps within indoor maps. ; Dig and Escape Rope should not take you to them. ld a, [wPrevMapGroup] - cp GROUP_MOUNT_MOON_SQUARE ; GROUP_TIN_TOWER_ROOF + cp GROUP_MOUNT_MOON_SQUARE ; aka GROUP_TIN_TOWER_ROOF jr nz, .not_mt_moon_or_tin_tower ld a, [wPrevMapNumber] cp MAP_MOUNT_MOON_SQUARE |