mirror of
https://github.com/zeldaret/oot.git
synced 2025-06-08 17:41:56 +00:00
Build fixups: build gc-eu-mq with extracted/dbg, remove asmproc pragmas (#1911)
* Remove asmproc recurse (somehow these two survived) * Use `extracted/gc-eu-mq-dbg` anyway for gc-eu-mq
This commit is contained in:
parent
6b9a2433ab
commit
ff81e2a891
3 changed files with 4 additions and 2 deletions
4
Makefile
4
Makefile
|
@ -67,6 +67,10 @@ BUILD_DIR := build/$(VERSION)
|
|||
EXPECTED_DIR := expected/$(BUILD_DIR)
|
||||
BASEROM_DIR := baseroms/$(VERSION)
|
||||
EXTRACTED_DIR := extracted/$(VERSION)
|
||||
ifeq ($(VERSION),gc-eu-mq)
|
||||
# TODO: for now, we only extract assets from the Debug ROM (see setup rule)
|
||||
EXTRACTED_DIR := extracted/gc-eu-mq-dbg
|
||||
endif
|
||||
VENV := .venv
|
||||
|
||||
MAKE = make
|
||||
|
|
|
@ -16,7 +16,6 @@ void DemoDu_Draw(Actor* thisx, PlayState* play);
|
|||
|
||||
static s32 sUnused = 0;
|
||||
|
||||
#pragma asmproc recurse
|
||||
#include "z_demo_du_cutscene_data.inc.c"
|
||||
|
||||
static void* sEyeTextures[] = { gDaruniaEyeOpenTex, gDaruniaEyeOpeningTex, gDaruniaEyeShutTex, gDaruniaEyeClosingTex };
|
||||
|
|
|
@ -72,7 +72,6 @@ static ColliderCylinderInitType1 sCylinderInit = {
|
|||
{ 25, 80, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma asmproc recurse
|
||||
#include "z_demo_im_cutscene_data.inc.c"
|
||||
|
||||
static DemoImActionFunc sActionFuncs[] = {
|
||||
|
|
Loading…
Add table
Reference in a new issue