From 8618cbbc381da54c7cb32325f7f38b94f2b37fd7 Mon Sep 17 00:00:00 2001 From: Ian Burgmyer Date: Fri, 11 Feb 2022 17:37:23 -0500 Subject: [PATCH] Fixed warnings on newer RGBDS builds. --- common/defines.inc | 56 ++++++++++++++++++++++++++--------------------------- common/header.inc | 4 ++-- cpu/rst.asm | 16 +++++++-------- video/vblankInt.asm | 2 +- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/common/defines.inc b/common/defines.inc index 5c1714a..8e4bd4a 100644 --- a/common/defines.inc +++ b/common/defines.inc @@ -1,28 +1,28 @@ ; ; Overrides ; -OverrideRst00 SET 0 -OverrideRst08 SET 0 -OverrideRst10 SET 0 -OverrideRst18 SET 0 -OverrideRst20 SET 0 -OverrideRst28 SET 0 -OverrideRst30 SET 0 -OverrideRst38 SET 0 - -OverrideIntVblank SET 0 -OverrideIntLcdc SET 0 -OverrideIntTimer SET 0 -OverrideIntSerial SET 0 -OverrideIntJoypad SET 0 - -OverrideHeaderJump SET 0 +OverrideRst00 = 0 +OverrideRst08 = 0 +OverrideRst10 = 0 +OverrideRst18 = 0 +OverrideRst20 = 0 +OverrideRst28 = 0 +OverrideRst30 = 0 +OverrideRst38 = 0 + +OverrideIntVblank = 0 +OverrideIntLcdc = 0 +OverrideIntTimer = 0 +OverrideIntSerial = 0 +OverrideIntJoypad = 0 + +OverrideHeaderJump = 0 ; Flags -ZeroFlag SET 7 -SubtractFlag SET 6 -HalfCarryFlag SET 5 -CarryFlag SET 4 +ZeroFlag = 7 +SubtractFlag = 6 +HalfCarryFlag = 5 +CarryFlag = 4 ; =========== ; HEADER DEFS @@ -34,7 +34,7 @@ CgbUnsupported EQU $00 CgbCompatible EQU $80 CgbOnly EQU $C00 -HeaderCgbFlag SET CgbUnsupported +HeaderCgbFlag = CgbUnsupported ; ; SGB Flag @@ -42,7 +42,7 @@ HeaderCgbFlag SET CgbUnsupported SgbUnsupported EQU $00 SgbSupported EQU $03 -HeaderSgbFlag SET SgbUnsupported +HeaderSgbFlag = SgbUnsupported ; ; Cartridge Type @@ -77,7 +77,7 @@ CartBandaiTama5 EQU $FD CartHuc3 EQU $FE CartHuc1RamBattery EQU $ff -HeaderCartType SET CartRomOnly +HeaderCartType = CartRomOnly ; ; ROM Size @@ -94,7 +94,7 @@ Rom1152K EQU $52 Rom1280K EQU $53 Rom1536K EQU $54 -HeaderRomSize SET Rom32K +HeaderRomSize = Rom32K ; ; RAM Size @@ -104,7 +104,7 @@ Ram2K EQU $01 Ram8K EQU $02 Ram32K EQU $02 -HeaderRamSize SET RamNone +HeaderRamSize = RamNone ; ; Destination Code @@ -112,14 +112,14 @@ HeaderRamSize SET RamNone DestinationJapan EQU $00 DestinationInternational EQU $01 -HeaderDestinationCode SET DestinationInternational +HeaderDestinationCode = DestinationInternational ; ; Old Licensee Code ; -HeaderOldLicensee SET $33 +HeaderOldLicensee = $33 ; ; Mask ROM Version ; -HeaderMaskRomVersion SET $00 +HeaderMaskRomVersion = $00 diff --git a/common/header.inc b/common/header.inc index 81342fb..ef72d16 100644 --- a/common/header.inc +++ b/common/header.inc @@ -133,7 +133,7 @@ SECTION "header", ROM0[$0100] DB HeaderMaskRomVersion ; 014D : Header Checksum - DB $ff + DB $00 ; 014E-014F : Global Checksum - DW $ffff + DW $0000 diff --git a/cpu/rst.asm b/cpu/rst.asm index f172761..741c850 100644 --- a/cpu/rst.asm +++ b/cpu/rst.asm @@ -2,14 +2,14 @@ HeaderTitle EQUS "\"RST\"" include "common/defines.inc" -OverrideRst00 SET 1 -OverrideRst08 SET 1 -OverrideRst10 SET 1 -OverrideRst18 SET 1 -OverrideRst20 SET 1 -OverrideRst28 SET 1 -OverrideRst30 SET 1 -OverrideRst38 SET 1 +OverrideRst00 = 1 +OverrideRst08 = 1 +OverrideRst10 = 1 +OverrideRst18 = 1 +OverrideRst20 = 1 +OverrideRst28 = 1 +OverrideRst30 = 1 +OverrideRst38 = 1 include "common/header.inc" include "common/functions.inc" diff --git a/video/vblankInt.asm b/video/vblankInt.asm index 455db2a..f451e58 100644 --- a/video/vblankInt.asm +++ b/video/vblankInt.asm @@ -2,7 +2,7 @@ HeaderTitle EQUS "\"VBLANKINT\"" include "common/defines.inc" -OverrideIntVblank SET 1 +OverrideIntVblank = 1 include "common/header.inc" SECTION "intVblank", ROM0