shithub: pokecrystal

Download patch

ref: 6343e2ddaf96b2dcc2cc0c70c951c379907b33ff
parent: be0af35e3f98d2d546571eca85df80cfa8133a3d
author: yenatch <yenatch@gmail.com>
date: Fri Jul 26 19:49:33 EDT 2013

Reset

--- a/engine/joypad.asm
+++ b/engine/joypad.asm
@@ -103,7 +103,7 @@
 ; For example, soft reset:
 	and BUTTON_A | BUTTON_B | SELECT | START
 	cp  BUTTON_A | BUTTON_B | SELECT | START
-	jp z, $0150 ; reset
+	jp z, Reset
 	
 	ret
 ; 984
--- a/main.asm
+++ b/main.asm
@@ -56,9 +56,24 @@
 
 SECTION "start",HOME[$150]
 
-INCBIN "baserom.gbc", $150, $16e - $150
+Reset: ; 150
+	di
+	call CleanSoundRestart
+	xor a
+	ld [$ffde], a
+	call ClearPalettes
+	xor a
+	ld [rIF], a
+	ld a, $1
+	ld [rIE], a
+	ei
+	ld hl, $cfbe
+	set 7, [hl]
+	ld c, $20
+	call DelayFrames
+	jr Function17d
+; 16e
 
-
 Function16e: ; 16e
 	cp $11
 	jr z, .asm_175
@@ -72,6 +87,9 @@
 	ld [hCGB], a
 	ld a, $1
 	ld [$ffea], a
+; 17d
+
+Function17d: ; 17d
 	di
 	xor a
 	ld [rIF], a
@@ -14056,7 +14074,7 @@
 	ld a, [$d4b5]
 	cp $2
 	jr z, .asm_5e80
-	jp $0150
+	jp Reset
 
 .asm_5e80
 	call Function5de2
@@ -16643,7 +16661,7 @@
 	dbw $46, $7a38
 	dbw $5c, $4bd3
 	dbw $45, $7656
-	dbw $00, $0150
+	dbw BANK(Reset), Reset
 	dbw $40, $51f1
 	dbw $40, $5220
 	dbw $40, $5225
--