Merge pull request #35 from andwhyisit/vwf-2

VWF Part 2
Medabots · Aug 14, 2023 · 2680be1 · 2680be1
2 parents 22f5117 + 5302a80
commit 2680be1
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/game/src/text/main_script.asm b/game/src/text/main_script.asm
@@ -40,9 +40,9 @@ InitiateMainScript::
   ld [W_MainScriptPauseTimer], a
   ld [W_MainScriptCCSubState], a
   ld [W_MainScriptPauseAutoAdvanceTimer], a
-  ld a, 0
   ld [W_MainScriptSpeed], a
-  ld a, $FF
+  dec a
+  ld [W_VWFIsInit], a
   ld [W_MainScriptPortraitCharacter], a
   ld [W_MainScriptPortraitPriorPlacement], a
   ld [W_MainScriptPortraitPlacement], a
@@ -143,9 +143,7 @@ MainScriptProcessor::
   ret
 
 .doNotPause
-  add hl, bc
-  add hl, bc
-  add hl, bc
+  call VWFGetTextPointerAddress
   ld a, [hli]
   ld [W_VWFTextBank], a
   push af
@@ -183,8 +181,16 @@ MainScriptProcessorPutCharLoop::
   call VWFLowBankswitch
   jp VWFDrawCharLoop
 
+VWFGetTextPointerAddress::
+  add hl, bc
+  add hl, bc
+  add hl, bc
+  jr VWFHighBankswitch.extEntry
+
 VWFHighBankswitch::
   rst $10
+
+.extEntry
   ld a, 1
   ld [W_CurrentHighBank], a
   ld [X_MBC5ROMBankHigh], a