diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/init.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/init.asm')
| -rw-r--r-- | home/init.asm | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/home/init.asm b/home/init.asm index ec541ad16..5496ba45f 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,4 +1,4 @@ -Reset:: ; 150 +Reset:: di call MapSetup_Sound_Off xor a @@ -17,10 +17,9 @@ Reset:: ; 150 call DelayFrames jr Init -; 16e -_Start:: ; 16e +_Start:: cp $11 jr z, .cgb xor a @@ -33,10 +32,9 @@ _Start:: ; 16e ld [hCGB], a ld a, $1 ld [hSystemBooted], a -; 17d -Init:: ; 17d +Init:: di @@ -172,10 +170,9 @@ Init:: ; 17d xor a ld [wMapMusic], a jp GameInit -; 245 -ClearVRAM:: ; 245 +ClearVRAM:: ; Wipe VRAM banks 0 and 1 ld a, 1 @@ -190,9 +187,8 @@ ClearVRAM:: ; 245 xor a call ByteFill ret -; 25a -ClearWRAM:: ; 25a +ClearWRAM:: ; Wipe swappable WRAM banks (1-7) ; Assumes CGB or AGB @@ -209,9 +205,8 @@ ClearWRAM:: ; 25a cp 8 jr nc, .bank_loop ; Should be jr c ret -; 270 -ClearsScratch:: ; 270 +ClearsScratch:: ; Wipe the first 32 bytes of sScratch ld a, BANK(sScratch) @@ -222,4 +217,3 @@ ClearsScratch:: ; 270 call ByteFill call CloseSRAM ret -; 283 |