Replace hardware_constants.asm with hardware.inc (#511)

1 files changed, 71 insertions, 71 deletions

diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index eeb4b9e8..fba1dc53 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -31,11 +31,11 @@ FileDataDestroyedText:
 	text_end
 
 LoadSAV0:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], 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,11 +81,11 @@ LoadSAV0:
 	jp SAVGoodChecksum
 
 LoadSAV1:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], a
+	ld [rRAMB], a
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
@@ -101,11 +101,11 @@ LoadSAV1:
 	jp SAVGoodChecksum
 
 LoadSAV2:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], a
+	ld [rRAMB], a
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
@@ -129,8 +129,8 @@ SAVBadCheckSum:
 
 SAVGoodChecksum:
 	ld a, $0
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 LoadSAVIgnoreBadCheckSum:
@@ -198,11 +198,11 @@ OlderFileWillBeErasedText:
 	text_end
 
 SaveSAVtoSRAM0:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], a
+	ld [rRAMB], a
 	ld hl, wPlayerName
 	ld de, sPlayerName
 	ld bc, NAME_LENGTH
@@ -226,17 +226,17 @@ SaveSAVtoSRAM0:
 	call SAVCheckSum
 	ld [sMainDataCheckSum], a
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 SaveSAVtoSRAM1:
 ; stored pokémon
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], a
+	ld [rRAMB], a
 	ld hl, wBoxDataStart
 	ld de, sCurBoxData
 	ld bc, wBoxDataEnd - wBoxDataStart
@@ -246,16 +246,16 @@ SaveSAVtoSRAM1:
 	call SAVCheckSum
 	ld [sMainDataCheckSum], a
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 SaveSAVtoSRAM2:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], a
+	ld [rRAMB], a
 	ld hl, wPartyDataStart
 	ld de, sPartyData
 	ld bc, wPartyDataEnd - wPartyDataStart
@@ -269,8 +269,8 @@ SaveSAVtoSRAM2:
 	call SAVCheckSum
 	ld [sMainDataCheckSum], a
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 SaveSAVtoSRAM::
@@ -358,7 +358,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
 	call GetBoxSRAMLocation
 	ld e, l
@@ -394,12 +394,12 @@ WhenYouChangeBoxText:
 CopyBoxToOrFromSRAM:
 ; copy an entire box from hl to de with b as the SRAM bank
 	push hl
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
+	ld [rBMODE], a
 	ld a, b
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld bc, wBoxDataEnd - wBoxDataStart
 	call CopyData
 	pop hl
@@ -416,14 +416,14 @@ CopyBoxToOrFromSRAM:
 	ld [sBank2AllBoxesChecksum], a ; sBank3AllBoxesChecksum
 	call CalcIndividualBoxCheckSums
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 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
@@ -515,19 +515,19 @@ BoxNoText:
 EmptyAllSRAMBoxes:
 ; marks all boxes in SRAM as empty (initialisation for the first time the
 ; player changes the box)
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
+	ld [rBMODE], a
 	ld a, 2
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call EmptySRAMBoxesInBank
 	ld a, 3
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call EmptySRAMBoxesInBank
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 EmptySRAMBoxesInBank:
@@ -561,19 +561,19 @@ EmptySRAMBox:
 GetMonCountsForAllBoxes:
 	ld hl, wBoxMonCounts
 	push hl
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
+	ld [rBMODE], a
 	ld a, $2
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call GetMonCountsForBoxesInBank
 	ld a, $3
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call GetMonCountsForBoxesInBank
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	pop hl
 
 ; copy the count for the current box from WRAM
@@ -607,10 +607,10 @@ SAVCheckRandomID:
 ; and the two random numbers generated at game beginning
 ; (which are stored at wPlayerID)s
 	ld a, $0a
-	ld [MBC1SRamEnable], a
+	ld [rRAMG], a
 	ld a, $01
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamBank], a
+	ld [rBMODE], a
+	ld [rRAMB], a
 	ld a, [sPlayerName]
 	and a
 	jr z, .next
@@ -632,8 +632,8 @@ SAVCheckRandomID:
 	cp h
 .next
 	ld a, $00
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 SaveHallOfFameTeams:
@@ -672,23 +672,23 @@ LoadHallOfFameTeams:
 	; fallthrough
 
 HallOfFame_Copy:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
+	ld [rBMODE], a
 	xor a
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call CopyData
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 ClearSAV:
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	ld a, $1
-	ld [MBC1SRamBankingMode], a
+	ld [rBMODE], a
 	xor a
 	call PadSRAM_FF
 	ld a, $1
@@ -698,12 +698,12 @@ ClearSAV:
 	ld a, $3
 	call PadSRAM_FF
 	xor a
-	ld [MBC1SRamBankingMode], a
-	ld [MBC1SRamEnable], a
+	ld [rBMODE], a
+	ld [rRAMG], a
 	ret
 
 PadSRAM_FF:
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, STARTOF(SRAM)
 	ld bc, SIZEOF(SRAM)
 	ld a, $ff