summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/check_battle_scene.asm2
-rw-r--r--engine/battle/core.asm6
-rw-r--r--engine/battle/read_trainer_party.asm6
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/check_battle_scene.asm b/engine/battle/check_battle_scene.asm
index ca6b94289..b7add8237 100644
--- a/engine/battle/check_battle_scene.asm
+++ b/engine/battle/check_battle_scene.asm
@@ -20,7 +20,7 @@ CheckBattleScene:
jr nz, .from_wram
ld a, BANK(s4_a60c) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
- call GetSRAMBank
+ call OpenSRAM
ld a, [s4_a60c]
ld c, a
call CloseSRAM
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index b1667381c..282dd8049 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -231,7 +231,7 @@ BattleTurn:
Stubbed_Function3c1bf:
ret
ld a, BANK(s5_a89b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
- call GetSRAMBank
+ call OpenSRAM
ld hl, s5_a89b ; address of MBC30 bank
inc [hl]
jr nz, .finish
@@ -8398,7 +8398,7 @@ DisplayLinkBattleResult:
call DelayFrames
ld a, BANK(sLinkBattleStats)
- call GetSRAMBank
+ call OpenSRAM
call AddLastLinkBattleToLinkRecord
call ReadAndPrintLinkBattleRecord
@@ -8446,7 +8446,7 @@ NUM_LINK_BATTLE_RECORDS EQUS "((sLinkBattleStatsEnd - sLinkBattleRecord) / LINK_
_DisplayLinkRecord:
ld a, BANK(sLinkBattleStats)
- call GetSRAMBank
+ call OpenSRAM
call ReadAndPrintLinkBattleRecord
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index e13747e07..b2a0903b4 100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -74,7 +74,7 @@ ReadTrainerParty:
.cal2
ld a, BANK(sMysteryGiftTrainer)
- call GetSRAMBank
+ call OpenSRAM
ld de, sMysteryGiftTrainer
call TrainerType2
call CloseSRAM
@@ -338,14 +338,14 @@ GetTrainerName::
jr nz, .not_cal2
ld a, BANK(sMysteryGiftTrainerHouseFlag)
- call GetSRAMBank
+ call OpenSRAM
ld a, [sMysteryGiftTrainerHouseFlag]
and a
call CloseSRAM
jr z, .not_cal2
ld a, BANK(sMysteryGiftPartnerName)
- call GetSRAMBank
+ call OpenSRAM
ld hl, sMysteryGiftPartnerName
call CopyTrainerName
jp CloseSRAM