izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

En_Tubo_Trap (Flying Pot Enemy) (#62)

Browse Source 
* 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 14:23:35 -04:00
committed by GitHub
co-authored by isghj8 Rozelette
parent 6536afc6d3
commit 204790ea8b
6 changed files with 337 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linker_scripts/object_script.txt
+4
View File
@@ -11,6 +11,9 @@ D_04062060 = 0x04062060;
D_04062000 = 0x04062000;
D_040622C0 = 0x040622C0;
/* gameplay_dangeon_keep */
D_05018090 = 0x05018090;
D_05017EA0 = 0x05017EA0;
D_0501D980 = 0x0501D980;
D_050219E0 = 0x050219E0;
@@ -66,6 +69,7 @@ D_06009120 = 0x06009120;
D_06005458 = 0x06005458;
D_0600788C = 0x0600788C;
/* en_ending_hero4 */
D_0600D640 = 0x0600D640;
D_06002A84 = 0x06002A84;