mirror of
https://github.com/zeldaret/oot
synced 2026-09-06 10:55:27 -04:00
Commit objects 2: object_spot15_obj, object_spot16_obj, object_spot17_obj, object_syokudai, object_ta, object_timeblock (#2645)
* commit object_timeblock * commit object_ta * commit object_syokudai * commit object_spot17_obj * format * commit object_spot16_obj * fixup * commit object_spot15_obj
This commit is contained in:
@@ -2080,7 +2080,15 @@ beginseg
|
||||
name "object_ta"
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/object_ta.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSitSleepingAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonStandAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSkel.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSitHandsUpAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSitWakeUpAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonRunAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonSleepAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonRunTransitionAnim.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_ta/gTalonWakeUpAnim.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
@@ -2304,7 +2312,10 @@ beginseg
|
||||
name "object_syokudai"
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/object_syokudai/object_syokudai.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_syokudai/gGoldenTorchDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_syokudai/gWoodenTorchDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_syokudai/gTimedTorchDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_syokudai/textures.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
@@ -2408,7 +2419,10 @@ beginseg
|
||||
name "object_spot17_obj"
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot17_obj/object_spot17_obj.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot17_obj/bombable_wall_dls.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot17_obj/gCraterBombableWallCol.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot17_obj/gCraterSmokeConeDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot17_obj/gCraterBombableWallCracksTex.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
@@ -2544,7 +2558,8 @@ beginseg
|
||||
name "object_spot16_obj"
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot16_obj/object_spot16_obj.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot16_obj/gDodongosCavernRockDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot16_obj/gDeathMountainRingDL.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
@@ -2896,7 +2911,11 @@ beginseg
|
||||
name "object_spot15_obj"
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot15_obj/object_spot15_obj.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonMilkCrateDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonMilkCrateCol.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonCorralFenceDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot15_obj/gLonLonCorralFenceCol.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_spot15_obj/textures.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
@@ -4194,7 +4213,8 @@ beginseg
|
||||
name "object_timeblock"
|
||||
compress
|
||||
romalign 0x1000
|
||||
include "$(BUILD_DIR)/assets/objects/object_timeblock/object_timeblock.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_timeblock/gSongOfTimeBlockDL.o"
|
||||
include "$(BUILD_DIR)/assets/objects/object_timeblock/gSongOfTimeBlockCol.o"
|
||||
number 6
|
||||
endseg
|
||||
|
||||
|
||||
Reference in New Issue
Block a user