Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 26 insertions, 26 deletions

diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index a2760d0a..e660020b 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -33,7 +33,7 @@ FileDataDestroyedText:
 LoadSAV0:
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], 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.
 	vc_hook Unknown_save_limit
@@ -81,7 +81,7 @@ LoadSAV0:
 LoadSAV1:
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
@@ -99,7 +99,7 @@ LoadSAV1:
 LoadSAV2:
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
@@ -196,7 +196,7 @@ OlderFileWillBeErasedText:
 SaveSAVtoSRAM0:
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, wPlayerName
 	ld de, sPlayerName
 	ld bc, NAME_LENGTH
@@ -226,7 +226,7 @@ SaveSAVtoSRAM1:
 ; stored pokémon
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, wBoxDataStart
 	ld de, sCurBoxData
 	ld bc, wBoxDataEnd - wBoxDataStart
@@ -241,7 +241,7 @@ SaveSAVtoSRAM1:
 SaveSAVtoSRAM2:
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, wPartyDataStart
 	ld de, sPartyData
 	ld bc, wPartyDataEnd - wPartyDataStart
@@ -349,7 +349,7 @@ ChangeBox::
 	call HandleMenuInput
 	ld hl, hUILayoutFlags
 	res BIT_DOUBLE_SPACED_MENU, [hl]
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 	ret nz
 	ld a, $b6
 	call PlaySoundWaitForCurrent
@@ -387,7 +387,7 @@ CopyBoxToOrFromSRAM:
 	push hl
 	call EnableSRAM
 	ld a, b
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld bc, wBoxDataEnd - wBoxDataStart
 	call CopyData
 	pop hl
@@ -409,7 +409,7 @@ CopyBoxToOrFromSRAM:
 DisplayChangeBoxMenu:
 	xor a
 	ldh [hAutoBGTransferEnabled], a
-	ld a, A_BUTTON | B_BUTTON
+	ld a, PAD_A | PAD_B
 	ld [wMenuWatchedKeys], a
 	ld a, 11
 	ld [wMaxMenuItem], a
@@ -501,10 +501,10 @@ EmptyAllSRAMBoxes:
 ; player changes the box)
 	call EnableSRAM
 	ld a, BANK("Saved Boxes 1")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call EmptySRAMBoxesInBank
 	ld a, BANK("Saved Boxes 2")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call EmptySRAMBoxesInBank
 	call DisableSRAM
 	ret
@@ -542,10 +542,10 @@ GetMonCountsForAllBoxes:
 	push hl
 	call EnableSRAM
 	ld a, BANK("Saved Boxes 1")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call GetMonCountsForBoxesInBank
 	ld a, BANK("Saved Boxes 2")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call GetMonCountsForBoxesInBank
 	call DisableSRAM
 	pop hl
@@ -582,7 +582,7 @@ SAVCheckRandomID:
 ; (which are stored at wPlayerID)s
 	call EnableSRAM
 	ld a, BANK("Save Data")
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld a, [sPlayerName]
 	and a
 	jr z, .next
@@ -603,9 +603,9 @@ SAVCheckRandomID:
 	ld a, [wPlayerID + 1]
 	cp h
 .next
-	ld a, SRAM_DISABLE
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld a, $00
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 SaveHallOfFameTeams:
@@ -646,7 +646,7 @@ LoadHallOfFameTeams:
 HallOfFame_Copy:
 	call EnableSRAM
 	xor a
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call CopyData
 	call DisableSRAM
 	ret
@@ -664,21 +664,21 @@ ClearSAV:
 	ret
 
 PadSRAM_FF:
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, STARTOF(SRAM)
 	ld bc, SIZEOF(SRAM)
 	ld a, $ff
 	jp FillMemory
 
 EnableSRAM:
-	ld a, SRAM_BANKING_MODE
-	ld [MBC1SRamBankingMode], a
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, BMODE_ADVANCED
+	ld [rBMODE], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ret
 
 DisableSRAM:
-	ld a, SRAM_DISABLE
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld a, 0
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret