diff --git a/config/splat.us.dra.yaml b/config/splat.us.dra.yaml index c66c2c858..896c679c7 100644 --- a/config/splat.us.dra.yaml +++ b/config/splat.us.dra.yaml @@ -108,7 +108,7 @@ segments: - [0xD4B8, .data, 7E4BC] - [0xDBD4, .data, d_DBD4] - [0xE294, .data, d_E294] - - [0x106C8, data] + - [0x10798, data] - [0x10A3C, .data, 90264] # D_800B0A3C to D_800B0AEC - [0x10B34, data] - [0x1107C, raw, vh_0] # aPbav diff --git a/src/dra/843B0.c b/src/dra/843B0.c index 600c55c44..dd914434c 100644 --- a/src/dra/843B0.c +++ b/src/dra/843B0.c @@ -849,7 +849,7 @@ void EntityHellfireHandler(Entity* self) { // I think this is to make the yellow laser beam? // it ends up looking like the library card effect. LoadImage(&D_800B0788, D_800B06C8); - LoadImage(&D_800B0790, &D_800B0728); + LoadImage(&D_800B0790, D_800B0728); prim = &g_PrimBuf[self->primIndex]; prim->v0 = prim->v1 = prim->v2 = prim->v3 = 0xF8; prim->u0 = prim->u2 = 1; diff --git a/src/dra/d_E294.c b/src/dra/d_E294.c index 684d539a2..6a348cb22 100644 --- a/src/dra/d_E294.c +++ b/src/dra/d_E294.c @@ -1412,3 +1412,18 @@ s16 D_800B0658[4][6] = {{0x0002, 0xFFFE, 0x0000, 0xFFFC, 0x0000, 0x0000}, Point32 D_800B0688[8] = {{28, 0}, {28, 16}, {28, 32}, {28, 48}, {60, 0}, {60, 16}, {60, 32}, {60, 48}}; + +u32 D_800B06C8[] = { + 0x98C694A5, 0xA1089CE7, 0xA94AA529, 0xB18CAD6B, 0xB9CEB5AD, 0xC210BDEF, + 0xCA52C631, 0xD294CE73, 0xDAD6D6B5, 0xE318DEF7, 0xE318E318, 0xE318E318, + 0xE318E318, 0xE318E318, 0xDEF7E318, 0xD6B5DAD6, 0xCE73D294, 0xC631CA52, + 0xBDEFC210, 0xB5ADB9CE, 0xAD6BB18C, 0xA529A94A, 0x9CE7A108, 0x94A598C6}; + +u32 D_800B0728[] = { + 0x910C90EB, 0x914E912D, 0x9190916F, 0x91D291B1, 0x921491F3, 0x92569235, + 0x92989277, 0x92DA92B9, 0x92DA92DA, 0x92DA92DA, 0x92DA92DA, 0x92DA92DA, + 0x92DA92DA, 0x92DA92DA, 0x92DA92DA, 0x92DA92DA, 0x92B992DA, 0x92779298, + 0x92359256, 0x91F39214, 0x91B191D2, 0x916F9190, 0x912D914E, 0x90EB910C}; + +RECT D_800B0788 = {0x0301, 0x01F8, 0x0030, 0x0001}; +RECT D_800B0790 = {0x0301, 0x01FC, 0x0030, 0x0001}; diff --git a/src/dra/dra.h b/src/dra/dra.h index 270a1c99f..29ba38dd1 100644 --- a/src/dra/dra.h +++ b/src/dra/dra.h @@ -430,8 +430,8 @@ extern AnimationFrame* D_800B0594[]; extern u8 D_800B0608[]; extern s16 D_800B0658[4][6]; extern Point32 D_800B0688[]; -extern u16 D_800B06C8[0x30]; -extern u32 D_800B0728; +extern u32 D_800B06C8[24]; +extern u32 D_800B0728[24]; extern RECT D_800B0788; extern RECT D_800B0790; extern AnimationFrame D_800B0798[]; diff --git a/src/pc/stubs.c b/src/pc/stubs.c index 5ede1b111..fc3704258 100644 --- a/src/pc/stubs.c +++ b/src/pc/stubs.c @@ -151,10 +151,6 @@ s16 D_800AC998[] = { 0x0300, 0x0320, 0x0300, 0x0320, 0x0340, 0x0360, 0x0340, 0x0360, 0x0380, 0x03A0, 0x0380, 0x03A0, 0x03C0, 0x03E0, 0x03C0, 0x03E0, }; -u32 D_800B0728 = 0x910C90EB; -RECT D_800B0788 = {0x0301, 0x01F8, 0x0030, 0x0001}; -RECT D_800B0790 = {0x0301, 0x01FC, 0x0030, 0x0001}; -u16 D_800B06C8[0x30] = {0}; s16 D_800ACF84[8]; u8 D_800ACF4C[0x200] = { // crouching anim 0x00, 0x11, 0x04, 0x15, 0x01, 0x10, 0x03, 0x23};