1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-17 12:09:55 +00:00

Match last function in EnTp (#968)

* Data imported, 8 easy functions matched

* Init only remaining nonmatching, data in

* some renaming & fiddling with Init, still nonmatching

* fix colours

* Init still not matching

* Decompile object_tp

* renames

* Rename func_80B20DE0

* Horrible new idea

* Known equivalent, docs next

* Another attempt

* Finished naming in object_tp

* Named functions, more enums

* DrawBridge -> Drawbridge

* skulltulla -> Skulltula

* Name almost all struct variables

* Named most of the temps

* delete asm

* spec

* Missed data file, whoops

* Review

* More review changes

* Match EnTp_Init

* spec

* Delete asm
This commit is contained in:
EllipticEllipsis 2021-09-16 00:03:47 +01:00 committed by GitHub
commit fbc4071cc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 235 deletions

12
spec
View file

@ -1575,11 +1575,7 @@ endseg
beginseg
name "ovl_Door_Warp1"
include "build/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Door_Warp1/ovl_Door_Warp1_reloc.o"
#else
include "build/data/overlays/actors/z_door_warp1.reloc.o"
#endif
endseg
beginseg
@ -2239,11 +2235,7 @@ endseg
beginseg
name "ovl_En_Ganon_Mant"
include "build/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant_reloc.o"
#else
include "build/data/overlays/actors/z_en_ganon_mant.reloc.o"
#endif
endseg
beginseg
@ -2967,11 +2959,7 @@ endseg
beginseg
name "ovl_En_Tp"
include "build/src/overlays/actors/ovl_En_Tp/z_en_tp.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Tp/ovl_En_Tp_reloc.o"
#else
include "build/data/overlays/actors/z_en_tp.reloc.o"
#endif
endseg
beginseg