Merge branch 'main' into overworld_kara

2021-07-01 23:02:23 -07:00
parent b8dc86d7c5 04a07025ef
commit 01abf889d7
12 changed files with 228 additions and 71 deletions
--- a/init.asm
+++ b/init.asm
@@ -40,8 +40,13 @@ Init_Primary:
 			INX
 			CPX #$15 : !BLT -
 	.done
-	
+
+	REP #$20
+	LDA.l OneMindTimer : STA.l !ONEMIND_TIMER
+	SEP #$20
+
 	LDA.b #$01 : STA $420D ; enable fastrom access on upper banks
+	STA.l !ONEMIND_ID
 	
 	LDA.b #$10 : STA $BC ; set default player sprite bank