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

Replace some more constants with proper asset symbols (#1053)

Browse source
This commit is contained in:
Dragorn421 2021-12-02 22:19:19 +01:00 • committed by GitHub
parent 1ac6e42b56
commit 8ff1f242fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 115 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assets/xml/objects/object_kingdodongo.xml
View file

@ -108,5 +108,15 @@
<DList Name="object_kingdodongo_DL_025BD0" Offset="0x25BD0"/>
<Texture Name="object_kingdodongo_Tex_025C58" OutName="tex_00025C58" Format="rgba16" Width="32" Height="32" Offset="0x25C58"/>
<Collision Name="object_kingdodongo_Col_0264A8" Offset="0x264A8"/>
<Texture Name="object_kingdodongo_Tex_02E4E0" OutName="tex_0002E4E0" Format="i4" Width="32" Height="64" Offset="0x2E4E0"/>
<Texture Name="object_kingdodongo_Tex_02E8E0" OutName="tex_0002E8E0" Format="i4" Width="32" Height="64" Offset="0x2E8E0"/>
<Texture Name="object_kingdodongo_Tex_02ECE0" OutName="tex_0002ECE0" Format="i4" Width="32" Height="64" Offset="0x2ECE0"/>
<Texture Name="object_kingdodongo_Tex_02F0E0" OutName="tex_0002F0E0" Format="i4" Width="32" Height="64" Offset="0x2F0E0"/>
<Texture Name="object_kingdodongo_Tex_02F4E0" OutName="tex_0002F4E0" Format="i4" Width="32" Height="64" Offset="0x2F4E0"/>
<Texture Name="object_kingdodongo_Tex_02F8E0" OutName="tex_0002F8E0" Format="i4" Width="32" Height="64" Offset="0x2F8E0"/>
<Texture Name="object_kingdodongo_Tex_02FCE0" OutName="tex_0002FCE0" Format="i4" Width="32" Height="64" Offset="0x2FCE0"/>
<Texture Name="object_kingdodongo_Tex_0300E0" OutName="tex_000300E0" Format="i4" Width="32" Height="64" Offset="0x300E0"/>
<Texture Name="object_kingdodongo_Tex_0304E0" OutName="tex_000304E0" Format="i4" Width="32" Height="64" Offset="0x304E0"/>
<Texture Name="object_kingdodongo_Tex_0308E0" OutName="tex_000308E0" Format="i4" Width="32" Height="64" Offset="0x308E0"/>
</File>
</Root>

5
assets/xml/objects/object_ssh.xml
View file

@ -8,9 +8,10 @@
<Texture Name="object_ssh_Tex_000620" OutName="tex_00000620" Format="i8" Width="16" Height="16" Offset="0x620"/>
<Texture Name="object_ssh_Tex_000720" OutName="tex_00000720" Format="ci8" Width="8" Height="16" Offset="0x720" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_0007A0" OutName="tex_000007A0" Format="ci8" Width="8" Height="8" Offset="0x7A0" TlutOffset="0x320"/>
<Blob Name="object_ssh_Blob_0007E0" Size="0x400" Offset="0x7E0"/>
<Texture Name="object_ssh_Tex_0007E0" OutName="tex_000007E0" Format="ci8" Width="32" Height="32" Offset="0x7E0" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_000BE0" OutName="tex_00000BE0" Format="ci8" Width="8" Height="16" Offset="0xBE0" TlutOffset="0x320"/>
<Blob Name="object_ssh_Blob_000C60" Size="0x800" Offset="0xC60"/>
<Texture Name="object_ssh_Tex_000C60" OutName="tex_00000C60" Format="ci8" Width="32" Height="32" Offset="0xC60" TlutOffset="0x320"/>
<Texture Name="object_ssh_Tex_001060" OutName="tex_00001060" Format="ci8" Width="32" Height="32" Offset="0x1060" TlutOffset="0x320"/>
<DList Name="object_ssh_DL_003CD0" Offset="0x3CD0"/>
<DList Name="object_ssh_DL_004080" Offset="0x4080"/>
<DList Name="object_ssh_DL_004510" Offset="0x4510"/>

11
assets/xml/objects/object_tr.xml
View file

@ -1,9 +1,9 @@
<Root>
<File Name="object_tr" Segment="6">
<Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/>
<Animation Name="object_tr_Anim_000BFC" Offset="0xBFC"/> <!-- Turn to look over left (?) shoulder -->
<Animation Name="object_tr_Anim_0013CC" Offset="0x13CC"/> <!-- Looking over right shoulder -->
<Animation Name="object_tr_Anim_001CDC" Offset="0x1CDC"/> <!-- Standing, broom in left hand -->
<Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/>
<Animation Name="object_tr_Anim_002BC4" Offset="0x2BC4"/> <!-- Turn to look over right (?) shoulder -->
<Animation Name="object_tr_Anim_0035CC" Offset="0x35CC"/> <!-- Looking over left shoulder -->
<Animation Name="object_tr_Anim_003FC8" Offset="0x3FC8"/> <!-- Standing, broom over right shoulder -->
<Animation Name="object_tr_Anim_0049C8" Offset="0x49C8"/> <!-- Floating on broom -->
@ -31,7 +31,7 @@
<Texture Name="object_tr_Tex_0080D8" OutName="tex_000080D8" Format="rgba16" Width="16" Height="16" Offset="0x80D8"/>
<Texture Name="object_tr_Tex_0082D8" OutName="tex_000082D8" Format="rgba16" Width="16" Height="16" Offset="0x82D8"/>
<Texture Name="object_tr_Tex_0084D8" OutName="tex_000084D8" Format="rgba16" Width="16" Height="16" Offset="0x84D8"/>
<Blob Name="object_tr_Blob_0086D8" Size="0x400" Offset="0x86D8"/>
<Texture Name="object_tr_Tex_0086D8" OutName="tex_000086D8" Format="ci8" Width="32" Height="32" Offset="0x86D8" TlutOffset="0x7730"/> <!-- eye open -->
<Texture Name="object_tr_Tex_008AD8" OutName="tex_00008AD8" Format="ci8" Width="16" Height="8" Offset="0x8AD8" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_008B58" OutName="tex_00008B58" Format="ci8" Width="8" Height="8" Offset="0x8B58" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_008B98" OutName="tex_00008B98" Format="rgba16" Width="8" Height="32" Offset="0x8B98"/>
@ -43,7 +43,8 @@
<Texture Name="object_tr_Tex_0093D8" OutName="tex_000093D8" Format="rgba16" Width="8" Height="8" Offset="0x93D8"/>
<Texture Name="object_tr_Tex_009458" OutName="tex_00009458" Format="ci8" Width="8" Height="8" Offset="0x9458" TlutOffset="0x7730"/>
<Texture Name="object_tr_Tex_009498" OutName="tex_00009498" Format="ci8" Width="8" Height="8" Offset="0x9498" TlutOffset="0x7730"/>
<Blob Name="object_tr_Blob_0094D8" Size="0x800" Offset="0x94D8"/>
<Texture Name="object_tr_Tex_0094D8" OutName="tex_000094D8" Format="ci8" Width="32" Height="32" Offset="0x94D8" TlutOffset="0x7730"/> <!-- eye half -->
<Texture Name="object_tr_Tex_0098D8" OutName="tex_000098D8" Format="ci8" Width="32" Height="32" Offset="0x98D8" TlutOffset="0x7730"/> <!-- eye closed -->
<DList Name="object_tr_DL_00AF38" Offset="0xAF38"/>
<DList Name="object_tr_DL_00B568" Offset="0xB568"/>
<DList Name="object_tr_DL_00B5C8" Offset="0xB5C8"/>
@ -143,6 +144,6 @@
<Limb Name="object_tr_Limb_011608" LimbType="Standard" Offset="0x11608"/>
<Limb Name="object_tr_Limb_011614" LimbType="Standard" Offset="0x11614"/>
<Skeleton Name="object_tr_Skel_011688" Type="Flex" LimbType="Standard" Offset="0x11688"/>
<Animation Name="object_tr_Anim_012E1C" Offset="0x12E1C"/>
<Animation Name="object_tr_Anim_012E1C" Offset="0x12E1C"/> <!-- Casting magic -->
</File>
</Root>

3
assets/xml/objects/object_ts.xml
View file

@ -7,7 +7,8 @@
<Texture Name="object_ts_Tex_0007F0" OutName="tex_000007F0" Format="ci8" Width="8" Height="8" Offset="0x7F0" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000830" OutName="tex_00000830" Format="ci8" Width="16" Height="16" Offset="0x830" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000930" OutName="tex_00000930" Format="ci8" Width="8" Height="8" Offset="0x930" TlutOffset="0x4B0"/>
<Blob Name="object_ts_Blob_000970" Size="0x800" Offset="0x970"/>
<Texture Name="object_ts_Tex_000970" OutName="tex_00000970" Format="ci8" Width="32" Height="32" Offset="0x970" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_000D70" OutName="tex_00000D70" Format="ci8" Width="32" Height="32" Offset="0xD70" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_001170" OutName="tex_00001170" Format="ci8" Width="16" Height="16" Offset="0x1170" TlutOffset="0x4B0"/>
<Texture Name="object_ts_Tex_001270" OutName="tex_00001270" Format="ci8" Width="32" Height="64" Offset="0x1270" TlutOffset="0x4B0"/>
<DList Name="object_ts_DL_003CD0" Offset="0x3CD0"/>

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

@ -1,6 +1,8 @@
<Root>
<File Name="object_yabusame_point" Segment="6">
<Blob Name="object_yabusame_point_Blob_000000" Size="0xD80" Offset="0x0"/>
<Texture Name="object_yabusame_point_Tex_000000" OutName="tex_00000000" Format="ia8" Width="48" Height="24" Offset="0x0"/>
<Texture Name="object_yabusame_point_Tex_000480" OutName="tex_00000480" Format="ia8" Width="48" Height="24" Offset="0x480"/>
<Texture Name="object_yabusame_point_Tex_000900" OutName="tex_00000900" Format="ia8" Width="48" Height="24" Offset="0x900"/>
<DList Name="object_yabusame_point_DL_000DC0" Offset="0xDC0"/>
</File>
</Root>

68
src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -90,40 +90,40 @@ static EnKoSkeleton sSkeleton[2] = {
};
static struct_80034EC0_Entry sOsAnimeTable[] = {
{ 0x06008F6C, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
{ 0x06008F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
{ 0x06009B64, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
{ 0x06009B64, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f },
{ 0x06009B64, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f },
{ 0x060062DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060062DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
{ 0x06005808, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
{ 0x06007830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06008178, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060065E0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x0600879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007FFC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060080B4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060091AC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06006F9C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007064, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007120, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007F38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06006EE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060098EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060090EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x0600982C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06009274, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x060099A4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06009028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007E64, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06007454, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ 0x06008F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f },
{ 0x06007D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ 0x0600879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ 0x06006A60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ 0x06007830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_8F6C, 1.0f, 2.0f, 14.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
{ &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, 0.0f },
{ &gObjOsAnim_9B64, 0.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
{ &gObjOsAnim_9B64, 0.0f, 1.0f, 1.0f, ANIMMODE_ONCE, 0.0f },
{ &gObjOsAnim_9B64, 0.0f, 2.0f, 2.0f, ANIMMODE_ONCE, 0.0f },
{ &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_62DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
{ &gObjOsAnim_5808, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
{ &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_8178, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_65E0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7FFC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_80B4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_91AC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_6F9C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7064, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7120, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7F38, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_6EE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_98EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_90EC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_982C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_9274, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_99A4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_9028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7E64, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_7454, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
{ &gObjOsAnim_8F6C, 0.0f, 1.0f, 1.0f, ANIMMODE_LOOP_PARTIAL, -8.0f },
{ &gObjOsAnim_7D94, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_879C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_6A60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
{ &gObjOsAnim_7830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -8.0f },
};
static u8 sOsAnimeLookup[13][5] = {

16
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
View file

@ -5,10 +5,12 @@
*/
#include "z_en_nutsball.h"
#include "objects/object_dns/object_dns.h"
#include "objects/object_hintnuts/object_hintnuts.h"
#include "objects/object_dnk/object_dnk.h"
#include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
#include "objects/object_dekunuts/object_dekunuts.h"
#include "objects/object_hintnuts/object_hintnuts.h"
#include "objects/object_shopnuts/object_shopnuts.h"
#include "objects/object_dns/object_dns.h"
#include "objects/object_dnk/object_dnk.h"
#define FLAGS 0x00000010
@ -54,9 +56,13 @@ static ColliderCylinderInit sCylinderInit = {
{ 13, 13, 0, { 0 } },
};
static s16 sObjectIDs[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK };
static s16 sObjectIDs[] = {
OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK,
};
static Gfx* sDLists[] = { 0x06002028, gHintNutsNutDL, 0x06004008, gDntJijiNutDL, gDntStageNutDL };
static Gfx* sDLists[] = {
gDekuNutsDekuNutDL, gHintNutsNutDL, gBusinessScrubDekuNutDL, gDntJijiNutDL, gDntStageNutDL,
};
void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) {
EnNutsball* this = THIS;

6
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -2353,7 +2353,11 @@ void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx) {
s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos,
Vec3s* rot, void* thisx) {
static void* sKokiriShopkeeperEyeTextures[] = { 0x06001570, 0x060001F0, 0x06000B30 };
static void* sKokiriShopkeeperEyeTextures[] = {
gKokiriShopkeeperEyeDefaultTex,
gKokiriShopkeeperEyeHalfTex,
gKokiriShopkeeperEyeOpenTex,
};
EnOssan* this = THIS;
s32 pad;

6
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
View file

@ -869,7 +869,11 @@ void EnSsh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx) {
static u32* blinkTex[] = { 0x060007E0, 0x06000C60, 0x06001060 };
static void* blinkTex[] = {
object_ssh_Tex_0007E0,
object_ssh_Tex_000C60,
object_ssh_Tex_001060,
};
s32 pad;
EnSsh* this = THIS;

9
src/overlays/actors/ovl_En_Sth/z_en_sth.c
View file

@ -6,6 +6,8 @@
#include "vt.h"
#include "z_en_sth.h"
#include "objects/object_ahg/object_ahg.h"
#include "objects/object_boj/object_boj.h"
#define FLAGS 0x00000019
@ -61,7 +63,12 @@ static s16 sObjectIds[6] = {
};
static FlexSkeletonHeader* sSkeletons[6] = {
0x060000F0, 0x060000F0, 0x060000F0, 0x060000F0, 0x060000F0, 0x060000F0,
/* object_ahg_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
};
static AnimationHeader* sAnimations[6] = {

4
src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
View file

@ -215,8 +215,8 @@ s32 EnTakaraMan_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**
void EnTakaraMan_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* eyeTextures[] = {
0x06000970,
0x06000D70,
object_ts_Tex_000970,
object_ts_Tex_000D70,
};
EnTakaraMan* this = THIS;

26
src/overlays/actors/ovl_En_Tr/z_en_tr.c
View file

@ -40,28 +40,28 @@ const ActorInit En_Tr_InitVars = {
// The first elements of these animation arrays are for Koume, the second for Kotake
static AnimationHeader* unused[] = {
0x06003FC8,
0x06001CDC,
&object_tr_Anim_003FC8,
&object_tr_Anim_001CDC,
};
static AnimationHeader* D_80B24368[] = {
0x06002BC4, // Turn to look over right shoulder
0x06000BFC, // Turn to look over right shoulder
&object_tr_Anim_002BC4,
&object_tr_Anim_000BFC,
};
static AnimationHeader* D_80B24370[] = {
0x060035CC, // Looking over left shoulder
0x060013CC, // Looking over right shoulder
&object_tr_Anim_0035CC,
&object_tr_Anim_0013CC,
};
static AnimationHeader* D_80B24378[] = {
0x060049C8, // Floating on broom
0x060049C8, // Floating on broom
&object_tr_Anim_0049C8,
&object_tr_Anim_0049C8,
};
static AnimationHeader* D_80B24380[] = {
0x06012E1C, // Casting magic
0x06012E1C, // Casting magic
&object_tr_Anim_012E1C,
&object_tr_Anim_012E1C,
};
static f32 D_80B24388[] = { 0.0f, 20.0f, -30.0f, 20.0f, -20.0f, -20.0f, 30.0f };
@ -77,9 +77,9 @@ static Color_RGBA8 D_80B243C0[4] = {
};
static void* sEyeTextures[] = {
0x060086D8, // Open
0x060094D8, // Half
0x060098D8, // Closed
object_tr_Tex_0086D8,
object_tr_Tex_0094D8,
object_tr_Tex_0098D8,
};
void EnTr_SetupAction(EnTr* this, EnTrActionFunc actionFunc) {

5
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
View file

@ -7,6 +7,7 @@
#include "z_obj_tsubo.h"
#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_tsubo/object_tsubo.h"
#define FLAGS 0x00800010
@ -51,9 +52,9 @@ const ActorInit Obj_Tsubo_InitVars = {
static s16 sObjectIds[] = { OBJECT_GAMEPLAY_DANGEON_KEEP, OBJECT_TSUBO };
static Gfx* D_80BA1B84[] = { gPotDL, 0x060017C0 };
static Gfx* D_80BA1B84[] = { gPotDL, object_tsubo_DL_0017C0 };
static Gfx* D_80BA1B8C[] = { gPotFragmentDL, 0x06001960 };
static Gfx* D_80BA1B8C[] = { gPotFragmentDL, object_tsubo_DL_001960 };
static ColliderCylinderInit sCylinderInit = {
{

6
src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
View file

@ -52,7 +52,11 @@ u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
return 0;
}
static void* sTextures[] = { 0x06000000, 0x06000480, 0x06000900 };
static void* sTextures[] = {
object_yabusame_point_Tex_000000,
object_yabusame_point_Tex_000480,
object_yabusame_point_Tex_000900,
};
void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
s32 pad;

7
src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
View file

@ -25,8 +25,11 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
static void* sTextures[] = {
0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0,
0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0,
object_kingdodongo_Tex_02E4E0, object_kingdodongo_Tex_02E8E0, object_kingdodongo_Tex_02ECE0,
object_kingdodongo_Tex_02F0E0, object_kingdodongo_Tex_02F4E0, object_kingdodongo_Tex_02F8E0,
object_kingdodongo_Tex_02FCE0, object_kingdodongo_Tex_0300E0, object_kingdodongo_Tex_0304E0,
object_kingdodongo_Tex_0308E0, object_kingdodongo_Tex_0308E0, object_kingdodongo_Tex_0308E0,
object_kingdodongo_Tex_0308E0,
};
EffectSsInit Effect_Ss_G_Magma2_InitVars = {