From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- home/init.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index 8895da0f9..f9c8ef485 100644 --- a/home/init.asm +++ b/home/init.asm @@ -166,7 +166,7 @@ Init:: ; 17d call DelayFrame - predef InitSGBBorder ; SGB init + predef Predef_InitSGBBorder ; SGB init call MapSetup_Sound_Off xor a -- cgit v1.2.3 From 51106cccd02ba305b1aa12b644f5a0e9193fd555 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 00:19:54 -0500 Subject: Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate. --- home/init.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index 8895da0f9..a65f75332 100644 --- a/home/init.asm +++ b/home/init.asm @@ -55,7 +55,7 @@ Init:: ; 17d ld [rOBP1], a ld [rTMA], a ld [rTAC], a - ld [$d000], a + ld [WRAM1_Begin], a ld a, %100 ; Start timer at 4096Hz ld [rTAC], a -- cgit v1.2.3 From 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 19:12:45 -0500 Subject: Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). --- home/init.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index a65f75332..dbdbccf3d 100644 --- a/home/init.asm +++ b/home/init.asm @@ -96,7 +96,7 @@ Init:: ; 17d ld [hCGB], a call ClearWRAM - ld a, 1 + ld a, BANK(wd000) ld [rSVBK], a call ClearVRAM call ClearSprites -- cgit v1.2.3 From 80480821142d7a7b16dd2b1a98a213e7b389af0f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 14:30:10 -0500 Subject: Remove Predef_ prefix from routines listed in PredefPointers --- home/init.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index 26fb17313..dbdbccf3d 100644 --- a/home/init.asm +++ b/home/init.asm @@ -166,7 +166,7 @@ Init:: ; 17d call DelayFrame - predef Predef_InitSGBBorder ; SGB init + predef InitSGBBorder ; SGB init call MapSetup_Sound_Off xor a -- cgit v1.2.3 From 95c0c31c8ff8e1149a9b959e04ea27e337e929b4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 01:25:19 -0500 Subject: Eliminate wd000 --- home/init.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index dbdbccf3d..87ecf926b 100644 --- a/home/init.asm +++ b/home/init.asm @@ -96,7 +96,7 @@ Init:: ; 17d ld [hCGB], a call ClearWRAM - ld a, BANK(wd000) + ld a, 1 ld [rSVBK], a call ClearVRAM call ClearSprites @@ -182,11 +182,11 @@ ClearVRAM:: ; 245 ld [rVBK], a call .clear - xor a + xor a ; 0 ld [rVBK], a .clear - ld hl, vTiles0 - ld bc, $2000 + ld hl, VRAM_Begin + ld bc, VRAM_End - VRAM_Begin xor a call ByteFill ret -- cgit v1.2.3 From 0c6338836d714f464bfcaa0c8c5b8c76e6f4958d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 14:49:43 -0500 Subject: Resolve #471 (although link code still needs more cleanup, like its WRAM labels) --- home/init.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index 87ecf926b..e5859bf08 100644 --- a/home/init.asm +++ b/home/init.asm @@ -32,7 +32,7 @@ _Start:: ; 16e .load ld [hCGB], a ld a, $1 - ld [hFFEA], a + ld [hSystemBooted], a ; 17d @@ -84,14 +84,14 @@ Init:: ; 17d ; Clear HRAM ld a, [hCGB] push af - ld a, [hFFEA] + ld a, [hSystemBooted] push af xor a ld hl, HRAM_Begin ld bc, HRAM_End - HRAM_Begin call ByteFill pop af - ld [hFFEA], a + ld [hSystemBooted], a pop af ld [hCGB], a @@ -137,7 +137,7 @@ Init:: ; 17d ld [rLCDC], a ld a, -1 - ld [hLinkPlayerNumber], a + ld [hSerialConnectionStatus], a farcall InitCGBPals -- cgit v1.2.3 From b199f6cfbff81cec3e62351ae4aaa6edce0270d5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 19 Jan 2018 19:31:45 -0500 Subject: Use hSerialConnectionStatus constants elsewhere --- home/init.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/init.asm') diff --git a/home/init.asm b/home/init.asm index e5859bf08..d8e476c3f 100644 --- a/home/init.asm +++ b/home/init.asm @@ -136,7 +136,7 @@ Init:: ; 17d ; BG on ld [rLCDC], a - ld a, -1 + ld a, CONNECTION_NOT_ESTABLISHED ld [hSerialConnectionStatus], a farcall InitCGBPals -- cgit v1.2.3