Replace hardware_constants.asm with the community-standard hardware.inc 5.0 (#1186)

ram/wram.asm

@@ -28,7 +28,7 @@ wCurNoteDuration:: db ; used in MusicE0 and LoadNote
 wCurMusicByte:: db
 wCurChannel:: db
 wVolume::
-; corresponds to rNR50
+; corresponds to rAUDVOL
 ; Channel control / ON-OFF / Volume (R/W)
 ;   bit 7 - Vin->SO2 ON/OFF
 ;   bit 6-4 - SO2 output level (volume) (# 0-7)
@@ -36,12 +36,12 @@ wVolume::
 ;   bit 2-0 - SO1 output level (volume) (# 0-7)
 	db
 wSoundOutput::
-; corresponds to rNR51
+; corresponds to rAUDTERM
 ; bit 4-7: ch1-4 so2 on/off
 ; bit 0-3: ch1-4 so1 on/off
 	db
 wPitchSweep::
-; corresponds to rNR10
+; corresponds to rAUD1SWEEP
 ; bit 7:   unused
 ; bit 4-6: sweep time
 ; bit 3:   sweep direction
@@ -302,7 +302,7 @@ SECTION "Sprites", WRAM0
 
 wShadowOAM::
 ; wShadowOAMSprite00 - wShadowOAMSprite39
-for n, NUM_SPRITE_OAM_STRUCTS
+for n, OAM_COUNT
 wShadowOAMSprite{02d:n}:: sprite_oam_struct wShadowOAMSprite{02d:n}
 endr
 wShadowOAMEnd::
@@ -312,7 +312,7 @@ SECTION "Tilemap", WRAM0
 
 wTilemap::
 ; 20x18 grid of 8x8 tiles
-	ds SCREEN_WIDTH * SCREEN_HEIGHT
+	ds SCREEN_AREA
 wTilemapEnd::
 
 
@@ -907,7 +907,7 @@ wPrinterSendByteOffset:: dw
 wPrinterSendByteCounter:: dw
 
 ; tilemap backup?
-wPrinterTilemapBuffer:: ds SCREEN_HEIGHT * SCREEN_WIDTH
+wPrinterTilemapBuffer:: ds SCREEN_AREA
 wPrinterStatus:: db
 	ds 1
 ; High nibble is for margin before the image, low nibble is for after.
@@ -1469,7 +1469,7 @@ wAttrmap::
 ;		bit 4: pal # (non-cgb)
 ;		bit 3: vram bank (cgb only)
 ;		bit 2-0: pal # (cgb only)
-	ds SCREEN_WIDTH * SCREEN_HEIGHT
+	ds SCREEN_AREA
 wAttrmapEnd::
 
 UNION
@@ -3393,7 +3393,7 @@ SECTION "Pic Animations", WRAMX
 
 wTempTilemap::
 ; 20x18 grid of 8x8 tiles
-	ds SCREEN_WIDTH * SCREEN_HEIGHT
+	ds SCREEN_AREA
 
 ; PokeAnim data
 wPokeAnimStruct::
@@ -3456,7 +3456,7 @@ w3_d742:: battle_tower_struct w3_d742
 
 NEXTU
 	ds $be
-w3_d800:: ds BG_MAP_WIDTH * SCREEN_HEIGHT
+w3_d800:: ds TILEMAP_WIDTH * SCREEN_HEIGHT
 
 NEXTU
 	ds $be
@@ -3485,9 +3485,9 @@ ENDU
 
 	ds $1c0
 
-w3_dc00:: ds SCREEN_WIDTH * SCREEN_HEIGHT
+w3_dc00:: ds SCREEN_AREA
 UNION
-w3_dd68:: ds SCREEN_WIDTH * SCREEN_HEIGHT
+w3_dd68:: ds SCREEN_AREA
 
 	ds $11c
 
@@ -3628,8 +3628,8 @@ w5_MobileOpponentBattleLossMessage:: ds $c
 SECTION "Scratch RAM", WRAMX
 
 UNION
-wScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
-wScratchAttrmap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
+wScratchTilemap:: ds TILEMAP_AREA
+wScratchAttrmap:: ds TILEMAP_AREA
 
 NEXTU
 wDecompressScratch:: ds $80 tiles