diff options
| author | surskitty <surskitty@gmail.com> | 2018-01-23 00:02:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-01-23 00:02:56 -0500 |
| commit | fbc6fe4722f3faa69f4126ea3d2fe3a41fcba16d (patch) | |
| tree | 98c4ff39e6cb5a310c8184ba7634ef5eb7cfd19e /home/init.asm | |
| parent | 4162705db909da94a62f30b5e2caee048b3bc107 (diff) | |
| parent | c60f1331fef22b886adf3472d2b4f348832cfaf7 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'home/init.asm')
| -rw-r--r-- | home/init.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/home/init.asm b/home/init.asm index 8895da0f9..d8e476c3f 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 @@ -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 @@ -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 @@ -136,8 +136,8 @@ Init:: ; 17d ; BG on ld [rLCDC], a - ld a, -1 - ld [hLinkPlayerNumber], a + ld a, CONNECTION_NOT_ESTABLISHED + ld [hSerialConnectionStatus], a farcall InitCGBPals @@ -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 |