mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-11 19:43:44 +00:00
Code Issues Projects Releases Wiki Activity

ntsc-1.0 OK

Browse source
This commit is contained in:
Dragorn421 2025-02-06 21:01:49 +01:00
parent 8aaaca4fe0
commit d5018d37fd
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
4 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/xml/objects/object_mo.xml
View file

@ -74,9 +74,5 @@
<Vtx/>
</Array>
<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x67B8">
<Vtx/>
</Array>
</File>
</Root>

2
assets/xml/scenes/dungeons/ddan.xml
View file

@ -1,5 +1,6 @@
<Root>
<File Name="ddan_scene" Segment="2">
<Texture Name="gDCSceneTLUT" Format="rgba16" Width="16" Height="16" Offset="0x11D70"/>
<Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
<Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
@ -18,6 +19,7 @@
</File>
<File Name="ddan_room_0" Segment="3">
<Room Name="ddan_room_0" Offset="0x0"/>
<Texture Name="gDCRoom0TLUT" Format="rgba16" Width="16" Height="16" Offset="0x11290"/>
</File>
<File Name="ddan_room_1" Segment="3">
<Room Name="ddan_room_1" Offset="0x0"/>

20
src/n64dd/n64dd_error_textures.c
View file

@ -1,19 +1,15 @@
#include "ultra64.h"
u64 gN64DDError41Texs[2][0x600 / sizeof(u64)] = {
{
#include "assets/n64dd/error_textures/n64dd_error_41_jpn.i4.inc.c"
},
{
#include "assets/n64dd/error_textures/n64dd_error_41_eng.i4.inc.c"
},
#include "assets/n64dd/error_textures/gN64DDError41JPNTex.i4.u64.inc.c"
,
#include "assets/n64dd/error_textures/gN64DDError41ENGTex.i4.u64.inc.c"
,
};
u64 gN64DDPleaseReadManualTexs[2][0x2800 / sizeof(u64)] = {
{
#include "assets/n64dd/error_textures/n64dd_please_read_manual_jpn.i4.inc.c"
},
{
#include "assets/n64dd/error_textures/n64dd_please_read_manual_eng.i4.inc.c"
},
#include "assets/n64dd/error_textures/gN64DDPleaseReadManualJPNTex.i4.u64.inc.c"
,
#include "assets/n64dd/error_textures/gN64DDPleaseReadManualENGTex.i4.u64.inc.c"
,
};

2
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -36,7 +36,7 @@
#endif
#pragma increment_block_number "gc-eu:170 gc-eu-mq:170 gc-jp:170 gc-jp-ce:170 gc-jp-mq:170 gc-us:170 gc-us-mq:170" \
"ntsc-1.0:121 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121"
"ntsc-1.0:0 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121"
#define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED