Commit 8488c54

Nick Faro committed on
Fix rgbds warnings
commit 8488c549abe98e10c4819c33b46b94628b991c54 parent 5292b06
3 changed files +15−15
Modifiedsetup-linux.sh +2−2
@@ -8,8 +8,8 @@ mkdir -p $BUILD_DIR
8 cp fonts/PixeliteTTF.ttf $BUILD_DIR/ 8 cp fonts/PixeliteTTF.ttf $BUILD_DIR/
9 9
10 # Compile halt.gb 10 # Compile halt.gb
11 rgbasm -E -i src/hUGEDriver/src -o hUGEDriver.obj src/hUGEDriver/src/hUGEDriver.asm 11 rgbasm -H -E -i src/hUGEDriver -o hUGEDriver.obj src/hUGEDriver/hUGEDriver.asm
12 rgbasm -i src/hUGEDriver/src/include -o halt.obj src/halt.asm 12 rgbasm -H -i src/hUGEDriver/include -o halt.obj src/halt.asm
13 rgblink -o $BUILD_DIR/halt.gb -n $BUILD_DIR/halt.sym halt.obj hUGEDriver.obj 13 rgblink -o $BUILD_DIR/halt.gb -n $BUILD_DIR/halt.sym halt.obj hUGEDriver.obj
14 rgbfix -vp0xFF $BUILD_DIR/halt.gb 14 rgbfix -vp0xFF $BUILD_DIR/halt.gb
15 15
Modifiedsetup-windows.cmd +2−2
@@ -13,8 +13,8 @@ rem Copy font
13 copy fonts\PixeliteTTF.ttf %BUILD_DIR%\ 13 copy fonts\PixeliteTTF.ttf %BUILD_DIR%\
14 14
15 rem Compile halt.gb 15 rem Compile halt.gb
16 rgbasm -E -i src\hUGEDriver\src -o hUGEDriver.obj src\hUGEDriver\src\hUGEDriver.asm 16 rgbasm -H -E -i src\hUGEDriver -o hUGEDriver.obj src\hUGEDriver\hUGEDriver.asm
17 rgbasm -i src\hUGEDriver\src\include -o halt.obj src\halt.asm 17 rgbasm -H -i src\hUGEDriver\include -o halt.obj src\halt.asm
18 rgblink -o %BUILD_DIR%\halt.gb -n %BUILD_DIR%\halt.sym halt.obj hUGEDriver.obj 18 rgblink -o %BUILD_DIR%\halt.gb -n %BUILD_DIR%\halt.sym halt.obj hUGEDriver.obj
19 rgbfix -vp0xFF %BUILD_DIR%\halt.gb 19 rgbfix -vp0xFF %BUILD_DIR%\halt.gb
20 20
Modifiedsrc/halt.asm +11−11
@@ -179,34 +179,34 @@ run_table4:
179 ret 179 ret
180 180
181 init: 181 init:
182 ld a, $FF
182 _addr = _AUD3WAVERAM 183 _addr = _AUD3WAVERAM
183 REPT 16 184 REPT 16
184 ld a, $FF 185 ldh [_addr], a
185 ld [_addr], a
186 _addr = _addr + 1 186 _addr = _addr + 1
187 ENDR 187 ENDR
188 188
189 ld a, $80 189 ld a, $80
190 ld [rAUDENA], a 190 ldh [rAUDENA], a
191 ; Enable all channels in stereo 191 ; Enable all channels in stereo
192 ld a, $FF 192 ld a, $FF
193 ld [rAUDTERM], a 193 ldh [rAUDTERM], a
194 ; Set volume 194 ; Set volume
195 ld a, $77 195 ld a, $77
196 ld [rAUDVOL], a 196 ldh [rAUDVOL], a
197 ; silence ch3 197 ; silence ch3
198 ld a, 0 198 xor a
199 ld [rAUD3LEVEL], a 199 ldh [rAUD3LEVEL], a
200 200
201 ;; Enable the HBlank interrupt on scanline 0 201 ;; Enable the HBlank interrupt on scanline 0
202 ld a, [rSTAT] 202 ldh a, [rSTAT]
203 or a, STATF_LYC 203 or a, STATF_LYC
204 ld [rSTAT], a 204 ldh [rSTAT], a
205 xor a 205 xor a
206 ld [rLYC], a 206 ldh [rLYC], a
207 207
208 ld a, IEF_LCDC 208 ld a, IEF_LCDC
209 ld [rIE], a 209 ldh [rIE], a
210 ei 210 ei
211 211
212 ;; Initialize hUGEDriver-related vars 212 ;; Initialize hUGEDriver-related vars