Merge in OWRando fixes #3

Merged
karafruit merged 7 commits from codemann_OWMain into beta 2026-02-03 23:48:20 +00:00
Showing only changes of commit 9fc26e8710 - Show all commits

View File

@@ -107,6 +107,9 @@ org $8aba6c ; < ? - Bank0a.asm:474 ()
jsl OWMapWorldCheck16 : nop jsl OWMapWorldCheck16 : nop
; Custom Overworld Map ; Custom Overworld Map
org $8ABA52
JSL OverworldMap_InitGfx_InitScrap
org $8ABA99 org $8ABA99
WorldMap_LoadDarkWorldMap: WorldMap_LoadDarkWorldMap:
LDA.b GameMode : CMP.b #$14 ; attract module LDA.b GameMode : CMP.b #$14 ; attract module
@@ -512,6 +515,12 @@ GetOWMapTilemapOffsetToCopy:
dw $0400+$0210 ; bottom right dw $0400+$0210 ; bottom right
} }
OverworldMap_InitGfx_InitScrap:
{
STZ.b ScrapBuffer72 ; clear tile swap flag
LDA.b #$11 : STA.b MAINDESQ ; what we wrote over
RTL
}
LoadMapDarkOrCustom_long: LoadMapDarkOrCustom_long:
{ {
PHB : LDA.b #WorldMap_DarkWorldTilemap>>16 : PHA : PLB PHB : LDA.b #WorldMap_DarkWorldTilemap>>16 : PHA : PLB