UW Sprites new home

Enemizer asm refinement

enemizer/NMI.asm

@@ -1,5 +1,5 @@
 ;-------------
-NMIHookAction:
+NMIHookActionEnemizer:
 {
     ;-----------------------------------------
     ; do our shell stuff
@@ -33,7 +33,7 @@ NMIHookAction:
     ; Sets DP to $0000
     LDA.w #$0000 : TCD
 
-JML.l NMIHookReturn
+JML.l NMIHookReturnEnemizer
 }
 
 DMAKholdstare:

enemizer/hooks.asm

@@ -18,4 +18,6 @@ incsrc hooks/damage_hooks.asm
 
 incsrc hooks/overworld_sprite_hooks.asm
 
+incsrc hooks/underworld_sprite_hooks.asm
+
 incsrc hooks/blindboss_hooks.asm

enemizer/hooks/NMI_hook.asm

@@ -3,7 +3,7 @@
 ;--------------------------------------------------------------------------------
 ; rando already hooks the Bank00.asm : 164 (PHA : PHX : PHY : PHD : PHB) so we have to hook after that
 org $0080D0 ; <- D0 - Bank00.asm : 164-167 (PHB, LDA.w #$0000)
-JML.l NMIHookAction
+JML.l NMIHookActionEnemizer
 org $0080D5 ; <- D5 - Bank00.asm : 164-167 (PHB, LDA.w #$0000)
-NMIHookReturn:
+NMIHookReturnEnemizer:
 ;--------------------------------------------------------------------------------

enemizer/hooks/kodongo_hooks.asm

@@ -1,3 +1,3 @@
 org $1EC147
-JSL newKodongoCollision
+JSL NewKodongoCollision
 NOP #$05

enemizer/hooks/underworld_sprite_hooks.asm

@@ -0,0 +1,67 @@
+org $09C29A
+JSL LoadUnderworldSprites : NOP
+
+; these hooks change the LDA.b ($00) commands to use LDA.b [$00] commands
+; so we can store the sprites in a different bank
+; also needs to change the use of $02 to $03 for slot index to make that possible
+
+org $09C2B2
+LDA.b [$00]
+
+org $09C2C1
+LDA.b [$00],Y
+
+org $09C2CA
+INC.b $03 ; change slot variable to $03
+
+;org $09C329  standing items overwrote this one
+;LDA.b [$00],Y
+
+org $09C332
+LDA.b [$00],Y
+
+org $09C345
+DEC.b $03 : LDX.b $03
+
+org $09C350
+LDA.b [$00],Y
+
+org $09C35A
+DEC.b $03
+
+org $09C36E
+LDA.b $03
+
+org $09C383
+LDX.b $03
+
+org $09C38C
+LDA.b [$00],Y
+
+org $09C398
+LDA.b [$00],Y
+
+org $09C3AA
+LDA.b [$00],Y
+
+org $09C3BF
+LDA.b [$00],Y
+
+org $09C3DF
+LDA.b $03
+
+org $09C3F3
+LDA.b [$00],Y
+
+org $09C3FB
+LDA.b [$00],Y
+
+org $09C404
+LDA.b [$00],Y
+
+org $09C416
+LDA.b [$00],Y
+
+
+
+

enemizer/kodongo_fixes.asm

@@ -1,4 +1,4 @@
-newKodongoCollision:
+NewKodongoCollision:
 {
     LDA $0DE0, X : INC A : AND.b #$03 : STA $0DE0, X
     ;If they collide more than 32time then kill them !

enemizer/main.asm

@@ -49,21 +49,15 @@ incsrc mimic_fixes.asm
 ; todo: vitreous key fix for boss shuffle
 
 incsrc overworld_sprites.asm
+incsrc underworld_sprites.asm
 
 incsrc blindboss.asm
+
+incsrc shell_gfx.asm
 warnpc $B6FFFF ;if we hit this we need to split stuff by bank
 
 org $0684BD
 Sprite_Get16BitCoords_long:
 
-org $0DBA71
-GetRandomInt:
-
-org $0DBB67
-Sound_SetSfxPanWithPlayerCoords:
-
-org $0DBB8A
-Sound_SetSfx3PanLong:
-
 org $1EC6FA ;F46FA
 SpritePrep_Eyegore:

enemizer/shell_gfx.asm

@@ -0,0 +1,12 @@
+;================================================================================
+; insert kholdstare & trinexx shell gfx file
+;--------------------------------------------------------------------------------
+GFX_Kholdstare_Shell:
+incbin gfx/shell.gfx
+
+GFX_Trinexx_Shell:
+incbin gfx/rocks.gfx
+
+GFX_Trinexx_Shell2:
+incbin gfx/rocks2.gfx
+;--------------------------------------------------------------------------------

enemizer/underworld_sprites.asm

@@ -0,0 +1,6 @@
+LoadUnderworldSprites:
+	STA.b $00  ; part one of what we replaced
+	LDA.w #$0028 : STA.b $02 ; set the bank to 28 for now
+    LDA.w $048E
+RTL
+