diff options
| author | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-19 18:25:42 +0100 |
|---|---|---|
| committer | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-19 18:25:42 +0100 |
| commit | 50092d9a52f85de8678bf003b8fc818812df91c2 (patch) | |
| tree | 4ab55ece782a543ec98ec9125eab7facee7f48a8 /home.asm | |
| parent | da4e2bbd49eadfa084341dd11df39a392047e404 (diff) | |
| parent | 504e04e292a309ca6e9a12c0c5e3fbd8bd7bab13 (diff) | |
Merge remote-tracking branch 'origin/master' into chaos_requests-tppfork
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -147,8 +147,8 @@ Start: ; 0x150 ld [rIE], a ; Only enable LCD Status interrupt ei ld a, $ff - ld [wd810], a - call Func_97a + ld [wRNGModulus], a + call ResetRNG xor a ld [wBootCheck], a ld a, BANK(Func_1ffc) @@ -236,8 +236,8 @@ SoftReset: ld [rIE], a ei ld a, $ff - ld [wd810], a - call Func_97a + ld [wRNGModulus], a + call ResetRNG ld a, [hGameBoyColorFlag] ld [$fffd], a xor a @@ -785,7 +785,7 @@ INCLUDE "home/random.asm" INCLUDE "home/joypad.asm" INCLUDE "home/palettes.asm" -Func_dd4: ; 0xdd4 +HorrendousMultiplyAbyL: ; 0xdd4 ; Return a * l to hl ; Stupid waste of space push bc @@ -2930,7 +2930,7 @@ Func_248a: ; 0x248a sub $e0 ld b, a ld a, [wCurrentStage] - cp $6 ; gengar stage buggy? + cp FIRST_BONUS_STAGE jr nc, .bonusStage bit 4, b ld hl, BottomLeftCollisionMasks |