Skip to content

Commit

Permalink
Implement suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
SatoMew committed Jan 21, 2024
1 parent 9466cf7 commit cc8e9d2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions engine/menus/save.asm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FileDataDestroyedText:

LoadSAV0:
call EnableSRAM
ld a, $1
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
; This vc_hook does not have to be in any particular location.
; It is defined here because it refers to the same labels as the two lines below.
Expand Down Expand Up @@ -81,7 +81,7 @@ LoadSAV0:

LoadSAV1:
call EnableSRAM
ld a, $1
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
ld hl, sGameData
ld bc, sGameDataEnd - sGameData
Expand All @@ -99,7 +99,7 @@ LoadSAV1:

LoadSAV2:
call EnableSRAM
ld a, $1
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
ld hl, sGameData
ld bc, sGameDataEnd - sGameData
Expand Down Expand Up @@ -196,7 +196,7 @@ OlderFileWillBeErasedText:

SaveSAVtoSRAM0:
call EnableSRAM
ld a, $1
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
ld hl, wPlayerName
ld de, sPlayerName
Expand Down Expand Up @@ -226,7 +226,7 @@ SaveSAVtoSRAM0:
SaveSAVtoSRAM1:
; stored pokémon
call EnableSRAM
ld a, $1
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
ld hl, wBoxDataStart
ld de, sCurBoxData
Expand All @@ -241,7 +241,7 @@ SaveSAVtoSRAM1:

SaveSAVtoSRAM2:
call EnableSRAM
ld a, $1
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
ld hl, wPartyDataStart
ld de, sPartyData
Expand Down Expand Up @@ -501,10 +501,10 @@ EmptyAllSRAMBoxes:
; marks all boxes in SRAM as empty (initialisation for the first time the
; player changes the box)
call EnableSRAM
ld a, 2
ld a, BANK("Saved Boxes 1")
ld [MBC1SRamBank], a
call EmptySRAMBoxesInBank
ld a, 3
ld a, BANK("Saved Boxes 2")
ld [MBC1SRamBank], a
call EmptySRAMBoxesInBank
call DisableSRAM
Expand Down Expand Up @@ -542,10 +542,10 @@ GetMonCountsForAllBoxes:
ld hl, wBoxMonCounts
push hl
call EnableSRAM
ld a, $2
ld a, BANK("Saved Boxes 1")
ld [MBC1SRamBank], a
call GetMonCountsForBoxesInBank
ld a, $3
ld a, BANK("Saved Boxes 2")
ld [MBC1SRamBank], a
call GetMonCountsForBoxesInBank
call DisableSRAM
Expand Down Expand Up @@ -582,7 +582,7 @@ SAVCheckRandomID:
; and the two random numbers generated at game beginning
; (which are stored at wPlayerID)s
call EnableSRAM
ld a, $01
ld a, BANK("Save Data")
ld [MBC1SRamBank], a
ld a, [sPlayerName]
and a
Expand Down
2 changes: 1 addition & 1 deletion engine/movie/hall_of_fame.asm
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ HoFLoadPlayerPics:
ld de, RedPicFront
ld a, BANK(RedPicFront)
call UncompressSpriteFromDE
ld a, $0
ld a, SRAM_DISABLE
call OpenSRAM
ld hl, sSpriteBuffer1
ld de, sSpriteBuffer0
Expand Down
2 changes: 1 addition & 1 deletion engine/movie/oak_speech/oak_speech.asm
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ IntroDisplayPicCenteredOrUpperRight:
push bc
ld a, b
call UncompressSpriteFromDE
ld a, $0
ld a, SRAM_DISABLE
call OpenSRAM
ld hl, sSpriteBuffer1
ld de, sSpriteBuffer0
Expand Down

0 comments on commit cc8e9d2

Please sign in to comment.