diff options
Diffstat (limited to 'engine')
46 files changed, 260 insertions, 259 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 diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index c4846a334..14396f385 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -950,7 +950,7 @@ BattleAnimCmd_RaiseSub: ldh [rSVBK], a xor a ; BANK(sScratch) - call GetSRAMBank + call OpenSRAM GetSubstitutePic: ; used only for BANK(GetSubstitutePic) ld hl, sScratch @@ -1025,7 +1025,7 @@ BattleAnimCmd_MinimizeOpp: ldh [rSVBK], a xor a ; BANK(sScratch) - call GetSRAMBank + call OpenSRAM call GetMinimizePic call Request2bpp call CloseSRAM @@ -1081,7 +1081,7 @@ BattleAnimCmd_Minimize: ldh [rSVBK], a xor a ; BANK(sScratch) - call GetSRAMBank + call OpenSRAM call GetMinimizePic ld hl, vTiles0 tile $00 call Request2bpp diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 9d10d7289..41de7135e 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -18,7 +18,7 @@ Function1700c4: call Function17042c ld a, BANK(s5_be45) ; aka BANK(s5_be46), BANK(s5_aa41), and BANK(s5_aa5d) - call GetSRAMBank + call OpenSRAM ld a, 1 ld [s5_be45], a xor a @@ -58,7 +58,7 @@ Function170114: .Function170121: ld a, BANK(s5_a948) - call GetSRAMBank + call OpenSRAM ld hl, s5_a948 ld de, wc608 ld bc, 246 @@ -70,7 +70,7 @@ Function170114: Function170139: ; Convert the 4-digit decimal number at 5:aa41 into binary ld a, BANK(s5_aa41) - call GetSRAMBank + call OpenSRAM ld de, s5_aa41 ld h, 0 ld l, h @@ -147,14 +147,14 @@ Function170139: jr nz, .CopyLoop ld a, BANK(s4_a013) - call GetSRAMBank + call OpenSRAM ld hl, s4_a013 ld bc, 36 call CopyBytes call CloseSRAM ld a, BANK(s5_a894) ; aka BANK(s5_a948) - call GetSRAMBank + call OpenSRAM ld hl, s5_a894 ld bc, NAME_LENGTH_JAPANESE call CopyBytes @@ -246,7 +246,7 @@ RunBattleTowerTrainer: and a ; WIN? jr nz, .lost ld a, BANK(sNrOfBeatenBattleTowerTrainers) - call GetSRAMBank + call OpenSRAM ld a, [sNrOfBeatenBattleTowerTrainers] ld [wNrOfBeatenBattleTowerTrainers], a call CloseSRAM @@ -410,7 +410,7 @@ endr ld [wCurSpecies], a call GetBaseData ld a, BANK(s5_b2fb) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2fb] ; s5_b2fb ; max level? call CloseSRAM ld e, a @@ -572,7 +572,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ldh [rSVBK], a ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, BATTLETOWER_CHALLENGE_IN_PROGESS ld [sBattleTowerChallengeState], a ld hl, sNrOfBeatenBattleTowerTrainers @@ -643,7 +643,7 @@ Function1704e1: .Jumptable_0: ld a, BANK(s5_a89c) - call GetSRAMBank + call OpenSRAM ld hl, s5_a89c ld de, wStringBuffer3 @@ -917,7 +917,7 @@ BattleTowerAction: ; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes) ResetBattleTowerTrainersSRAM: ld a, BANK(sBTTrainers) - call GetSRAMBank + call OpenSRAM ld a, $ff ld hl, sBTTrainers @@ -933,7 +933,7 @@ ResetBattleTowerTrainersSRAM: BattleTower_GiveReward: ld a, BANK(sBattleTowerReward) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerReward] call CloseSRAM @@ -962,7 +962,7 @@ BattleTower_GiveReward: Function17071b: ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, BATTLETOWER_WON_CHALLENGE ld [sBattleTowerChallengeState], a call CloseSRAM @@ -970,7 +970,7 @@ Function17071b: Function170729: ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, BATTLETOWER_RECEIVED_REWARD ld [sBattleTowerChallengeState], a call CloseSRAM @@ -995,7 +995,7 @@ BattleTower_RandomlyChooseReward: jr z, .loop push af ld a, BANK(sBattleTowerReward) - call GetSRAMBank + call OpenSRAM pop af ld [sBattleTowerReward], a call CloseSRAM @@ -1008,7 +1008,7 @@ BattleTowerAction_CheckExplanationRead: ret z ld a, BANK(sBattleTowerSaveFileFlags) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerSaveFileFlags] and 2 ld [wScriptVar], a @@ -1018,7 +1018,7 @@ BattleTowerAction_CheckExplanationRead: BattleTowerAction_GetChallengeState: ld hl, sBattleTowerChallengeState ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, [hl] ld [wScriptVar], a call CloseSRAM @@ -1026,7 +1026,7 @@ BattleTowerAction_GetChallengeState: BattleTowerAction_SetExplanationRead: ld a, BANK(sBattleTowerSaveFileFlags) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerSaveFileFlags] or 2 ld [sBattleTowerSaveFileFlags], a @@ -1041,7 +1041,7 @@ BattleTowerAction_SetByteToCancelChallenge: ld c, BATTLETOWER_NO_CHALLENGE asm_17079f: ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, c ld [sBattleTowerChallengeState], a call CloseSRAM @@ -1049,7 +1049,7 @@ asm_17079f: Function1707ac: ld a, BANK(s5_aa8c) ; aka BANK(s5_be46) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa8c] ld b, a ld a, [s5_be46] @@ -1064,7 +1064,7 @@ Function1707ac: call UpdateTime pop bc ld a, BANK(s5_aa8c) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa8b] call CloseSRAM ld c, a @@ -1090,7 +1090,7 @@ Function1707ac: Function1707f4: ld a, BANK(s5_be46) ; aka BANK(s5_aa8b) and BANK(s5_aa8c) - call GetSRAMBank + call OpenSRAM xor a ld [s5_be46], a ld [s5_aa8b], a @@ -1101,7 +1101,7 @@ Function1707f4: Function170807: call UpdateTime ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa) - call GetSRAMBank + call OpenSRAM ld a, [wCurDay] ld [s5_b2f9], a xor a @@ -1113,7 +1113,7 @@ Function17081d: xor a ld [wScriptVar], a ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2f9] ld c, a ld a, [s5_b2fa] @@ -1145,7 +1145,7 @@ Function17081d: ld a, 1 ld [wScriptVar], a ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa) - call GetSRAMBank + call OpenSRAM xor a ld [s5_b2f9], a ld [s5_b2fa], a @@ -1154,7 +1154,7 @@ Function17081d: SaveBattleTowerLevelGroup: ld a, BANK(sBTChoiceOfLevelGroup) - call GetSRAMBank + call OpenSRAM ldh a, [rSVBK] push af ld a, BANK(wBTChoiceOfLvlGroup) @@ -1168,7 +1168,7 @@ SaveBattleTowerLevelGroup: LoadBattleTowerLevelGroup: ; Load level group choice ld a, BANK(sBTChoiceOfLevelGroup) - call GetSRAMBank + call OpenSRAM ldh a, [rSVBK] push af ld a, BANK(wBTChoiceOfLvlGroup) @@ -1204,7 +1204,7 @@ Function1708b1: ; BattleTowerAction $0a CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball ld a, BANK(sMobileEventIndex) - call GetSRAMBank + call OpenSRAM ld a, [sMobileEventIndex] ld [wScriptVar], a call CloseSRAM @@ -1213,7 +1213,7 @@ CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball Function1708c8: ; BattleTowerAction $0c call UpdateTime ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c), BANK(s5_aa5d), BANK(s5_aa48), and BANK(s5_aa47) - call GetSRAMBank + call OpenSRAM ld a, [wCurDay] ld [s5_aa8b], a xor a @@ -1234,7 +1234,7 @@ Function1708f0: ; BattleTowerAction $0d ld [wScriptVar], a call UpdateTime ld a, BANK(s5_aa48) ; aka BANK(s5_aa47) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa48] ld c, a ld a, [s5_aa47] @@ -1246,7 +1246,7 @@ Function1708f0: ; BattleTowerAction $0d cp [hl] jr nz, Function170923 ld a, BANK(s5_aa5d) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa5d] call CloseSRAM cp 5 @@ -1257,7 +1257,7 @@ Function1708f0: ; BattleTowerAction $0d Function170923: ld a, BANK(s5_aa48) ; aka BANK(s5_aa47) and BANK(s5_aa5d) - call GetSRAMBank + call OpenSRAM xor a ld [s5_aa48], a ld [s5_aa47], a @@ -1352,7 +1352,7 @@ Function1709bb: ; BattleTowerAction $10 xor a ; FALSE ld [wScriptVar], a ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM ld a, [s5_a800] call CloseSRAM cp 6 @@ -1369,7 +1369,7 @@ Function1709bb: ; BattleTowerAction $10 .invalid ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM xor a ld [s5_a800], a call CloseSRAM @@ -1385,7 +1385,7 @@ Function1709bb: ; BattleTowerAction $10 .DoAction1: ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM ld a, 1 ld [s5_a800], a call CloseSRAM @@ -1395,7 +1395,7 @@ Function1709bb: ; BattleTowerAction $10 .Action4: ld a, BANK(s5_b023) ; aka BANK(s5_a825) and BANK(s5_a826) - call GetSRAMBank + call OpenSRAM ld hl, s5_b023 ld de, wc608 ld bc, 105 @@ -1413,14 +1413,14 @@ Function1709bb: ; BattleTowerAction $10 .Action5: ld a, 0 ; ??? - call GetSRAMBank + call OpenSRAM ld hl, wRTC ld de, wc608 ld bc, 4 call CopyBytes call CloseSRAM ld a, BANK(s5_b08c) - call GetSRAMBank + call OpenSRAM ld hl, s5_b08c ld de, wc608 ld c, 4 @@ -1453,7 +1453,7 @@ Function1709bb: ; BattleTowerAction $10 .different call CloseSRAM ld a, BANK(s5_a800) - call GetSRAMBank + call OpenSRAM xor a ld [s5_a800], a call CloseSRAM @@ -1480,7 +1480,7 @@ Function170aa0: ld c, TRUE asm_170aa2: ld a, BANK(s5_aa8d) - call GetSRAMBank + call OpenSRAM ld a, c ld [s5_aa8d], a call CloseSRAM @@ -1488,7 +1488,7 @@ asm_170aa2: Function170aaf: ld a, BANK(s5_aa8d) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa8d] ld [wScriptVar], a call CloseSRAM @@ -1501,7 +1501,7 @@ Function170abe: ret z ld a, BANK(sBattleTowerSaveFileFlags) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerSaveFileFlags] and 1 ld [wScriptVar], a @@ -1510,7 +1510,7 @@ Function170abe: Function170ad7: ld a, BANK(sBattleTowerSaveFileFlags) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerSaveFileFlags] or 1 ld [sBattleTowerSaveFileFlags], a @@ -1519,7 +1519,7 @@ Function170ad7: BattleTowerAction_LevelCheck: ld a, BANK(s5_b2fb) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2fb] call CloseSRAM ld c, 10 @@ -1531,7 +1531,7 @@ BattleTowerAction_LevelCheck: farcall BattleTower_LevelCheck ret nc ld a, BANK(s5_b2fb) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2fb] call CloseSRAM ld [wScriptVar], a @@ -1539,7 +1539,7 @@ BattleTowerAction_LevelCheck: BattleTowerAction_UbersCheck: ld a, BANK(s5_b2fb) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2fb] call CloseSRAM ld c, 10 @@ -1551,7 +1551,7 @@ BattleTowerAction_UbersCheck: farcall BattleTower_UbersCheck ret nc ld a, BANK(s5_b2fb) - call GetSRAMBank + call OpenSRAM ld a, [s5_b2fb] call CloseSRAM ld [wScriptVar], a diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 0e4c9d04a..8ed401afe 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -39,7 +39,7 @@ endc ld b, a ld a, BANK(sBTTrainers) - call GetSRAMBank + call OpenSRAM ld c, BATTLETOWER_STREAK_LENGTH ld hl, sBTTrainers @@ -96,7 +96,7 @@ Function_LoadRandomBattleTowerMon: .loop push bc ld a, BANK(sBTMonPrevTrainer1) - call GetSRAMBank + call OpenSRAM .FindARandomBattleTowerMon: ; From Which LevelGroup are the mon loaded diff --git a/engine/events/checksave.asm b/engine/events/checksave.asm index 67efaf9e3..7ce413dff 100644 --- a/engine/events/checksave.asm +++ b/engine/events/checksave.asm @@ -1,6 +1,6 @@ CheckSave:: ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) - call GetSRAMBank + call OpenSRAM ld a, [sCheckValue1] ld b, a ld a, [sCheckValue2] diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index e488a3941..d49c7aa1b 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -412,7 +412,7 @@ LoadHOFTeam: ld bc, wHallOfFameTempEnd - wHallOfFameTemp + 1 call AddNTimes ld a, BANK(sHallOfFame) - call GetSRAMBank + call OpenSRAM ld a, [hl] and a jr z, .absent diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 43eb79558..f9d17c8a9 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -20,7 +20,7 @@ CheckForLuckyNumberWinners: dec d jr nz, .PartyLoop ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld a, [sBoxCount] and a jr z, .SkipOpenBox @@ -59,7 +59,7 @@ CheckForLuckyNumberWinners: add hl, bc add hl, bc ld a, [hli] - call GetSRAMBank + call OpenSRAM ld a, [hli] ld h, [hl] ld l, a ; hl now contains the address of the loaded box in SRAM diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 484ea3792..dac7d4b97 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -159,7 +159,7 @@ _UnownPrinter: ldh [rSVBK], a ld a, BANK(sScratch) - call GetSRAMBank + call OpenSRAM ld de, wDecompressScratch ld hl, sScratch ldh a, [hROMBank] @@ -180,7 +180,7 @@ _UnownPrinter: ld de, UnownDexVacantString call PlaceString xor a ; sScratch - call GetSRAMBank + call OpenSRAM ld hl, sScratch ld bc, $31 tiles xor a diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 8751c2434..0badae200 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -2,7 +2,7 @@ RotateUnownFrontpic: ; something to do with Unown printer push de xor a ; BANK(sScratch) - call GetSRAMBank + call OpenSRAM ld hl, sScratch ld bc, 0 .loop diff --git a/engine/events/specials.asm b/engine/events/specials.asm index d133dd68f..c914e2d63 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -128,7 +128,7 @@ PlayersHousePC: CheckMysteryGift: ld a, BANK(sMysteryGiftItem) - call GetSRAMBank + call OpenSRAM ld a, [sMysteryGiftItem] and a jr z, .no @@ -141,7 +141,7 @@ CheckMysteryGift: GetMysteryGiftItem: ld a, BANK(sMysteryGiftItem) - call GetSRAMBank + call OpenSRAM ld a, [sMysteryGiftItem] ld [wCurItem], a ld a, 1 @@ -420,7 +420,7 @@ PrintDiploma: TrainerHouse: ld a, BANK(sMysteryGiftTrainerHouseFlag) - call GetSRAMBank + call OpenSRAM ld a, [sMysteryGiftTrainerHouseFlag] ld [wScriptVar], a jp CloseSRAM diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index bb6aecf26..89203b561 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -221,7 +221,7 @@ DoAnimFrame: ret .GameFreakLogo: - callfar GameFreakLogoJumper + callfar PlaceGameFreakLogo ret .GSIntroStar diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 82f3f9fc7..a6ae46c29 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -203,7 +203,7 @@ PokeBallEffect: jr nz, .room_in_party ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld a, [sBoxCount] cp MONS_PER_BOX call CloseSRAM @@ -605,7 +605,7 @@ PokeBallEffect: farcall SetBoxMonCaughtData ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld a, [sBoxCount] cp MONS_PER_BOX @@ -641,7 +641,7 @@ PokeBallEffect: farcall NamingScreen ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM ld hl, wMonOrItemNameBuffer ld de, sBoxMonNicknames @@ -656,7 +656,7 @@ PokeBallEffect: .SkipBoxMonNickname: ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM ld hl, sBoxMonNicknames ld de, wMonOrItemNameBuffer diff --git a/engine/link/link.asm b/engine/link/link.asm index 18d6a44de..6a698761f 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -835,7 +835,7 @@ Link_PrepPartyData_Gen2: ; Copy all the mail messages to wc9f9 ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld hl, sPartyMail ld b, PARTY_LENGTH .loop2 @@ -1706,7 +1706,7 @@ LinkTrade: ld bc, MAIL_STRUCT_LENGTH call AddNTimes ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld d, h ld e, l ld bc, MAIL_STRUCT_LENGTH @@ -2508,7 +2508,7 @@ INCBIN "gfx/trade/unused_gs_border_tiles.2bpp" Unreferenced_Function29fe4: ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld d, FALSE ld b, CHECK_FLAG predef SmallFarFlagAction diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 6cdad03ed..5bf58ac2e 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1202,14 +1202,14 @@ MysteryGift_ClearTrainerData: GetMysteryGiftBank: ld a, BANK(sBackupMysteryGiftItem) - jp GetSRAMBank + jp OpenSRAM StagePartyDataForMysteryGift: ; You will be sending this data to your mystery gift partner. ; Structure is the same as a trainer with species and moves ; defined. ld a, BANK(sPokemonData) - call GetSRAMBank + call OpenSRAM ld de, wMysteryGiftStaging ld bc, sPokemonData + wPartyMons - wPokemonData ld hl, sPokemonData + wPartySpecies - wPokemonData @@ -1521,7 +1521,7 @@ Function105777: Function10578c: ld de, wLinkData ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sPlayerData + wPlayerName - wPlayerData ld bc, NAME_LENGTH call CopyBytes @@ -1533,12 +1533,12 @@ Function10578c: call CopyBytes call CloseSRAM ld a, BANK(sCrystalData) - call GetSRAMBank + call OpenSRAM ld a, [sCrystalData + 0] ld [de], a inc de ld a, BANK(s4_a603) ; aka BANK(s4_a007) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 - call GetSRAMBank + call OpenSRAM ld hl, s4_a603 ; address of MBC30 bank ld bc, $8 call CopyBytes diff --git a/engine/link/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm index 75bb8aa49..f6e9fa320 100644 --- a/engine/link/mystery_gift_2.asm +++ b/engine/link/mystery_gift_2.asm @@ -4,7 +4,7 @@ PrepMysteryGiftDataToSend: ld [de], a inc de ; wc801 ld a, BANK(sGameData) - call GetSRAMBank + call OpenSRAM ld hl, sPlayerData + wPlayerID - wPlayerData ld a, [hli] ld [de], a @@ -42,7 +42,7 @@ PrepMysteryGiftDataToSend: ld [de], a inc de ; wc812 ld a, BANK(sBackupMysteryGiftItem) - call GetSRAMBank + call OpenSRAM ld a, [sBackupMysteryGiftItem] ld [de], a inc de diff --git a/engine/menus/empty_sram.asm b/engine/menus/empty_sram.asm index 45a4a8884..264f08136 100644 --- a/engine/menus/empty_sram.asm +++ b/engine/menus/empty_sram.asm @@ -10,7 +10,7 @@ EmptyAllSRAMBanks: ret .EmptyBank: - call GetSRAMBank + call OpenSRAM ld hl, SRAM_Begin ld bc, SRAM_End - SRAM_Begin xor a diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 63f8e565a..3bb21b55b 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -137,7 +137,7 @@ _ResetWRAM: call SetDefaultBoxNames ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount call .InitList call CloseSRAM @@ -167,7 +167,7 @@ _ResetWRAM: ld [wRoamMon3MapNumber], a ld a, BANK(sMysteryGiftItem) - call GetSRAMBank + call OpenSRAM ld hl, sMysteryGiftItem xor a ld [hli], a @@ -304,7 +304,7 @@ InitializeWorld: LoadOrRegenerateLuckyIDNumber: ld a, BANK(sLuckyIDNumber) - call GetSRAMBank + call OpenSRAM ld a, [wCurDay] inc a ld b, a @@ -953,7 +953,7 @@ Intro_PlacePlayerSprite: db 10 * 8 + 4, 10 * 8, 3 CrystalIntroSequence: - callfar Copyright_GFPresents + callfar Copyright_GameFreakPresents jr c, StartTitleScreen farcall CrystalIntro diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 1e4210cd3..202909031 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -155,7 +155,7 @@ MainMenu_GetWhichMenu: ld a, $1 ret nz ld a, BANK(sNumDailyMysteryGiftPartnerIDs) - call GetSRAMBank + call OpenSRAM ld a, [sNumDailyMysteryGiftPartnerIDs] cp -1 call CloseSRAM diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 2a90c6f90..4799827a1 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -697,7 +697,7 @@ Unreferenced_Function24423: bit 0, a ret z xor a ; sScratch - call GetSRAMBank + call OpenSRAM hlcoord 0, 0 ld de, sScratch ld bc, SCREEN_WIDTH * SCREEN_HEIGHT @@ -705,7 +705,7 @@ Unreferenced_Function24423: call CloseSRAM call OverworldTextModeSwitch xor a ; sScratch - call GetSRAMBank + call OpenSRAM ld hl, sScratch decoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 98a3a25c5..3676c3528 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -144,7 +144,7 @@ ResumeGameLogic: AddHallOfFameEntry: ld a, BANK(sHallOfFame) - call GetSRAMBank + call OpenSRAM ld hl, sHallOfFame + HOF_LENGTH * (NUM_HOF_TEAMS - 1) - 1 ld de, sHallOfFame + HOF_LENGTH * NUM_HOF_TEAMS - 1 ld bc, HOF_LENGTH * (NUM_HOF_TEAMS - 1) @@ -212,7 +212,7 @@ SaveTheGame_yesorno: CompareLoadedAndSavedPlayerID: ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sPlayerData + (wPlayerID - wPlayerData) ld a, [hli] ld c, [hl] @@ -273,7 +273,7 @@ _SaveGameData: farcall BackupMobileEventIndex farcall SaveRTC ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerChallengeState] cp BATTLETOWER_RECEIVED_REWARD jr nz, .ok @@ -288,7 +288,7 @@ UpdateStackTop: ; It could have been used to debug stack overflow during saving. call FindStackTop ld a, BANK(sStackTop) - call GetSRAMBank + call OpenSRAM ld a, [sStackTop + 0] ld e, a ld a, [sStackTop + 1] @@ -354,7 +354,7 @@ ErasePreviousSave: call SaveData call EraseBattleTowerStatus ld a, BANK(sStackTop) - call GetSRAMBank + call OpenSRAM xor a ld [sStackTop + 0], a ld [sStackTop + 1], a @@ -365,7 +365,7 @@ ErasePreviousSave: EraseLinkBattleStats: ld a, BANK(sLinkBattleStats) - call GetSRAMBank + call OpenSRAM ld hl, sLinkBattleStats ld bc, sLinkBattleStatsEnd - sLinkBattleStats xor a @@ -374,7 +374,7 @@ EraseLinkBattleStats: EraseMysteryGift: ld a, BANK(sBackupMysteryGiftItem) - call GetSRAMBank + call OpenSRAM ld hl, sBackupMysteryGiftItem ld bc, sBackupMysteryGiftItemEnd - sBackupMysteryGiftItem xor a @@ -383,7 +383,7 @@ EraseMysteryGift: EraseHallOfFame: ld a, BANK(sHallOfFame) - call GetSRAMBank + call OpenSRAM ld hl, sHallOfFame ld bc, sHallOfFameEnd - sHallOfFame xor a @@ -392,7 +392,7 @@ EraseHallOfFame: Unreferenced_Function14d18: ld a, BANK(s4_a007) - call GetSRAMBank + call OpenSRAM ld hl, .Data ld de, s4_a007 ld bc, .DataEnd - .Data @@ -412,7 +412,7 @@ Unreferenced_Function14d18: EraseBattleTowerStatus: ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM xor a ld [sBattleTowerChallengeState], a jp CloseSRAM @@ -423,7 +423,7 @@ SaveData: Unreferenced_Function14d6c: ld a, BANK(s4_a60b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 - call GetSRAMBank + call OpenSRAM ld a, [s4_a60b] ; address of MBC30 bank ld b, $0 and a @@ -438,7 +438,7 @@ Unreferenced_Function14d6c: Unreferenced_Function14d83: ld a, BANK(s4_a60c) ; aka BANK(s4_a60d) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 - call GetSRAMBank + call OpenSRAM xor a ld [s4_a60c], a ; address of MBC30 bank ld [s4_a60d], a ; address of MBC30 bank @@ -447,7 +447,7 @@ Unreferenced_Function14d83: Unreferenced_Function14d93: ld a, BANK(s7_a000) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 - call GetSRAMBank + call OpenSRAM xor a ld [s7_a000], a ; address of MBC30 bank call CloseSRAM @@ -462,7 +462,7 @@ HallOfFame_InitSaveIfNeeded: ValidateSave: ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) - call GetSRAMBank + call OpenSRAM ld a, SAVE_CHECK_VALUE_1 ld [sCheckValue1], a ld a, SAVE_CHECK_VALUE_2 @@ -471,7 +471,7 @@ ValidateSave: SaveOptions: ld a, BANK(sOptions) - call GetSRAMBank + call OpenSRAM ld hl, wOptions ld de, sOptions ld bc, wOptionsEnd - wOptions @@ -483,7 +483,7 @@ SaveOptions: SavePlayerData: ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, wPlayerData ld de, sPlayerData ld bc, wPlayerDataEnd - wPlayerData @@ -496,7 +496,7 @@ SavePlayerData: SavePokemonData: ld a, BANK(sPokemonData) - call GetSRAMBank + call OpenSRAM ld hl, wPokemonData ld de, sPokemonData ld bc, wPokemonDataEnd - wPokemonData @@ -513,7 +513,7 @@ SaveChecksum: ld hl, sGameData ld bc, sGameDataEnd - sGameData ld a, BANK(sGameData) - call GetSRAMBank + call OpenSRAM call Checksum ld a, e ld [sChecksum + 0], a @@ -524,7 +524,7 @@ SaveChecksum: ValidateBackupSave: ld a, BANK(sBackupCheckValue1) ; aka BANK(sBackupCheckValue2) - call GetSRAMBank + call OpenSRAM ld a, SAVE_CHECK_VALUE_1 ld [sBackupCheckValue1], a ld a, SAVE_CHECK_VALUE_2 @@ -534,7 +534,7 @@ ValidateBackupSave: SaveBackupOptions: ld a, BANK(sBackupOptions) - call GetSRAMBank + call OpenSRAM ld hl, wOptions ld de, sBackupOptions ld bc, wOptionsEnd - wOptions @@ -544,7 +544,7 @@ SaveBackupOptions: SaveBackupPlayerData: ld a, BANK(sBackupPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, wPlayerData ld de, sBackupPlayerData ld bc, wPlayerDataEnd - wPlayerData @@ -558,7 +558,7 @@ SaveBackupPlayerData: SaveBackupPokemonData: ld a, BANK(sBackupPokemonData) - call GetSRAMBank + call OpenSRAM ld hl, wPokemonData ld de, sBackupPokemonData ld bc, wPokemonDataEnd - wPokemonData @@ -570,7 +570,7 @@ SaveBackupChecksum: ld hl, sBackupGameData ld bc, sBackupGameDataEnd - sBackupGameData ld a, BANK(sBackupGameData) - call GetSRAMBank + call OpenSRAM call Checksum ld a, e ld [sBackupChecksum + 0], a @@ -634,7 +634,7 @@ TryLoadSaveData: jr z, .backup ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sPlayerData + wStartDay - wPlayerData ld de, wStartDay ld bc, 8 @@ -653,7 +653,7 @@ TryLoadSaveData: jr z, .corrupt ld a, BANK(sBackupPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sBackupPlayerData + wStartDay - wPlayerData ld de, wStartDay ld bc, 8 @@ -677,7 +677,7 @@ INCLUDE "data/default_options.asm" CheckPrimarySaveFile: ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) - call GetSRAMBank + call OpenSRAM ld a, [sCheckValue1] cp SAVE_CHECK_VALUE_1 jr nz, .nope @@ -698,7 +698,7 @@ CheckPrimarySaveFile: CheckBackupSaveFile: ld a, BANK(sBackupCheckValue1) ; aka BANK(sBackupCheckValue2) - call GetSRAMBank + call OpenSRAM ld a, [sBackupCheckValue1] cp SAVE_CHECK_VALUE_1 jr nz, .nope @@ -718,7 +718,7 @@ CheckBackupSaveFile: LoadPlayerData: ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sPlayerData ld de, wPlayerData ld bc, wPlayerDataEnd - wPlayerData @@ -729,7 +729,7 @@ LoadPlayerData: call CopyBytes call CloseSRAM ld a, BANK(sBattleTowerChallengeState) - call GetSRAMBank + call OpenSRAM ld a, [sBattleTowerChallengeState] cp BATTLETOWER_RECEIVED_REWARD jr nz, .not_4 @@ -741,7 +741,7 @@ LoadPlayerData: LoadPokemonData: ld a, BANK(sPokemonData) - call GetSRAMBank + call OpenSRAM ld hl, sPokemonData ld de, wPokemonData ld bc, wPokemonDataEnd - wPokemonData @@ -758,7 +758,7 @@ VerifyChecksum: ld hl, sGameData ld bc, sGameDataEnd - sGameData ld a, BANK(sGameData) - call GetSRAMBank + call OpenSRAM call Checksum ld a, [sChecksum + 0] cp e @@ -773,7 +773,7 @@ VerifyChecksum: LoadBackupPlayerData: ld a, BANK(sBackupPlayerData) - call GetSRAMBank + call OpenSRAM ld hl, sBackupPlayerData ld de, wPlayerData ld bc, wPlayerDataEnd - wPlayerData @@ -787,7 +787,7 @@ LoadBackupPlayerData: LoadBackupPokemonData: ld a, BANK(sBackupPokemonData) - call GetSRAMBank + call OpenSRAM ld hl, sBackupPokemonData ld de, wPokemonData ld bc, wPokemonDataEnd - wPokemonData @@ -799,7 +799,7 @@ VerifyBackupChecksum: ld hl, sBackupGameData ld bc, sBackupGameDataEnd - sBackupGameData ld a, BANK(sBackupGameData) - call GetSRAMBank + call OpenSRAM call Checksum ld a, [sBackupChecksum + 0] cp e @@ -819,7 +819,7 @@ _SaveData: ; It is not part of a regular save. ld a, BANK(sCrystalData) - call GetSRAMBank + call OpenSRAM ld hl, wCrystalData ld de, sCrystalData ld bc, wCrystalDataEnd - wCrystalData @@ -840,7 +840,7 @@ _SaveData: _LoadData: ld a, BANK(sCrystalData) - call GetSRAMBank + call OpenSRAM ld hl, sCrystalData ld de, wCrystalData ld bc, wCrystalDataEnd - wCrystalData @@ -892,7 +892,7 @@ SaveBoxAddress: push af push de ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBox ld de, wBoxPartialData ld bc, (wBoxPartialDataEnd - wBoxPartialData) @@ -903,7 +903,7 @@ SaveBoxAddress: ; Save it to the target box. push af push de - call GetSRAMBank + call OpenSRAM ld hl, wBoxPartialData ld bc, (wBoxPartialDataEnd - wBoxPartialData) call CopyBytes @@ -911,7 +911,7 @@ SaveBoxAddress: ; Load the second part of the active box. ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBox + (wBoxPartialDataEnd - wBoxPartialData) ld de, wBoxPartialData ld bc, (wBoxPartialDataEnd - wBoxPartialData) @@ -927,7 +927,7 @@ SaveBoxAddress: ; Save it to the next part of the target box. push af push de - call GetSRAMBank + call OpenSRAM ld hl, wBoxPartialData ld bc, (wBoxPartialDataEnd - wBoxPartialData) call CopyBytes @@ -935,7 +935,7 @@ SaveBoxAddress: ; Load the third and final part of the active box. ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2 ld de, wBoxPartialData ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e @@ -949,7 +949,7 @@ SaveBoxAddress: ld e, l ld d, h ; Save it to the final part of the target box. - call GetSRAMBank + call OpenSRAM ld hl, wBoxPartialData ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e call CopyBytes @@ -968,13 +968,13 @@ LoadBoxAddress: ; Load part 1 push af push hl - call GetSRAMBank + call OpenSRAM ld de, wBoxPartialData ld bc, (wBoxPartialDataEnd - wBoxPartialData) call CopyBytes call CloseSRAM ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, wBoxPartialData ld de, sBox ld bc, (wBoxPartialDataEnd - wBoxPartialData) @@ -988,13 +988,13 @@ LoadBoxAddress: ; Load part 2 push af push hl - call GetSRAMBank + call OpenSRAM ld de, wBoxPartialData ld bc, (wBoxPartialDataEnd - wBoxPartialData) call CopyBytes call CloseSRAM ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, wBoxPartialData ld de, sBox + (wBoxPartialDataEnd - wBoxPartialData) ld bc, (wBoxPartialDataEnd - wBoxPartialData) @@ -1005,13 +1005,13 @@ LoadBoxAddress: ; Load part 3 ld de, (wBoxPartialDataEnd - wBoxPartialData) add hl, de - call GetSRAMBank + call OpenSRAM ld de, wBoxPartialData ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e call CopyBytes call CloseSRAM ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, wBoxPartialData ld de, sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2 ld bc, sBoxEnd - (sBox + (wBoxPartialDataEnd - wBoxPartialData) * 2) ; $8e @@ -1027,7 +1027,7 @@ EraseBoxes: .next push bc ld a, [hli] - call GetSRAMBank + call OpenSRAM ld a, [hli] ld e, a ld a, [hli] diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index bb35c96e4..701b8c57d 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -80,7 +80,7 @@ Credits:: push af ld a, $5 ldh [hVBlank], a - ld a, $1 + ld a, TRUE ldh [hInMenu], a xor a ldh [hBGMapMode], a @@ -198,7 +198,7 @@ Credits_UpdateGFXRequestPath: Credits_RequestGFX: xor a ldh [hBGMapMode], a - ld a, $8 + ld a, 8 ld [wRequested2bpp], a jp Credits_Next @@ -572,14 +572,17 @@ Credits_LoadBorderGFX: dw CreditsPichuGFX + 16 tiles dw CreditsPichuGFX + 32 tiles dw CreditsPichuGFX + 48 tiles + dw CreditsSmoochumGFX dw CreditsSmoochumGFX + 16 tiles dw CreditsSmoochumGFX + 32 tiles dw CreditsSmoochumGFX + 48 tiles + dw CreditsDittoGFX dw CreditsDittoGFX + 16 tiles dw CreditsDittoGFX + 32 tiles dw CreditsDittoGFX + 48 tiles + dw CreditsIgglybuffGFX dw CreditsIgglybuffGFX + 16 tiles dw CreditsIgglybuffGFX + 32 tiles diff --git a/engine/movie/evolution_animation.asm b/engine/movie/evolution_animation.asm index 0960fb3e7..dfc088e21 100644 --- a/engine/movie/evolution_animation.asm +++ b/engine/movie/evolution_animation.asm @@ -47,11 +47,13 @@ EvolutionAnimation: call WaitBGMap xor a ldh [hBGMapMode], a + ld a, [wEvolutionOldSpecies] ld [wPlayerHPPal], a - ld c, $0 + ld c, FALSE call .GetSGBLayout + ld a, [wEvolutionOldSpecies] ld [wCurPartySpecies], a ld [wCurSpecies], a @@ -69,41 +71,45 @@ EvolutionAnimation: ld [wCurPartySpecies], a ld [wCurSpecies], a call .LoadFrontpic + ld a, [wEvolutionOldSpecies] ld [wCurPartySpecies], a ld [wCurSpecies], a - ld a, $1 + ld a, 1 ldh [hBGMapMode], a + call .check_statused jr c, .skip_cry - ld a, [wEvolutionOldSpecies] call PlayMonCry - .skip_cry + ld de, MUSIC_EVOLUTION call PlayMusic ld c, 80 call DelayFrames - ld c, $1 + ld c, TRUE call .GetSGBLayout + call .AnimationSequence jr c, .cancel_evo ld a, -7 * 7 ld [wEvolutionPicOffset], a call .ReplaceFrontpic + xor a ld [wEvolutionCanceled], a ld a, [wEvolutionNewSpecies] ld [wPlayerHPPal], a - ld c, $0 + ld c, FALSE call .GetSGBLayout + call .PlayEvolvedSFX farcall ClearSpriteAnims call .check_statused @@ -133,14 +139,15 @@ EvolutionAnimation: ret .cancel_evo - ld a, $1 + ld a, TRUE ld [wEvolutionCanceled], a ld a, [wEvolutionOldSpecies] ld [wPlayerHPPal], a - ld c, $0 + ld c, FALSE call .GetSGBLayout + call .PlayEvolvedSFX farcall ClearSpriteAnims call .check_statused diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 0a88f8ab7..2c7a9c68a 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -1,4 +1,4 @@ -Copyright_GFPresents: +Copyright_GameFreakPresents: ; Play the copyright screen and GameFreak Presents sequence. ; Return carry if user cancels animation by pressing a button. @@ -13,7 +13,7 @@ Copyright_GFPresents: ldh [hJoyDown], a ldh [hSCX], a ldh [hSCY], a - ld a, $90 + ld a, SCREEN_HEIGHT_PX ldh [hWY], a call WaitBGMap ld b, SCGB_GAMEFREAK_LOGO @@ -116,32 +116,23 @@ Copyright_GFPresents: ret PlaceGameFreakPresents: - ld a, [wJumptableIndex] - ld e, a - ld d, 0 - ld hl, .dw - add hl, de - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - jp hl + jumptable .scenes, wJumptableIndex -.dw - dw PlaceGameFreakPresents_0 - dw PlaceGameFreakPresents_1 - dw PlaceGameFreakPresents_2 - dw PlaceGameFreakPresents_3 +.scenes + dw GameFreakPresentsScene0 + dw GameFreakPresentsScene1 + dw GameFreakPresentsScene2 + dw GameFreakPresentsScene3 -PlaceGameFreakPresents_AdvanceIndex: +PlaceGameFreakPresents_NextScene: ld hl, wJumptableIndex inc [hl] ret -PlaceGameFreakPresents_0: +GameFreakPresentsScene0: ret -PlaceGameFreakPresents_1: +GameFreakPresentsScene1: ld hl, wIntroSceneTimer ld a, [hl] cp $20 @@ -155,7 +146,7 @@ PlaceGameFreakPresents_1: decoord 5, 10 ld bc, .end - .GAME_FREAK call CopyBytes - call PlaceGameFreakPresents_AdvanceIndex + call PlaceGameFreakPresents_NextScene ld de, SFX_GAME_FREAK_PRESENTS call PlaySFX ret @@ -166,7 +157,7 @@ PlaceGameFreakPresents_1: .end db "@" -PlaceGameFreakPresents_2: +GameFreakPresentsScene2: ld hl, wIntroSceneTimer ld a, [hl] cp $40 @@ -180,7 +171,7 @@ PlaceGameFreakPresents_2: decoord 7, 11 ld bc, .end - .presents call CopyBytes - call PlaceGameFreakPresents_AdvanceIndex + call PlaceGameFreakPresents_NextScene ret .presents @@ -188,7 +179,7 @@ PlaceGameFreakPresents_2: .end db "@" -PlaceGameFreakPresents_3: +GameFreakPresentsScene3: ld hl, wIntroSceneTimer ld a, [hl] cp $80 @@ -201,12 +192,12 @@ PlaceGameFreakPresents_3: set 7, [hl] ret -GameFreakLogoJumper: +PlaceGameFreakLogo: ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc ld e, [hl] ld d, 0 - ld hl, GameFreakLogoScenes + ld hl, .scenes add hl, de add hl, de ld a, [hli] @@ -214,7 +205,7 @@ GameFreakLogoJumper: ld l, a jp hl -GameFreakLogoScenes: +.scenes: dw GameFreakLogoScene1 dw GameFreakLogoScene2 dw GameFreakLogoScene3 @@ -325,7 +316,7 @@ GameFreakLogoScene4: ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc inc [hl] - call PlaceGameFreakPresents_AdvanceIndex + call PlaceGameFreakPresents_NextScene GameFreakLogoScene5: ret diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 9291192d7..c933c610c 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2450,7 +2450,7 @@ Script_warpfacing: set PLAYERSPRITESETUP_CUSTOM_FACING_F, a or c ld [wPlayerSpriteSetupFlags], a -; fall through +; fallthrough Script_warp: ; script command 0x3c diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index afc7d3b2d..da6d6745a 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -244,7 +244,7 @@ _CheckLuckyNumberShowFlag: DoMysteryGiftIfDayHasPassed: ld a, BANK(sMysteryGiftTimer) - call GetSRAMBank + call OpenSRAM ld hl, sMysteryGiftTimer ld a, [hli] ld [wBuffer1], a @@ -262,7 +262,7 @@ DoMysteryGiftIfDayHasPassed: .not_timed_out ld a, BANK(sMysteryGiftTimer) - call GetSRAMBank + call OpenSRAM ld hl, wBuffer1 ld a, [hli] ld [sMysteryGiftTimer], a diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index c98b9cc56..329a2f9f2 100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm @@ -126,7 +126,7 @@ _GetVarAction:: .BoxFreeSpace: ; Remaining slots in the current box. ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount ld a, MONS_PER_BOX sub [hl] diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index a98871828..245cbf11f 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -2362,7 +2362,7 @@ Pokedex_LoadSelectedMonTiles: .QuestionMark: ld a, BANK(sScratch) - call GetSRAMBank + call OpenSRAM farcall LoadQuestionMarkPic ld hl, vTiles2 ld de, sScratch @@ -2478,7 +2478,7 @@ Pokedex_CheckSGB: Pokedex_LoadUnownFont: ld a, BANK(sScratch) - call GetSRAMBank + call OpenSRAM ld hl, UnownFont ld de, sScratch + $188 ld bc, 39 tiles diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 3b3857062..93fbeab8d 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1127,7 +1127,7 @@ BillsPC_LoadMonStats: ld b, a call GetBoxPointer ld a, b - call GetSRAMBank + call OpenSRAM push hl ld bc, sBoxMon1Level - sBox add hl, bc @@ -1187,7 +1187,7 @@ BillsPC_LoadMonStats: .sBox ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBoxMon1Level ld bc, BOXMON_STRUCT_LENGTH ld a, e @@ -1282,7 +1282,7 @@ BillsPC_RefreshTextboxes: push hl call GetBoxPointer ld a, b - call GetSRAMBank + call OpenSRAM push hl ld bc, sBoxMons - sBox add hl, bc @@ -1339,7 +1339,7 @@ BillsPC_RefreshTextboxes: .sBox push hl ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBoxSpecies ld d, $0 add hl, de @@ -1421,7 +1421,7 @@ CopyBoxmonSpecies: ld b, a call GetBoxPointer ld a, b - call GetSRAMBank + call OpenSRAM inc hl copy_box_data 1 ret @@ -1433,7 +1433,7 @@ CopyBoxmonSpecies: .sBox ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBoxSpecies copy_box_data 1 ret @@ -1652,7 +1652,7 @@ BillsPC_IsMonAnEgg: BillsPC_StatsScreen: call LowVolume call BillsPC_CopyMon - ld a, $3 + ld a, TEMPMON ld [wMonType], a predef StatsScreenInit call BillsPC_InitGFX @@ -1704,7 +1704,7 @@ BillsPC_CopyMon: cp NUM_BOXES + 1 jr nz, .box ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBoxSpecies call CopySpeciesToTemp ld hl, sBoxMonNicknames @@ -1742,7 +1742,7 @@ BillsPC_CopyMon: ld b, a call GetBoxPointer ld a, b - call GetSRAMBank + call OpenSRAM push hl inc hl call CopySpeciesToTemp @@ -1823,7 +1823,7 @@ TryWithdrawPokemon: add [hl] ld [wCurPartyMon], a ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM ld a, [wCurPartyMon] ld hl, sBoxMonNicknames call GetNick @@ -2046,7 +2046,7 @@ MovePKMNWitoutMail_InsertMon: add [hl] ld [wCurPartyMon], a ld a, BANK(sBox) - call GetSRAMBank + call OpenSRAM ld hl, sBoxSpecies call CopySpeciesToTemp ld hl, sBoxMonNicknames @@ -2348,7 +2348,7 @@ GetBoxCount: add hl, bc ld a, [hli] ld b, a - call GetSRAMBank + call OpenSRAM ld a, [hli] ld h, [hl] ld l, a @@ -2368,7 +2368,7 @@ GetBoxCount: .activebox ld a, BANK(sBoxCount) ld b, a - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount ld a, [hl] call CloseSRAM diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 3883d89c3..71e65186a 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -209,11 +209,11 @@ BillsPC_WithdrawMenu: Unreferenced_Functione56d: ld a, [wPartyCount] cp PARTY_LENGTH - jr nc, .asm_e576 + jr nc, .party_full and a ret -.asm_e576 +.party_full ld hl, PCCantTakeText call MenuTextboxBackup scf @@ -256,7 +256,7 @@ CopyBoxmonToTempMon: ld de, wTempMonSpecies ld bc, BOXMON_STRUCT_LENGTH ld a, BANK(sBoxMon1Species) - call GetSRAMBank + call OpenSRAM call CopyBytes call CloseSRAM ret @@ -282,7 +282,7 @@ Unreferenced_LoadBoxMonListing: ld hl, sBoxCount .okay - call GetSRAMBank + call OpenSRAM ld a, [hl] ld bc, sBoxMons - sBox add hl, bc diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 7bf57cdc3..84ebf6254 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -1,5 +1,5 @@ CheckPartyFullAfterContest: - ld a, [wContestMon] + ld a, [wContestMonSpecies] and a jp z, .DidntCatchAnything ld [wCurPartySpecies], a @@ -14,7 +14,7 @@ CheckPartyFullAfterContest: ld c, a ld b, 0 add hl, bc - ld a, [wContestMon] + ld a, [wContestMonSpecies] ld [hli], a ld [wCurSpecies], a ld a, -1 @@ -80,14 +80,14 @@ CheckPartyFullAfterContest: or b ld [hl], a xor a - ld [wContestMon], a + ld [wContestMonSpecies], a and a ; BUGCONTEST_CAUGHT_MON ld [wScriptVar], a ret .TryAddToBox: ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount ld a, [hl] cp MONS_PER_BOX @@ -118,7 +118,7 @@ CheckPartyFullAfterContest: .Box_SkipNickname: ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM ld de, sBoxMonNicknames ld bc, MON_NAME_LENGTH call CopyBytes @@ -126,13 +126,13 @@ CheckPartyFullAfterContest: .BoxFull: ld a, BANK(sBoxMon1Level) - call GetSRAMBank + call OpenSRAM ld a, [sBoxMon1Level] ld [wCurPartyLevel], a call CloseSRAM call SetBoxMonCaughtData ld a, BANK(sBoxMon1CaughtLocation) - call GetSRAMBank + call OpenSRAM ld hl, sBoxMon1CaughtLocation ld a, [hl] and CAUGHT_GENDER_MASK @@ -200,7 +200,7 @@ SetBoxmonOrEggmonCaughtData: SetBoxMonCaughtData: ld a, BANK(sBoxMon1CaughtLevel) - call GetSRAMBank + call OpenSRAM ld hl, sBoxMon1CaughtLevel call SetBoxmonOrEggmonCaughtData call CloseSRAM @@ -209,7 +209,7 @@ SetBoxMonCaughtData: SetGiftBoxMonCaughtData: push bc ld a, BANK(sBoxMon1CaughtLevel) - call GetSRAMBank + call OpenSRAM ld hl, sBoxMon1CaughtLevel pop bc call SetGiftMonCaughtData diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 43eb77a4e..7d0267045 100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm @@ -93,7 +93,7 @@ CalcExpAtLevel: ldh a, [hProduct + 3] sub b ldh [hMultiplicand + 2], a - ld b, $0 + ld b, 0 ldh a, [hProduct + 2] sbc b ldh [hMultiplicand + 1], a diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index fa3955003..acf6626b1 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -18,7 +18,7 @@ SendMailToPC: call AddNTimes push hl ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM ld bc, MAIL_STRUCT_LENGTH call CopyBytes pop hl @@ -41,7 +41,7 @@ SendMailToPC: DeleteMailFromPC: ; Shift all mail messages in the mailbox ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM ld a, b push bc ld hl, sMailbox @@ -83,7 +83,7 @@ ReadMailMessage: MoveMailFromPCToParty: ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM push bc ld a, b ld bc, MAIL_STRUCT_LENGTH @@ -115,7 +115,7 @@ MoveMailFromPCToParty: GetMailboxCount: ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM ld a, [sMailboxCount] ld c, a jp CloseSRAM @@ -137,7 +137,7 @@ CheckPokeMail:: jr nc, .pop_return ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld a, [wCurPartyMon] ld hl, sPartyMail ld bc, MAIL_STRUCT_LENGTH @@ -209,7 +209,7 @@ GivePokeMail:: ld hl, wd002 ld bc, MAIL_MSG_LENGTH + 1 ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM call CopyBytes pop af push af @@ -238,7 +238,7 @@ GivePokeMail:: BackupPartyMonMail: ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld hl, sPartyMail ld de, sPartyMailBackup ld bc, 6 * MAIL_STRUCT_LENGTH @@ -251,7 +251,7 @@ BackupPartyMonMail: RestorePartyMonMail: ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld hl, sPartyMailBackup ld de, sPartyMail ld bc, 6 * MAIL_STRUCT_LENGTH @@ -264,7 +264,7 @@ RestorePartyMonMail: DeletePartyMonMail: ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM xor a ld hl, sPartyMail ld bc, 6 * MAIL_STRUCT_LENGTH @@ -317,7 +317,7 @@ InitMail: ; initialize wMailboxCount and beyond with incrementing values, one per mail ; set z if no mail ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM ld a, [sMailboxCount] call CloseSRAM ld hl, wMailboxCount @@ -347,7 +347,7 @@ MailboxPC_GetMailAuthor: ld bc, MAIL_STRUCT_LENGTH call AddNTimes ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM ld de, wStringBuffer2 push de ld bc, NAME_LENGTH - 1 @@ -467,7 +467,7 @@ MailboxPC: .GetMailType: push af ld a, BANK(sMailboxCount) - call GetSRAMBank + call OpenSRAM pop af ld hl, sMailbox1Type ld bc, MAIL_STRUCT_LENGTH diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index de7b253ea..7114569fb 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -15,7 +15,7 @@ ReadAnyMail: pop de push de ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM farcall IsMailEuropean call CloseSRAM ld a, c @@ -69,7 +69,7 @@ ReadAnyMail: ld l, e push hl ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ld de, sPartyMon1MailAuthorID - sPartyMon1Mail add hl, de ld a, [hli] @@ -680,7 +680,7 @@ MailGFX_PlaceMessage: ld bc, MAIL_STRUCT_LENGTH ld de, wTempMail ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM call CopyBytes call CloseSRAM ld hl, wTempMailAuthor diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 8ffba32bf..c785a098e 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -466,7 +466,7 @@ ComposeMailMessage: ld hl, wTempMail ld bc, MAIL_STRUCT_LENGTH ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM call CopyBytes call CloseSRAM ret diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 0a3022628..e32bf7160 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -174,7 +174,7 @@ GetGender: ld a, [wMonType] cp BOXMON ld a, BANK(sBox) - call z, GetSRAMBank + call z, OpenSRAM ; Attack DV ld a, [hli] diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index bfd2f91f2..36d8c4fd3 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -485,7 +485,7 @@ SendGetMonIntoFromBox: ; wPokemonWithdrawDepositParameter == 3: put mon into DayCare ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld a, [wPokemonWithdrawDepositParameter] and a jr z, .check_IfPartyIsFull @@ -942,7 +942,7 @@ SendMonIntoBox: ; Sends the mon into one of Bills Boxes ; the data comes mainly from 'wEnemyMon:' ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld de, sBoxCount ld a, [de] cp MONS_PER_BOX @@ -1226,7 +1226,7 @@ RemoveMonFromPartyOrBox: jr z, .okay ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount .okay @@ -1336,7 +1336,7 @@ RemoveMonFromPartyOrBox: ret nz ; Shift mail ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM ; If this is the last mon in our party, no need to shift mail. ld hl, wPartyCount ld a, [wCurPartyMon] @@ -1735,7 +1735,7 @@ GivePoke:: .send_to_box ld a, BANK(sBoxMonOT) - call GetSRAMBank + call OpenSRAM ld de, sBoxMonOT .loop ld a, [wScriptBank] @@ -1785,7 +1785,7 @@ GivePoke:: ld hl, WasSentToBillsPCText call PrintText ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM ld hl, wMonOrItemNameBuffer ld de, sBoxMonNicknames ld bc, MON_NAME_LENGTH diff --git a/engine/pokemon/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm index 8166d348c..79f70d05e 100644 --- a/engine/pokemon/move_mon_wo_mail.asm +++ b/engine/pokemon/move_mon_wo_mail.asm @@ -1,6 +1,6 @@ InsertPokemonIntoBox: ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount call InsertSpeciesIntoBoxOrParty ld a, [sBoxCount] diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm index bc3e6ae3b..b6da60605 100644 --- a/engine/pokemon/search.asm +++ b/engine/pokemon/search.asm @@ -75,7 +75,7 @@ CheckOwnMonAnywhere: ; Run CheckOwnMon on each Pokémon in the PC. ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld a, [sBoxCount] and a jr z, .boxes @@ -119,7 +119,7 @@ CheckOwnMonAnywhere: 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/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 62db2e851..3a150c434 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -224,7 +224,7 @@ StatsScreenWaitCry: StatsScreen_CopyToTempMon: ld a, [wMonType] cp TEMPMON - jr nz, .breedmon + jr nz, .not_tempmon ld a, [wBufferMonSpecies] ld [wCurSpecies], a call GetBaseData @@ -234,7 +234,7 @@ StatsScreen_CopyToTempMon: call CopyBytes jr .done -.breedmon +.not_tempmon farcall CopyMonToTempMon ld a, [wCurPartySpecies] cp EGG @@ -251,7 +251,7 @@ StatsScreen_GetJoypad: call GetJoypad ld a, [wMonType] cp TEMPMON - jr nz, .notbreedmon + jr nz, .not_tempmon push hl push de push bc @@ -263,11 +263,11 @@ StatsScreen_GetJoypad: and D_DOWN | D_UP jr nz, .set_carry ld a, [wMenuJoypad] - jr .clear_flags + jr .clear_carry -.notbreedmon +.not_tempmon ldh a, [hJoyPressed] -.clear_flags +.clear_carry and a ret @@ -532,11 +532,11 @@ StatsScreen_LoadGFX: .Jumptable: ; entries correspond to *_PAGE constants - dw .PinkPage - dw .GreenPage - dw .BluePage + dw LoadPinkPage + dw LoadGreenPage + dw LoadBluePage -.PinkPage: +LoadPinkPage: hlcoord 0, 9 ld b, $0 predef DrawPlayerHP @@ -678,7 +678,7 @@ StatsScreen_LoadGFX: .PkrsStr: db "#RUS@" -.GreenPage: +LoadGreenPage: ld de, .Item hlcoord 0, 8 call PlaceString @@ -723,17 +723,17 @@ StatsScreen_LoadGFX: .Move: db "MOVE@" -.BluePage: +LoadBluePage: call .PlaceOTInfo hlcoord 10, 8 ld de, SCREEN_WIDTH ld b, 10 ld a, $31 ; vertical divider -.BluePageVerticalDivider: +.vertical_divider ld [hl], a add hl, de dec b - jr nz, .BluePageVerticalDivider + jr nz, .vertical_divider hlcoord 11, 8 ld bc, 6 predef PrintTempMonStats @@ -890,7 +890,7 @@ StatsScreen_GetAnimationParam: ld b, h ld c, l ld a, BANK(sBoxMons) - call GetSRAMBank + call OpenSRAM call .CheckEggFaintedFrzSlp push af call CloseSRAM @@ -1095,7 +1095,7 @@ CopyNickname: cp BOXMON jr nz, .partymon ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM push de call CopyBytes pop de diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index 6d68ec88d..26aa6e5fa 100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm @@ -116,7 +116,7 @@ _SwitchPartyMons: ld de, wd002 ld bc, MAIL_STRUCT_LENGTH ld a, BANK(sPartyMail) - call GetSRAMBank + call OpenSRAM call CopyBytes ld hl, sPartyMail ld a, [wBuffer3] diff --git a/engine/pokemon/tempmon.asm b/engine/pokemon/tempmon.asm index 4547a02b9..97ce1ee76 100644 --- a/engine/pokemon/tempmon.asm +++ b/engine/pokemon/tempmon.asm @@ -107,7 +107,7 @@ GetMonSpecies: .boxmon ld a, BANK(sBoxSpecies) - call GetSRAMBank + call OpenSRAM ld hl, sBoxSpecies call .done call CloseSRAM diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 2d9495cbd..267d29fe8 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -716,7 +716,7 @@ PrintPCBox_Page4: Printer_PrintBoxListSegment: ld a, [wBankOfBoxToPrint] - call GetSRAMBank + call OpenSRAM .loop ld a, c and a diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index b24609a10..49c9a122e 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -18,7 +18,7 @@ _ResetClock: call ClockResetPassword jr c, .wrongpassword ld a, BANK(sRTCStatusFlags) - call GetSRAMBank + call OpenSRAM ld a, $80 ld [sRTCStatusFlags], a call CloseSRAM @@ -216,7 +216,7 @@ ClockResetPassword: .CalculatePassword: ld a, BANK(sPlayerData) - call GetSRAMBank + call OpenSRAM ld de, 0 ld hl, sPlayerData + (wPlayerID - wPlayerData) ld c, 2 diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index 6577598f3..eb39adb76 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -137,7 +137,7 @@ ClockContinue: farcall ClearDailyTimers farcall Function170923 ld a, BANK(s5_aa8c) ; aka BANK(s5_b2fa) - call GetSRAMBank + call OpenSRAM ld a, [s5_aa8c] inc a ld [s5_aa8c], a |