scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup world_map.asm

Browse Source
This commit is contained in:
scawful
2024-09-29 21:16:11 -04:00
parent 863b3eaf5d
commit 1b013499f6
1 changed files with 118 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Overworld/world_map.asm
View File

@@ -396,7 +396,6 @@ HandleMapDrawIcon:
AND.b #$10 AND.b #$10
BNE .skip_draw ; Timer to make it flash BNE .skip_draw ; Timer to make it flash
.noflash ; ALTERNATE ENTRY POINT .noflash ; ALTERNATE ENTRY POINT
JSR WorldMapIcon_AdjustCoordinate JSR WorldMapIcon_AdjustCoordinate
LDA.l $7EC025 : TAX LDA.l $7EC025 : TAX
JSR WorldMap_CalculateOAMCoordinates JSR WorldMap_CalculateOAMCoordinates
@@ -439,14 +438,9 @@ restore_coords_and_exit:
WorldMap_CalculateOAMCoordinates: WorldMap_CalculateOAMCoordinates:
; ========================================================= ; =========================================================
; Gfx Notes
; 0x0C4000 to 0x0C8000 for the map gfx ; 0x0C4000 to 0x0C8000 for the map gfx
; patch a new rom with your map data/gfx ; patch a new rom with your map data/gfx
; create a new bin file out of these bytes ; create a new bin file out of these bytes
; OverworldMap.asm you can copy everything from start to line 214
; and 264 to 272 if you want palettes in asm too
; 0AC727 (pc: 054727) to 0AD726 (pc: 055726) 0x1000 bytes ; 0AC727 (pc: 054727) to 0AD726 (pc: 055726) 0x1000 bytes
; ========================================================= ; =========================================================
@@ -465,7 +459,7 @@ org $00E399
; DW OVERWORLD MAP ; DW OVERWORLD MAP
; ========================================================= ; =========================================================
org $008FF3 org $008FF3
RTS ; do not do anything during the DW update we'll handle it in the LW routine RTS ; do nothing during DW update, we'll handle it in the LW routine
org $3D8000 org $3D8000
LWWorldMap_Tiles: LWWorldMap_Tiles:
@@ -486,7 +480,6 @@ DMAOwMap:
JSL Palette_ArmorAndGloves JSL Palette_ArmorAndGloves
LDA $8A : AND #$40 : BEQ .LWMAP LDA $8A : AND #$40 : BEQ .LWMAP
JMP .DWMAP JMP .DWMAP
.LWMAP .LWMAP
STZ.w $2115 STZ.w $2115