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

update ram and import house_tag

Browse Source
This commit is contained in:
Justin Scofield
2022-12-15 21:50:28 -06:00
parent 6ee8708125
commit 8dfa653aeb
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Oracle_main.asm
View File

@@ -12,6 +12,7 @@
; Lost Sea Area Combo ; Lost Sea Area Combo
; ;
;=========================================================== ;===========================================================
namespace Oracle namespace Oracle
{ {
print "" print ""
@@ -21,31 +22,43 @@ namespace Oracle
incsrc "Util/ram.asm" incsrc "Util/ram.asm"
incsrc "Util/functions.asm" incsrc "Util/functions.asm"
incsrc "Menu/menu.asm" ; ---------------------------------------------------------
print "End of Menu/menu.asm ", pc
incsrc "Events/intro.asm"
print "End of Events/intro.asm ", pc
incsrc "MakuTree/maku_tree.asm"
print "End of MakuTree/maku_tree.asm ", pc
incsrc "Events/lostsea.asm"
print "End of Events/lostsea.asm ", pc
incsrc "Items/ice_rod.asm"
print "End of Items/ice_rod.asm ", pc
incsrc "KeyBlock/keyblock.asm" incsrc "KeyBlock/keyblock.asm"
print "End of KeyBlock/keyblock.asm ", pc print "End of KeyBlock/keyblock.asm ", pc
; ---------------------------------------------------------
incsrc "Events/house_tag.asm"
print "End of Events/house_tag.asm ", pc
; ---------------------------------------------------------
incsrc "Menu/menu.asm"
print "End of Menu/menu.asm ", pc
; ---------------------------------------------------------
incsrc "Events/intro.asm"
print "End of Events/intro.asm ", pc
; ---------------------------------------------------------
incsrc "MakuTree/maku_tree.asm"
print "End of MakuTree/maku_tree.asm ", pc
; ---------------------------------------------------------
incsrc "Events/lostsea.asm"
print "End of Events/lostsea.asm ", pc
; ---------------------------------------------------------
incsrc "Items/ice_rod.asm"
print "End of Items/ice_rod.asm ", pc
; ---------------------------------------------------------
incsrc "Items/book_of_secrets.asm" incsrc "Items/book_of_secrets.asm"
print "End of Items/book_of_secrets.asm ", pc print "End of Items/book_of_secrets.asm ", pc
; ---------------------------------------------------------
incsrc "Debug/debug.asm" incsrc "Debug/debug.asm"
print "End of Debug/debug.asm ", pc print "End of Debug/debug.asm ", pc
; ---------------------------------------------------------
incsrc "Masks/mask_routines.asm" incsrc "Masks/mask_routines.asm"
incsrc "Masks/deku_mask.asm" incsrc "Masks/deku_mask.asm"
@@ -55,7 +68,7 @@ namespace Oracle
print "End of Masks/zora_mask.asm ", pc print "End of Masks/zora_mask.asm ", pc
incsrc "Masks/wolf_mask.asm" incsrc "Masks/wolf_mask.asm"
print "End of Masks/wolf_mask.asm ", pc print "End of Masks/wolf_mask.asm ", pc
incsrc "Masks/bunny_hood.asm" incsrc "Masks/bunny_hood.asm"
print "End of Masks/bunny_hood.asm ", pc print "End of Masks/bunny_hood.asm ", pc

6
Util/ram.asm
View File

@@ -1,3 +1,7 @@
; ==============================
; RAM in Use
StoryState = $7C
org $008000 org $008000
base $7E0730 base $7E0730
@@ -9,4 +13,4 @@ ShortSpoof: skip 1
MusicNoteValue: skip 2 MusicNoteValue: skip 2
OverworldLocationPointer: skip 2 OverworldLocationPointer: skip 2
base off base off