Merge remote-tracking branch 'baserom/master' into MergeDecompression

# Conflicts: # bookofmudora.asm
2023-09-01 11:37:46 -06:00
parent 5ccdebe09d 6fbce240b8
commit aecc65595e
10 changed files with 83 additions and 36 deletions
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -1362,11 +1362,11 @@ OverworldMapChangePointers:

 	dw !OWW_Stripe|!OWW_Vertical
 	dw $2422
-	dw $02F3, $00C9, $00E3
+	dw $02F3, $00C9, $00E3|!OWW_STOP

 	dw !OWW_Stripe|!OWW_Vertical
 	dw $2424
-	dw $02F3, $00C9, $00E3
+	dw $02F3, $00C9, $00E3|!OWW_STOP

 	dw !OWW_END