Reorganize expanded banks

2024-01-15 14:11:40 -05:00
parent decc99dc2b
commit 7d71cb1ad9
6 changed files with 15 additions and 9 deletions
--- a/Dungeons/Objects/Collision/main.asm
+++ b/Dungeons/Objects/Collision/main.asm
@@ -1,5 +1,5 @@
 incsrc CollisionTablesExpanded_Hook.asm

-org $348000
+org $338000

 incsrc CollisionTablesExpanded.asm
--- a/Dungeons/house_tag.asm
+++ b/Dungeons/house_tag.asm
@@ -10,7 +10,8 @@ org $01CC18 ; override routine 0x39 "Holes(7)"
 org $01CC5A 
  HouseTag_Return:

-org $2F8000
+; org $2F8000
+pullpc
 HouseTag:
 {
  PHX 
@@ -110,6 +111,8 @@ HouseTag_End:
  RTS
 }

+pushpc
+
 ; ==============================================================================
 ; Dying Uncle Code Hook
 ; Uncle won't remove tagalong when interacting 
--- a/Dungeons/spike_subtype.asm
+++ b/Dungeons/spike_subtype.asm
@@ -44,4 +44,5 @@ LDA $0D40, X : EOR.b #$FF : INC A : STA $0D40, X

 LDA.b #$05 : JSL $0DBB7C ; Sound_SetSfx2PanLong

-RTL
+RTL
+pushpc
--- a/Dungeons/together_warp_tag.asm
+++ b/Dungeons/together_warp_tag.asm
@@ -14,7 +14,7 @@

 ;relpaces the original tag.

-dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)"
+; dw $CC1C ; = $CC1C* ; routine 0x3A "Holes(8)"

 org $01CC1C
    JML WarpTag
@@ -24,7 +24,9 @@ org $01CC5A

 ; ==============================================================================

-org $338000
+; org $338000
+pullpc ; Bank 0x2C
+print "Warp Tag", pc
 WarpTag:
 {
    PHX