diff options
Diffstat (limited to 'mobile')
-rw-r--r-- | mobile/fixed_words.asm | 4 | ||||
-rw-r--r-- | mobile/mobile_12_2.asm | 4 | ||||
-rw-r--r-- | mobile/mobile_22.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_40.asm | 28 | ||||
-rw-r--r-- | mobile/mobile_41.asm | 38 | ||||
-rw-r--r-- | mobile/mobile_45_stadium.asm | 10 | ||||
-rw-r--r-- | mobile/mobile_46.asm | 66 | ||||
-rw-r--r-- | mobile/mobile_5c.asm | 10 | ||||
-rw-r--r-- | mobile/mobile_5f.asm | 70 | ||||
-rw-r--r-- | mobile/mobile_menu.asm | 6 | ||||
-rw-r--r-- | mobile/news/news.asm | 6 |
11 files changed, 122 insertions, 122 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index e5bc1e504..a1c0192f5 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -340,7 +340,7 @@ Function11c1b9: Function11c254: push af ld a, $4 - call GetSRAMBank + call OpenSRAM ld hl, s4_a007 pop af sla a @@ -1763,7 +1763,7 @@ Function11cb66: and a jr nz, .asm_11cbd4 ld a, $4 - call GetSRAMBank + call OpenSRAM ld hl, s4_a007 ld a, [wMenuCursorY] dec a diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 1c8173dbc..b2b3c84c6 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -21,7 +21,7 @@ MobileCheckOwnMonAnywhere: dec d jr nz, .asm_4a851 ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld a, [sBoxCount] and a jr z, .asm_4a888 @@ -57,7 +57,7 @@ MobileCheckOwnMonAnywhere: add hl, bc add hl, bc ld a, [hli] - call GetSRAMBank + call OpenSRAM ld a, [hli] ld h, [hl] ld l, a diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 0c1241b03..f5e3073e2 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -15,7 +15,7 @@ String_89153: OpenSRAMBank4: push af ld a, $4 - call GetSRAMBank + call OpenSRAM pop af ret diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1cbb3bda7..3a3519883 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1092,7 +1092,7 @@ Function1006dc: MobileBattleResetTimer: ld a, BANK(sMobileBattleTimer) ld hl, sMobileBattleTimer - call GetSRAMBank + call OpenSRAM xor a ld [hli], a ld [hli], a @@ -1103,7 +1103,7 @@ MobileBattleResetTimer: MobileBattleFixTimer: ld a, BANK(sMobileBattleTimer) ld hl, sMobileBattleTimer - call GetSRAMBank + call OpenSRAM xor a ; MOBILE_BATTLE_ALLOWED_SECONDS ld [hli], a ld a, MOBILE_BATTLE_ALLOWED_MINUTES @@ -1125,7 +1125,7 @@ Function100720: ld [wcd74], a ld a, BANK(sMobileBattleTimer) ld hl, sMobileBattleTimer - call GetSRAMBank + call OpenSRAM ld a, [hli] ld [wcd6c], a ld a, [hli] @@ -1248,7 +1248,7 @@ Function1007f6: ld de, wcd71 call Function1006dc ld a, $04 - call GetSRAMBank + call OpenSRAM ld hl, $a802 call Function100826 call CloseSRAM @@ -1338,7 +1338,7 @@ MobileBattleGetRemainingTime: ; Returns minutes in c and seconds in b ld a, BANK(sMobileBattleTimer) ld hl, sMobileBattleTimer - call GetSRAMBank + call OpenSRAM ld a, [hli] ld [wStringBuffer2], a ld a, [hli] @@ -2374,7 +2374,7 @@ Function100f8d: ret .sram - call GetSRAMBank + call OpenSRAM call CopyBytes call CloseSRAM ret @@ -2428,7 +2428,7 @@ endr inc hl ld [hl], d ld a, $07 - call GetSRAMBank + call OpenSRAM ld hl, wc608 ld de, $a001 ld bc, wc7bd - wc608 @@ -2654,7 +2654,7 @@ LoadSelectedPartiesForColosseum: Function1011f1: ld a, BANK(s4_a60c) - call GetSRAMBank + call OpenSRAM ld a, [s4_a60c] ld [wdc41], a call CloseSRAM @@ -4659,7 +4659,7 @@ Function1020bf: ld d, h ld e, l ld a, $04 - call GetSRAMBank + call OpenSRAM call Function10208e call Function102068 call CloseSRAM @@ -4695,7 +4695,7 @@ Function1020ea: Function102112: ld a, $04 - call GetSRAMBank + call OpenSRAM ld hl, $a041 ld c, 40 .outer_loop @@ -6254,7 +6254,7 @@ Function102c3b: Function102c48: farcall Function10165a ld a, 0 - call GetSRAMBank + call OpenSRAM ld hl, $a600 ld de, wc608 ld bc, $2f @@ -6364,7 +6364,7 @@ Function102d34: ret Function102d3e: - call GetSRAMBank + call OpenSRAM call CopyBytes call CloseSRAM ret @@ -6909,7 +6909,7 @@ Function103309: xor a call ByteFill ld a, BANK(s4_a60c) - call GetSRAMBank + call OpenSRAM ld a, [wdc41] ld [s4_a60c], a ld [wBuffer1], a @@ -6961,7 +6961,7 @@ Function103362: bit 6, [hl] jr z, .asm_103398 ld a, BANK(s4_a60c) - call GetSRAMBank + call OpenSRAM ld a, [wBuffer1] ld [s4_a60c], a ld [wdc41], a diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index fc3516c4c..9ef8a1383 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -5,7 +5,7 @@ StubbedTrainerRankings_HallOfFame2:: ret ld a, BANK(sTrainerRankingGameTimeHOF) - call GetSRAMBank + call OpenSRAM ld hl, wGameTimeHours ld de, sTrainerRankingGameTimeHOF @@ -36,7 +36,7 @@ StubbedTrainerRankings_HallOfFame2:: StubbedTrainerRankings_MagikarpLength: ret ld a, BANK(sTrainerRankingLongestMagikarp) - call GetSRAMBank + call OpenSRAM ld de, wBuffer1 ld hl, sTrainerRankingLongestMagikarp @@ -104,7 +104,7 @@ StubbedTrainerRankings_MagikarpLength: StubbedTrainerRankings_BugContestScore: ret ld a, BANK(sTrainerRankingBugContestScore) - call GetSRAMBank + call OpenSRAM ldh a, [hProduct] ld hl, sTrainerRankingBugContestScore cp [hl] @@ -133,7 +133,7 @@ StubbedTrainerRankings_BugContestScore: StubbedTrainerRankings_AddToSlotsWinStreak: ret ld a, BANK(sTrainerRankingCurrentSlotsStreak) - call GetSRAMBank + call OpenSRAM ; Increment the current streak ld hl, sTrainerRankingCurrentSlotsStreak + 1 @@ -173,7 +173,7 @@ StubbedTrainerRankings_AddToSlotsWinStreak: StubbedTrainerRankings_EndSlotsWinStreak: ret ld a, BANK(sTrainerRankingCurrentSlotsStreak) - call GetSRAMBank + call OpenSRAM ld hl, sTrainerRankingCurrentSlotsStreak xor a ld [hli], a @@ -185,7 +185,7 @@ StubbedTrainerRankings_EndSlotsWinStreak: StubbedTrainerRankings_AddToSlotsPayouts: ret ld a, BANK(sTrainerRankingTotalSlotsPayouts) - call GetSRAMBank + call OpenSRAM ld hl, sTrainerRankingTotalSlotsPayouts + 3 ld a, e add [hl] @@ -213,7 +213,7 @@ StubbedTrainerRankings_AddToSlotsPayouts: StubbedTrainerRankings_AddToBattlePayouts: ret ld a, BANK(sTrainerRankingTotalBattlePayouts) - call GetSRAMBank + call OpenSRAM ld hl, sTrainerRankingTotalBattlePayouts + 3 ld a, [bc] dec bc @@ -248,7 +248,7 @@ StubbedTrainerRankings_StepCount: Unreferenced_StubbedTrainerRankings_BattleTowerWins: ret ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [$aa8d] and a call CloseSRAM @@ -439,7 +439,7 @@ StubbedTrainerRankings_Increment1Byte: ; Increments a big-endian value of bc + 1 bytes at hl StubbedTrainerRankings_Increment: ld a, BANK(sTrainerRankings) - call GetSRAMBank + call OpenSRAM push hl push de ld e, c @@ -476,7 +476,7 @@ StubbedTrainerRankings_Increment: UpdateTrainerRankingsChecksum2: ret ld a, BANK(sTrainerRankings) - call GetSRAMBank + call OpenSRAM call UpdateTrainerRankingsChecksum call CloseSRAM ret @@ -515,11 +515,11 @@ CalculateTrainerRankingsChecksum: BackupMobileEventIndex: ld a, BANK(sMobileEventIndex) - call GetSRAMBank + call OpenSRAM ld a, [sMobileEventIndex] push af ld a, BANK(sMobileEventIndexBackup) - call GetSRAMBank + call OpenSRAM pop af ld [sMobileEventIndexBackup], a call CloseSRAM @@ -527,11 +527,11 @@ BackupMobileEventIndex: RestoreMobileEventIndex: ld a, BANK(sMobileEventIndexBackup) - call GetSRAMBank + call OpenSRAM ld a, [sMobileEventIndexBackup] push af ld a, BANK(sMobileEventIndex) - call GetSRAMBank + call OpenSRAM pop af ld [sMobileEventIndex], a call CloseSRAM @@ -550,7 +550,7 @@ Unreferenced_VerifyTrainerRankingsChecksum: DeleteMobileEventIndex: ld a, BANK(sMobileEventIndex) - call GetSRAMBank + call OpenSRAM xor a ld [sMobileEventIndex], a call CloseSRAM @@ -791,13 +791,13 @@ Mobile_DummyReturnFalse: Stubbed_Function106314: ret ld a, $4 - call GetSRAMBank + call OpenSRAM ld a, c cpl ld [$b000], a call CloseSRAM ld a, $7 - call GetSRAMBank + call OpenSRAM ld a, c ld [$a800], a call CloseSRAM @@ -811,13 +811,13 @@ Function106331: ; called by Mobile_DummyReturnFalse in Crystal-J ; check ~[4:b000] == [7:a800] ld a, $4 - call GetSRAMBank + call OpenSRAM ld a, [$b000] cpl ld b, a call CloseSRAM ld a, $7 - call GetSRAMBank + call OpenSRAM ld a, [$a800] ld c, a call CloseSRAM diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm index e9dcba54d..860984aea 100644 --- a/mobile/mobile_45_stadium.asm +++ b/mobile/mobile_45_stadium.asm @@ -20,7 +20,7 @@ Function11766b: ldh [rSVBK], a call Function1176ee ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $b1f3 ld de, wcd49 ld bc, $8 @@ -35,7 +35,7 @@ Function11766b: Function117699: ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, wcd49 ld de, $b1f3 ld bc, $8 @@ -408,7 +408,7 @@ Function117942: ld a, $1e ld [wcd4e], a ld a, BANK(sMobileLoginPassword) - call GetSRAMBank + call OpenSRAM ld a, [wcd4f] ld [sMobileLoginPassword], a ld hl, $c708 @@ -729,7 +729,7 @@ Function117bb6: ld a, $3 ldh [rSVBK], a ld a, $7 - call GetSRAMBank + call OpenSRAM ld hl, w3_d002 ld de, $b000 ld bc, $1000 @@ -773,7 +773,7 @@ Function117c4a: Function117c89: ld a, $7 - call GetSRAMBank + call OpenSRAM ld l, $0 ld h, l ld de, $b000 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 0f4698c1d..c89041deb 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -184,7 +184,7 @@ Function118180: and a ret z ld a, BANK(s5_a89c) ; aka BANK(s5_a8b2) - call GetSRAMBank + call OpenSRAM ld hl, wcd69 ld de, s5_a89c ld bc, 22 @@ -478,7 +478,7 @@ BattleTowerRoomMenu_InitRAM: farcall Function115d99 farcall Function11615a ld a, BANK(s5_bfff) - call GetSRAMBank + call OpenSRAM xor a ld [s5_bfff], a call CloseSRAM @@ -487,7 +487,7 @@ BattleTowerRoomMenu_InitRAM: Function118440: push af ld a, BANK(s5_bfff) - call GetSRAMBank + call OpenSRAM ld a, [s5_bfff] inc a ld [s5_bfff], a @@ -1091,7 +1091,7 @@ Function1188c8: Function1188e7: ld de, wc346 ld a, BANK(s5_aa4a) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa4a] call CloseSRAM and a @@ -1521,7 +1521,7 @@ Unreferenced_Function118d35: add b ld b, a ld a, BANK(s5_b2fb) - call GetSRAMBank + call OpenSRAM ld a, b ld [s5_b2fb], a call CloseSRAM @@ -1942,7 +1942,7 @@ Function119009: Function119054: ld a, $6 - call GetSRAMBank + call OpenSRAM ld hl, wd002 ld a, [wcd4f] ld e, a @@ -1972,7 +1972,7 @@ Function119054: ld a, $3 ; ??? ldh [rSVBK], a ld a, BANK(s5_b1b3) ; aka BANK(s5_b1b4) and BANK(s5_aa7f) and BANK(s5_b2f3) and BANK(s5_b2f4) - call GetSRAMBank + call OpenSRAM ld a, [wcd4f] ld [s5_b1b3], a ld a, [wcd50] @@ -2012,19 +2012,19 @@ Function1190d0: Function1190ec: ld a, BANK(s5_aa73) - call GetSRAMBank + call OpenSRAM ld hl, wBGMapBuffer ld de, s5_aa73 ld bc, 12 call CopyBytes call CloseSRAM ld a, BANK(s5_aa72) - call GetSRAMBank + call OpenSRAM ld a, $1 ld [s5_aa72], a call CloseSRAM ld a, BANK(s6_a000) - call GetSRAMBank + call OpenSRAM ld a, [w3_d000] ld c, a ld a, [w3_d000 + 1] @@ -2069,7 +2069,7 @@ Function11915d: ld bc, 12 call CopyBytes ld a, BANK(s5_aa7f) - call GetSRAMBank + call OpenSRAM ld hl, wBGMapBuffer ld de, s5_aa7f ld c, 12 @@ -2201,7 +2201,7 @@ Function119223: ld [wcd4b], a ld [wcd4c], a ld a, BANK(s5_b092) ; aka BANK(s5_b1b1) and BANK(s5_b1b2) and BANK(s5_b1d3) - call GetSRAMBank + call OpenSRAM ld hl, wc3cd ld de, s5_b092 ld bc, 31 @@ -2237,7 +2237,7 @@ Function119223: jr z, .asm_1192c2 cp $fe jr z, .asm_1192a5 - call GetSRAMBank + call OpenSRAM ld a, [de] inc de ld c, a @@ -2308,7 +2308,7 @@ Function119223: Function1192cc: ld a, BANK(s5_aa73) - call GetSRAMBank + call OpenSRAM ld hl, s5_aa73 ld de, wc608 ld bc, 12 @@ -2369,7 +2369,7 @@ Function119300: ld [wcd4c], a ld a, [de] inc de - call GetSRAMBank + call OpenSRAM ld a, [de] inc de ld c, a @@ -2499,7 +2499,7 @@ Function1193fb: Function119413: ld a, $6 ; ??? - call GetSRAMBank + call OpenSRAM ld a, [w3_d000] ld c, a ld a, [w3_d000 + 1] @@ -3580,7 +3580,7 @@ Function119b52: cp $1 jr nz, .asm_119b66 ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM ld a, $4 ld [s5_a800], a call CloseSRAM @@ -3680,7 +3680,7 @@ Function119b6b: ld a, $19 ld [wBattleTowerRoomMenuJumptableIndex], a ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM ld a, $1 ld [s5_a800], a call CloseSRAM @@ -3700,7 +3700,7 @@ Function119b6b: cp HIGH(w3_d869) jr nz, .asm_119be3 ld a, BANK(s5_b090) ; aka BANK(s5_b091) and BANK(s5_b023) - call GetSRAMBank + call OpenSRAM ld a, [wcf64] ld [s5_b090], a ld a, [wcf65] @@ -3750,7 +3750,7 @@ popc ld a, $19 ld [wBattleTowerRoomMenuJumptableIndex], a ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM ld a, $1 ld [s5_a800], a call CloseSRAM @@ -4123,7 +4123,7 @@ Function119eb4: Function119ec2: ld a, BANK(sMobileLoginPassword) - call GetSRAMBank + call OpenSRAM xor a ld [sMobileLoginPassword + MOBILE_LOGIN_PASSWORD_LENGTH], a ld de, sMobileLoginPassword + 1 @@ -4288,7 +4288,7 @@ Function119f98: Function11a00e: ld a, BANK(sMobileLoginPassword) - call GetSRAMBank + call OpenSRAM ld a, [sMobileLoginPassword] and a jr z, .asm_11a02a @@ -4297,7 +4297,7 @@ Function11a00e: and a ret nz ld a, BANK(sMobileLoginPassword) - call GetSRAMBank + call OpenSRAM xor a ld [sMobileLoginPassword], a @@ -6955,7 +6955,7 @@ Function11b483: .okay4 ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld a, MAIL_STRUCT_LENGTH .loop9 push af @@ -7033,7 +7033,7 @@ Function11b570: ld a, $1 ldh [rSVBK], a ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM ld de, s5_a800 ld a, $1 @@ -7079,14 +7079,14 @@ Function11b5e7: Function11b5e8: ld a, $0 - call GetSRAMBank + call OpenSRAM ld hl, wRTC ld de, $c608 ld bc, 4 call CopyBytes call CloseSRAM ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $c608 ld de, $b08c ld bc, 4 @@ -7174,7 +7174,7 @@ Function11b6b3: Function11b6b4: ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [wcd30] ld [$c708], a ld a, [wcd31] @@ -7347,7 +7347,7 @@ Function11b7e5: ld [wLinkMode], a farcall SaveAfterLinkTrade ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, $5 ld [$a800], a call CloseSRAM @@ -7373,7 +7373,7 @@ Function11b879: and a ret z ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [$a800] ld [wScriptVar], a ld a, [$a890] @@ -7462,7 +7462,7 @@ Function11b879: Function11b920: call Mobile46_InitJumptable ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $a81f ld de, $c626 ld bc, 8 @@ -7473,7 +7473,7 @@ Function11b920: Function11b93b: ld a, $5 - call GetSRAMBank + call OpenSRAM xor a ld [$a800], a ld hl, $a823 @@ -7600,7 +7600,7 @@ AddMobileMonToParty: and a jr nz, .loop5 ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld e, l ld d, h ld a, [wMobileMonMailPointerBuffer] diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 2e3c5001e..ea43accc8 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -37,7 +37,7 @@ Function170000: Function17005a: ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [$a824] ld [wOTTrademonSpecies], a ld hl, $a827 @@ -75,7 +75,7 @@ INCLUDE "engine/events/battle_tower/battle_tower.asm" Function170be4: ld a, $5 - call GetSRAMBank + call OpenSRAM xor a ld hl, $a894 ld bc, $0008 @@ -85,7 +85,7 @@ Function170be4: Clears5_a89a: ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $a89a xor a ld [hli], a @@ -95,7 +95,7 @@ Clears5_a89a: Function170c06: ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $a894 ld a, [wBattleResult] and a ; WIN? @@ -589,7 +589,7 @@ Function171bdc: Function171beb: ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [wcd4a] ld [$aa4a], a call CloseSRAM diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index fefc4d104..ed4df965e 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -302,7 +302,7 @@ Function17d0f3: ld [wLinkMode], a farcall SaveAfterLinkTrade ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, $5 ld [$a800], a call CloseSRAM @@ -508,7 +508,7 @@ Function17d2c0: Function17d2ce: ld a, BANK(s5_aa72) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa72] call CloseSRAM and a @@ -543,13 +543,13 @@ Function17d2ce: Function17d314: ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [$b1b1] call CloseSRAM cp $21 jr nc, .asm_17d354 ld a, $6 - call GetSRAMBank + call OpenSRAM ld l, $0 ld h, l ld de, $a006 @@ -582,7 +582,7 @@ Function17d314: .asm_17d354 call CloseSRAM ld a, $5 - call GetSRAMBank + call OpenSRAM xor a ld hl, $aa73 ld bc, $c @@ -636,7 +636,7 @@ Function17d370: ld a, $d0 ld [wcd21], a ld a, $6 - call GetSRAMBank + call OpenSRAM ld hl, $a006 ld de, wBGPals1 ld bc, $1000 @@ -948,7 +948,7 @@ Function17d5f6: Function17d60b: ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $b1d3 ld de, wc608 ld bc, $20 @@ -963,7 +963,7 @@ Function17d60b: ld h, a call CloseSRAM ld a, $6 - call GetSRAMBank + call OpenSRAM ld de, wc708 ld a, c and a @@ -1023,7 +1023,7 @@ Function17d60b: .asm_17d684 call CloseSRAM ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, wc708 ld de, $b1b3 ld a, [$b1b1] @@ -1040,7 +1040,7 @@ Function17d6a1: ld c, a ld b, $0 ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $b1d3 add hl, bc add hl, bc @@ -1058,7 +1058,7 @@ Function17d6a1: ld l, c call CloseSRAM ld a, $6 - call GetSRAMBank + call OpenSRAM ld a, l ld [wcd5e], a ld a, h @@ -1177,7 +1177,7 @@ Function17d78d: ld b, a call HlToCrashCheckPointer ld a, $6 - call GetSRAMBank + call OpenSRAM ld hl, $a006 add hl, bc ld de, wBGPals1 @@ -1330,7 +1330,7 @@ Function17d85d: .asm_17d89b ld a, [wcd4f] - call GetSRAMBank + call OpenSRAM .asm_17d8a1 push hl @@ -1511,7 +1511,7 @@ Function17d9e3: .asm_17da01 ld a, [wc70c] - call GetSRAMBank + call OpenSRAM .asm_17da07 ld a, [wc708] @@ -1556,7 +1556,7 @@ Function17da31: .asm_17da4f ld a, [wc70a] - call GetSRAMBank + call OpenSRAM .asm_17da55 ld a, [wc708] @@ -2021,7 +2021,7 @@ Function17dd49: .sram ld a, [wc708] - call GetSRAMBank + call OpenSRAM .got_bank ld a, [wc709] @@ -2097,7 +2097,7 @@ Function17ddcd: .asm_17dde7 ld a, [wc708] - call GetSRAMBank + call OpenSRAM .asm_17dded ld a, [wc709] @@ -2154,7 +2154,7 @@ Function17de32: ld b, $0 call CopyBytes ld a, $6 - call GetSRAMBank + call OpenSRAM call Function17f4f6 ld a, [wc708] ld e, a @@ -2208,7 +2208,7 @@ Function17de91: ld bc, $7 call CopyBytes ld a, $6 - call GetSRAMBank + call OpenSRAM call Function17f4f6 ld a, [wc708] ld e, a @@ -2452,7 +2452,7 @@ Function17ded9: Function17e026: ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld a, [sBoxCount] call CloseSRAM cp $14 @@ -2467,7 +2467,7 @@ Function17e026: pop hl pop bc ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM bit 1, b jr z, .asm_17e067 push bc @@ -2494,7 +2494,7 @@ Function17e026: call CloseSRAM farcall SetGiftBoxMonCaughtData ld a, $1 - call GetSRAMBank + call OpenSRAM pop hl pop bc jr .asm_17e092 @@ -2696,7 +2696,7 @@ Function17e1a1: .asm_17e1bb ld a, [wc708] - call GetSRAMBank + call OpenSRAM .asm_17e1c1 ld a, [wc709] @@ -2728,7 +2728,7 @@ Function17e1a1: .asm_17e1f3 ld a, [wc70c] - call GetSRAMBank + call OpenSRAM .asm_17e1f9 ld a, [wc70d] @@ -2890,7 +2890,7 @@ Function17e2a7: xor a ld [wcd7a], a ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $aa73 ld de, $aa7f ld bc, $c @@ -2926,7 +2926,7 @@ Function17e309: Function17e32b: ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, wc608 ld de, $b0b1 ld bc, $40 @@ -2939,7 +2939,7 @@ Function17e32b: Function17e349: ld a, $5 - call GetSRAMBank + call OpenSRAM ld hl, $b0b1 ld de, wc608 ld bc, $40 @@ -3541,7 +3541,7 @@ INCLUDE "gfx/mobile/pokemon_news.pal" RunMobileScript:: ld a, $6 - call GetSRAMBank + call OpenSRAM inc de .loop call _RunMobileScript @@ -4082,13 +4082,13 @@ MobileScript_Prefecture: bit 7, a jr nz, .asm_17f355 ld a, BANK(sCrystalData) - call GetSRAMBank + call OpenSRAM ld a, [sCrystalData + 2] jr .asm_17f35d .asm_17f355 ld a, BANK(s5_b2f3) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2f3] .asm_17f35d @@ -4125,13 +4125,13 @@ Function17f382: bit 7, a jr nz, .asm_17f3a3 ld a, BANK(sCrystalData) - call GetSRAMBank + call OpenSRAM ld de, sCrystalData + 3 jr .asm_17f3ab .asm_17f3a3 ld a, BANK(s5_b2f4) - call GetSRAMBank + call OpenSRAM ld de, s5_b2f4 .asm_17f3ab @@ -4299,7 +4299,7 @@ Function17f44f: .asm_17f488 ld a, [wcd54] - call GetSRAMBank + call OpenSRAM .asm_17f48e ld a, [wcd55] @@ -4321,7 +4321,7 @@ Function17f44f: .asm_17f4af call CloseSRAM ld a, $6 - call GetSRAMBank + call OpenSRAM .asm_17f4b7 ld de, wc608 @@ -4491,7 +4491,7 @@ DisplayMobileError: .asm_17f5a1 ld a, BANK(sMobileLoginPassword) - call GetSRAMBank + call OpenSRAM xor a ld [sMobileLoginPassword], a call CloseSRAM diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index 376260d4d..bab29dcb4 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -180,7 +180,7 @@ Function4a0c2: ld a, 2 call MenuClickSound ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sPlayerData + wPlayerName - wPlayerData ld de, wPlayerName ld bc, NAME_LENGTH_JAPANESE @@ -378,7 +378,7 @@ Function4a28a: call WaitBGMap call LoadStandardMenuHeader ld a, $5 - call GetSRAMBank + call OpenSRAM ld a, [$aa4b] call CloseSRAM and a @@ -429,7 +429,7 @@ Function4a28a: cp $2 jr z, .dont_delete_password ld a, BANK(sMobileLoginPassword) - call GetSRAMBank + call OpenSRAM ld hl, sMobileLoginPassword xor a ld bc, MOBILE_LOGIN_PASSWORD_LENGTH diff --git a/mobile/news/news.asm b/mobile/news/news.asm index 0aec6a35e..130ff048e 100644 --- a/mobile/news/news.asm +++ b/mobile/news/news.asm @@ -4,7 +4,7 @@ Unreferenced_Function1f4003: ld a, BANK(s6_a000) - call GetSRAMBank + call OpenSRAM ld hl, .news_data ld de, s6_a000 ld bc, $1000 @@ -17,7 +17,7 @@ INCBIN "mobile/news/news_1.bin" Unreferenced_Function1f4dbe: ld a, BANK(s6_a000) - call GetSRAMBank + call OpenSRAM ld hl, .news_data ld de, s6_a000 ld bc, $1000 @@ -30,7 +30,7 @@ INCBIN "mobile/news/news_2.bin" Function1f5d9f: ld a, BANK(s6_a000) - call GetSRAMBank + call OpenSRAM ld hl, .news_data ld de, s6_a000 ld bc, $1000 |