En_Tubo_Trap (Flying Pot Enemy) (#62)

* EnTuboTrap: All but one, non-matching: minor regalloc

* EnTuboTrap: updates to zel's actor struct changes and cleaning

* EnTuboTrap: fullgrowngaming's requested changes

* EnTuboTrap: changed non-matching asm to new location

* Update src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* EnTuboTrap: moved dlist externs to segment, and objects up to top of object_script.txt

* EnTuboTrap: requested changes

* EnTuboTrap: Fix GLOBAL_ASM, updated to Tharo's collision

* EnTuboTrap: collision enum was added

* EnTuboTrap: Update sfx function name

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
This commit is contained in:
Isghj
2021-03-27 11:23:35 -07:00
committed by GitHub
parent 6536afc6d3
commit 204790ea8b
6 changed files with 337 additions and 24 deletions
+1 -1
View File
@@ -2079,7 +2079,7 @@ SECTIONS
ovl_En_Tubo_Trap : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.text)
build/asm/overlays/ovl_En_Tubo_Trap_data.o(.data)
build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.data)
build/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.o(.rodata)
build/asm/overlays/ovl_En_Tubo_Trap_rodata.o(.rodata)
}