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

Cleanup collision tables expanded file organization

Browse Source
This commit is contained in:
scawful
2024-03-01 19:02:18 -05:00
parent aaa21706a8
commit 343f63806a
4 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dungeons/Objects/Collision/CollisionTablesExpanded.asm
View File

@@ -4,6 +4,11 @@
; By Jeimuzu & Zarby
; -----------------------------------------------------------------------------------
org $0E942A
JSL Dungeon_LoadCustomTileAttr
RTL
org $338000
; *$7142A-$71458 LONG
Dungeon_LoadCustomTileAttr:
@@ -138,6 +143,7 @@ group03:
db $02, $02, $02, $01, $02, $02, $08, $08, $08, $08, $09, $09, $09, $09, $09, $09 ; Animated Tiles
; Goron Mines
group04:
; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F

10
Dungeons/Objects/Collision/CollisionTablesExpanded_Hook.asm
View File

@@ -1,10 +0,0 @@
; -----------------------------------------------------------------------------------
; HOOK FOR INDOOR EXPANDED COLLISION TABLES
;
; By Jeimuzu & Zarby
; -----------------------------------------------------------------------------------
org $0E942A
JSL Dungeon_LoadCustomTileAttr
RTL

5
Dungeons/Objects/Collision/main.asm
View File

@@ -1,5 +0,0 @@
incsrc CollisionTablesExpanded_Hook.asm
org $338000
incsrc CollisionTablesExpanded.asm

4
Dungeons/Objects/object_handler.asm
View File

@@ -1,6 +1,6 @@
; Dungeon Object Handler
incsrc Collision/main.asm
incsrc Collision/CollisionTablesExpanded.asm
org $018262 ;object id 0x31
dw ExpandedObject
@@ -127,7 +127,7 @@ NewObjectsCode:
CustomDrawConfig:
{
PHA
LDA $03 : CMP.w #$000E : BEQ .custom_config
LDA $03 : AND #$00FF : CMP.w #$000E : BEQ .custom_config
TYA : LSR : AND #$00FF