diff --git a/assets/xml/code/fbdemo_circle.xml b/assets/xml/code/fbdemo_circle.xml new file mode 100644 index 0000000000..fd55a887ed --- /dev/null +++ b/assets/xml/code/fbdemo_circle.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/code/fbdemo_triforce.xml b/assets/xml/code/fbdemo_triforce.xml new file mode 100644 index 0000000000..b45b2ca9f5 --- /dev/null +++ b/assets/xml/code/fbdemo_triforce.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/assets/xml/code/fbdemo_wipe1.xml b/assets/xml/code/fbdemo_wipe1.xml new file mode 100644 index 0000000000..498d150fce --- /dev/null +++ b/assets/xml/code/fbdemo_wipe1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_anubice.xml b/assets/xml/objects/object_anubice.xml index 5a5b51f823..2140187e4e 100644 --- a/assets/xml/objects/object_anubice.xml +++ b/assets/xml/objects/object_anubice.xml @@ -11,8 +11,8 @@ - - + + diff --git a/assets/xml/objects/object_fd.xml b/assets/xml/objects/object_fd.xml index d63b6b474c..1b96e9f22e 100644 --- a/assets/xml/objects/object_fd.xml +++ b/assets/xml/objects/object_fd.xml @@ -15,8 +15,8 @@ - - + + @@ -49,14 +49,14 @@ - - - - - - - - + + + + + + + + diff --git a/assets/xml/objects/object_fd2.xml b/assets/xml/objects/object_fd2.xml index c2a1457125..8689098b9b 100644 --- a/assets/xml/objects/object_fd2.xml +++ b/assets/xml/objects/object_fd2.xml @@ -4,8 +4,8 @@ - - + + diff --git a/assets/xml/objects/object_fish.xml b/assets/xml/objects/object_fish.xml index c10b0fe33d..f6e74eca1a 100644 --- a/assets/xml/objects/object_fish.xml +++ b/assets/xml/objects/object_fish.xml @@ -46,21 +46,21 @@ - - + + - - + + - - + + - + - - + + @@ -83,12 +83,12 @@ - - + + - - + + @@ -107,12 +107,12 @@ - - + + - - + + @@ -151,7 +151,7 @@ - + @@ -161,15 +161,15 @@ - - - - + + + + - - - - + + + + diff --git a/assets/xml/objects/object_gi_egg.xml b/assets/xml/objects/object_gi_egg.xml index 4847309969..2b2e2847db 100644 --- a/assets/xml/objects/object_gi_egg.xml +++ b/assets/xml/objects/object_gi_egg.xml @@ -1,6 +1,6 @@ - + diff --git a/assets/xml/objects/object_gs.xml b/assets/xml/objects/object_gs.xml index 55124c27f7..145be16653 100644 --- a/assets/xml/objects/object_gs.xml +++ b/assets/xml/objects/object_gs.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_mo.xml b/assets/xml/objects/object_mo.xml index 0a252ff5da..a0e8ded406 100644 --- a/assets/xml/objects/object_mo.xml +++ b/assets/xml/objects/object_mo.xml @@ -53,9 +53,9 @@ - - - + + + diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml index c1eab1deeb..43319e055b 100644 --- a/assets/xml/objects/object_zo.xml +++ b/assets/xml/objects/object_zo.xml @@ -75,14 +75,14 @@ - - + + - - + + - - + + diff --git a/assets/xml/overlays/ovl_Arrow_Fire.xml b/assets/xml/overlays/ovl_Arrow_Fire.xml new file mode 100644 index 0000000000..6a701847c9 --- /dev/null +++ b/assets/xml/overlays/ovl_Arrow_Fire.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Arrow_Ice.xml b/assets/xml/overlays/ovl_Arrow_Ice.xml new file mode 100644 index 0000000000..07d73628b8 --- /dev/null +++ b/assets/xml/overlays/ovl_Arrow_Ice.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Arrow_Light.xml b/assets/xml/overlays/ovl_Arrow_Light.xml new file mode 100644 index 0000000000..dd8e0fbf96 --- /dev/null +++ b/assets/xml/overlays/ovl_Arrow_Light.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml new file mode 100644 index 0000000000..7eb328d91e --- /dev/null +++ b/assets/xml/overlays/ovl_Bg_Ganon_Otyuka.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml b/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml new file mode 100644 index 0000000000..4e40918f87 --- /dev/null +++ b/assets/xml/overlays/ovl_Bg_Jya_Cobra.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Demo_Shd.xml b/assets/xml/overlays/ovl_Demo_Shd.xml new file mode 100644 index 0000000000..2ac9a9b484 --- /dev/null +++ b/assets/xml/overlays/ovl_Demo_Shd.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/overlays/ovl_Elf_Msg.xml b/assets/xml/overlays/ovl_Elf_Msg.xml new file mode 100644 index 0000000000..82cd468a3e --- /dev/null +++ b/assets/xml/overlays/ovl_Elf_Msg.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Elf_Msg2.xml b/assets/xml/overlays/ovl_Elf_Msg2.xml new file mode 100644 index 0000000000..fb2199424e --- /dev/null +++ b/assets/xml/overlays/ovl_Elf_Msg2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Bili.xml b/assets/xml/overlays/ovl_En_Bili.xml new file mode 100644 index 0000000000..483a2fcd46 --- /dev/null +++ b/assets/xml/overlays/ovl_En_Bili.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Ganon_Mant.xml b/assets/xml/overlays/ovl_En_Ganon_Mant.xml index 6edb8ddb6e..900ec46ac8 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Mant.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Mant.xml @@ -8,10 +8,10 @@ - + - + diff --git a/assets/xml/overlays/ovl_En_Ganon_Organ.xml b/assets/xml/overlays/ovl_En_Ganon_Organ.xml index 864f08f003..7d4f8bc785 100644 --- a/assets/xml/overlays/ovl_En_Ganon_Organ.xml +++ b/assets/xml/overlays/ovl_En_Ganon_Organ.xml @@ -1,19 +1,19 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + diff --git a/assets/xml/overlays/ovl_En_Holl.xml b/assets/xml/overlays/ovl_En_Holl.xml new file mode 100644 index 0000000000..6fa7d36433 --- /dev/null +++ b/assets/xml/overlays/ovl_En_Holl.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Jsjutan.xml b/assets/xml/overlays/ovl_En_Jsjutan.xml index 2602120846..ba79dca3c3 100644 --- a/assets/xml/overlays/ovl_En_Jsjutan.xml +++ b/assets/xml/overlays/ovl_En_Jsjutan.xml @@ -1,38 +1,38 @@ - + - - + + - - + + - - + + - - + + - + - + - + - - + + - + diff --git a/assets/xml/overlays/ovl_En_Kanban.xml b/assets/xml/overlays/ovl_En_Kanban.xml new file mode 100644 index 0000000000..546de14d0c --- /dev/null +++ b/assets/xml/overlays/ovl_En_Kanban.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Sda.xml b/assets/xml/overlays/ovl_En_Sda.xml new file mode 100644 index 0000000000..c4293e92bd --- /dev/null +++ b/assets/xml/overlays/ovl_En_Sda.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Ssh.xml b/assets/xml/overlays/ovl_En_Ssh.xml new file mode 100644 index 0000000000..5467eed62d --- /dev/null +++ b/assets/xml/overlays/ovl_En_Ssh.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_St.xml b/assets/xml/overlays/ovl_En_St.xml new file mode 100644 index 0000000000..0252a1387a --- /dev/null +++ b/assets/xml/overlays/ovl_En_St.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/xml/overlays/ovl_En_Sth.xml b/assets/xml/overlays/ovl_En_Sth.xml new file mode 100644 index 0000000000..125109dad6 --- /dev/null +++ b/assets/xml/overlays/ovl_En_Sth.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/overlays/ovl_End_Title.xml b/assets/xml/overlays/ovl_End_Title.xml new file mode 100644 index 0000000000..82dceca252 --- /dev/null +++ b/assets/xml/overlays/ovl_End_Title.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml index 54c5c4ac81..30cfda6bc6 100644 --- a/assets/xml/overlays/ovl_Magic_Dark.xml +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -1,8 +1,10 @@ - - + - + + + + + diff --git a/assets/xml/overlays/ovl_Magic_Fire.xml b/assets/xml/overlays/ovl_Magic_Fire.xml new file mode 100644 index 0000000000..d1059385b5 --- /dev/null +++ b/assets/xml/overlays/ovl_Magic_Fire.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Magic_Wind.xml b/assets/xml/overlays/ovl_Magic_Wind.xml new file mode 100644 index 0000000000..e04fa294e3 --- /dev/null +++ b/assets/xml/overlays/ovl_Magic_Wind.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_Spot.xml b/assets/xml/overlays/ovl_Oceff_Spot.xml new file mode 100644 index 0000000000..809adcfb64 --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_Spot.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_Storm.xml b/assets/xml/overlays/ovl_Oceff_Storm.xml new file mode 100644 index 0000000000..93caba324a --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_Storm.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe.xml b/assets/xml/overlays/ovl_Oceff_Wipe.xml new file mode 100644 index 0000000000..c543ab9889 --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_Wipe.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe2.xml b/assets/xml/overlays/ovl_Oceff_Wipe2.xml new file mode 100644 index 0000000000..20d17a6c9a --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_Wipe2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe3.xml b/assets/xml/overlays/ovl_Oceff_Wipe3.xml new file mode 100644 index 0000000000..8dffc33a00 --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_Wipe3.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_Wipe4.xml b/assets/xml/overlays/ovl_Oceff_Wipe4.xml new file mode 100644 index 0000000000..109097a7b2 --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_Wipe4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Oceff_spot.xml b/assets/xml/overlays/ovl_Oceff_spot.xml new file mode 100644 index 0000000000..d9b59bb021 --- /dev/null +++ b/assets/xml/overlays/ovl_Oceff_spot.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/extract_assets.py b/extract_assets.py index 6a7afd1e37..6e04f7d6e8 100755 --- a/extract_assets.py +++ b/extract_assets.py @@ -9,6 +9,7 @@ import signal EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json" + def SignalHandler(sig, frame): print(f'Signal {sig} received. Aborting...') mainAbort.set() diff --git a/include/z64scene.h b/include/z64scene.h index 8d3f0802e2..6fd0e9edf8 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -196,8 +196,8 @@ typedef struct { MeshHeaderBase base; u8 numEntries; - u32 dListStart; - u32 dListEnd; + Gfx* dListStart; + Gfx* dListEnd; } MeshHeader0; typedef struct { @@ -254,8 +254,8 @@ typedef struct { typedef struct { MeshHeaderBase base; u8 numEntries; - u32 dListStart; - u32 dListEnd; + Gfx* dListStart; + Gfx* dListEnd; } MeshHeader2; typedef struct { diff --git a/include/z64transition.h b/include/z64transition.h index 8ac8ec0065..2adb6f604b 100644 --- a/include/z64transition.h +++ b/include/z64transition.h @@ -60,7 +60,7 @@ typedef struct { /* 0x01A */ u16 normal; /* 0x020 */ Mtx projection; /* 0x060 */ Mtx lookAt; - /* 0x0A0 */ char* texture; + /* 0x0A0 */ void* texture; /* 0x0A8 */ Mtx modelView[2][3]; } TransitionCircle; // size = 0x228; diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 82d0e3e39c..ee3b127c0f 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -107,7 +107,7 @@ void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId); typedef struct { /* 0x00 */ void (*drawFunc)(GlobalContext*, s16); - /* 0x04 */ u32 dlists[8]; + /* 0x04 */ Gfx* dlists[8]; } DrawItemTableEntry; // size = 0x24 DrawItemTableEntry sDrawItemTable[] = { @@ -196,7 +196,7 @@ DrawItemTableEntry sDrawItemTable[] = { // bombchus, OBJECT_GI_BOMB_2 { GetItem_DrawMaskOrBombchu, { gGiBombchuDL } }, // egg, OBJECT_GI_EGG - { GetItem_DrawEggOrMedallion, { gGiEggSetupDL, gGiEggDL } }, + { GetItem_DrawEggOrMedallion, { gGiEggMaterialDL, gGiEggDL } }, // silver scale, OBJECT_GI_SCALE { GetItem_DrawScale, { gGiScaleWaterDL, gGiSilverScaleWaterColorDL, gGiSilverScaleColorDL, gGiScaleDL } }, // gold scale, OBJECT_GI_SCALE diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index d3326e0535..233665db11 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -5,253 +5,7 @@ Gfx sCircleNullDList[] = { gsSPEndDisplayList(), }; -char sCircleTexDefault[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x13, 0x13, 0x13, - 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, - 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, - 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, - 0x2E, 0x2E, 0x2E, 0x2E, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, - 0x38, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x4A, 0x4A, - 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x53, 0x53, 0x53, 0x53, 0x53, - 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, - 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, 0x65, - 0x65, 0x65, 0x65, 0x65, 0x65, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E, - 0x6E, 0x6E, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x7F, - 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x89, 0x89, 0x89, 0x89, - 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, - 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, - 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, - 0xA4, 0xA4, 0xA4, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, - 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xBF, 0xBF, 0xBF, - 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, - 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, - 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, - 0xDB, 0xDB, 0xDB, 0xDB, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, 0xE4, - 0xE4, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xED, 0xF7, 0xF7, - 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; - -char sCircleTexWave[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x17, 0x17, 0x17, 0x17, 0x12, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x08, 0x08, 0x08, 0x07, 0x08, - 0x18, 0x18, 0x18, 0x18, 0x1B, 0x15, 0x07, 0x06, 0x06, 0x06, 0x06, 0x08, 0x07, 0x07, 0x0B, 0x15, 0x18, 0x18, 0x18, - 0x18, 0x1D, 0x1F, 0x17, 0x17, 0x1A, 0x17, 0x10, 0x07, 0x0A, 0x11, 0x1A, 0x20, 0x17, 0x17, 0x17, 0x1B, 0x20, 0x20, - 0x1C, 0x18, 0x18, 0x17, 0x17, 0x0B, 0x19, 0x20, 0x21, 0x20, 0x21, 0x21, 0x1F, 0x1F, 0x1F, 0x20, 0x1C, 0x18, 0x18, - 0x21, 0x2C, 0x2B, 0x23, 0x20, 0x20, 0x20, 0x35, 0x35, 0x34, 0x30, 0x26, 0x24, 0x34, 0x37, 0x31, 0x35, 0x39, 0x3B, - 0x30, 0x20, 0x1F, 0x1F, 0x39, 0x39, 0x39, 0x39, 0x3C, 0x3D, 0x41, 0x42, 0x3F, 0x39, 0x38, 0x38, 0x40, 0x40, 0x3D, - 0x39, 0x38, 0x39, 0x3E, 0x43, 0x47, 0x44, 0x40, 0x40, 0x40, 0x39, 0x38, 0x41, 0x48, 0x49, 0x4D, 0x4F, 0x40, 0x41, - 0x47, 0x48, 0x47, 0x43, 0x3E, 0x3D, 0x3D, 0x3D, 0x41, 0x47, 0x46, 0x4A, 0x50, 0x50, 0x59, 0x54, 0x4C, 0x46, 0x49, - 0x50, 0x50, 0x4C, 0x4E, 0x53, 0x51, 0x51, 0x50, 0x4F, 0x4F, 0x4F, 0x6A, 0x69, 0x61, 0x59, 0x5F, 0x67, 0x6B, 0x69, - 0x6A, 0x6B, 0x64, 0x60, 0x62, 0x5B, 0x57, 0x57, 0x68, 0x68, 0x69, 0x6E, 0x71, 0x6A, 0x68, 0x68, 0x68, 0x68, 0x68, - 0x61, 0x5F, 0x66, 0x6C, 0x6C, 0x68, 0x68, 0x69, 0x70, 0x70, 0x6C, 0x68, 0x68, 0x68, 0x68, 0x68, 0x64, 0x66, 0x6F, - 0x71, 0x71, 0x67, 0x67, 0x6B, 0x6F, 0x6F, 0x6E, 0x6B, 0x68, 0x68, 0x67, 0x67, 0x65, 0x6D, 0x70, 0x70, 0x70, 0x6C, - 0x77, 0x7E, 0x77, 0x74, 0x75, 0x7F, 0x7D, 0x79, 0x6B, 0x6A, 0x6A, 0x70, 0x6D, 0x6E, 0x6E, 0x8E, 0x98, 0x98, 0x98, - 0x95, 0x96, 0x98, 0x98, 0x98, 0x8D, 0x8D, 0x8C, 0x89, 0x7D, 0x7A, 0x78, 0x9C, 0x96, 0x97, 0x97, 0x97, 0x97, 0x97, - 0x97, 0x97, 0x98, 0xA6, 0xA9, 0xAA, 0xA9, 0xA4, 0xA2, 0xAA, 0x9C, 0x96, 0x97, 0x96, 0x96, 0x95, 0x96, 0x98, 0x9E, - 0xA7, 0xA7, 0xA7, 0xA7, 0xAB, 0xB0, 0xB0, 0xAC, 0x9E, 0x96, 0x9C, 0xA5, 0xA7, 0xA5, 0xA4, 0xAC, 0xA6, 0xA7, 0xA7, - 0xA7, 0xAC, 0xAF, 0xAF, 0xB0, 0xB1, 0xA8, 0xAC, 0xB0, 0xB1, 0xB0, 0xB3, 0xBD, 0xB0, 0xA7, 0xA7, 0xA8, 0xAF, 0xAF, - 0xB4, 0xB9, 0xBD, 0xC2, 0xBB, 0xAF, 0xAF, 0xB0, 0xBD, 0xC0, 0xBE, 0xB2, 0xA8, 0xAA, 0xAE, 0xAE, 0xBF, 0xBF, 0xC1, - 0xC7, 0xC7, 0xBC, 0xAF, 0xB7, 0xBE, 0xBF, 0xBF, 0xC0, 0xC6, 0xBD, 0xB3, 0xB1, 0xBE, 0xBE, 0xC5, 0xC7, 0xC7, 0xC7, - 0xC4, 0xC8, 0xC2, 0xBE, 0xC1, 0xCE, 0xD8, 0xD8, 0xD3, 0xD0, 0xC3, 0xC6, 0xC3, 0xC5, 0xC5, 0xD0, 0xE0, 0xDF, 0xD6, - 0xCB, 0xD0, 0xD8, 0xD7, 0xD7, 0xDC, 0xE0, 0xE2, 0xE3, 0xDA, 0xD1, 0xCE, 0xDD, 0xDF, 0xDF, 0xE0, 0xDE, 0xD7, 0xD5, - 0xD6, 0xD6, 0xDE, 0xDF, 0xF2, 0xF1, 0xF2, 0xEB, 0xE6, 0xE1, 0xDF, 0xDD, 0xDF, 0xE8, 0xEB, 0xE3, 0xDF, 0xDF, 0xE1, - 0xDE, 0xF2, 0xEF, 0xEF, 0xF0, 0xEE, 0xEE, 0xEF, 0xF1, 0xEF, 0xF6, 0xF8, 0xF5, 0xF4, 0xF4, 0xF3, 0xED, 0xF7, 0xF3, - 0xF1, 0xF0, 0xF3, 0xF8, 0xF8, 0xF9, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xFF, 0xFF, 0xFE, 0xFE, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; - -char sCircleTexRipple[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, - 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, - 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, - 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, - 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, - 0x37, 0x37, 0x37, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, - 0x38, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x71, 0x72, 0x72, - 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, - 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x4A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, - 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, - 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, 0x7D, - 0x7D, 0x7D, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0xC0, - 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xBA, 0xBA, 0xBA, 0xBA, - 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, - 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, - 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, 0xE8, - 0xE8, 0xE8, 0xE8, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, - 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xEF, 0xEF, 0xEF, - 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEF, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, - 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, - 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, 0xEA, - 0xEA, 0xEA, 0xEA, 0xEA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF2, 0xF6, 0xF6, - 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xF6, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; - -char sCircleTexStarburst[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x11, 0x08, 0x02, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x14, 0x0A, 0x02, - 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x03, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x01, 0x19, 0x0C, 0x04, 0x02, 0x00, 0x00, - 0x00, 0x09, 0x00, 0x05, 0x00, 0x00, 0x14, 0x00, 0x00, 0x03, 0x1E, 0x0D, 0x05, 0x04, 0x00, 0x00, 0x01, 0x0B, 0x00, - 0x08, 0x00, 0x00, 0x1A, 0x00, 0x02, 0x06, 0x23, 0x10, 0x07, 0x07, 0x00, 0x00, 0x01, 0x0E, 0x00, 0x0B, 0x00, 0x00, - 0x21, 0x00, 0x03, 0x09, 0x29, 0x15, 0x09, 0x09, 0x00, 0x00, 0x02, 0x13, 0x00, 0x11, 0x00, 0x00, 0x28, 0x00, 0x05, - 0x0E, 0x2E, 0x18, 0x0B, 0x0A, 0x00, 0x01, 0x04, 0x16, 0x01, 0x16, 0x00, 0x01, 0x2F, 0x00, 0x07, 0x12, 0x35, 0x1D, - 0x0F, 0x0C, 0x00, 0x02, 0x05, 0x1B, 0x02, 0x1C, 0x00, 0x02, 0x38, 0x00, 0x0A, 0x18, 0x3D, 0x23, 0x12, 0x10, 0x01, - 0x02, 0x08, 0x21, 0x02, 0x20, 0x00, 0x03, 0x40, 0x00, 0x0D, 0x1E, 0x47, 0x29, 0x15, 0x15, 0x04, 0x04, 0x0D, 0x27, - 0x04, 0x28, 0x01, 0x04, 0x4A, 0x00, 0x11, 0x25, 0x55, 0x35, 0x1F, 0x1F, 0x0D, 0x0D, 0x17, 0x33, 0x0D, 0x36, 0x08, - 0x0C, 0x58, 0x05, 0x1B, 0x2F, 0x66, 0x42, 0x2D, 0x2E, 0x18, 0x1A, 0x26, 0x43, 0x1A, 0x48, 0x14, 0x17, 0x68, 0x11, - 0x2C, 0x3D, 0x76, 0x51, 0x39, 0x3C, 0x24, 0x28, 0x37, 0x54, 0x28, 0x5C, 0x20, 0x23, 0x74, 0x1C, 0x3D, 0x49, 0x85, - 0x61, 0x44, 0x49, 0x30, 0x38, 0x47, 0x64, 0x38, 0x6F, 0x2E, 0x31, 0x80, 0x29, 0x50, 0x5B, 0x92, 0x71, 0x4E, 0x58, - 0x3C, 0x47, 0x57, 0x74, 0x49, 0x7C, 0x3D, 0x3E, 0x8E, 0x35, 0x63, 0x6E, 0x9D, 0x81, 0x5B, 0x69, 0x49, 0x58, 0x6B, - 0x82, 0x5D, 0x89, 0x4F, 0x4A, 0x9C, 0x43, 0x76, 0x81, 0xA9, 0x91, 0x67, 0x79, 0x56, 0x69, 0x81, 0x90, 0x72, 0x9A, - 0x61, 0x59, 0xA7, 0x51, 0x8B, 0x93, 0xB4, 0xA2, 0x73, 0x88, 0x65, 0x7C, 0x96, 0x9F, 0x88, 0xA9, 0x74, 0x66, 0xB2, - 0x60, 0xA2, 0xA3, 0xBF, 0xB0, 0x7E, 0x96, 0x76, 0x8E, 0xA9, 0xAF, 0x9E, 0xB7, 0x84, 0x74, 0xBC, 0x71, 0xB7, 0xB0, - 0xCA, 0xC0, 0x8D, 0xA8, 0x89, 0xA1, 0xBA, 0xBC, 0xB2, 0xC6, 0x92, 0x85, 0xC6, 0x82, 0xC9, 0xBC, 0xD3, 0xCE, 0x9F, - 0xB6, 0x9E, 0xB3, 0xC9, 0xC9, 0xC5, 0xD3, 0x9E, 0x99, 0xD0, 0x94, 0xD8, 0xC8, 0xDB, 0xD8, 0xB1, 0xC7, 0xB3, 0xC5, - 0xD6, 0xD2, 0xD1, 0xDE, 0xAF, 0xAC, 0xDB, 0xA8, 0xE4, 0xD4, 0xE2, 0xDF, 0xC4, 0xD8, 0xC8, 0xD4, 0xDF, 0xDB, 0xDB, - 0xE4, 0xC4, 0xBF, 0xE5, 0xBB, 0xEC, 0xE0, 0xE7, 0xE5, 0xD9, 0xE8, 0xDA, 0xE1, 0xE9, 0xE7, 0xE6, 0xEC, 0xD9, 0xD4, - 0xEF, 0xCF, 0xF1, 0xE9, 0xED, 0xEA, 0xEB, 0xF2, 0xE6, 0xE8, 0xF2, 0xF1, 0xEE, 0xF4, 0xEB, 0xE6, 0xF7, 0xDD, 0xF6, - 0xF0, 0xF5, 0xF3, 0xF6, 0xF6, 0xF4, 0xF0, 0xF8, 0xF5, 0xF2, 0xFA, 0xF7, 0xF1, 0xFB, 0xE6, 0xFB, 0xF6, 0xFC, 0xFD, - 0xFC, 0xFB, 0xFD, 0xFB, 0xFB, 0xFB, 0xFA, 0xFE, 0xFD, 0xFB, 0xFE, 0xF7, 0xFE, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; - -Vtx sCircleVtx[] = { - VTX(-25, 0, 0, 0, 4096, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-23, 10, 0, 384, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 192, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-18, 18, 0, 768, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 576, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-10, 23, 0, 1152, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 960, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 25, 0, 1536, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 1344, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(10, 23, 0, 1920, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 1728, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(18, 18, 0, 2304, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 2112, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(23, 10, 0, 2688, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 2496, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(25, 0, 0, 3072, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 2880, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(23, -10, 0, 3456, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 3264, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(18, -18, 0, 3840, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 3648, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(10, -23, 0, 4224, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 4032, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, -25, 0, 4608, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 4416, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-10, -23, 0, 4992, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 4800, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-18, -18, 0, 5376, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 5184, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-23, -10, 0, 5760, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -10, 5568, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-23, -10, 0, 5760, 4096, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-25, 0, 0, 6144, 4096, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 0, -10, 5952, 2048, 0xFF, 0xFF, 0xFF, 0xFF), -}; +#include "code/fbdemo_circle/z_fbdemo_circle.c" Gfx sCircleDList[] = { gsDPPipeSync(), @@ -266,7 +20,7 @@ Gfx sCircleDList[] = { gsDPLoadTextureBlock(0x08000000, G_IM_FMT_I, G_IM_SIZ_8b, 16, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 6, G_TX_NOLOD, G_TX_NOLOD), gsSPDisplayList(0x09000000), - gsSPVertex(sCircleVtx, 32, 0), + gsSPVertex(sCircleWipeVtx, 32, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), gsSP2Triangles(3, 5, 6, 0, 5, 7, 8, 0), gsSP2Triangles(7, 9, 10, 0, 9, 11, 12, 0), @@ -275,7 +29,7 @@ Gfx sCircleDList[] = { gsSP2Triangles(19, 21, 22, 0, 21, 23, 24, 0), gsSP2Triangles(23, 25, 26, 0, 25, 27, 28, 0), gsSP1Triangle(27, 29, 30, 0), - gsSPVertex(&sCircleVtx[31], 3, 0), + gsSPVertex(&sCircleWipeVtx[31], 3, 0), gsSP1Triangle(0, 1, 2, 0), gsSPEndDisplayList(), }; @@ -289,16 +43,16 @@ void TransitionCircle_Start(void* thisx) { switch (this->effect) { case 1: - this->texture = sCircleTexWave; + this->texture = sCircleWipeWaveTex; break; case 2: - this->texture = sCircleTexRipple; + this->texture = sCircleWipeRippleTex; break; case 3: - this->texture = sCircleTexStarburst; + this->texture = sCircleWipeStarburstTex; break; default: - this->texture = sCircleTexDefault; + this->texture = sCircleWipeDefaultTex; break; } diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 945b74455d..b17e161015 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -1,24 +1,6 @@ #include "global.h" -Gfx sTriforceDList[] = { - gsDPPipeSync(), - gsSPTexture(0x8000, 0x8000, 0, G_TX_RENDERTILE, G_ON), - gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | - G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH), - gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), - gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_1PRIMITIVE, - G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), - gsSPEndDisplayList(), -}; - -Vtx sTriforceVTX[] = { - VTX(0, 577, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(1000, -1154, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1000, -1154, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, -1154, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(500, -288, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-500, -288, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-32000, 32000, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(32000, 32000, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(32000, -32000, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-32000, -32000, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; +#include "code/fbdemo_triforce/z_fbdemo_triforce.c" #define THIS ((TransitionTriforce*)thisx) @@ -102,14 +84,14 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) { guRotate(&modelView[1], rotation, 0.0f, 0.0f, 1.0f); guTranslate(&modelView[2], 0.0f, 0.0f, 0.0f); gDPPipeSync(gfx++); - gSPDisplayList(gfx++, sTriforceDList); + gSPDisplayList(gfx++, sTriforceWipeDL); gDPSetColor(gfx++, G_SETPRIMCOLOR, this->color.rgba); gDPSetCombineMode(gfx++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gSPMatrix(gfx++, &this->projection, G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gfx++, &modelView[0], G_MTX_LOAD); gSPMatrix(gfx++, &modelView[1], G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_MUL); gSPMatrix(gfx++, &modelView[2], G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_MUL); - gSPVertex(gfx++, sTriforceVTX, 10, 0); + gSPVertex(gfx++, sTriforceWipeVtx, 10, 0); if (!TransitionTriforce_IsDone(this)) { switch (this->fadeDirection) { case 1: diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 68306e84d9..fcf96994a7 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -1,131 +1,6 @@ #include "global.h" -Vtx sWipeVtx[] = { - VTX(-1299, 750, 0, 13653, 2048, 0xAD, 0x30, 0xB8, 0xFF), VTX(-750, 1299, 0, 15019, 2048, 0xD0, 0x53, 0xB8, 0xFF), - VTX(0, 0, -500, 14336, 0, 0xCE, 0xCE, 0xA0, 0xFF), VTX(0, 1500, 0, 16384, 2048, 0x00, 0x60, 0xB8, 0xFF), - VTX(0, 0, -500, 15701, 0, 0x3D, 0x3D, 0xAD, 0xFF), VTX(0, 1500, 0, 0, 2048, 0x00, 0x60, 0xB8, 0xFF), - VTX(750, 1299, 0, 1365, 2048, 0x30, 0x53, 0xB8, 0xFF), VTX(0, 0, -500, 683, 0, 0x3D, 0x3D, 0xAD, 0xFF), - VTX(1299, 750, 0, 2731, 2048, 0x53, 0x30, 0xB8, 0xFF), VTX(0, 0, -500, 2048, 0, 0x3D, 0x3D, 0xAD, 0xFF), - VTX(1500, 0, 0, 4096, 2048, 0x60, 0x00, 0xB8, 0xFF), VTX(0, 0, -500, 3413, 0, 0x3D, 0x3D, 0xAD, 0xFF), - VTX(1299, -750, 0, 5461, 2048, 0x53, 0xD0, 0xB8, 0xFF), VTX(0, 0, -500, 4779, 0, 0x3D, 0x3D, 0xAD, 0xFF), - VTX(750, -1299, 0, 6827, 2048, 0x30, 0xAD, 0xB8, 0xFF), VTX(0, 0, -500, 6144, 0, 0xCE, 0xCE, 0xA0, 0xFF), - VTX(0, -1500, 0, 8192, 2048, 0x00, 0xA0, 0xB8, 0xFF), VTX(0, 0, -500, 7509, 0, 0xCE, 0xCE, 0xA0, 0xFF), - VTX(-750, -1299, 0, 9557, 2048, 0xD0, 0xAD, 0xB8, 0xFF), VTX(0, 0, -500, 8875, 0, 0xCE, 0xCE, 0xA0, 0xFF), - VTX(-1299, -750, 0, 10923, 2048, 0xAD, 0xD0, 0xB8, 0xFF), VTX(0, 0, -500, 10240, 0, 0xCE, 0xCE, 0xA0, 0xFF), - VTX(-1500, 0, 0, 12288, 2048, 0xA0, 0x00, 0xB8, 0xFF), VTX(0, 0, -500, 11605, 0, 0xCE, 0xCE, 0xA0, 0xFF), - VTX(0, 0, -500, 12971, 0, 0xCE, 0xCE, 0xA0, 0xFF), -}; - -char sWipeTexture[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x01, - 0x24, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, 0x12, 0x34, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x01, 0x31, 0x23, 0x45, 0x21, 0x10, 0x00, 0x00, 0x01, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x41, - 0x34, 0x56, 0x31, 0x10, 0x00, 0x00, 0x01, 0x00, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x10, 0x02, 0x42, 0x35, 0x66, 0x32, 0x20, 0x00, 0x00, - 0x02, 0x00, 0x32, 0x13, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, - 0x01, 0x00, 0x00, 0x00, 0x10, 0x02, 0x53, 0x45, 0x67, 0x42, 0x20, 0x00, 0x00, 0x02, 0x01, 0x32, 0x23, 0x10, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x12, 0x00, 0x10, 0x00, 0x10, 0x03, - 0x64, 0x56, 0x77, 0x53, 0x30, 0x01, 0x00, 0x13, 0x12, 0x42, 0x24, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, - 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x31, 0x13, 0x00, 0x11, 0x00, 0x10, 0x03, 0x64, 0x67, 0x77, 0x54, 0x41, 0x01, - 0x00, 0x14, 0x12, 0x53, 0x35, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x02, - 0x41, 0x24, 0x11, 0x21, 0x00, 0x20, 0x14, 0x75, 0x67, 0x77, 0x64, 0x51, 0x12, 0x00, 0x24, 0x23, 0x53, 0x46, 0x30, - 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x52, 0x34, 0x11, 0x31, 0x01, 0x20, - 0x15, 0x76, 0x77, 0x87, 0x65, 0x52, 0x13, 0x00, 0x25, 0x34, 0x64, 0x56, 0x31, 0x20, 0x00, 0x00, 0x00, 0x01, 0x31, - 0x02, 0x10, 0x00, 0x00, 0x00, 0x10, 0x03, 0x52, 0x35, 0x22, 0x41, 0x02, 0x21, 0x26, 0x77, 0x77, 0x87, 0x75, 0x62, - 0x13, 0x11, 0x36, 0x35, 0x65, 0x57, 0x41, 0x30, 0x00, 0x10, 0x00, 0x01, 0x31, 0x12, 0x10, 0x10, 0x00, 0x00, 0x10, - 0x04, 0x62, 0x46, 0x23, 0x51, 0x02, 0x21, 0x36, 0x77, 0x78, 0x88, 0x76, 0x63, 0x24, 0x11, 0x46, 0x46, 0x75, 0x67, - 0x52, 0x40, 0x01, 0x10, 0x00, 0x02, 0x42, 0x13, 0x10, 0x20, 0x01, 0x00, 0x21, 0x15, 0x63, 0x56, 0x34, 0x51, 0x13, - 0x31, 0x47, 0x88, 0x78, 0x88, 0x77, 0x64, 0x24, 0x22, 0x56, 0x56, 0x76, 0x77, 0x53, 0x41, 0x02, 0x10, 0x10, 0x03, - 0x53, 0x23, 0x21, 0x31, 0x01, 0x01, 0x31, 0x16, 0x74, 0x66, 0x35, 0x62, 0x14, 0x32, 0x47, 0x88, 0x88, 0x88, 0x87, - 0x75, 0x34, 0x22, 0x57, 0x57, 0x76, 0x77, 0x54, 0x51, 0x03, 0x10, 0x11, 0x04, 0x63, 0x34, 0x22, 0x31, 0x02, 0x01, - 0x42, 0x26, 0x74, 0x67, 0x46, 0x62, 0x25, 0x42, 0x57, 0x89, 0x88, 0x88, 0x98, 0x75, 0x35, 0x33, 0x67, 0x67, 0x77, - 0x77, 0x65, 0x51, 0x03, 0x10, 0x21, 0x14, 0x64, 0x45, 0x33, 0x41, 0x12, 0x12, 0x52, 0x37, 0x75, 0x77, 0x56, 0x72, - 0x36, 0x53, 0x67, 0x89, 0x88, 0x89, 0xA8, 0x76, 0x45, 0x44, 0x67, 0x67, 0x87, 0x77, 0x76, 0x62, 0x14, 0x21, 0x32, - 0x15, 0x75, 0x55, 0x43, 0x52, 0x13, 0x13, 0x63, 0x47, 0x75, 0x77, 0x57, 0x73, 0x46, 0x54, 0x78, 0x8A, 0x88, 0x9A, - 0xA8, 0x77, 0x56, 0x55, 0x77, 0x67, 0x88, 0x88, 0x76, 0x72, 0x25, 0x21, 0x42, 0x26, 0x75, 0x66, 0x54, 0x62, 0x24, - 0x23, 0x64, 0x57, 0x76, 0x77, 0x67, 0x74, 0x57, 0x65, 0x78, 0x9B, 0x89, 0x9B, 0xB8, 0x87, 0x56, 0x55, 0x77, 0x78, - 0x88, 0x88, 0x87, 0x73, 0x25, 0x21, 0x43, 0x36, 0x76, 0x67, 0x65, 0x63, 0x35, 0x24, 0x75, 0x57, 0x77, 0x77, 0x77, - 0x75, 0x67, 0x65, 0x78, 0x9B, 0x89, 0xAB, 0xC8, 0x87, 0x67, 0x66, 0x77, 0x78, 0x98, 0x88, 0x98, 0x74, 0x36, 0x32, - 0x54, 0x37, 0x76, 0x77, 0x66, 0x73, 0x45, 0x35, 0x75, 0x67, 0x77, 0x88, 0x77, 0x75, 0x67, 0x66, 0x78, 0xAC, 0x9A, - 0xBC, 0xC8, 0x87, 0x67, 0x66, 0x77, 0x78, 0xA9, 0x88, 0x98, 0x75, 0x46, 0x33, 0x65, 0x47, 0x77, 0x77, 0x77, 0x74, - 0x56, 0x46, 0x76, 0x77, 0x87, 0x89, 0x88, 0x76, 0x77, 0x76, 0x78, 0xBD, 0x9B, 0xCD, 0xD8, 0x98, 0x77, 0x76, 0x78, - 0x78, 0xAA, 0x89, 0x98, 0x76, 0x56, 0x44, 0x66, 0x57, 0x77, 0x77, 0x77, 0x75, 0x67, 0x46, 0x77, 0x78, 0x88, 0x89, - 0x88, 0x87, 0x78, 0x87, 0x78, 0xCD, 0x9C, 0xDE, 0xD9, 0x98, 0x77, 0x77, 0x78, 0x88, 0xBA, 0x99, 0xA8, 0x76, 0x66, - 0x44, 0x76, 0x67, 0x88, 0x88, 0x88, 0x75, 0x77, 0x56, 0x77, 0x78, 0x99, 0x89, 0x88, 0x88, 0x88, 0x87, 0x88, 0xCD, - 0x9D, 0xEE, 0xD9, 0xA8, 0x88, 0x87, 0x88, 0x88, 0xCB, 0x9A, 0xA8, 0x77, 0x67, 0x55, 0x77, 0x77, 0x88, 0x88, 0x88, - 0x76, 0x77, 0x67, 0x78, 0x88, 0xAA, 0x8A, 0x98, 0x89, 0x88, 0x98, 0x88, 0xDD, 0xAD, 0xFE, 0xDA, 0xB9, 0x88, 0x98, - 0x89, 0x88, 0xDC, 0xAB, 0xB8, 0x88, 0x77, 0x56, 0x77, 0x77, 0x89, 0x88, 0x98, 0x76, 0x77, 0x67, 0x88, 0x88, 0xAA, - 0x8A, 0xA8, 0x9A, 0x88, 0xA8, 0x89, 0xDD, 0xAE, 0xFF, 0xDA, 0xC9, 0x88, 0x98, 0x89, 0x88, 0xDD, 0xAC, 0xB8, 0x88, - 0x77, 0x66, 0x78, 0x78, 0x99, 0x88, 0x98, 0x77, 0x77, 0x77, 0x89, 0x88, 0xBB, 0x9B, 0xA8, 0x9B, 0x88, 0xB8, 0x8A, - 0xED, 0xBE, 0xFF, 0xDB, 0xDA, 0x88, 0xA8, 0x8A, 0x89, 0xED, 0xBD, 0xC8, 0x89, 0x87, 0x67, 0x89, 0x88, 0x9A, 0x88, - 0xA8, 0x87, 0x77, 0x77, 0x8A, 0x88, 0xCB, 0x9C, 0xB8, 0xAC, 0x88, 0xC9, 0x8A, 0xFD, 0xCF, 0xFF, 0xEC, 0xEB, 0x89, - 0xB8, 0x9B, 0x89, 0xED, 0xCE, 0xC8, 0x9A, 0x87, 0x77, 0x89, 0x88, 0xAB, 0x89, 0xA8, 0x87, 0x88, 0x78, 0x8B, 0x89, - 0xDC, 0x9C, 0xC9, 0xBC, 0x88, 0xDA, 0x8B, 0xFE, 0xCF, 0xFF, 0xEC, 0xEB, 0x8A, 0xC9, 0xAC, 0x9A, 0xEE, 0xCE, 0xD8, - 0x9A, 0x87, 0x77, 0x8A, 0x88, 0xBC, 0x9A, 0xB8, 0x98, 0x88, 0x78, 0x8B, 0x8A, 0xED, 0x9D, 0xC9, 0xCD, 0x89, 0xEB, - 0x8C, 0xFE, 0xDF, 0xFF, 0xFD, 0xFC, 0x9B, 0xD9, 0xBD, 0x9A, 0xFE, 0xDF, 0xE9, 0xAB, 0x88, 0x77, 0x8A, 0x88, 0xCD, - 0x9B, 0xC8, 0xA9, 0x88, 0x88, 0x9C, 0x9A, 0xED, 0xAD, 0xD9, 0xDE, 0x89, 0xEB, 0x9C, 0xFE, 0xEF, 0xFF, 0xFE, 0xFD, - 0x9B, 0xD9, 0xBD, 0xAB, 0xFE, 0xDF, 0xE9, 0xBC, 0x88, 0x88, 0x8B, 0x98, 0xDD, 0xAB, 0xC9, 0xAA, 0x88, 0x88, 0xAD, - 0x9B, 0xED, 0xBE, 0xE9, 0xDE, 0x99, 0xEC, 0x9D, 0xFE, 0xFF, 0xFF, 0xFF, 0xFD, 0xAC, 0xE9, 0xCE, 0xAC, 0xFE, 0xDF, - 0xE9, 0xCC, 0x89, 0x88, 0x8C, 0x99, 0xEE, 0xAC, 0xC9, 0xBB, 0x88, 0x88, 0xAE, 0x9B, 0xFD, 0xBF, 0xE9, 0xEE, 0x99, - 0xEC, 0x9D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xAD, 0xE9, 0xDE, 0xBD, 0xFE, 0xEF, 0xEA, 0xDD, 0x99, 0x88, 0x9D, 0xA9, - 0xEE, 0xAD, 0xDA, 0xCC, 0x89, 0x88, 0xBE, 0xAC, 0xFE, 0xCF, 0xEA, 0xEE, 0xAA, 0xED, 0x9E, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFE, 0xBE, 0xEA, 0xDF, 0xCE, 0xFE, 0xEF, 0xEB, 0xED, 0x9A, 0x88, 0xAD, 0xAA, 0xFE, 0xBE, 0xDA, 0xDC, 0x99, 0x98, - 0xCE, 0xBD, 0xFE, 0xDF, 0xEA, 0xFF, 0xAB, 0xFD, 0xAE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xCE, 0xDA, 0xEF, 0xCE, 0xFE, - 0xFF, 0xFC, 0xED, 0x9A, 0x88, 0xBE, 0xBB, 0xFE, 0xBE, 0xDB, 0xED, 0xAA, 0xA9, 0xDF, 0xBD, 0xFD, 0xEF, 0xEB, 0xFF, - 0xBC, 0xFE, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xDF, 0xEB, 0xEF, 0xDF, 0xFF, 0xFF, 0xFD, 0xFC, 0x9B, 0x99, 0xCE, - 0xBC, 0xFE, 0xCF, 0xEC, 0xFE, 0xBB, 0xB9, 0xEF, 0xCE, 0xFD, 0xEF, 0xEC, 0xFF, 0xCD, 0xFE, 0xCE, 0xFE, 0xFF, 0xFF, - 0xFF, 0xFE, 0xDF, 0xEC, 0xEF, 0xDF, 0xFF, 0xFF, 0xFD, 0xFC, 0xAC, 0xAA, 0xCE, 0xCD, 0xFE, 0xDF, 0xEC, 0xFE, 0xCC, - 0xBA, 0xEF, 0xDE, 0xED, 0xFF, 0xED, 0xFF, 0xDD, 0xEE, 0xCF, 0xEE, 0xFF, 0xFF, 0xFF, 0xFE, 0xEF, 0xEC, 0xEF, 0xEF, - 0xFF, 0xFF, 0xFE, 0xFC, 0xBC, 0xAB, 0xDD, 0xDD, 0xFE, 0xDF, 0xED, 0xFE, 0xCD, 0xCB, 0xFF, 0xEE, 0xEC, 0xFF, 0xDD, - 0xFF, 0xEE, 0xEE, 0xDF, 0xEE, 0xFF, 0xFF, 0xFF, 0xFE, 0xEF, 0xED, 0xFF, 0xEF, 0xFF, 0xFF, 0xFF, 0xFC, 0xCD, 0xAC, - 0xED, 0xDE, 0xFE, 0xEF, 0xFE, 0xFE, 0xDE, 0xDC, 0xFF, 0xEF, 0xEC, 0xFF, 0xDE, 0xFF, 0xFF, 0xEE, 0xEF, 0xEE, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xCD, 0xAD, 0xFD, 0xDF, 0xFE, 0xEF, 0xFF, 0xFE, - 0xEE, 0xED, 0xFF, 0xFF, 0xEC, 0xFF, 0xDF, 0xFE, 0xFF, 0xEF, 0xFF, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xFE, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xDD, 0xBE, 0xFD, 0xEF, 0xFF, 0xFF, 0xFF, 0xFE, 0xEF, 0xED, 0xFF, 0xFF, 0xEB, 0xFF, - 0xDF, 0xFE, 0xFF, 0xEF, 0xFF, 0xEF, 0xFF, 0xFF, 0xFF, 0xEF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xEE, - 0xBE, 0xFD, 0xEF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xEE, 0xFF, 0xFF, 0xEB, 0xFF, 0xDF, 0xFE, 0xFF, 0xEF, 0xFF, 0xEF, - 0xFF, 0xFF, 0xFF, 0xEF, 0xFF, 0xFF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xFE, 0xBF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFE, 0xEF, 0xEE, 0xFF, 0xFF, 0xFC, 0xFF, 0xEF, 0xFE, 0xFF, 0xEF, 0xFF, 0xEF, 0xFF, 0xFF, 0xFF, 0xEF, 0xFF, 0xFF, - 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xAF, 0xFE, 0xFF, 0xFF, 0xFF, 0xEF, 0xFE, 0xEF, 0xEE, 0xFF, 0xFF, 0xFC, - 0xFF, 0xEF, 0xFE, 0xFF, 0xEF, 0xFF, 0xEF, 0xFF, 0xFF, 0xFF, 0xDF, 0xFF, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xAF, 0xFE, 0xFF, 0xFF, 0xFF, 0xEF, 0xFE, 0xEF, 0xEE, 0xFF, 0xFF, 0xFC, 0xFF, 0xEF, 0xFE, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xFF, 0xFF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xAE, 0xFE, 0xFF, 0xFF, 0xFF, - 0xEF, 0xFF, 0xEF, 0xED, 0xFF, 0xFF, 0xFC, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; +#include "code/fbdemo_wipe1/z_fbdemo_wipe1.c" Gfx sWipeDList[] = { gsDPPipeSync(), @@ -138,14 +13,14 @@ Gfx sWipeDList[] = { gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0), gsDPSetPrimDepth(0, 0), - gsDPLoadTextureBlock_4b(sWipeTexture, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, + gsDPLoadTextureBlock_4b(sWipe1Tex, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, 11, G_TX_NOLOD), - gsDPLoadMultiBlock_4b(sWipeTexture, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + gsDPLoadMultiBlock_4b(sWipe1Tex, 0x0100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 6, 6, 11, 1), gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsSPDisplayList(0x08000000), - gsSPVertex(sWipeVtx, 25, 0), + gsSPVertex(sWipe1Vtx, 25, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), gsSP2Triangles(5, 6, 7, 0, 6, 8, 9, 0), gsSP2Triangles(8, 10, 11, 0, 10, 12, 13, 0), diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 1206ca8c2d..81d576d117 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -20,7 +20,7 @@ void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Hit(ArrowFire* this, GlobalContext* globalCtx); -#include "z_arrow_fire_gfx.c" +#include "overlays/ovl_Arrow_Fire/ovl_Arrow_Fire.c" const ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, @@ -189,9 +189,9 @@ void ArrowFire_Update(Actor* thisx, GlobalContext* globalCtx) { } } -void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { +void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) { ArrowFire* this = THIS; - s32 pad; + GlobalContext* globalCtx = globalCtx2; u32 stateFrames; EnArrow* arrow; Actor* tranform; @@ -236,11 +236,11 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1, 255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64)); - gSPDisplayList(POLY_XLU_DISP++, sVertexDL); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682); } diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c deleted file mode 100644 index d434dbe7ce..0000000000 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c +++ /dev/null @@ -1,190 +0,0 @@ -#include "z_arrow_fire.h" - -static UNK_TYPE texture1[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, - 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, - 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, - 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, - 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, - 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, - 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, - 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, - 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, - 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, - 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, - 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, - 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, - 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, - 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, - 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, - 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, - 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, - 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, - 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, - 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, - 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, - 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, - 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, - 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, - 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, - 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, - 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, - 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, - 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, - 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, - 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, - 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, - 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, - 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, - 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, - 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, - 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, - 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, - 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, - 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, - 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, - 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, - 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, - 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, - 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, - 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -}; - -static UNK_TYPE texture2[] = { - 0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC, - 0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301, - 0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE, - 0x43312030, 0x2B4C82BA, 0x77431607, 0x2B70C7D5, 0xA6B95B13, 0x409C93A6, 0xB87D1D08, 0x367FE1C1, 0x3C261629, - 0x2A508AAB, 0x69410C0C, 0x3986DDDB, 0xB5AE6316, 0x40A0A7A1, 0xAA7D2610, 0x4596F1CD, 0x47281E36, 0x365C97A3, - 0x63450713, 0x499DF0D8, 0xB49E721A, 0x409AB59F, 0x8A662D1C, 0x57AEFBDF, 0x6B404456, 0x536EA49B, 0x6A4D061E, - 0x5CB6FCC6, 0x9A8E7F20, 0x428EBEA0, 0x623F2E2A, 0x69C6FFF0, 0x9A686569, 0x6F83AC92, 0x7F5D0B2A, 0x70CDFFB2, - 0x77848D29, 0x4787C4A0, 0x401D2E3E, 0x7ED9FFFC, 0xC48F7973, 0x8598AE86, 0x9A701339, 0x85E1FFA6, 0x5E859534, - 0x5189C99B, 0x2C0B3455, 0x92E9FFFA, 0xDCAB8071, 0x94ACAD7A, 0xB1882249, 0x9AF1FFB0, 0x6A8F9746, 0x6394CD8D, - 0x290C416F, 0xA5EEFFF4, 0xDCB46B6D, 0xA1BFAD77, 0xB6A43A58, 0xAAF8FFC8, 0x84959963, 0x7BA4CE78, 0x351A588E, - 0xB5E3F9F1, 0xCFAC6077, 0xABCFAC77, 0xA8C05A6A, 0xB2F3FFE1, 0xA3959471, 0x94B9D065, 0x473274A9, 0xBDCDECEF, - 0xC2A05F86, 0xBADDAC78, 0x92D87C7D, 0xAFDEFDF1, 0xBC8C8971, 0xA6D2D45A, 0x584B95BB, 0xC1B3D5ED, 0xB8956697, - 0xC5E9A670, 0x7AE6978F, 0xA4BEF0EF, 0xB9797360, 0xB1E8DD5D, 0x5D5FAFC7, 0xC49CB8E3, 0xAF8C78A5, 0xCBF19D5F, - 0x6AE5A6A3, 0x9398DBE7, 0xB46A5841, 0xB8F2E871, 0x586DC1CD, 0xC78C9DD5, 0xAA878CB1, 0xD8F89249, 0x63DCABB3, - 0x8576C5D8, 0xA95E4430, 0xC0EBEE91, 0x5378CACE, 0xC58087C5, 0xA4859EAE, 0xE1FD8A36, 0x60D0ACBD, 0x7765B9C5, - 0x9C563A2B, 0xCED7E7B4, 0x5484C7CC, 0xB66F7CBB, 0x9F81A898, 0xE3FF8D2E, 0x63C8B0BA, 0x6D69B8B0, 0x93573B2E, - 0xE0C2CED2, 0x6898C0C3, 0x97587EBC, 0x9D749570, 0xDEFF9D36, 0x67C8B4A8, 0x6682BD9B, 0x93643E37, 0xF0B4A8DE, - 0x86A9B6B0, 0x70448BBE, 0x99617545, 0xD1FFB84E, 0x70CAB48C, 0x64A4BD8D, 0x96763D41, 0xFAAC82DA, 0xA7B6AE9A, - 0x4D359AC0, 0x90494F27, 0xC0FFD675, 0x80CCAD6D, 0x63C1B681, 0x9C85374E, 0xFFA069C9, 0xC1BAA785, 0x3936A4B6, - 0x7D342E18, 0xA9FFEEA5, 0x9AC59F56, 0x60D0A873, 0x9288315E, 0xFB8669B6, 0xD0B6A473, 0x3C47A39A, 0x6228241B, - 0x8BFFF6CD, 0xB7BB8F47, 0x57CFA169, 0x77782C6B, 0xE56478AA, 0xD6AC9E64, 0x4E61977C, 0x4B232428, 0x6FFFEBE5, - 0xD0AF813C, 0x44C2A266, 0x5B61296E, 0xC04188A8, 0xD4A09051, 0x5D788B61, 0x3E202234, 0x58F9D7DF, 0xDEA27332, - 0x31AE9A6C, 0x3E4B2F62, 0x902688B3, 0xD0937A3F, 0x5D7D8B58, 0x37241F35, 0x46F2C5BF, 0xD7956528, 0x1E918E76, - 0x3442424A, 0x601774C3, 0xCB8F6630, 0x48698261, 0x333C2729, 0x3CECBF95, 0xC2885420, 0x11717B78, 0x4952673A, - 0x3D1153CD, 0xC994602F, 0x2D496F6D, 0x31674418, 0x32E7CA6C, 0xA77D4318, 0x09526672, 0x6B6F963E, 0x2B1036D0, - 0xCAA26E3C, 0x1B2A5A7B, 0x3798700F, 0x2BDFD94D, 0x8C773712, 0x043C606C, 0x9086B955, 0x281225C9, 0xC7AD8954, - 0x141B4085, 0x53CB9C10, 0x26D3E63A, 0x757A3B11, 0x0131666F, 0xAB87BA6A, 0x2E151FBF, 0xC1AEA16A, 0x1721388C, - 0x81ECBB17, 0x23C1EE30, 0x6688561E, 0x02317381, 0xA36A9566, 0x3B171FB9, 0xB5A5AF7A, 0x1B384395, 0xABFBC81D, - 0x20AAEB28, 0x61987838, 0x05358299, 0x85405D4E, 0x45181FB5, 0xA695B083, 0x1C55569C, 0xCEFFCF1E, 0x1A8CDA24, - 0x62A39755, 0x0A398FAE, 0x601A2A2C, 0x49161FB1, 0x9A8BAC8A, 0x23736DA0, 0xE0FFD61E, 0x136BAF23, 0x70ABAD6D, - 0x143D95BD, 0x41030D16, 0x41151DAA, 0x938BAA94, 0x2E8A8BA7, 0xE6FFD921, 0x0C4A7D2D, 0x7CACAB70, 0x244093C3, - 0x38020F11, 0x2F151CA3, 0x9293ABA1, 0x3995AAB7, 0xEDF7D924, 0x072F5842, 0x83AE9C66, 0x3F498EC7, 0x420D2812, - 0x1E151F9B, 0x989CB0B2, 0x4697C5CE, 0xF5F0D626, 0x061B435B, 0x85B18A5B, 0x5F568BCD, 0x54245213, 0x12172593, - 0x9FA1BAC0, 0x5291D4E1, 0xFAF0D123, 0x0711416F, 0x82B2765B, 0x84668FCB, 0x684D8212, 0x1318308A, 0xA3A2C2C6, - 0x5F88D3EE, 0xFEF6C81B, 0x0B104276, 0x85B06A72, 0xA97896C3, 0x7C81AC19, 0x24194083, 0xA2A0C6C4, 0x6A82CCF1, - 0xFFFFB910, 0x14173E77, 0x8BAE6992, 0xC6879BB4, 0x92B3C933, 0x3C1D4F7D, 0x9DA2CCBE, 0x7381C6E6, 0xFFFFB111, - 0x26233975, 0x92AF6DAF, 0xDB949AA3, 0xADDBDD64, 0x5927597B, 0x99AAD4B9, 0x7687C6D5, 0xFCFFB736, 0x432D3A78, - 0x98B371BD, 0xE5A0989E, 0xCCF2EAA0, 0x753C5C80, 0x9DB9E3BC, 0x7896CFBF, 0xF6FFCB72, 0x64323F81, 0x9CBC70B4, - 0xE3AC9EAD, 0xE6FBF6CF, 0x8B5C5C85, 0xA7C8F4C2, 0x7AA6D9A3, 0xF0FFE2A9, 0x8032448D, 0xA4C970A0, 0xDBB5AAC6, - 0xF7FEFDE7, 0xA3806187, 0xB0D6FFC9, 0x7FB5D686, 0xE7FFF0D2, 0x8D2F4E98, 0xABD7768D, 0xCFB9B4E1, 0xF8F8FFE7, - 0xB29B7089, 0xB7E4FFCD, 0x8CB8BF65, 0xD5FFF0D7, 0x8D34609D, 0xB4E48385, 0xC3BAB0F1, 0xE2E8FEDC, 0xB5A07A8D, - 0xBDEFFFD0, 0x9AAB9543, 0xB9FFE9C3, 0x80447497, 0xC0EF9C90, 0xBDB997E5, 0xC2CCFBD4, 0xAB8F7387, 0xC8F8FFD4, - 0xA4936324, 0x98FFE5B3, 0x6F577E8A, 0xCEFABCA8, 0xC0BC71C7, 0x9EADF4D2, 0x916D5D7B, 0xD4FEFFD6, 0xA575390F, - 0x76FFE4A6, 0x656A7F7D, 0xDDFFDABF, 0xC8BF4CA1, 0x8095E8CC, 0x744A3B66, 0xDAFFFFD6, 0x9D5B1E04, 0x5DFDDF9A, - 0x6075787A, 0xECFFF1CD, 0xCEC42E7C, 0x7087D6BF, 0x5A311F49, 0xD4FFFFD0, 0x8E4B1100, 0x50F7D892, 0x68767788, - 0xF6FFFDCE, 0xCDC31E65, 0x6E88C3A8, 0x4922153A, 0xC3FFFDC4, 0x7F410B03, 0x4BEED08B, 0x747682A0, 0xFDFFFEBF, - 0xBCB61456, 0x7792B18B, 0x3E19153D, 0xB5FFF8B2, 0x733B0908, 0x4DE0C487, 0x827797BC, 0xFFFFF8AB, 0x9E9B0E50, - 0x869E9F6E, 0x3714184D, 0xB5FFF09E, 0x67380C11, 0x56CFB285, 0x8F7EADD4, 0xFFFFED96, 0x78730A53, 0x9CA98F57, - 0x310F1C69, 0xC8FFE18A, 0x5D35161D, 0x64BC9E84, 0x978BBFE7, 0xFFFFDD81, 0x5348075A, 0xB5B07F48, 0x290A2088, - 0xE1FFCF75, 0x5335272B, 0x74AD877F, 0x9C9DCFF3, 0xFFFEC86E, 0x35260864, 0xC6B16F3E, 0x200422A6, 0xF8FCB95F, - 0x47373A3C, 0x86A36F73, 0x9FB0D9FA, 0xFFF7B15B, 0x21110E70, 0xCDAB6139, 0x160027C1, 0xFFF09F4C, 0x3B3A4B4D, - 0x989D5B5D, 0x9DB5D9FE, 0xFFEA994C, 0x1509177B, 0xC8A15C3C, 0x0E022BD1, 0xFFE1873B, 0x2F3E5460, 0xA8954F44, - 0x96A6CEFF, 0xFFD7823C, 0x0C0A2784, 0xB9956343, 0x0B0731DB, 0xFFCE722C, 0x22415672, 0xB58C4A31, 0x8A88BAFF, - 0xFAC56E2E, 0x060F398F, 0xA989764A, 0x0A0C3AE1, 0xFFB85F20, 0x17425787, 0xBF824826, 0x775FA3FF, 0xF1B66121, - 0x03164B98, 0x9A818E4A, 0x0A1040D4, 0xE8974D14, 0x11405495, 0xBB74401F, 0x603D86F1, 0xD7A35414, 0x02195694, - 0x8476943E, 0x171A46C5, 0xCC7D3D0C, 0x0D3E599E, 0xAE6C371C, 0x4A2D72E3, 0xC38F4C0E, 0x03205F96, 0x766A792A, - 0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17 -}; - -static UNK_TYPE vertices1[] = { - 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, - 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, - 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, - 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, - 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, - 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, - 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, - 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, - 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, - 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, - 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, - 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, - 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, - 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, - 0x05000419, 0x273FA2FF, -}; - -static UNK_TYPE vertices2[] = { - 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, - 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, - 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, - 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, - 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF, -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(texture1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 1, 15), - gsDPLoadMultiBlock(texture2, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 1, G_TX_NOLOD), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 1, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_LIGHTING), - gsSPEndDisplayList(), -}; - -static Gfx sVertexDL[] = { - gsSPVertex(vertices1, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), - gsSP2Triangles(5, 4, 6, 0, 2, 7, 8, 0), - gsSP2Triangles(2, 8, 4, 0, 4, 8, 9, 0), - gsSP2Triangles(4, 9, 6, 0, 6, 9, 10, 0), - gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0), - gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), - gsSP2Triangles(10, 13, 14, 0, 12, 15, 16, 0), - gsSP2Triangles(12, 16, 13, 0, 13, 16, 17, 0), - gsSP2Triangles(13, 17, 14, 0, 14, 17, 18, 0), - gsSP2Triangles(16, 19, 17, 0, 17, 19, 20, 0), - gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0), - gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0), - gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0), - gsSP2Triangles(23, 27, 28, 0, 26, 29, 30, 0), - gsSP2Triangles(26, 30, 27, 0, 27, 30, 31, 0), - gsSP1Triangle(27, 31, 28, 0), - gsSPVertex(vertices2, 11, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(3, 5, 1, 0, 1, 5, 6, 0), - gsSP2Triangles(1, 6, 2, 0, 2, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index f909f0d982..53009d2da2 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -21,7 +21,7 @@ void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Hit(ArrowIce* this, GlobalContext* globalCtx); -#include "z_arrow_ice_gfx.c" +#include "overlays/ovl_Arrow_Ice/ovl_Arrow_Ice.c" const ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, @@ -235,11 +235,11 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16)); - gSPDisplayList(POLY_XLU_DISP++, sVertexDL); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676); } diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c deleted file mode 100644 index 6ade81b98b..0000000000 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c +++ /dev/null @@ -1,190 +0,0 @@ -#include "z_arrow_ice.h" - -static UNK_TYPE texture1[] = { - 0x00061507, 0x00000000, 0x295A2B08, 0x10030F03, 0x0D070006, 0x00031625, 0x3F230012, 0x79590000, 0x00102C2A, - 0x254A1B0E, 0xAFF66600, 0x00467E29, 0x08020000, 0x03383E0B, 0x0501000A, 0x31211C05, 0x00031C27, 0x4CA92F13, - 0xB2EF5500, 0x057EBF37, 0x00000000, 0x0E493F13, 0x00000002, 0x335C3E03, 0x00000E07, 0x3C761200, 0x447E2200, - 0x00426710, 0x00000000, 0x071C2208, 0x00000168, 0xE18F0F00, 0x00060E00, 0x0A100000, 0x0514022D, 0x1B020400, - 0x00000000, 0x093A3F0A, 0x050010AE, 0xDA360000, 0x00070500, 0x00000000, 0x00001461, 0x3E050024, 0x24000000, - 0x184E3755, 0x9132043C, 0x2F000000, 0x12020A54, 0x3C000200, 0x00000F3E, 0x2B041159, 0x2C000000, 0x030B22CE, - 0xF9420000, 0x00000301, 0x371160EF, 0xAC6D2B00, 0x00000008, 0x05000D27, 0x06000000, 0x00001A91, 0x760B0000, - 0x000B030A, 0x747DB0BD, 0xBDA31D00, 0x00000000, 0x00000000, 0x00000511, 0x01000209, 0x03020015, 0x583A0010, - 0xC1E0892D, 0x532D0000, 0x03160600, 0x00050001, 0x15142E4E, 0x07000500, 0x100D004C, 0xB65C001B, 0xB2DF9417, - 0x00000020, 0x57420400, 0x45882F00, 0x18093B3E, 0x01182F0D, 0x1405003F, 0xB75B001E, 0x5DC2E14F, 0x00000161, - 0xBC4A005A, 0xECF84A00, 0x0011330F, 0x0044591C, 0x01001C7C, 0xB122001F, 0x5DE4FF71, 0x00000177, 0xBA3218D9, - 0xFFC41700, 0x1E7B5A1C, 0x2B769635, 0x0044D5FA, 0x9E000530, 0xC7FFCE35, 0x00000035, 0x663441CF, 0xC9380000, - 0x3D733C28, 0x3E709726, 0x0086FAF1, 0x9B170D4C, 0xC9812700, 0x000E1A02, 0x4C642544, 0x2B000000, 0x0D0E0508, - 0x0A252F03, 0x00335297, 0xC75B014E, 0x77470600, 0x00160F00, 0x3A350016, 0x29070000, 0x0C3A3911, 0x00000003, - 0x0100004B, 0x8F4B051C, 0x7F6C1C00, 0x00000000, 0x00000437, 0x2E030001, 0x2A6E6B2C, 0x0604000E, 0x0B000004, - 0x19350814, 0x3E63813D, 0x13000000, 0x00000117, 0x06000000, 0x14362911, 0x312E021F, 0x13000000, 0x010C000C, - 0x10B9EF72, 0x2D010000, 0x040C0C10, 0x02000000, 0x33410306, 0x3B30071D, 0x07000000, 0x00000000, 0x1BC2A129, - 0x0D000000, 0x050E1112, 0x0100002E, 0xD2C22E00, 0x21593403, 0x00000000, 0x01010000, 0x0E451B00, 0x00000000, - 0x0000060D, 0x00000061, 0xFFEA2E00, 0x3DA04200, 0x00000000, 0x06140B00, 0x00040200, 0x00000000, 0x00061B0C, - 0x00000037, 0x8D620500, 0x2A8F5801, 0x00000000, 0x082E3404, 0x00000000, 0x00000003, 0x0A201B02, 0x00000000, - 0x06000000, 0x11826503, 0x00060400, 0x07303402, 0x07010007, 0x2F1E0B0A, 0x09080000, 0x03000000, 0x00000000, - 0x07452500, 0x0E361100, 0x000B0A00, 0x06000018, 0x3E170600, 0x00060F0D, 0x3E190000, 0x00000000, 0x00000000, - 0x21360700, 0x00000000, 0x00000007, 0x09000000, 0x0A857124, 0x703C0000, 0x01000000, 0x00000000, 0x08050000, - 0x00000000, 0x00000000, 0x00000000, 0x32D97112, 0x4A1B0001, 0x02050000, 0x00000000, 0x021A0A00, 0x00000613, - 0x07000000, 0x00000000, 0x1E5D1700, 0x04000000, 0x37550400, 0x00000000, 0x14300600, 0x00003E5B, 0x08000000, - 0x00000000, 0x2F2F0000, 0x00000007, 0x90840300, 0x0F070000, 0x06070000, 0x00055A62, 0x00000000, 0x00000020, - 0xA77B0700, 0x0106000F, 0x612D0006, 0x1B030000, 0x00000001, 0x0000211A, 0x00000000, 0x0000002E, 0x944A0103, - 0x3B390200, 0x04000011, 0x14000005, 0x302F0D10, 0x01000000, 0x00000000, 0x00000009, 0x10000015, 0x5D290000, - 0x00000015, 0x09000027, 0x73510F09, 0x37410700, 0x00061408, 0x00000000, 0x25582D09, 0x12020E03, 0x0C070007, - 0x00031627, 0x41240011, 0x795B0000, 0x00102D29, 0x244B1C0D, 0xB0F76600, 0x00467C28, 0x08020000, 0x02383E0B, - 0x0401000A, 0x32231C04, 0x00031B28, 0x4CA83112, 0xB2EF5500, 0x057EBE38, 0x00000000, 0x0D493D13, 0x00000002, - 0x325C3F03, 0x00000E08, 0x3D761200, 0x457F2200, 0x0043660F, 0x00000000, 0x071D2208, 0x00000168, 0xE1901000, - 0x00070E00, 0x09110000, 0x0515022D, 0x1B020400, 0x00000000, 0x093B3E09, 0x050011AE, 0xD9370000, 0x00070500, - 0x00000000, 0x00001462, 0x3E050024, 0x25000000, 0x184E3554, 0x9431043C, 0x2E000000, 0x12010955, 0x3C000300, - 0x0000103E, 0x2B04115A, 0x2D000000, 0x030B22CE, 0xF9420000, 0x00000301, 0x361161EF, 0xAC6B2B00, 0x00000008, - 0x05000D27, 0x07000000, 0x00001A8F, 0x760B0000, 0x000B030A, 0x727DB1BD, 0xBCA21C00, 0x00000000, 0x00000000, - 0x00000610, 0x00000208, 0x03030016, 0x57390010, 0xC1E1892E, 0x522C0000, 0x03160600, 0x00060001, 0x14142F4E, - 0x07000500, 0x100E004B, 0xB55C001B, 0xB0DD9416, 0x0000001F, 0x57430500, 0x468A3000, 0x16093B3E, 0x01192F0D, - 0x1405003E, 0xB65B001D, 0x5CC1E04E, 0x0000005E, 0xBC4B0058, 0xEBFA4B00, 0x0011340E, 0x0045591C, 0x02001C7C, - 0xB223001E, 0x5CE5FF71, 0x00000176, 0xB93216D8, 0xFFC21700, 0x1D7B5B1C, 0x2B759636, 0x0041D4FC, 0x9D000530, - 0xC7FFCE36, 0x00000036, 0x663540CE, 0xC6360000, 0x3C743E29, 0x3E719827, 0x0085FAF0, 0x9B160D4E, 0xC9812600, - 0x000F1A03, 0x4B642646, 0x2B000000, 0x0D0E0608, 0x0A253002, 0x00345299, 0xC85B014E, 0x75470600, 0x00160F00, - 0x39350015, 0x29070000, 0x0C3A3911, 0x00000003, 0x0100004B, 0x914B051E, 0x7D6C1C01, 0x00000000, 0x00000437, - 0x2E030001, 0x2A6F6A2A, 0x0604000E, 0x0B000003, 0x1A350814, 0x3E63813E, 0x13000000, 0x00000118, 0x07000000, - 0x13382911, 0x302E0320, 0x14000000, 0x010D000C, 0x0FB9EE73, 0x2F000000, 0x040B0C11, 0x02000000, 0x36440307, - 0x3B30071D, 0x07000000, 0x00000000, 0x1ABF9F29, 0x0E000000, 0x050F1112, 0x0100002D, 0xD3C42B00, 0x22593404, - 0x00000000, 0x01010000, 0x0E451B00, 0x00000000, 0x0000070C, 0x00000061, 0xFFED2F00, 0x3EA04300, 0x00000000, - 0x05140B00, 0x00030200, 0x00000000, 0x00061C0B, 0x00000037, 0x8F640500, 0x2A8F5901, 0x00000000, 0x082D3504, - 0x00000000, 0x00010003, 0x0A201B02, 0x00000000, 0x07000000, 0x11826503, 0x00050400, 0x072F3503, 0x07010007, - 0x2F1E0C0B, 0x09080000, 0x03000000, 0x00000000, 0x07462500, 0x0E361100, 0x000B0900, 0x04000018, 0x3E160600, - 0x00060F0B, 0x3D190000, 0x00000000, 0x00000000, 0x21370600, 0x00000000, 0x00000007, 0x09000000, 0x0B866F22, - 0x713C0000, 0x02000000, 0x00000000, 0x08060000, 0x00000000, 0x00000000, 0x00000000, 0x30D76F12, 0x4B1A0001, - 0x02050000, 0x00000000, 0x021A0A00, 0x00000714, 0x08000000, 0x00000000, 0x1E5C1700, 0x03000000, 0x36560400, - 0x00000000, 0x15300600, 0x00003F5D, 0x07000000, 0x00000000, 0x2E2F0000, 0x00000008, 0x8F840300, 0x0F060000, - 0x06070000, 0x00065B61, 0x00000000, 0x00000020, 0xA67C0700, 0x0006000E, 0x612D0006, 0x1B030000, 0x00000001, - 0x0001211B, 0x00000000, 0x0000002F, 0x93490103, 0x3B390200, 0x04000011, 0x13000005, 0x2F2E0C11, 0x02000000, - 0x00000000, 0x00000008, 0x14030015, 0x5D2C0000, 0x00000115, 0x08000027, 0x724F0F0A, 0x353D0600, -}; - -static UNK_TYPE texture2[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x02030404, - 0x04040303, 0x03030303, 0x03020202, 0x02020201, 0x01010000, 0x00000000, 0x01010305, 0x090B0D0D, 0x0C0B0A0A, - 0x0A0A0B0A, 0x09080707, 0x07070707, 0x07070705, 0x04030201, 0x0304070B, 0x11141717, 0x16141313, 0x14151514, - 0x110D0B0B, 0x0C0D0F12, 0x13141413, 0x110C0905, 0x07070B12, 0x181E2121, 0x201F1F20, 0x2225221D, 0x17120F0F, - 0x13171D23, 0x292D2D2A, 0x2219120A, 0x07080C13, 0x1B202223, 0x22232629, 0x2C2B261F, 0x17121112, 0x18202B36, - 0x4046453D, 0x3022150C, 0x07080D15, 0x1C202325, 0x272A2E33, 0x3431281E, 0x16121217, 0x202E3F4F, 0x595D5A4E, - 0x3B27170C, 0x07090F16, 0x1C202327, 0x2B32383C, 0x3B34291E, 0x1613161E, 0x2D425866, 0x6D6E6856, 0x3F28160B, - 0x070A1117, 0x1C20252A, 0x333B4245, 0x41382C21, 0x18161B28, 0x3D586E7A, 0x7D7A6F58, 0x3C231309, 0x070C1318, - 0x1E222932, 0x3C464E4F, 0x4A413529, 0x1F1D2232, 0x4C6A8189, 0x88816D50, 0x331D0E07, 0x090F181F, 0x252B343F, - 0x4A555E5F, 0x5C524537, 0x2B272D40, 0x5D7C9197, 0x91816444, 0x29160B07, 0x0F19222A, 0x323B4550, 0x5D6D787D, - 0x796B5B49, 0x3C373E52, 0x7190A2A2, 0x93785537, 0x20110A0A, 0x1D28343E, 0x47505A64, 0x738698A1, 0x9C8D7761, - 0x534E566D, 0x8DA6B0A6, 0x8D69472C, 0x190F0E13, 0x36434F57, 0x5F676E77, 0x869BB0BC, 0xBBAF9A84, 0x74717D93, - 0xADBCBBA5, 0x835E412A, 0x1D1A1E27, 0x5360696E, 0x73777C82, 0x8C9EB3C5, 0xCECBBEAB, 0x9F9FA9BC, 0xCACEBFA0, - 0x7A593F2F, 0x282B3545, 0x6F767778, 0x78787A7F, 0x8593A8C2, 0xD6DDDAD2, 0xCCCBD2DA, 0xDFD7BE9B, 0x775A473C, - 0x3A445463, 0x7E7D7875, 0x716D6D71, 0x78849BBA, 0xD8EAEDED, 0xEBEBEDED, 0xEBDABB97, 0x7862554F, 0x5562727B, - 0x7F766E67, 0x625D5C5F, 0x697991B2, 0xD6EFF7F5, 0xF3F4F7F7, 0xEDD5B496, 0x7F70696B, 0x74808787, 0x796C5F57, - 0x514D4C52, 0x5E738EAF, 0xD1EAF1ED, 0xEBEDF4F4, 0xE6CCB099, 0x8A818087, 0x91959288, 0x7261534A, 0x4541434A, - 0x597290AE, 0xCADCE0DC, 0xDADDE5E6, 0xD9C2AD9D, 0x9390949D, 0xA2A09584, 0x6C5A4B41, 0x3B3B3D46, 0x57718EA9, - 0xBDC9CBCA, 0xCACED2CF, 0xC3B3A398, 0x92939AA1, 0xA39D907F, 0x6955453C, 0x38373C46, 0x58718DA5, 0xB7C1C5C6, - 0xC9CCCAC2, 0xB4A59A91, 0x8D91979D, 0x9E998D7D, 0x6752423A, 0x38383C46, 0x576F8AA2, 0xB3BFC6CB, 0xCECCC5B7, - 0xA7988D86, 0x83868E95, 0x98968D7D, 0x644F403B, 0x393A3E47, 0x566C859C, 0xAFBDC7CE, 0xCEC8BCAA, 0x9A8A7F78, - 0x777A838D, 0x94958C7A, 0x5E4C423E, 0x3E3E4047, 0x54677D94, 0xA9BAC7CD, 0xC9C0AF9F, 0x8E80746D, 0x6B707A86, - 0x91928975, 0x5A4B4543, 0x43434448, 0x5161768C, 0xA3B5C3C7, 0xC1B4A394, 0x85776D66, 0x63687480, 0x8C8D836F, - 0x574D4848, 0x4848484A, 0x505D7087, 0x9DB1BDBE, 0xB6A9998B, 0x7F746A63, 0x62656F7B, 0x84847A67, 0x554F4D4D, - 0x4D4D4E4F, 0x535F6F85, 0x9BAEB8B8, 0xAFA29488, 0x7E756B65, 0x62656D75, 0x7B797061, 0x56535353, 0x5556585A, - 0x6069788A, 0x9EAEB6B4, 0xAB9F948A, 0x817A726B, 0x67686B6F, 0x726E665D, 0x585A5C5E, 0x62676C70, 0x767E8A98, - 0xA6B2B6B4, 0xACA1978E, 0x89837C76, 0x716E6C6C, 0x6A66605C, 0x5F62686F, 0x7680888F, 0x94999FA7, 0xAFB6B7B5, - 0xAEA49C96, 0x928E8983, 0x7D76716B, 0x67625F5D, 0x676D7681, 0x8E9BA6AD, 0xB0B1B1B2, 0xB4B7B9B6, 0xB1A8A29E, - 0x9B999590, 0x877F7770, 0x6A656364, 0x71788392, 0xA3B2BDC3, 0xC3BFBAB7, 0xB6B8B9B7, 0xB3ABA6A3, 0xA3A19E98, - 0x91888079, 0x736E6C6D, 0x7A818C9C, 0xAFBFC9CE, 0xCBC4BDB7, 0xB7B8BBBA, 0xB4ACA6A4, 0xA4A5A4A0, 0x9A958F89, - 0x837E7A79, 0x868A94A3, 0xB5C4CED0, 0xCCC5BEBA, 0xBBBFC1BF, 0xB7AEA8A5, 0xA7A9ABAC, 0xACAAA8A4, 0x9D968D88, - 0x8F9199A7, 0xB7C5CCCD, 0xC9C4C0BF, 0xC3C7C8C2, 0xB7ADA7A6, 0xA8ADB3BA, 0xBFC3C4BF, 0xB7AB9E94, 0x97979FAB, - 0xB9C3C8C9, 0xC7C5C4C7, 0xCCCFCBC2, 0xB6ADA8A8, 0xADB5C1CD, 0xD8E0E0D9, 0xCCBBAB9E, 0x9C9DA4AE, 0xBAC1C5C6, - 0xC6C7CAD0, 0xD4D3CBC0, 0xB5ADABAD, 0xB6C2D2E3, 0xF1F9F8ED, 0xDAC5B2A3, 0xA2A4ABB4, 0xBBC1C4C5, 0xC8CCD2D7, - 0xD8D3CABE, 0xB4B0B0B6, 0xC1D2E5F7, 0xFFFFFFF5, 0xE0C9B6A9, 0xA9ABB1B7, 0xBDC1C4C7, 0xCBD1D8DC, 0xDAD4C9BF, - 0xB7B4B7BF, 0xCEE1F5FF, 0xFFFFFFF5, 0xDEC8B7AD, 0xB0B2B7BC, 0xC0C3C7CB, 0xD1D8DEDF, 0xDCD6CDC4, 0xBEBBBFC9, - 0xD9EDFFFF, 0xFFFFFFEE, 0xD9C6B9B1, 0xB6BABEC2, 0xC5C8CCD2, 0xD8DFE3E4, 0xE1DBD4CC, 0xC6C4C8D2, 0xE2F6FFFF, - 0xFFFFF7E5, 0xD3C5BBB6, 0xBEC2C6C9, 0xCDD0D5DA, 0xE1E6EAEB, 0xE9E4DED6, 0xD0CED1DB, 0xEAFAFFFF, 0xFFFDEEDD, - 0xCFC5BFBD, 0xC7CBCFD3, 0xD6DADEE3, 0xE9EFF4F7, 0xF4EFE7E0, 0xDBD8DBE4, 0xF2FFFFFF, 0xFFF4E6D8, 0xCEC7C4C4, - 0xD1D5D9DD, 0xE0E3E7EB, 0xF0F7FEFF, 0xFFFAF2EA, 0xE5E3E6EE, 0xFAFFFFFF, 0xFAEDE0D7, 0xD0CDCCCD, 0xDCE0E3E6, - 0xE9EBEDF0, 0xF5FBFFFF, 0xFFFFFBF4, 0xEFEEF2F9, 0xFFFFFFFE, 0xF4E8DFD8, 0xD4D3D5D7, 0xE6E9EBED, 0xEEEFF1F2, - 0xF5F9FFFF, 0xFFFFFFFD, 0xFAFAFDFF, 0xFFFFFFFA, 0xF0E7E1DD, 0xDBDCDEE2, 0xEDEFEFF0, 0xF0F0F0F1, 0xF2F5FAFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF7, 0xEFE9E5E2, 0xE2E4E7EB, 0xF1F1F0F0, 0xEFEEEEEF, 0xF0F3F6FC, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFDF6, 0xF0ECEAE8, 0xEAECEFF1, 0xF2F1EFEF, 0xEEEDEDED, 0xEFF1F5FA, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFBF6, 0xF2F0EFEF, 0xF1F2F3F3, 0xF3F1EFEE, 0xEDEDEDED, 0xEFF2F5FA, 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFDFAF7, - 0xF5F4F4F5, 0xF6F7F6F5, 0xF3F1F0EF, 0xEEEEEEEF, 0xF1F3F6FA, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFCFAF8, 0xF7F6F7F8, - 0xF8F8F7F5, 0xF5F3F2F1, 0xF0F0F0F1, 0xF3F5F8FA, 0xFCFDFDFD, 0xFDFEFEFE, 0xFDFBFAF9, 0xF8F9F9FA, 0xFAF9F8F7, - 0xF7F5F3F3, 0xF3F2F3F4, 0xF5F7F9FB, 0xFDFDFEFE, 0xFEFEFEFD, 0xFCFBFAFA, 0xF9FAFAFB, 0xFBFAF9F8, 0xF8F7F6F5, - 0xF5F5F5F6, 0xF7F9FAFC, 0xFDFEFEFF, 0xFFFFFEFD, 0xFDFBFBFA, 0xFAFAFBFB, 0xFBFBFBFA, 0xFAF9F8F7, 0xF7F7F8F8, - 0xF9FAFBFC, 0xFEFFFFFF, 0xFFFFFEFD, 0xFCFCFBFB, 0xFBFBFBFC, 0xFCFCFCFB, 0xFBFAFAFA, 0xFAFAFAFA, 0xFBFBFCFD, - 0xFEFFFFFF, 0xFFFFFEFE, 0xFDFCFCFC, 0xFBFCFCFD, 0xFDFDFDFC, 0xFCFCFBFB, 0xFBFBFBFC, 0xFCFCFDFE, 0xFFFFFFFF, - 0xFFFFFFFE, 0xFEFDFDFD, 0xFDFDFDFD, 0xFEFEFDFD, 0xFDFDFDFD, 0xFDFDFDFD, 0xFDFDFEFE, 0xFFFFFFFF, 0xFFFFFFFE, - 0xFEFEFEFD, 0xFDFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, - 0xFEFEFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -}; - -static UNK_TYPE vertices1[] = { - 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, - 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, - 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, - 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, - 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, - 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, - 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, - 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, - 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, - 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, - 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, - 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, - 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, - 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, - 0x05000419, 0x273FA2FF, -}; - -static UNK_TYPE vertices2[] = { - 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, - 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, - 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, - 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, - 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF, -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(texture2, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 1, 15), - gsDPLoadMultiBlock(texture1, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 13, 14), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_LIGHTING), - gsSPEndDisplayList(), -}; - -static Gfx sVertexDL[] = { - gsSPVertex(vertices1, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), - gsSP2Triangles(5, 4, 6, 0, 2, 7, 8, 0), - gsSP2Triangles(2, 8, 4, 0, 4, 8, 9, 0), - gsSP2Triangles(4, 9, 6, 0, 6, 9, 10, 0), - gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0), - gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), - gsSP2Triangles(10, 13, 14, 0, 12, 15, 16, 0), - gsSP2Triangles(12, 16, 13, 0, 13, 16, 17, 0), - gsSP2Triangles(13, 17, 14, 0, 14, 17, 18, 0), - gsSP2Triangles(16, 19, 17, 0, 17, 19, 20, 0), - gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0), - gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0), - gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0), - gsSP2Triangles(23, 27, 28, 0, 26, 29, 30, 0), - gsSP2Triangles(26, 30, 27, 0, 27, 30, 31, 0), - gsSP1Triangle(27, 31, 28, 0), - gsSPVertex(vertices2, 11, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(3, 5, 1, 0, 1, 5, 6, 0), - gsSP2Triangles(1, 6, 2, 0, 2, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index d5c8b80a65..56f14bb07f 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -21,7 +21,7 @@ void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Hit(ArrowLight* this, GlobalContext* globalCtx); -#include "z_arrow_light_gfx.c" +#include "overlays/ovl_Arrow_Light/ovl_Arrow_Light.c" const ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, @@ -233,11 +233,11 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16)); - gSPDisplayList(POLY_XLU_DISP++, sVertexDL); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_light.c", 664); } diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c deleted file mode 100644 index a9580f0ecc..0000000000 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c +++ /dev/null @@ -1,190 +0,0 @@ -#include "z_arrow_light.h" - -static UNK_TYPE texture1[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, - 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, - 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, - 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, - 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, - 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, - 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, - 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, - 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, - 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, - 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, - 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, - 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, - 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, - 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, - 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, - 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, - 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, - 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, - 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, - 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, - 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, - 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, - 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, - 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, - 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, - 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, - 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, - 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, - 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, - 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, - 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, - 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, - 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, - 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, - 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, - 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, - 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, - 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, - 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, - 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, - 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, - 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, - 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, - 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, - 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, - 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -}; - -static UNK_TYPE texture2[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000001, 0x00000000, 0x00000000, 0x00000001, 0x01000000, 0x00000102, 0x02010000, 0x00000001, 0x01010202, - 0x00000000, 0x00000000, 0x00000202, 0x02000000, 0x01010205, 0x07050200, 0x00000001, 0x01010304, 0x02010000, - 0x00000000, 0x00000305, 0x04010001, 0x05030307, 0x0A090401, 0x00000101, 0x01020206, 0x05030200, 0x00000000, - 0x01010408, 0x08030003, 0x08080607, 0x09090602, 0x01000001, 0x01010104, 0x05060603, 0x02010002, 0x0505060A, - 0x0C080404, 0x07090707, 0x06050709, 0x07010000, 0x01010101, 0x05080B0A, 0x06020205, 0x090A0A0C, 0x0F0E0A05, - 0x05080905, 0x05040810, 0x10060000, 0x00010102, 0x050A1113, 0x0E080608, 0x0A0C0D10, 0x1514120D, 0x0E0C0D0B, - 0x09080B15, 0x190F0402, 0x01000308, 0x0A0F161A, 0x180F0A0A, 0x0A0B0B12, 0x191B2A20, 0x221B1F1B, 0x1815141C, - 0x22170806, 0x03030611, 0x1A1F201E, 0x1C140E0E, 0x0D0E0F11, 0x181D2F3D, 0x3F333532, 0x2C261F24, 0x2E230F0D, - 0x0A090E18, 0x242E2D24, 0x1B141010, 0x11161813, 0x1618274A, 0x4E464948, 0x42383030, 0x39311712, 0x16151F24, - 0x2331362A, 0x1B111013, 0x191D201C, 0x1E273145, 0x4F51565B, 0x584C4140, 0x4A3F1C14, 0x1E202D32, 0x242B3631, - 0x22140F14, 0x1D23221D, 0x273C4A4E, 0x675F636D, 0x70645452, 0x564C2616, 0x2D363842, 0x38333F3F, 0x35241817, - 0x242C2A25, 0x2F4F656C, 0x948A7E81, 0x887D6A63, 0x60583B2F, 0x4454575F, 0x5B555C5E, 0x56493E34, 0x39414644, - 0x49627089, 0xBBBAA89B, 0x9B917A70, 0x67595152, 0x677A8184, 0x857F7A7C, 0x756D6A63, 0x5C5D626E, 0x767F8795, - 0xC4D1CABB, 0xB5A68C82, 0x7D706B76, 0x8B969DA7, 0xAEA69592, 0x928C8B8A, 0x857D8094, 0xA5AAA8A5, 0xC4CEC9C7, - 0xC2B69E94, 0x948F8991, 0x9EA4A9B7, 0xBEBDAFA2, 0xA2A49F9A, 0x99959BB7, 0xC9CECAC4, 0xD7CDC8C8, 0xCBC8B6AB, - 0xAAAAA7A0, 0xA0A2ACBD, 0xC6CCC9BD, 0xB4BAB6A8, 0xA3A3AECF, 0xE3E4E0DE, 0xE6DBD4CE, 0xD0D0C6BA, 0xB6B6B3A7, - 0x9FA7B4C7, 0xD5D7D8D3, 0xC9C9CDBF, 0xB1B2BED9, 0xF2ECE3E5, 0xECEAE1DA, 0xDBDDD7CB, 0xC2BFBCB4, 0xADB4C4D7, - 0xE4E7E4DD, 0xD6D6E0DC, 0xC7BABFD4, 0xE9E8DFE2, 0xF0F4EDE8, 0xE6E7E7DD, 0xCFC9CAC9, 0xC8CEDCEA, 0xF3F6F1E7, - 0xE0DEE3E7, 0xDAC2C3D6, 0xE4E8E3E5, 0xF7FBF8F1, 0xECEAEFEB, 0xDFDCDDE0, 0xE2E4E7EF, 0xF7FCFAF4, 0xEFE9E5E7, - 0xE2CDC8D7, 0xE5E9EAEE, 0xFDFEFCF7, 0xF1EBEDF0, 0xE9E8EDF1, 0xF3F0EEF0, 0xF5FBFBF8, 0xF7F3E9E2, 0xDDD6D3E1, - 0xEBEBEBF4, 0xFCFEFEFC, 0xF6F0F1F4, 0xEDEAF3FA, 0xFCF5EBEA, 0xF0F8F8F6, 0xF7F6EEE6, 0xE2E0E4ED, 0xEDE9E1EE, - 0xFAFFFDFD, 0xFAF7F7F7, 0xF2EFF6FB, 0xFBF2E1DF, 0xEEF8F6F2, 0xF4F6F2EE, 0xEAE7ECF2, 0xEEE6E0E5, 0xF6FCFCFD, - 0xFDFCFCF9, 0xF2F0F5FA, 0xFAF3DED8, 0xE8F7F7F3, 0xF4F8F7F6, 0xF2EEEEF0, 0xECE5E2E5, 0xF8FBF5F7, 0xFAFBFAF5, - 0xEBE7F4FC, 0xFAF6E8DD, 0xE8F8FCF8, 0xF8F9FAFA, 0xF9F4EEE9, 0xE4DFE0E9, 0xF9FAF1EE, 0xF2F5F7F5, 0xEBE1EDFB, - 0xFBFAF5EF, 0xF4FCFEFD, 0xFBF8F8FB, 0xFBF7F2EA, 0xE4DCD8E5, 0xF6FBF0EA, 0xECEFF3F2, 0xEDE5EAF9, 0xFDFCFDFC, - 0xFCFDFDFC, 0xF9F5F7FA, 0xFCF9F6F2, 0xEBE0D6E1, 0xEDF9F5EE, 0xEDEEF0F0, 0xEEEBEFFA, 0xFEFEFFFC, 0xF9F6F8FB, - 0xFAF7F6FA, 0xFDFDFBFA, 0xF7E8DCDB, 0xECF7F9F4, 0xF3F1F0EF, 0xECECF3FC, 0xFEFEFEF9, 0xF1EDEEF7, 0xFBFAF9FC, - 0xFEFEFDFC, 0xFBF3DFE0, 0xF0F5FBFA, 0xF7F3F3F4, 0xF1EFF2F8, 0xFAFCFEFA, 0xF1EAE7F0, 0xFAFEFDFE, 0xFFFEFEFD, - 0xFDFBE7E9, 0xF6FBFDFB, 0xF8F3F2F7, 0xF9F4EFF0, 0xF3F6FBFB, 0xF5EEEDF0, 0xFAFFFFFF, 0xFEFDFDFE, 0xFEFDF7F0, - 0xF9FDFCFA, 0xF5ECEAF4, 0xFCF8ECE8, 0xEBEFF7FC, 0xF8F6F7F6, 0xF9FCFEFD, 0xFBFAF8FB, 0xFEFFFEF7, 0xF3FAFCF7, - 0xEFE4E1EA, 0xF7F8EBE1, 0xE4EAEDF5, 0xF6F3F7F8, 0xF7F9FAF9, 0xF5F3F1F0, 0xF4FBFFFA, 0xECEEF6F4, 0xECE1DBE1, - 0xEFF5EDE0, 0xE0E2E0E6, 0xEDEBEFF2, 0xF3F6F6F5, 0xEEECEDE6, 0xE2EEFEFA, 0xEAE3E6E6, 0xE5E2DEDF, 0xE7EDE7DD, - 0xDBDDD8DA, 0xE5E6E8ED, 0xEEF2F4EF, 0xE3D9DFE4, 0xDDE2F7FB, 0xF2E5D8D2, 0xD4DDE3DB, 0xD7DCDCD4, 0xCFD1D5DC, - 0xE6E7E8E8, 0xE5E9EBE3, 0xD1C5CEE0, 0xE2E2F3FD, 0xF8EAD6C2, 0xC1CDDCD7, 0xC5BFC4C1, 0xB7B9CCE7, 0xF0EDE2DD, - 0xD8D4D7CA, 0xB4AFBFD6, 0xE4EBF2FC, 0xEEEAD8C2, 0xBABECCCF, 0xB9A1A3AA, 0xA6A2B0DB, 0xF0E9D8CE, 0xC6BFBDAE, - 0x9292ACCC, 0xE0E4E3EB, 0xCFD5CFBF, 0xB3AEB1B6, 0xA68D8A95, 0x9A99A1C2, 0xE3DBC6BA, 0xB4ACA292, 0x757299C0, - 0xD7D8CBC6, 0xA5B3BAB0, 0xA59A9293, 0x8C7A757E, 0x889198AE, 0xCACAB7A7, 0xA09C9480, 0x63597696, 0xAEC0BEA8, - 0x8C959F97, 0x89807772, 0x6752536B, 0x79808896, 0xAEB8A894, 0x827E796B, 0x59556374, 0x849EB6A5, 0x918F8D7B, - 0x6A676A66, 0x53363453, 0x6A6D6E76, 0x8A9D9E90, 0x73625D58, 0x5157605F, 0x5E749CA7, 0x96898163, 0x4E506064, - 0x4A2A1E36, 0x565D5B5F, 0x697D8D8C, 0x714E4240, 0x44525E59, 0x5161869C, 0x81776D54, 0x3D3A4D5A, 0x46281B22, - 0x363E424A, 0x545D6E7B, 0x714F3630, 0x313E4E4C, 0x44537384, 0x625B4E3E, 0x2E293646, 0x37201C20, 0x1E1D1F2D, - 0x3E454A59, 0x5F4D2D20, 0x2229363E, 0x3B4A6A70, 0x453C3329, 0x211F2835, 0x2A1A1B20, 0x1307050F, 0x242C2933, - 0x43442C18, 0x15151C2A, 0x3140655C, 0x251B1F1B, 0x15161F27, 0x261D1C20, 0x15040005, 0x141E1516, 0x26312716, - 0x0E0C0D19, 0x28385556, 0x170D1511, 0x0A0B141E, 0x2222201F, 0x170B0403, 0x0D190F0B, 0x151F1B10, 0x0B08050C, - 0x17264546, 0x130C140C, 0x03030C12, 0x13181F1C, 0x16100A07, 0x090E0F09, 0x11160F08, 0x0C0F0A09, 0x0F1B2E32, - 0x12171D11, 0x0301070D, 0x0B0D1414, 0x110F110F, 0x0A07070A, 0x11150B04, 0x0C15130F, 0x0E0E1B23, 0x10172113, - 0x0401050C, 0x0E09090B, 0x09090E13, 0x10090505, 0x0D120C04, 0x07141911, 0x0C0A1016, 0x09101811, 0x05020308, - 0x0D090606, 0x0504060C, 0x110F0903, 0x060B0804, 0x030A100D, 0x0A090B0C, 0x05060A06, 0x01010204, 0x07080403, - 0x02010307, 0x0A0D0B04, 0x02020302, 0x02030606, 0x04040708, 0x02020200, 0x00000201, 0x02030200, 0x00000102, - 0x05060704, 0x01000001, 0x01020201, 0x00010406, 0x01000201, 0x00000000, 0x00000000, 0x00000001, 0x02020202, - 0x01000000, 0x00000101, 0x00000102, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -}; - -static UNK_TYPE vertices1[] = { - 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, - 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, - 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, - 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, - 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, - 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, - 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, - 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, - 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, - 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, - 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, - 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, - 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, - 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, - 0x05000419, 0x273FA2FF, -}; - -static UNK_TYPE vertices2[] = { - 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, - 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, - 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, - 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, - 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF, -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(texture1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 13, 15), - gsDPLoadMultiBlock(texture2, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 14, 14), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 1, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_LIGHTING), - gsSPEndDisplayList(), -}; - -static Gfx sVertexDL[] = { - gsSPVertex(vertices1, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), - gsSP2Triangles(5, 4, 6, 0, 2, 7, 8, 0), - gsSP2Triangles(2, 8, 4, 0, 4, 8, 9, 0), - gsSP2Triangles(4, 9, 6, 0, 6, 9, 10, 0), - gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0), - gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), - gsSP2Triangles(10, 13, 14, 0, 12, 15, 16, 0), - gsSP2Triangles(12, 16, 13, 0, 13, 16, 17, 0), - gsSP2Triangles(13, 17, 14, 0, 14, 17, 18, 0), - gsSP2Triangles(16, 19, 17, 0, 17, 19, 20, 0), - gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0), - gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0), - gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0), - gsSP2Triangles(23, 27, 28, 0, 26, 29, 30, 0), - gsSP2Triangles(26, 30, 27, 0, 27, 30, 31, 0), - gsSP1Triangle(27, 31, 28, 0), - gsSPVertex(vertices2, 11, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(3, 5, 1, 0, 1, 5, 6, 0), - gsSP2Triangles(1, 6, 2, 0, 2, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 8109e5e615..0b8dbb0871 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -65,46 +65,16 @@ static Vec3f sSideCenters[] = { static f32 sSideAngles[] = { M_PI / 2, -M_PI / 2, 0.0f, M_PI }; -#include "z_bg_ganon_otyuka_gfx.c" +#include "overlays/ovl_Bg_Ganon_Otyuka/ovl_Bg_Ganon_Otyuka.c" -static CamData sCameraDataList[] = { { 0, 0, 0 } }; - -static SurfaceType sSurfaceTypeList[] = { - { 0x00000000, 0x000007C0 }, - { 0x00000000, 0x000007C2 }, -}; - -static CollisionPoly sPolyList[] = { - { 0x0000, 0x0000, 0x0001, 0x0002, { 32767, 0, 0 }, -60 }, - { 0x0000, 0x0000, 0x0002, 0x0003, { 32767, 0, 0 }, -60 }, - { 0x0000, 0x0003, 0x0002, 0x0004, { 0, 0, -32767 }, -60 }, - { 0x0000, 0x0003, 0x0004, 0x0005, { 0, 0, -32767 }, -60 }, - { 0x0000, 0x0005, 0x0004, 0x0006, { -32767, 0, 0 }, -60 }, - { 0x0000, 0x0005, 0x0006, 0x0007, { -32767, 0, 0 }, -60 }, - { 0x0000, 0x0007, 0x0006, 0x0001, { 0, 0, 32767 }, -60 }, - { 0x0000, 0x0007, 0x0001, 0x0000, { 0, 0, 32767 }, -60 }, - { 0x0001, 0x0000, 0x0003, 0x0005, { 0, 32767, 0 }, 0 }, - { 0x0001, 0x0000, 0x0005, 0x0007, { 0, 32767, 0 }, 0 }, -}; - -static Vec3s sVtxList[] = { - { 60, 0, 60 }, { 60, -60, 60 }, { 60, -60, -60 }, { 60, 0, -60 }, - { -60, -60, -60 }, { -60, 0, -60 }, { -60, -60, 60 }, { -60, 0, 60 }, -}; - -static CollisionHeader sColHeader = { - { -60, -60, -60 }, { 60, 0, 60 }, ARRAY_COUNT(sVtxList), sVtxList, ARRAY_COUNT(sPolyList), - sPolyList, sSurfaceTypeList, sCameraDataList, 0, NULL, -}; - -void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx) { +void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx2) { BgGanonOtyuka* this = THIS; - s32 pad; + GlobalContext* globalCtx = globalCtx2; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&sColHeader, &colHeader); + CollisionHeader_GetVirtual(&sCol, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); if (thisx->params != 0x23) { @@ -115,9 +85,10 @@ void BgGanonOtyuka_Init(Actor* thisx, GlobalContext* globalCtx) { } } -void BgGanonOtyuka_Destroy(Actor* thisx, GlobalContext* globalCtx) { +void BgGanonOtyuka_Destroy(Actor* thisx, GlobalContext* globalCtx2) { BgGanonOtyuka* this = THIS; - + GlobalContext* globalCtx = globalCtx2; + DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); osSyncPrintf(VT_FGCOL(GREEN)); @@ -305,7 +276,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { } func_80093D18(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, sPlatformSetupDList); + gSPDisplayList(POLY_OPA_DISP++, sPlatformMaterialDL); actor = globalCtx->actorCtx.actorLists[ACTORCAT_PROP].head; while (actor != NULL) { @@ -314,9 +285,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { if (platform->dyna.actor.projectedPos.z > spBC) { if (camera->eye.y > platform->dyna.actor.world.pos.y) { - phi_s2 = sPlatformTopDList; + phi_s2 = sPlatformTopDL; } else { - phi_s2 = sPlatformBottomDList; + phi_s2 = sPlatformBottomDL; } Matrix_Translate(platform->dyna.actor.world.pos.x, platform->dyna.actor.world.pos.y, platform->dyna.actor.world.pos.z, MTXMODE_NEW); @@ -325,9 +296,9 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX((platform->dyna.actor.shape.rot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); Matrix_RotateZ((platform->dyna.actor.shape.rot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); if (camera->eye.y > platform->dyna.actor.world.pos.y) { - phi_s1 = sPlatformBottomDList; + phi_s1 = sPlatformBottomDL; } else { - phi_s1 = sPlatformTopDList; + phi_s1 = sPlatformTopDL; } } gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 766), @@ -346,7 +317,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 785), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, sPlatformSideDList); + gSPDisplayList(POLY_OPA_DISP++, sPlatformSideDL); Matrix_Pop(); } } @@ -382,7 +353,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, sFlashDList); + gSPDisplayList(POLY_XLU_DISP++, sFlashDL); Matrix_Pop(); } } diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c deleted file mode 100644 index c862467571..0000000000 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka_gfx.c +++ /dev/null @@ -1,207 +0,0 @@ -#include "z_bg_ganon_otyuka.h" - -static UNK_TYPE sPlatformTexture[] = { - 0x19033187, 0x39C74207, 0x4A495247, 0x5A494A09, 0x498749C5, 0x5A476247, 0x62076287, 0x734F8393, 0x6A8B6A09, - 0x5A495207, 0x49C54A89, 0x4A895289, 0x5AC95A89, 0x5A4B5A8B, 0x5A896249, 0x52095207, 0x19033185, 0x420949C7, - 0x52095207, 0x5A075A45, 0x41C749C5, 0x62075207, 0x62896A49, 0x6B4F7B51, 0x62C75A49, 0x52095247, 0x4A475249, - 0x5A075A89, 0x52895A89, 0x62876247, 0x62495A4B, 0x52095A07, 0x214339C7, 0x52095209, 0x524749C7, 0x49C74A07, - 0x41C74985, 0x52095A47, 0x6A096A47, 0x72CD7BD3, 0x6249628B, 0x62495207, 0x49C55A49, 0x5A495249, 0x5A096A89, - 0x6A4B5A47, 0x5A496207, 0x5A475207, 0x210741C5, 0x61C96AC7, 0x52094A09, 0x5A0951C7, 0x398541C5, 0x51C759C9, - 0x5A495287, 0x6ACD7B11, 0x6249528B, 0x62075205, 0x4A0751C7, 0x52494A47, 0x52095209, 0x62075209, 0x5A0951C7, - 0x52054A07, 0x21434205, 0x620959C7, 0x4A0B2985, 0x52474987, 0x31C34185, 0x49C749C3, 0x4A074A07, 0x6A4B728F, - 0x52474A47, 0x51C949C9, 0x51C549C7, 0x42094A07, 0x52474A05, 0x520759C7, 0x52095207, 0x5A0751C7, 0x21454205, - 0x5A4772CD, 0x8C9D4A0B, 0x5A075A09, 0x41853985, 0x51C35187, 0x41C749C9, 0x524D630F, 0x5A4951C7, 0x51C75207, - 0x49C74A07, 0x49C74A09, 0x4A075207, 0x62475A89, 0x5A896207, 0x62475209, 0x10C541C7, 0x62077249, 0x7B0D5A09, - 0x624B6207, 0x41C74145, 0x49C949C7, 0x4A076209, 0x6ACD7351, 0x62896207, 0x62875A47, 0x5A075209, 0x4A074A09, - 0x4A076249, 0x5A496249, 0x624B6287, 0x5A475A87, 0x21454207, 0x624B6A47, 0x624962C9, 0x6A896209, 0x49C949C5, - 0x49C55207, 0x52475A89, 0x728B7B93, 0x6A8D6209, 0x6A896207, 0x5A074A49, 0x4A094A09, 0x52496289, 0x5A896A49, - 0x624962C7, 0x62896AC9, 0x210539C7, 0x624962CB, 0x62C96A87, 0x62475A8B, 0x39854985, 0x49C749C5, 0x624562C7, - 0x730D8351, 0x6A8B6289, 0x62896249, 0x624949C7, 0x42055247, 0x5A876287, 0x6A4B6A49, 0x628B6A87, 0x6A87628B, - 0x21034209, 0x5A076249, 0x62495A49, 0x6A87624B, 0x49894185, 0x4A0549C7, 0x5A07628B, 0x7B0D8395, 0x72896A89, - 0x6A8B5A49, 0x52095209, 0x49C95249, 0x62475A49, 0x6247628B, 0x62896A47, 0x6A476249, 0x210331C9, 0x52076249, - 0x5289628B, 0x62495A47, 0x49874185, 0x418749C7, 0x62876A89, 0x72CD83D1, 0x728B6249, 0x6A496A49, 0x52494A07, - 0x4A075247, 0x5A895A49, 0x62496AC9, 0x62C76A47, 0x6AC96249, 0x194541C7, 0x4A075247, 0x520B5AC9, 0x5A4B51C7, - 0x41C54185, 0x498749C5, 0x52476289, 0x6B0D8353, 0x6A4B6AC9, 0x62495A09, 0x52874A47, 0x3A493A49, 0x524B5249, - 0x6A476AC5, 0x6249728B, 0x62495A87, 0x190339C7, 0x5A494A49, 0x5287528B, 0x4A4B4A47, 0x318939C5, 0x4A0559C5, - 0x62496287, 0x7B0F83D5, 0x62CB6289, 0x62876247, 0x524B5209, 0x3A074A47, 0x4A095249, 0x5A475249, 0x62496A89, - 0x620B6247, 0x110539C7, 0x520752C7, 0x524B5207, 0x52894A4B, 0x298731C5, 0x42075209, 0x5A896287, 0x73518393, - 0x628B6289, 0x52895AC9, 0x52494A0B, 0x4A074A49, 0x52494A49, 0x4A476287, 0x62876A89, 0x6A496A47, 0x19434A07, - 0x5A475ACB, 0x52475249, 0x52894A49, 0x31C531C7, 0x31C549C7, 0x528952C9, 0x634D7353, 0x52894A89, 0x52895A47, - 0x524B5A49, 0x52074A07, 0x4A094A4B, 0x5207524B, 0x5A496287, 0x6A496A89, 0x19454A07, 0x62496207, 0x49C93905, - 0x62495207, 0x39C73145, 0x41C94A07, 0x4A875249, 0x5B0D6351, 0x528B6249, 0x624B6A8B, 0x62C96249, 0x5A495207, - 0x628B5A49, 0x52895249, 0x4A89628B, 0x628762C7, 0x194549C9, 0x5A4772CB, 0x945D4A0D, 0x62075209, 0x39874187, - 0x3A074A47, 0x52494A49, 0x52CB6B91, 0x73117BD1, 0x73917B93, 0x7B537B53, 0x730F630F, 0x7B517B91, 0x6B516B0F, - 0x73916B8F, 0x73137351, 0x21034187, 0x6A496249, 0x7B4D6247, 0x62875207, 0x41853987, 0x42075207, 0x4A494A47, - 0x5A475B0B, 0x62CB72CF, 0x72CD6B4D, 0x6B0D6ACD, 0x624B5ACB, 0x62CB62CD, 0x6ACB62CD, 0x62CD4A8B, 0x628B62CF, - 0x20C54207, 0x524B6A89, 0x62496287, 0x5A4749C7, 0x31853945, 0x41C55185, 0x49C53A45, 0x4A495209, 0x62475A05, - 0x52076207, 0x52055A47, 0x4A0949C5, 0x52095247, 0x52075249, 0x5A494A87, 0x42473A09, 0x190539C9, 0x5A095A0B, - 0x5A075A07, 0x4A0549C7, 0x41453985, 0x41C94187, 0x420941C5, 0x4A054A09, 0x49C55205, 0x4A054A07, 0x5A0749C3, - 0x49C55205, 0x520551C7, 0x59C75207, 0x4A474A07, 0x3A073A07, 0x190339C5, 0x52455A49, 0x5A075249, 0x52074A07, - 0x41C34985, 0x4A055A47, 0x49C74A09, 0x420951C7, 0x49C75207, 0x49C551C5, 0x51875207, 0x52455A45, 0x52075209, - 0x59C74A05, 0x498549C5, 0x3A074207, 0x20C53985, 0x52475209, 0x52055247, 0x62096247, 0x39874207, 0x4A075245, - 0x52474249, 0x42474A09, 0x4A055207, 0x41C541C5, 0x41C55A45, 0x52075209, 0x62895A07, 0x52875203, 0x49C539C7, - 0x3A053A07, 0x19033A07, 0x51876209, 0x5A476207, 0x5A875A09, 0x41874147, 0x49C749C5, 0x49C53A07, 0x49C94205, - 0x498541C5, 0x41474185, 0x41C54A07, 0x4A0551C7, 0x498549C5, 0x4A074207, 0x39473985, 0x318739C7, 0x190341C5, - 0x5A476205, 0x624962C9, 0x62475A47, 0x49C74985, 0x41C74985, 0x42054207, 0x41C741C9, 0x39C74149, 0x41474147, - 0x39874987, 0x41874987, 0x41C749C5, 0x41854987, 0x49893985, 0x29C739C5, 0x21074185, 0x62456249, 0x624B6A89, - 0x62496A89, 0x52475249, 0x52474A87, 0x4A474A07, 0x524B5247, 0x4A474A09, 0x4A074987, 0x4A095A09, 0x5A896249, - 0x62076205, 0x6247624B, 0x528951C9, 0x41C54205, 0x11054207, 0x52496209, 0x52496287, 0x62476A87, 0x5A895A87, - 0x6247520B, 0x4A094AC9, 0x5A895A07, 0x5A0B5A47, 0x52074A47, 0x5A896289, 0x62876A89, 0x6A476AC9, 0x62475209, - 0x5A474A09, 0x4A094A07, 0x194341C9, 0x62475A47, 0x49CB3945, 0x5A076287, 0x6A496289, 0x62895A87, 0x5A895249, - 0x520951C9, 0x310749C7, 0x51C75A49, 0x62476289, 0x620962C7, 0x62875A47, 0x4A0B2985, 0x4A4B5247, 0x41C54A09, - 0x19454209, 0x5A8972CD, 0x9C5B4A0B, 0x62476AC9, 0x62875AC9, 0x62095A0B, 0x524B524B, 0x6B0F9419, 0x418B41C7, - 0x4A075A07, 0x62496287, 0x62876AC7, 0x628972CF, 0x8C5D4A4B, 0x52874A47, 0x424B4A07, 0x18C54985, 0x5A896287, - 0x7B4D6247, 0x6247728B, 0x62C76289, 0x6A075ACB, 0x4A474A47, 0x5A876AD1, 0x52455205, 0x52095A07, 0x62876A89, - 0x62496247, 0x6A496249, 0x7B0B5209, 0x52874A49, 0x42495209, 0x19434207, 0x52876207, 0x52495A49, 0x62095A09, - 0x5A095289, 0x62475207, 0x4A874A89, 0x52495287, 0x52495205, 0x42075A05, 0x62476247, 0x5A095249, 0x52496249, - 0x62495249, 0x5A874A07, 0x49C74207, 0x19453945, 0x41C739C7, 0x420741C9, 0x41C74209, 0x42054187, 0x3A0541C5, - 0x3A0931C7, 0x39C541C7, 0x49C73147, 0x3A0541C5, 0x49C549C7, 0x398941C7, 0x420749C7, 0x49C739C7, 0x420731C7, - 0x320741C7, 0x08C51903, 0x19431143, 0x21451903, 0x21432105, 0x19432105, 0x19051905, 0x11031905, 0x21451907, - 0x11072105, 0x19031943, 0x190518C5, 0x214518C5, 0x21432145, 0x11032103, 0x19051905, 0x19031903, -}; - -// probably unused? -static UNK_TYPE D_808772E0[] = { 0x00000000, 0x00000000 }; - -static Vtx sPlatformTopVerts[] = { - VTX(60, 0, 60, 2048, -1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(60, 0, -60, 0, -1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-60, 0, -60, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-60, 0, 60, 2048, 1024, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sPlatformSetupDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sPlatformTexture, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_MIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, 1, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsSPClearGeometryMode(G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_CULL_BACK | G_FOG), - gsDPSetPrimColor(0, 0, 255, 255, 255, 255), - gsDPPipeSync(), - gsSPEndDisplayList(), -}; - -static Gfx sPlatformTopDList[] = { - gsSPVertex(sPlatformTopVerts, ARRAY_COUNT(sPlatformTopVerts), 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -static Vtx sPlatformBottomVerts[] = { - VTX(60, -60, 60, 2048, -1024, 0x32, 0x32, 0x32, 0xFF), - VTX(60, -60, -60, 0, -1024, 0x32, 0x32, 0x32, 0xFF), - VTX(-60, -60, -60, 0, 1024, 0x32, 0x32, 0x32, 0xFF), - VTX(-60, -60, 60, 2048, 1024, 0x32, 0x32, 0x32, 0xFF), -}; - -static Gfx sPlatformBottomDList[] = { - gsSPVertex(sPlatformBottomVerts, ARRAY_COUNT(sPlatformBottomVerts), 0), - gsSP2Triangles(0, 2, 1, 0, 0, 3, 2, 0), - gsSPEndDisplayList(), -}; - -static Vtx sPlatformSideVerts[] = { - VTX(-60, 0, 0, 2048, -1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-60, -60, 0, 2048, 1024, 0x32, 0x32, 0x32, 0xFF), - VTX(60, -60, 0, 0, 1024, 0x32, 0x32, 0x32, 0xFF), - VTX(60, 0, 0, 0, -1024, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sPlatformSideDList[] = { - gsSPVertex(sPlatformSideVerts, ARRAY_COUNT(sPlatformSideVerts), 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; - -static UNK_TYPE sFlashTexture[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, - 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, - 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, - 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, - 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, - 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, - 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, - 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, - 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, - 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, - 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, - 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, - 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, - 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, - 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, - 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, - 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, - 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, - 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, - 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, - 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, - 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, - 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, - 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, - 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, - 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, - 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, - 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, - 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, - 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, - 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, - 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, - 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, - 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, - 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, - 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, - 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, - 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, - 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, - 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, - 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, - 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, - 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, - 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, - 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, - 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, - 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, -}; - -static Vtx sFlashVerts[] = { - VTX(-180, 300, 0, 256, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-360, 0, 0, 0, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-180, 0, 0, 256, 2048, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-360, 300, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(180, 300, 0, 768, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(180, 0, 0, 768, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(360, 0, 0, 1024, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(360, 300, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0x00), -}; - -static Gfx sFlashDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sFlashTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, 15, 1), - gsDPTileSync(), - gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0000, 1, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, 14, G_TX_NOMIRROR | G_TX_WRAP, - 5, 13), - gsDPSetTileSize(1, 0, 0, 0x007C, 0x00FC), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 1, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPDisplayList(0x08000000), - gsSPVertex(sFlashVerts, 8, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSP2Triangles(4, 2, 5, 0, 4, 0, 2, 0), - gsSP2Triangles(6, 4, 5, 0, 6, 7, 4, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 0b87417ab8..bbaed9d41d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -18,22 +18,7 @@ void func_80896950(BgJyaCobra* this, GlobalContext* globalCtx); void func_808969F8(BgJyaCobra* this, GlobalContext* globalCtx); void func_80896ABC(BgJyaCobra* this, GlobalContext* globalCtx); -static Vtx sShadowVtx[4] = { - VTX(-800, 0, -800, 0, 2048, 255, 255, 255, 255), - VTX(800, 0, -800, 2048, 2048, 255, 255, 255, 255), - VTX(800, 0, 800, 2048, 0, 255, 255, 255, 255), - VTX(-800, 0, 800, 0, 0, 255, 255, 255, 255), -}; - -static Gfx sShadowDL[] = { - gsDPPipeSync(), - gsDPSetCombineLERP(PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_DECAL2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPVertex(sShadowVtx, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_Bg_Jya_Cobra/ovl_Bg_Jya_Cobra.c" const ActorInit Bg_Jya_Cobra_InitVars = { ACTOR_BG_JYA_COBRA, @@ -365,7 +350,7 @@ void BgJyaCobra_UpdateShadowFromSide(BgJyaCobra* this) { temp_s2[j * 0x40 + 0] = 0; temp_s2[j * 0x40 + 0x3F] = 0; } - if (D_80897398) {} + if (D_80897398[0][0]) {} } /* @@ -527,8 +512,8 @@ void func_80896ABC(BgJyaCobra* this, GlobalContext* globalCtx) { func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } -void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx) { - s32 pad; +void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; BgJyaCobra* this = THIS; this->actionFunc(this, globalCtx); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index b1a0a84dea..e9572b9001 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -32,9 +32,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx gGTGRotatingRingPlatformDL[]; -extern CollisionHeader gGTGRotatingRingPlatformCol; - void BgMenkuriKaiten_Init(Actor* thisx, GlobalContext* globalCtx) { BgMenkuriKaiten* this = THIS; s32 pad; diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 1e4a73f504..b36fc620b8 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -103,7 +103,7 @@ void BgMjin_Update(Actor* thisx, GlobalContext* globalCtx) { void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) { BgMjin* this = THIS; - u32 dlist; + Gfx* dlist; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250); diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index b4d271a764..e8e98f97cc 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1525,7 +1525,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { if (effect->type == BFD_FX_EMBER) { if (!flag) { func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberMaterialDL); flag++; } @@ -1536,7 +1536,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4046), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberModelDL); } } @@ -1546,7 +1546,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { if (effect->type == BFD_FX_DEBRIS) { if (!flag) { func_80093D18(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisMaterialDL); flag++; } @@ -1557,7 +1557,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4068), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisVtxDL); + gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisModelDL); } } @@ -1567,7 +1567,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { if (effect->type == BFD_FX_DUST) { if (!flag) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustMaterialDL); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 90, 30, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 90, 30, 0, 0); flag++; @@ -1580,7 +1580,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4104), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2])); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL); } } @@ -1590,7 +1590,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { if (effect->type == BFD_FX_FIRE_BREATH) { if (!flag) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 255, 10, 0, 255); flag++; } @@ -1603,7 +1603,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4154), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2])); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL); } } @@ -1613,7 +1613,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { if (effect->type == BFD_FX_SKULL_PIECE) { if (!flag) { func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceMaterialDL); flag++; } @@ -1624,7 +1624,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4192), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceModelDL); } } @@ -1761,7 +1761,7 @@ void BossFd_DrawMane(GlobalContext* globalCtx, BossFd* this, Vec3f* manePos, Vec Matrix_RotateX(-M_PI / 2.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4480), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeModelDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4483); @@ -1957,7 +1957,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { Vec3f spA4 = { -1000.0f, 700.0f, 7000.0f }; func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeMaterialDL); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, this->fwork[BFD_MANE_COLOR_CENTER], 0, 255); Matrix_Push(); Matrix_MultVec3f(&spB0, &this->centerMane.head); diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index d9d6069ddb..12230d7280 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -1150,7 +1150,7 @@ void BossFd2_UpdateMane(BossFd2* this, GlobalContext* globalCtx, Vec3f* head, Ve Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2498), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeModelDL); } Matrix_Pop(); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2503); @@ -1171,7 +1171,7 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeMaterialDL); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, bossFd->fwork[BFD_MANE_COLOR_CENTER], 0, 255); BossFd2_UpdateMane(this, globalCtx, &this->centerMane.head, this->centerMane.pos, this->centerMane.rot, diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index d61506d2a0..a26dd2c5ba 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -2959,7 +2959,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust1Tex)); - gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 250, 250, 255, 0); flag++; @@ -2975,7 +2975,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7373), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletModelDL); } } @@ -2988,7 +2988,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust1Tex)); gDPSetEnvColor(POLY_XLU_DISP++, 250, 250, 255, 0); - gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletMaterialDL); flag++; } @@ -3001,7 +3001,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7441), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotModelDL); } } diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 88208e5427..290dd82e5d 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -29,7 +29,7 @@ const ActorInit Demo_Shd_InitVars = { (ActorFunc)DemoShd_Draw, }; -#include "z_demo_shd_gfxdata.c" +#include "overlays/ovl_Demo_Shd/ovl_Demo_Shd.c" void DemoShd_SetupAction(DemoShd* this, DemoShdActionFunc actionFunc) { this->actionFunc = actionFunc; diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c deleted file mode 100644 index a15046e989..0000000000 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd_gfxdata.c +++ /dev/null @@ -1,432 +0,0 @@ -#include "ultra64.h" -#include "global.h" - -static UNK_TYPE D_80991680[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x08000000, 0x00000000, 0x00000000, 0x00000524, 0x31090000, - 0x00000000, 0x00000000, 0x00041443, 0x4C120001, 0x03000000, 0x00000500, 0x072D5D88, 0x7C37100D, 0x12030000, - 0x00051808, 0x2479B9D7, 0xC37C4C3A, 0x2C060000, 0x00051A0D, 0x4ABEF1FC, 0xEEAE8D79, 0x4B0A0000, 0x00041612, - 0x68E0FEFF, 0xF5BBB8B6, 0x6D100000, 0x00031423, 0x84EEFFFF, 0xF4C4D1DB, 0x8A1D0300, 0x00041C3C, 0xA0F4FFFE, - 0xF1DAE7E9, 0x93200400, 0x00083154, 0xB6F7FFFA, 0xF4F7FBEA, 0x84140100, 0x000C4767, 0xC3F9FCEA, 0xEAFCFFED, - 0x7C0F0200, 0x000D4E77, 0xCCFAFBE5, 0xE3FAFFEE, 0x7D0F0200, 0x000A3F83, 0xD6FBFEF0, 0xE4F6FEF0, 0x84110200, - 0x00052688, 0xE5FDFDF0, 0xE6F9FFEF, 0x7F100200, 0x0002147E, 0xECFFFCE6, 0xDFFAFFEC, 0x710E0200, 0x00020C65, - 0xE2FEFAD9, 0xCFF7FFEA, 0x660B0200, 0x00020953, 0xD2FBFADA, 0xC9F5FFEB, 0x6B0D0200, 0x00020951, 0xCBFAFAE0, - 0xD4F6FFED, 0x750F0200, 0x00020C5C, 0xD4FAF1E2, 0xEBFCFFEB, 0x740F0100, 0x00010B60, 0xDEF8DDD7, 0xF6FFFEE9, - 0x690D0100, 0x00010B60, 0xE2F8D7CF, 0xF1FDFFE9, 0x5F0A0100, 0x00000C63, 0xDAFAE6D4, 0xE1F1FDE7, 0x5B0A0000, - 0x00000C5F, 0xC6F8F8E1, 0xDAE9FAD9, 0x52090000, 0x00000B59, 0xB4F0FBE0, 0xD1DDF4C0, 0x44070000, 0x00000A54, - 0xAFEFF3C6, 0xBBC0EDB0, 0x40070000, 0x00000B57, 0xB1E8DAA4, 0xA092DCA6, 0x45080000, 0x00000C5A, 0xAEDAB480, - 0x8C68BF92, 0x40080000, 0x00000C52, 0xA2C99264, 0x814FA06F, 0x23030000, 0x00010F48, 0x97BC7B4A, 0x75459760, - 0x0F000000, 0x00010E41, 0x95B46B36, 0x683E9663, 0x0D000000, 0x00000941, 0x9AAD602B, 0x5A328C64, 0x0E000000, - 0x00000841, 0x989E5524, 0x54347951, 0x0B000000, 0x0000073D, 0x88834C22, 0x4F3D6330, 0x07000000, 0x0000073B, - 0x73624726, 0x463E4B17, 0x0B010000, 0x00000941, 0x6748482C, 0x392A3413, 0x1C050000, 0x00000A46, 0x5D303B2E, - 0x3310211B, 0x2D070000, 0x00000941, 0x4B131B2C, 0x3F0D1821, 0x33080000, 0x0000093F, 0x4109092D, 0x490D0C20, - 0x32080000, 0x00000A43, 0x3F09062C, 0x450B061E, 0x2B070000, 0x00000B47, 0x410A0722, 0x3108081E, 0x20040000, - 0x00000838, 0x35090C19, 0x21050920, 0x20040000, 0x00000522, 0x1F060B0A, 0x1B04061E, 0x29060000, 0x00000313, - 0x0B020608, 0x28070319, 0x34090000, 0x0000020E, 0x03000108, 0x2F080214, 0x2F090000, 0x0000020D, 0x03000007, - 0x2407020C, 0x0B000000, 0x00000311, 0x06010001, 0x0D010413, 0x04000000, 0x0000051C, 0x0B010001, 0x0801020C, - 0x02000000, 0x00000623, 0x0D010003, 0x12030002, 0x00000000, 0x0000051D, 0x0A010005, 0x1B050000, 0x00000000, - 0x0000020C, 0x03000005, 0x18050000, 0x00000000, 0x00000002, 0x00000000, 0x05000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -}; - -static UNK_TYPE D_80991E80[] = { - 0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC, - 0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301, - 0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE, - 0x43312030, 0x2B4C82BA, 0x77431607, 0x2B70C7D5, 0xA6B95B13, 0x409C93A6, 0xB87D1D08, 0x367FE1C1, 0x3C261629, - 0x2A508AAB, 0x69410C0C, 0x3986DDDB, 0xB5AE6316, 0x40A0A7A1, 0xAA7D2610, 0x4596F1CD, 0x47281E36, 0x365C97A3, - 0x63450713, 0x499DF0D8, 0xB49E721A, 0x409AB59F, 0x8A662D1C, 0x57AEFBDF, 0x6B404456, 0x536EA49B, 0x6A4D061E, - 0x5CB6FCC6, 0x9A8E7F20, 0x428EBEA0, 0x623F2E2A, 0x69C6FFF0, 0x9A686569, 0x6F83AC92, 0x7F5D0B2A, 0x70CDFFB2, - 0x77848D29, 0x4787C4A0, 0x401D2E3E, 0x7ED9FFFC, 0xC48F7973, 0x8598AE86, 0x9A701339, 0x85E1FFA6, 0x5E859534, - 0x5189C99B, 0x2C0B3455, 0x92E9FFFA, 0xDCAB8071, 0x94ACAD7A, 0xB1882249, 0x9AF1FFB0, 0x6A8F9746, 0x6394CD8D, - 0x290C416F, 0xA5EEFFF4, 0xDCB46B6D, 0xA1BFAD77, 0xB6A43A58, 0xAAF8FFC8, 0x84959963, 0x7BA4CE78, 0x351A588E, - 0xB5E3F9F1, 0xCFAC6077, 0xABCFAC77, 0xA8C05A6A, 0xB2F3FFE1, 0xA3959471, 0x94B9D065, 0x473274A9, 0xBDCDECEF, - 0xC2A05F86, 0xBADDAC78, 0x92D87C7D, 0xAFDEFDF1, 0xBC8C8971, 0xA6D2D45A, 0x584B95BB, 0xC1B3D5ED, 0xB8956697, - 0xC5E9A670, 0x7AE6978F, 0xA4BEF0EF, 0xB9797360, 0xB1E8DD5D, 0x5D5FAFC7, 0xC49CB8E3, 0xAF8C78A5, 0xCBF19D5F, - 0x6AE5A6A3, 0x9398DBE7, 0xB46A5841, 0xB8F2E871, 0x586DC1CD, 0xC78C9DD5, 0xAA878CB1, 0xD8F89249, 0x63DCABB3, - 0x8576C5D8, 0xA95E4430, 0xC0EBEE91, 0x5378CACE, 0xC58087C5, 0xA4859EAE, 0xE1FD8A36, 0x60D0ACBD, 0x7765B9C5, - 0x9C563A2B, 0xCED7E7B4, 0x5484C7CC, 0xB66F7CBB, 0x9F81A898, 0xE3FF8D2E, 0x63C8B0BA, 0x6D69B8B0, 0x93573B2E, - 0xE0C2CED2, 0x6898C0C3, 0x97587EBC, 0x9D749570, 0xDEFF9D36, 0x67C8B4A8, 0x6682BD9B, 0x93643E37, 0xF0B4A8DE, - 0x86A9B6B0, 0x70448BBE, 0x99617545, 0xD1FFB84E, 0x70CAB48C, 0x64A4BD8D, 0x96763D41, 0xFAAC82DA, 0xA7B6AE9A, - 0x4D359AC0, 0x90494F27, 0xC0FFD675, 0x80CCAD6D, 0x63C1B681, 0x9C85374E, 0xFFA069C9, 0xC1BAA785, 0x3936A4B6, - 0x7D342E18, 0xA9FFEEA5, 0x9AC59F56, 0x60D0A873, 0x9288315E, 0xFB8669B6, 0xD0B6A473, 0x3C47A39A, 0x6228241B, - 0x8BFFF6CD, 0xB7BB8F47, 0x57CFA169, 0x77782C6B, 0xE56478AA, 0xD6AC9E64, 0x4E61977C, 0x4B232428, 0x6FFFEBE5, - 0xD0AF813C, 0x44C2A266, 0x5B61296E, 0xC04188A8, 0xD4A09051, 0x5D788B61, 0x3E202234, 0x58F9D7DF, 0xDEA27332, - 0x31AE9A6C, 0x3E4B2F62, 0x902688B3, 0xD0937A3F, 0x5D7D8B58, 0x37241F35, 0x46F2C5BF, 0xD7956528, 0x1E918E76, - 0x3442424A, 0x601774C3, 0xCB8F6630, 0x48698261, 0x333C2729, 0x3CECBF95, 0xC2885420, 0x11717B78, 0x4952673A, - 0x3D1153CD, 0xC994602F, 0x2D496F6D, 0x31674418, 0x32E7CA6C, 0xA77D4318, 0x09526672, 0x6B6F963E, 0x2B1036D0, - 0xCAA26E3C, 0x1B2A5A7B, 0x3798700F, 0x2BDFD94D, 0x8C773712, 0x043C606C, 0x9086B955, 0x281225C9, 0xC7AD8954, - 0x141B4085, 0x53CB9C10, 0x26D3E63A, 0x757A3B11, 0x0131666F, 0xAB87BA6A, 0x2E151FBF, 0xC1AEA16A, 0x1721388C, - 0x81ECBB17, 0x23C1EE30, 0x6688561E, 0x02317381, 0xA36A9566, 0x3B171FB9, 0xB5A5AF7A, 0x1B384395, 0xABFBC81D, - 0x20AAEB28, 0x61987838, 0x05358299, 0x85405D4E, 0x45181FB5, 0xA695B083, 0x1C55569C, 0xCEFFCF1E, 0x1A8CDA24, - 0x62A39755, 0x0A398FAE, 0x601A2A2C, 0x49161FB1, 0x9A8BAC8A, 0x23736DA0, 0xE0FFD61E, 0x136BAF23, 0x70ABAD6D, - 0x143D95BD, 0x41030D16, 0x41151DAA, 0x938BAA94, 0x2E8A8BA7, 0xE6FFD921, 0x0C4A7D2D, 0x7CACAB70, 0x244093C3, - 0x38020F11, 0x2F151CA3, 0x9293ABA1, 0x3995AAB7, 0xEDF7D924, 0x072F5842, 0x83AE9C66, 0x3F498EC7, 0x420D2812, - 0x1E151F9B, 0x989CB0B2, 0x4697C5CE, 0xF5F0D626, 0x061B435B, 0x85B18A5B, 0x5F568BCD, 0x54245213, 0x12172593, - 0x9FA1BAC0, 0x5291D4E1, 0xFAF0D123, 0x0711416F, 0x82B2765B, 0x84668FCB, 0x684D8212, 0x1318308A, 0xA3A2C2C6, - 0x5F88D3EE, 0xFEF6C81B, 0x0B104276, 0x85B06A72, 0xA97896C3, 0x7C81AC19, 0x24194083, 0xA2A0C6C4, 0x6A82CCF1, - 0xFFFFB910, 0x14173E77, 0x8BAE6992, 0xC6879BB4, 0x92B3C933, 0x3C1D4F7D, 0x9DA2CCBE, 0x7381C6E6, 0xFFFFB111, - 0x26233975, 0x92AF6DAF, 0xDB949AA3, 0xADDBDD64, 0x5927597B, 0x99AAD4B9, 0x7687C6D5, 0xFCFFB736, 0x432D3A78, - 0x98B371BD, 0xE5A0989E, 0xCCF2EAA0, 0x753C5C80, 0x9DB9E3BC, 0x7896CFBF, 0xF6FFCB72, 0x64323F81, 0x9CBC70B4, - 0xE3AC9EAD, 0xE6FBF6CF, 0x8B5C5C85, 0xA7C8F4C2, 0x7AA6D9A3, 0xF0FFE2A9, 0x8032448D, 0xA4C970A0, 0xDBB5AAC6, - 0xF7FEFDE7, 0xA3806187, 0xB0D6FFC9, 0x7FB5D686, 0xE7FFF0D2, 0x8D2F4E98, 0xABD7768D, 0xCFB9B4E1, 0xF8F8FFE7, - 0xB29B7089, 0xB7E4FFCD, 0x8CB8BF65, 0xD5FFF0D7, 0x8D34609D, 0xB4E48385, 0xC3BAB0F1, 0xE2E8FEDC, 0xB5A07A8D, - 0xBDEFFFD0, 0x9AAB9543, 0xB9FFE9C3, 0x80447497, 0xC0EF9C90, 0xBDB997E5, 0xC2CCFBD4, 0xAB8F7387, 0xC8F8FFD4, - 0xA4936324, 0x98FFE5B3, 0x6F577E8A, 0xCEFABCA8, 0xC0BC71C7, 0x9EADF4D2, 0x916D5D7B, 0xD4FEFFD6, 0xA575390F, - 0x76FFE4A6, 0x656A7F7D, 0xDDFFDABF, 0xC8BF4CA1, 0x8095E8CC, 0x744A3B66, 0xDAFFFFD6, 0x9D5B1E04, 0x5DFDDF9A, - 0x6075787A, 0xECFFF1CD, 0xCEC42E7C, 0x7087D6BF, 0x5A311F49, 0xD4FFFFD0, 0x8E4B1100, 0x50F7D892, 0x68767788, - 0xF6FFFDCE, 0xCDC31E65, 0x6E88C3A8, 0x4922153A, 0xC3FFFDC4, 0x7F410B03, 0x4BEED08B, 0x747682A0, 0xFDFFFEBF, - 0xBCB61456, 0x7792B18B, 0x3E19153D, 0xB5FFF8B2, 0x733B0908, 0x4DE0C487, 0x827797BC, 0xFFFFF8AB, 0x9E9B0E50, - 0x869E9F6E, 0x3714184D, 0xB5FFF09E, 0x67380C11, 0x56CFB285, 0x8F7EADD4, 0xFFFFED96, 0x78730A53, 0x9CA98F57, - 0x310F1C69, 0xC8FFE18A, 0x5D35161D, 0x64BC9E84, 0x978BBFE7, 0xFFFFDD81, 0x5348075A, 0xB5B07F48, 0x290A2088, - 0xE1FFCF75, 0x5335272B, 0x74AD877F, 0x9C9DCFF3, 0xFFFEC86E, 0x35260864, 0xC6B16F3E, 0x200422A6, 0xF8FCB95F, - 0x47373A3C, 0x86A36F73, 0x9FB0D9FA, 0xFFF7B15B, 0x21110E70, 0xCDAB6139, 0x160027C1, 0xFFF09F4C, 0x3B3A4B4D, - 0x989D5B5D, 0x9DB5D9FE, 0xFFEA994C, 0x1509177B, 0xC8A15C3C, 0x0E022BD1, 0xFFE1873B, 0x2F3E5460, 0xA8954F44, - 0x96A6CEFF, 0xFFD7823C, 0x0C0A2784, 0xB9956343, 0x0B0731DB, 0xFFCE722C, 0x22415672, 0xB58C4A31, 0x8A88BAFF, - 0xFAC56E2E, 0x060F398F, 0xA989764A, 0x0A0C3AE1, 0xFFB85F20, 0x17425787, 0xBF824826, 0x775FA3FF, 0xF1B66121, - 0x03164B98, 0x9A818E4A, 0x0A1040D4, 0xE8974D14, 0x11405495, 0xBB74401F, 0x603D86F1, 0xD7A35414, 0x02195694, - 0x8476943E, 0x171A46C5, 0xCC7D3D0C, 0x0D3E599E, 0xAE6C371C, 0x4A2D72E3, 0xC38F4C0E, 0x03205F96, 0x766A792A, - 0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17, -}; - -static Vtx D_80992680[] = { - VTX(405, 1572, -1643, 401, -3470, 0x00, 0x78, 0x00, 0xFF), - VTX(470, 1488, -1799, 512, -3755, 0x00, 0x78, 0x00, 0xFF), - VTX(207, 1312, -1162, 251, -3368, 0x00, 0x78, 0x00, 0xFF), - VTX(207, 820, -1162, 61, -3381, 0x00, 0x78, 0x00, 0xFF), - VTX(973, 820, -847, 512, -2788, 0x00, 0x78, 0x00, 0xFF), - VTX(207, 1312, -1162, 252, -3368, 0x00, 0x78, 0x00, 0xFF), - VTX(973, 1312, -847, 512, -3015, 0x00, 0x78, 0x00, 0xFF), - VTX(1340, 1012, -209, 512, -455, 0x00, 0x78, 0x00, 0xFF), - VTX(1340, 220, -209, 512, -1081, 0x00, 0x78, 0x00, 0xFF), - VTX(939, 520, -209, 201, -1404, 0x00, 0x78, 0x00, 0xFF), - VTX(939, 220, -209, 391, -1391, 0x00, 0x78, 0x00, 0xFF), - VTX(1223, 177, 831, 0, 1707, 0x00, 0x78, 0x00, 0xFF), - VTX(1309, 220, 831, 143, 1679, 0x00, 0x78, 0x00, 0xFF), - VTX(1223, 500, 831, 0, 1365, 0x00, 0x78, 0x00, 0xFF), - VTX(1871, 220, 831, 512, 1593, 0x00, 0x78, 0x00, 0xFF), - VTX(973, 1312, -847, 512, -3015, 0x00, 0x78, 0x00, 0xFF), - VTX(612, 1572, -1558, 512, -3300, 0x00, 0x78, 0x00, 0xFF), - VTX(612, 1572, -1558, 512, -3300, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 1012, -209, 143, -626, 0x00, 0x78, 0x00, 0xFF), - VTX(1602, 1272, 312, 512, 284, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 1176, 119, 0, -284, 0x00, 0x78, 0x00, 0xFF), - VTX(953, 1272, 312, 0, 114, 0x00, 0x78, 0x00, 0xFF), - VTX(1223, 1014, 831, 0, 853, 0x00, 0x78, 0x00, 0xFF), - VTX(1871, 1014, 831, 512, 853, 0x00, 0x78, 0x00, 0xFF), - VTX(691, 520, -209, 0, -1536, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 676, 119, 0, -967, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 520, -209, 127, -1452, 0x00, 0x78, 0x00, 0xFF), - VTX(1905, 220, 1026, 396, 2481, 0x00, 0x78, 0x00, 0xFF), - VTX(1658, 220, 1169, 101, 2487, 0x00, 0x78, 0x00, 0xFF), - VTX(1905, 295, 1026, 410, 2617, 0x00, 0x78, 0x00, 0xFF), - VTX(1658, 295, 1169, 102, 2617, 0x00, 0x78, 0x00, 0xFF), - VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_80992880[] = { - VTX(1905, 295, 1026, 410, 2617, 0x00, 0x78, 0x00, 0xFF), VTX(1940, 295, 1047, 512, 2674, 0x00, 0x78, 0x00, 0xFF), - VTX(1905, 220, 1026, 396, 2481, 0x00, 0x78, 0x00, 0xFF), VTX(1940, 220, 1047, 512, 2560, 0x00, 0x78, 0x00, 0xFF), - VTX(1658, 220, 1169, 101, 2487, 0x00, 0x78, 0x00, 0xFF), VTX(1658, 220, 1215, 0, 2560, 0x00, 0x78, 0x00, 0xFF), - VTX(1658, 295, 1169, 102, 2617, 0x00, 0x78, 0x00, 0xFF), VTX(1658, 295, 1215, 0, 2674, 0x00, 0x78, 0x00, 0xFF), - VTX(1968, 295, 1172, 512, 2958, 0x00, 0x78, 0x00, 0xFF), VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF), - VTX(1763, 295, 1241, 102, 2901, 0x00, 0x78, 0x00, 0xFF), VTX(1753, 295, 1295, 0, 2958, 0x00, 0x78, 0x00, 0xFF), - VTX(973, 820, -847, 512, -2788, 0x00, 0x78, 0x00, 0xFF), VTX(207, 820, -1162, 61, -3381, 0x00, 0x78, 0x00, 0xFF), - VTX(973, 520, -847, 512, -2389, 0x00, 0x78, 0x00, 0xFF), VTX(142, 520, -1189, 0, -3015, 0x00, 0x78, 0x00, 0xFF), - VTX(1116, 520, -638, 512, -2105, 0x00, 0x78, 0x00, 0xFF), VTX(939, 520, -209, 201, -1404, 0x00, 0x78, 0x00, 0xFF), - VTX(1116, 220, -638, 512, -1764, 0x00, 0x78, 0x00, 0xFF), VTX(939, 220, -209, 391, -1391, 0x00, 0x78, 0x00, 0xFF), - VTX(1309, 220, 831, 143, 1679, 0x00, 0x78, 0x00, 0xFF), VTX(1907, 220, 920, 512, 2332, 0x00, 0x78, 0x00, 0xFF), - VTX(1871, 220, 831, 512, 1593, 0x00, 0x78, 0x00, 0xFF), VTX(1223, 177, 831, 0, 1707, 0x00, 0x78, 0x00, 0xFF), - VTX(1309, 220, 910, 0, 1820, 0x00, 0x78, 0x00, 0xFF), VTX(1932, 220, 1015, 512, 2503, 0x00, 0x78, 0x00, 0xFF), - VTX(1340, 220, -209, 512, -1081, 0x00, 0x78, 0x00, 0xFF), VTX(1636, 220, 1194, 0, 2503, 0x00, 0x78, 0x00, 0xFF), - VTX(691, 520, -209, 0, -1536, 0x00, 0x78, 0x00, 0xFF), VTX(839, 520, -209, 127, -1452, 0x00, 0x78, 0x00, 0xFF), - VTX(1915, -200, 1153, 410, 4096, 0x00, 0x78, 0x00, 0xFF), VTX(1968, -200, 1172, 512, 4096, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_80992A80[] = { - VTX(1915, 295, 1153, 410, 2901, 0x00, 0x78, 0x00, 0xFF), - VTX(1968, -200, 1172, 512, 4096, 0x00, 0x78, 0x00, 0xFF), - VTX(1968, 295, 1172, 512, 2958, 0x00, 0x78, 0x00, 0xFF), - VTX(1763, 295, 1241, 102, 2901, 0x00, 0x78, 0x00, 0xFF), - VTX(1763, -200, 1241, 102, 4096, 0x00, 0x78, 0x00, 0xFF), - VTX(1915, -200, 1153, 410, 4096, 0x00, 0x78, 0x00, 0xFF), - VTX(1753, 295, 1295, 0, 2958, 0x00, 0x78, 0x00, 0xFF), - VTX(1753, -200, 1295, 0, 4096, 0x00, 0x78, 0x00, 0xFF), - VTX(1340, 1012, -209, 512, -455, 0x00, 0x78, 0x00, 0xFF), - VTX(939, 520, -209, 201, -1404, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 1012, -209, 143, -626, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 520, -209, 127, -1452, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 676, 119, 0, -967, 0x00, 0x78, 0x00, 0xFF), - VTX(839, 1176, 119, 0, -284, 0x00, 0x78, 0x00, 0xFF), - VTX(1116, 520, -638, 512, -2105, 0x00, 0x78, 0x00, 0xFF), - VTX(469, 820, -1799, 512, -4096, 0x00, 0x78, 0x00, 0xFF), - VTX(207, 820, -1162, 61, -3381, 0x00, 0x78, 0x00, 0xFF), - VTX(207, 1312, -1162, 251, -3368, 0x00, 0x78, 0x00, 0xFF), - VTX(470, 1488, -1799, 512, -3755, 0x00, 0x78, 0x00, 0xFF), - VTX(1223, 1014, 831, 0, 853, 0x00, 0x78, 0x00, 0xFF), - VTX(1223, 500, 831, 0, 1365, 0x00, 0x78, 0x00, 0xFF), - VTX(1871, 1014, 831, 512, 853, 0x00, 0x78, 0x00, 0xFF), - VTX(1871, 220, 831, 512, 1593, 0x00, 0x78, 0x00, 0xFF), - VTX(142, 520, -1189, 0, -3015, 0x00, 0x78, 0x00, 0xFF), - VTX(142, 820, -1189, 0, -3413, 0x00, 0x78, 0x00, 0xFF), - VTX(-76, 820, -1633, 0, -4096, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_80992C20[] = { - VTX(1658, 295, 1169, 205, 1308, 0x00, 0x78, 0x00, 0xFF), - VTX(1763, 295, 1241, 205, 1451, 0x00, 0x78, 0x00, 0xFF), - VTX(1915, 295, 1153, 819, 1451, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_80992C50[] = { - VTX(-389, 800, -1884, 102, 4096, 0x2E, 0x00, 0x92, 0xFF), - VTX(-989, 800, -2131, 512, 4096, 0x2E, 0x00, 0x92, 0xFF), - VTX(-389, 1312, -1884, 102, 3589, 0x2B, 0x29, 0x98, 0xFF), - VTX(-989, 1312, -2131, 512, 3183, 0x1C, 0x5E, 0xBC, 0xFF), - VTX(-1491, 1521, -1887, 512, 2676, 0x14, 0x6B, 0xCF, 0xFF), - VTX(-1526, 1573, -1788, 432, 2534, 0x07, 0x76, 0xEE, 0xFF), - VTX(-960, 1573, -1555, 0, 2929, 0x07, 0x76, 0xEE, 0xFF), - VTX(-431, 1368, -1782, 0, 3487, 0x14, 0x6B, 0xCF, 0xFF), - VTX(-3551, 128, 2017, 512, -8687, 0x00, 0x78, 0x00, 0xFF), - VTX(-3362, 110, 1813, 512, -9143, 0x00, 0x78, 0x00, 0xFF), - VTX(-3663, 171, 1333, 0, -9143, 0x00, 0x78, 0x00, 0xFF), - VTX(-2482, 20, 1094, 0, -10005, 0x00, 0x78, 0x00, 0xFF), - VTX(-4018, 201, 1769, 0, -8687, 0x00, 0x78, 0x00, 0xFF), - VTX(-4183, 210, 2614, 0, -8129, 0x00, 0x78, 0x00, 0xFF), - VTX(-3596, 132, 2353, 512, -8129, 0x00, 0x78, 0x00, 0xFF), - VTX(-2655, 20, 1678, 508, -9752, 0x00, 0x78, 0x00, 0xFF), - VTX(-4574, 262, 2787, 0, -4832, 0x00, 0x78, 0x00, 0xFF), - VTX(-4684, 277, 2678, 0, -4679, 0x00, 0x78, 0x00, 0xFF), - VTX(-5168, 341, 2737, 512, -4527, 0x00, 0x78, 0x00, 0xFF), - VTX(-5194, 351, 2079, 512, -3868, 0x00, 0x78, 0x00, 0xFF), - VTX(-4997, 318, 2975, 512, -4832, 0x00, 0x78, 0x00, 0xFF), - VTX(-4710, 283, 1899, 0, -4121, 0x00, 0x78, 0x00, 0xFF), - VTX(-4653, 291, 1728, 0, -3868, 0x00, 0x78, 0x00, 0xFF), - VTX(-1962, 20, 988, 0, -10462, 0x00, 0x78, 0x00, 0xFF), - VTX(-1824, 20, 1516, 512, -10462, 0x00, 0x78, 0x00, 0xFF), - VTX(-116, 20, 907, 0, -12034, 0x00, 0x78, 0x00, 0xFF), - VTX(-253, 20, 908, 0, -11882, 0x00, 0x78, 0x00, 0xFF), - VTX(-261, 20, 1460, 512, -11882, 0x00, 0x78, 0x00, 0xFF), - VTX(-1189, 20, 1466, 512, -11121, 0x00, 0x78, 0x00, 0xFF), - VTX(105, 20, 905, 0, -12288, 0x00, 0x78, 0x00, 0xFF), - VTX(-42, 20, 906, 0, -12136, 0x00, 0x78, 0x00, 0xFF), - VTX(112, 20, 1211, 256, -12288, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_80992E50[] = { - VTX(-1481, 1314, -1874, 512, 2676, 0x4D, 0x56, 0x1F, 0xFF), - VTX(-2157, 1810, -1555, 512, 1661, 0x49, 0x56, 0x28, 0xFF), - VTX(-1708, 1312, -1303, 181, 2088, 0x47, 0x53, 0x31, 0xFF), - VTX(-4127, 2148, -205, 512, -774, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-4859, 1836, 734, 512, -1675, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-4433, 1483, 1025, 0, -1940, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-5178, 1470, 1540, 512, -2352, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-5210, 1260, 1920, 512, -2803, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-5196, 1149, 2080, 512, -2955, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-4655, 1124, 1729, 0, -2955, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-2443, 1728, -884, 0, 900, 0x49, 0x55, 0x2A, 0xFF), - VTX(-1743, 1282, -1195, 0, 1813, 0x65, 0x2F, 0x2C, 0xFF), - VTX(-1601, 520, -1259, 0, 2168, 0xD2, 0x00, 0x6E, 0xFF), - VTX(-1601, 1312, -1259, 0, 2371, 0xD5, 0x29, 0x68, 0xFF), - VTX(-1708, 520, -1303, 86, 2090, 0xD2, 0x00, 0x6E, 0xFF), - VTX(-1708, 1312, -1303, 181, 2088, 0xD2, 0x00, 0x6E, 0xFF), - VTX(-1708, 520, -1303, 86, 2090, 0x00, 0x78, 0x00, 0xFF), - VTX(-1743, 520, -1195, 0, 2016, 0x00, 0x78, 0x00, 0xFF), - VTX(-1601, 520, -1259, 0, 2168, 0x00, 0x78, 0x00, 0xFF), - VTX(-960, 1573, -1555, 0, 2929, 0x07, 0x76, 0xEE, 0xFF), - VTX(-1526, 1573, -1788, 432, 2534, 0x07, 0x76, 0xEE, 0xFF), - VTX(-431, 800, -1782, 0, 4096, 0x6E, 0x00, 0x2E, 0xFF), - VTX(-389, 1312, -1884, 102, 3589, 0x6E, 0x00, 0x2E, 0xFF), - VTX(-431, 1368, -1782, 0, 3487, 0x6E, 0x00, 0x2E, 0xFF), - VTX(-389, 800, -1884, 102, 4096, 0x6E, 0x00, 0x2E, 0xFF), - VTX(-1708, 520, -1303, 86, 2090, 0x72, 0x00, 0x25, 0xFF), - VTX(-1743, 520, -1195, 0, 2016, 0x72, 0x00, 0x25, 0xFF), - VTX(-2793, 2196, -1235, 512, 748, 0x3B, 0x5A, 0x34, 0xFF), - VTX(-2584, 1794, -774, 0, 697, 0x3B, 0x5A, 0x34, 0xFF), - VTX(-2717, 2160, -1291, 512, 850, 0x48, 0x55, 0x2A, 0xFF), -}; - -static Vtx D_80993030[] = { - VTX(-5196, 1149, 2080, 512, -2955, 0x00, 0x78, 0x00, 0xFF), - VTX(-5194, 351, 2079, 512, -3868, 0x00, 0x78, 0x00, 0xFF), - VTX(-4653, 291, 1728, 0, -3868, 0x00, 0x78, 0x00, 0xFF), - VTX(-4655, 1124, 1729, 0, -2955, 0x00, 0x78, 0x00, 0xFF), - VTX(-4574, 262, 2787, 0, -4832, 0x00, 0x78, 0x00, 0xFF), - VTX(-4997, 318, 2975, 512, -4832, 0x00, 0x78, 0x00, 0xFF), - VTX(-4997, 1136, 2975, 512, -5795, 0x00, 0x78, 0x00, 0xFF), - VTX(-4574, 1112, 2787, 0, -5795, 0x00, 0x78, 0x00, 0xFF), - VTX(-3596, 1057, 2353, 512, -7266, 0x00, 0x78, 0x00, 0xFF), - VTX(-3596, 132, 2353, 512, -8129, 0x00, 0x78, 0x00, 0xFF), - VTX(-4183, 210, 2614, 0, -8129, 0x00, 0x78, 0x00, 0xFF), - VTX(-4183, 1090, 2614, 0, -7266, 0x00, 0x78, 0x00, 0xFF), - VTX(-1189, 20, 1466, 512, -11121, 0x00, 0x78, 0x00, 0xFF), - VTX(-1194, 20, 914, 0, -11071, 0x00, 0x78, 0x00, 0xFF), - VTX(-1577, 20, 1468, 512, -10716, 0x00, 0x78, 0x00, 0xFF), - VTX(-253, 20, 908, 0, -11882, 0x00, 0x78, 0x00, 0xFF), - VTX(-1610, 20, 917, 0, -10766, 0x00, 0x78, 0x00, 0xFF), - VTX(-1962, 20, 988, 0, -10462, 0x00, 0x78, 0x00, 0xFF), - VTX(-1824, 20, 1516, 512, -10462, 0x00, 0x78, 0x00, 0xFF), - VTX(-4433, 1483, 1025, 0, -1940, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-3678, 1748, 81, 0, -621, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-4127, 2148, -205, 512, -774, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-3641, 2217, -657, 512, -114, 0x2C, 0x5D, 0x3D, 0xFF), - VTX(-2584, 1794, -774, 0, 697, 0x3B, 0x5A, 0x34, 0xFF), - VTX(-2584, 1794, -774, 0, 697, 0x3B, 0x5A, 0x34, 0xFF), - VTX(-2793, 2196, -1235, 512, 748, 0x3B, 0x5A, 0x34, 0xFF), - VTX(-4997, 1136, 2975, 512, -5795, 0x00, 0x78, 0x00, 0xFF), - VTX(-4876, 1279, 3143, 512, -6089, 0x00, 0x78, 0x00, 0xFF), - VTX(-4574, 1112, 2787, 0, -5795, 0x00, 0x78, 0x00, 0xFF), - VTX(-4445, 1191, 2858, 0, -6163, 0x00, 0x78, 0x00, 0xFF), - VTX(-4488, 1519, 3360, 512, -6384, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_80993220[] = { - VTX(-4488, 1519, 3360, 512, -6384, 0x00, 0x78, 0x00, 0xFF), - VTX(-3980, 1539, 3206, 512, -6678, 0x00, 0x78, 0x00, 0xFF), - VTX(-4281, 1193, 2801, 0, -6531, 0x00, 0x78, 0x00, 0xFF), - VTX(-4445, 1191, 2858, 0, -6163, 0x00, 0x78, 0x00, 0xFF), - VTX(-3643, 1337, 2785, 512, -6972, 0x00, 0x78, 0x00, 0xFF), - VTX(-4203, 1151, 2711, 0, -6899, 0x00, 0x78, 0x00, 0xFF), - VTX(-3596, 1057, 2353, 512, -7266, 0x00, 0x78, 0x00, 0xFF), - VTX(-4183, 1090, 2614, 0, -7266, 0x00, 0x78, 0x00, 0xFF), -}; - -static Vtx D_809932A0[] = { - VTX(117, 20, 1458, 1024, -6144, 0x00, 0x78, 0x00, 0xFF), - VTX(112, 20, 1211, 512, -6144, 0x00, 0x78, 0x00, 0xFF), - VTX(-261, 20, 1460, 1024, -5941, 0x00, 0x78, 0x00, 0xFF), -}; - -static Gfx D_809932D0[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(65535, 65535, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(D_80991680, G_IM_FMT_I, G_IM_SIZ_8b, 16, 128, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_WRAP, 4, 7, G_TX_NOLOD, 1), - gsDPLoadMultiBlock(D_80991E80, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 6, G_TX_NOLOD, 15), - gsDPSetCombineLERP(NOISE, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL1, 1, ENVIRONMENT, TEXEL0, 0, 0, 0, COMBINED, 0, - 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_CULL_BACK | G_LIGHTING), - gsDPSetPrimColor(0, 0, 0x00, 0x32, 0x64, 0xFF), - gsDPSetEnvColor(0x32, 0x14, 0x00, 0x80), - gsSPEndDisplayList(), -}; - -static Gfx D_80993390[] = { - gsSPVertex(D_80992680, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0), - gsSP2Triangles(8, 10, 9, 0, 11, 12, 13, 0), - gsSP2Triangles(12, 14, 13, 0, 15, 16, 2, 0), - gsSP2Triangles(16, 0, 2, 0, 17, 1, 0, 0), - gsSP2Triangles(7, 18, 19, 0, 18, 20, 19, 0), - gsSP2Triangles(20, 21, 19, 0, 22, 23, 21, 0), - gsSP2Triangles(23, 19, 21, 0, 24, 25, 26, 0), - gsSP2Triangles(27, 28, 29, 0, 28, 30, 29, 0), - gsSP2Triangles(29, 30, 31, 0, 26, 25, 18, 0), - gsSPVertex(D_80992880, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0), - gsSP2Triangles(1, 0, 8, 0, 0, 9, 8, 0), - gsSP2Triangles(6, 7, 10, 0, 7, 11, 10, 0), - gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0), - gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0), - gsSP2Triangles(4, 2, 20, 0, 2, 21, 20, 0), - gsSP2Triangles(21, 22, 20, 0, 23, 24, 20, 0), - gsSP2Triangles(25, 21, 2, 0, 3, 25, 2, 0), - gsSP2Triangles(26, 18, 19, 0, 24, 27, 20, 0), - gsSP2Triangles(27, 4, 20, 0, 27, 5, 4, 0), - gsSP2Triangles(28, 29, 15, 0, 29, 16, 15, 0), - gsSP2Triangles(16, 14, 15, 0, 9, 30, 31, 0), - gsSPVertex(D_80992A80, 26, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(3, 5, 0, 0, 6, 7, 4, 0), - gsSP2Triangles(6, 4, 3, 0, 8, 9, 10, 0), - gsSP2Triangles(9, 11, 10, 0, 10, 12, 13, 0), - gsSP2Triangles(14, 11, 9, 0, 15, 16, 17, 0), - gsSP2Triangles(15, 17, 18, 0, 19, 20, 21, 0), - gsSP2Triangles(20, 22, 21, 0, 23, 16, 24, 0), - gsSP2Triangles(15, 25, 16, 0, 25, 24, 16, 0), - gsSPVertex(D_80992C20, 3, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSPEndDisplayList(), -}; - -static Gfx D_809934B8[] = { - gsSPVertex(D_80992C50, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 3, 0, 5, 6, 3, 0), - gsSP2Triangles(6, 7, 3, 0, 7, 2, 3, 0), - gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0), - gsSP2Triangles(10, 12, 8, 0, 12, 13, 8, 0), - gsSP2Triangles(13, 14, 8, 0, 9, 15, 11, 0), - gsSP2Triangles(16, 17, 18, 0, 17, 19, 18, 0), - gsSP2Triangles(18, 20, 16, 0, 17, 21, 19, 0), - gsSP2Triangles(21, 22, 19, 0, 23, 11, 24, 0), - gsSP2Triangles(11, 15, 24, 0, 25, 26, 27, 0), - gsSP2Triangles(26, 28, 27, 0, 29, 30, 31, 0), - gsSP2Triangles(31, 30, 27, 0, 30, 25, 27, 0), - gsSPVertex(D_80992E50, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(4, 6, 5, 0, 6, 7, 5, 0), - gsSP2Triangles(7, 8, 5, 0, 8, 9, 5, 0), - gsSP2Triangles(10, 11, 1, 0, 11, 2, 1, 0), - gsSP2Triangles(12, 13, 14, 0, 13, 15, 14, 0), - gsSP2Triangles(16, 17, 18, 0, 2, 13, 19, 0), - gsSP2Triangles(2, 19, 20, 0, 21, 22, 23, 0), - gsSP2Triangles(21, 24, 22, 0, 11, 25, 2, 0), - gsSP2Triangles(11, 26, 25, 0, 27, 28, 29, 0), - gsSP2Triangles(28, 10, 29, 0, 10, 1, 29, 0), - gsSPVertex(D_80993030, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), - gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), - gsSP2Triangles(12, 13, 14, 0, 12, 15, 13, 0), - gsSP2Triangles(13, 16, 14, 0, 16, 17, 14, 0), - gsSP2Triangles(17, 18, 14, 0, 19, 20, 21, 0), - gsSP2Triangles(20, 22, 21, 0, 20, 23, 22, 0), - gsSP2Triangles(24, 25, 22, 0, 26, 27, 28, 0), - gsSP2Triangles(27, 29, 28, 0, 27, 30, 29, 0), - gsSPVertex(D_80993220, 8, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), - gsSP2Triangles(4, 6, 7, 0, 4, 7, 5, 0), - gsSPVertex(D_809932A0, 3, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index dc2c52e43e..3d2cd34595 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -36,7 +36,7 @@ const ActorInit Eff_Dust_InitVars = { (ActorFunc)EffDust_Draw, }; -static Gfx D_8099EB60[] = { +static Gfx sEmptyDL[] = { gsSPEndDisplayList(), }; @@ -281,7 +281,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { initialPositions = this->initialPositions; distanceTraveled = this->distanceTraveled; - gSPSegment(POLY_XLU_DISP++, 0x08, D_8099EB60); + gSPSegment(POLY_XLU_DISP++, 0x08, sEmptyDL); for (i = 0; i < 64; i++) { if (*distanceTraveled < 1.0f) { @@ -333,7 +333,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { initialPositions = this->initialPositions; distanceTraveled = this->distanceTraveled; - gSPSegment(POLY_XLU_DISP++, 0x08, D_8099EB60); + gSPSegment(POLY_XLU_DISP++, 0x08, sEmptyDL); for (i = 0; i < 64; i++) { if (*distanceTraveled < 1.0f) { diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index cb4fae34d6..5838b46fe1 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -37,56 +37,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), }; -// Draw properties -static Gfx D_809AD278[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_LIGHTING), - gsSPEndDisplayList(), -}; - -static Vtx sCylinderVertices[] = { - VTX(100, 0, 0, 0, 0, 0x59, 0xA7, 0x00, 0xFF), VTX(70, 0, 70, 0, 0, 0x49, 0xB7, 0x49, 0xFF), - VTX(0, 0, 100, 0, 0, 0x00, 0xA7, 0x59, 0xFF), VTX(-70, 0, 70, 0, 0, 0xB7, 0xB7, 0x49, 0xFF), - VTX(-100, 0, 0, 0, 0, 0xA7, 0xA7, 0x00, 0xFF), VTX(-70, 0, -70, 0, 0, 0xB7, 0xB7, 0xB7, 0xFF), - VTX(0, 0, -100, 0, 0, 0x00, 0xA7, 0xA7, 0xFF), VTX(70, 0, -70, 0, 0, 0x49, 0xB7, 0xB7, 0xFF), - VTX(100, 100, 0, 0, 0, 0x59, 0x59, 0x00, 0xFF), VTX(70, 100, 70, 0, 0, 0x49, 0x49, 0x49, 0xFF), - VTX(0, 100, 100, 0, 0, 0x00, 0x59, 0x59, 0xFF), VTX(-70, 100, 70, 0, 0, 0xB7, 0x49, 0x49, 0xFF), - VTX(-100, 100, 0, 0, 0, 0xA7, 0x59, 0x00, 0xFF), VTX(-70, 100, -70, 0, 0, 0xB7, 0x49, 0xB7, 0xFF), - VTX(0, 100, -100, 0, 0, 0x00, 0x59, 0xA7, 0xFF), VTX(70, 100, -70, 0, 0, 0x49, 0x49, 0xB7, 0xFF), -}; - -// Polygons for cylinder -static Gfx D_809AD3B8[] = { - gsSPVertex(sCylinderVertices, 16, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(0, 3, 4, 0, 0, 4, 5, 0), gsSP2Triangles(0, 5, 6, 0, 0, 6, 7, 0), - gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0), gsSP2Triangles(8, 11, 12, 0, 8, 12, 13, 0), - gsSP2Triangles(8, 13, 14, 0, 8, 14, 15, 0), gsSP2Triangles(0, 1, 8, 0, 1, 8, 9, 0), - gsSP2Triangles(1, 2, 9, 0, 2, 9, 10, 0), gsSP2Triangles(2, 3, 10, 0, 3, 10, 11, 0), - gsSP2Triangles(3, 4, 11, 0, 4, 11, 12, 0), gsSP2Triangles(4, 5, 12, 0, 5, 12, 13, 0), - gsSP2Triangles(5, 6, 13, 0, 6, 13, 14, 0), gsSP2Triangles(6, 7, 14, 0, 7, 14, 15, 0), - gsSP2Triangles(7, 0, 15, 0, 0, 15, 8, 0), gsSPEndDisplayList(), -}; - -static Vtx sCuboidVertices[] = { - VTX(100, 0, 100, 0, 0, 0x49, 0xB7, 0x49, 0xFF), VTX(100, 0, -100, 0, 0, 0x49, 0xB7, 0xB7, 0xFF), - VTX(-100, 0, -100, 0, 0, 0xB7, 0xB7, 0xB7, 0xFF), VTX(-100, 0, 100, 0, 0, 0xB7, 0xB7, 0x49, 0xFF), - VTX(100, 100, 100, 0, 0, 0x49, 0x49, 0x49, 0xFF), VTX(100, 100, -100, 0, 0, 0x49, 0x49, 0xB7, 0xFF), - VTX(-100, 100, -100, 0, 0, 0xB7, 0x49, 0xB7, 0xFF), VTX(-100, 100, 100, 0, 0, 0xB7, 0x49, 0x49, 0xFF), -}; - -// Polygons for cuboid -static Gfx D_809AD4B8[] = { - gsSPVertex(sCuboidVertices, 8, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSP2Triangles(0, 1, 4, 0, 1, 4, 5, 0), - gsSP2Triangles(1, 2, 5, 0, 2, 5, 6, 0), gsSP2Triangles(2, 3, 6, 0, 3, 6, 7, 0), - gsSP2Triangles(3, 0, 7, 0, 0, 7, 4, 0), gsSPEndDisplayList(), -}; - void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -96,25 +46,24 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { * Can also set a switch flag from params while killing. */ s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) { - if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && - (Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1))) { + Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) { LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { - Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); + Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) { LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { - Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); + Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); } Actor_Kill(&this->actor); return 1; } else if (((this->actor.params >> 8) & 0x3F) == 0x3F) { return 0; - } else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) { + } else if (Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { Actor_Kill(&this->actor); return 1; } @@ -216,6 +165,8 @@ void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx) { } } +#include "overlays/ovl_Elf_Msg/ovl_Elf_Msg.c" + void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 436); @@ -235,9 +186,9 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, D_809AD278); if (thisx->params & 0x4000) { - gSPDisplayList(POLY_XLU_DISP++, D_809AD4B8); + gSPDisplayList(POLY_XLU_DISP++, sCubeDL); } else { - gSPDisplayList(POLY_XLU_DISP++, D_809AD3B8); + gSPDisplayList(POLY_XLU_DISP++, sCylinderDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457); diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index a04484310c..a664f5b07d 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -37,33 +37,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), }; -// Draw properties -static Gfx D_809ADC38[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_LIGHTING), - gsSPEndDisplayList(), -}; - -static Vtx sCuboidVertices[] = { - VTX(100, 0, 100, 0, 0, 0x49, 0xB7, 0x49, 0xFF), VTX(100, 0, -100, 0, 0, 0x49, 0xB7, 0xB7, 0xFF), - VTX(-100, 0, -100, 0, 0, 0xB7, 0xB7, 0xB7, 0xFF), VTX(-100, 0, 100, 0, 0, 0xB7, 0xB7, 0x49, 0xFF), - VTX(100, 100, 100, 0, 0, 0x49, 0x49, 0x49, 0xFF), VTX(100, 100, -100, 0, 0, 0x49, 0x49, 0xB7, 0xFF), - VTX(-100, 100, -100, 0, 0, 0xB7, 0x49, 0xB7, 0xFF), VTX(-100, 100, 100, 0, 0, 0xB7, 0x49, 0x49, 0xFF), -}; - -// Cuboid polygons -static Gfx D_809ADCF8[] = { - gsSPVertex(sCuboidVertices, 8, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSP2Triangles(0, 1, 4, 0, 1, 4, 5, 0), - gsSP2Triangles(1, 2, 5, 0, 2, 5, 6, 0), gsSP2Triangles(2, 3, 6, 0, 3, 6, 7, 0), - gsSP2Triangles(3, 0, 7, 0, 0, 7, 4, 0), gsSPEndDisplayList(), -}; - void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -73,9 +46,8 @@ void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { * Can also set a switch flag from params while killing. */ s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) { - if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && - (Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1))) { + Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) { LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); @@ -171,11 +143,14 @@ void ElfMsg2_WaitUntilActivated(ElfMsg2* this, GlobalContext* globalCtx) { void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx) { ElfMsg2* this = THIS; + if (!ElfMsg2_KillCheck(this, globalCtx)) { this->actionFunc(this, globalCtx); } } +#include "overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.c" + void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 355); @@ -188,7 +163,7 @@ void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 362), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_809ADC38); - gSPDisplayList(POLY_XLU_DISP++, D_809ADCF8); + gSPDisplayList(POLY_XLU_DISP++, sCubeDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 367); } diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 62d5e9196a..4749162385 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -747,17 +747,7 @@ static void* sTentaclesTextures[] = { gBiriTentacles4Tex, gBiriTentacles5Tex, gBiriTentacles6Tex, gBiriTentacles7Tex, }; -static Gfx D_809C16F0[] = { - gsDPSetCombineLERP(1, TEXEL0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0, TEXEL1, 0, - PRIM_LOD_FRAC, COMBINED), - gsSPEndDisplayList(), -}; - -static Gfx D_809C1700[] = { - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0, TEXEL1, 0, - PRIM_LOD_FRAC, COMBINED), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_En_Bili/ovl_En_Bili.c" void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBili* this = THIS; @@ -770,9 +760,9 @@ void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTentaclesTextures[this->tentaclesTexIndex])); if ((this->actionFunc == EnBili_DischargeLightning) && ((this->timer & 1) != 0)) { - gSPSegment(POLY_XLU_DISP++, 0x09, &D_809C16F0); + gSPSegment(POLY_XLU_DISP++, 0x09, D_809C16F0); } else { - gSPSegment(POLY_XLU_DISP++, 0x09, &D_809C1700); + gSPSegment(POLY_XLU_DISP++, 0x09, D_809C1700); } POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index dba5cd72a1..55bd9774c8 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -368,7 +368,7 @@ void EnGanonMant_DrawCloak(GlobalContext* globalCtx, EnGanonMant* this) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // set texture - gSPDisplayList(POLY_OPA_DISP++, gMantTexDL); + gSPDisplayList(POLY_OPA_DISP++, gMantMaterialDL); // set vertices, vertices are double buffered to prevent // modification of vertices as they are being drawn diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 20fd2350ad..90c8c4ad16 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -109,8 +109,8 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 221), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gGanondorfRoomOrganAndFloorDL); - gSPDisplayList(POLY_OPA_DISP++, gGanondorfRoomStatuesDL); + gSPDisplayList(POLY_OPA_DISP++, sRoomOrganAndFloorDL); + gSPDisplayList(POLY_OPA_DISP++, sRoomStatuesDL); osSyncPrintf("ORGAN DRAW 2\n"); diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 60ae180ef5..66b63f3fbf 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -582,7 +582,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1064), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gGossipStoneSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gGossipStoneMaterialDL); if (this->unk_19E & 4) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->flashColor.r, this->flashColor.g, this->flashColor.b, diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 999c646202..11844f5691 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -73,21 +73,6 @@ static f32 sHorizTriggerDists[2][4] = { { 100.0f, 75.0f, 50.0f, 25.0f }, }; -static Vtx sVertices[] = { - VTX(0x55F0, 0x4E20, 0x0000, 0x0800, 0x0800, 255, 255, 255, 255), - VTX(0xAA10, 0x4E20, 0x0000, 0x0000, 0x0800, 255, 255, 255, 255), - VTX(0xAA10, 0xB1E0, 0x0000, 0x0000, 0x0000, 255, 255, 255, 255), - VTX(0x55F0, 0xB1E0, 0x0000, 0x0800, 0x0000, 255, 255, 255, 255), -}; - -static Gfx sPlaneDlist[] = { - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PASS2), - gsSPVertex(sVertices, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; - void EnHoll_SetupAction(EnHoll* this, EnHollActionFunc func) { this->actionFunc = func; } @@ -335,10 +320,12 @@ void EnHoll_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } +#include "overlays/ovl_En_Holl/ovl_En_Holl.c" + void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { EnHoll* this = THIS; Gfx* gfxP; - u32 setupDLIdx; + u32 setupDlIdx; // Only draw the plane if not invisible if (this->planeAlpha != 0) { @@ -346,12 +333,12 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->planeAlpha == 255) { gfxP = POLY_OPA_DISP; - setupDLIdx = 37; + setupDlIdx = 37; } else { gfxP = POLY_XLU_DISP; - setupDLIdx = 0; + setupDlIdx = 0; } - gfxP = Gfx_CallSetupDL(gfxP, setupDLIdx); + gfxP = Gfx_CallSetupDL(gfxP, setupDlIdx); if (this->side == 0) { Matrix_RotateY(M_PI, MTXMODE_APPLY); } @@ -359,7 +346,7 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(gfxP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_holl.c", 824), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gfxP++, 0, 0, 0, 0, 0, (u8)this->planeAlpha); - gSPDisplayList(gfxP++, sPlaneDlist); + gSPDisplayList(gfxP++, sPlaneDL); if (this->planeAlpha == 255) { POLY_OPA_DISP = gfxP; diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 12a11955c2..d24f766edc 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -29,9 +29,9 @@ const ActorInit En_Jsjutan_InitVars = { }; // Shadow texture. 32x64 I8. -u8 gJsjutanShadowTex[0x800]; +static u8 sShadowTex[0x800]; -Vec3s D_80A8EE10[0x90]; +static Vec3s D_80A8EE10[0x90]; static s32 sUnused[2] = { 0, 0 }; @@ -44,7 +44,7 @@ void EnJsjutan_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.flags &= ~1; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&gJsjutanCol, &header); + CollisionHeader_GetVirtual(&sCol, &header); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, header); Actor_SetScale(thisx, 0.02f); this->unk_164 = true; @@ -59,23 +59,23 @@ void EnJsjutan_Destroy(Actor* thisx, GlobalContext* globalCtx) { void func_80A89860(EnJsjutan* this, GlobalContext* globalCtx) { s16 i; - Vtx* phi_s0; - Vtx* phi_s2; + Vtx* oddVtx; + Vtx* evenVtx; Vec3f actorPos = this->dyna.actor.world.pos; - phi_s0 = SEGMENTED_TO_VIRTUAL(gJsjutanShadowOddVtx); - phi_s2 = SEGMENTED_TO_VIRTUAL(gJsjutanShadowEvenVtx); + oddVtx = SEGMENTED_TO_VIRTUAL(gShadowOddVtx); + evenVtx = SEGMENTED_TO_VIRTUAL(sShadowEvenVtx); - for (i = 0; i < ARRAY_COUNT(D_80A8EE10); i++, phi_s0++, phi_s2++) { - D_80A8EE10[i].x = phi_s0->v.ob[0]; - D_80A8EE10[i].z = phi_s0->v.ob[2]; + for (i = 0; i < ARRAY_COUNT(D_80A8EE10); i++, oddVtx++, evenVtx++) { + D_80A8EE10[i].x = oddVtx->v.ob[0]; + D_80A8EE10[i].z = oddVtx->v.ob[2]; if (this->dyna.actor.params == ENJSJUTAN_TYPE_01) { - phi_s0->v.ob[1] = phi_s2->v.ob[1] = 0x585; + oddVtx->v.ob[1] = evenVtx->v.ob[1] = 0x585; } else { - this->dyna.actor.world.pos.x = phi_s0->v.ob[0] * 0.02f + actorPos.x; - this->dyna.actor.world.pos.z = phi_s0->v.ob[2] * 0.02f + actorPos.z; + this->dyna.actor.world.pos.x = oddVtx->v.ob[0] * 0.02f + actorPos.x; + this->dyna.actor.world.pos.z = oddVtx->v.ob[2] * 0.02f + actorPos.z; Actor_UpdateBgCheckInfo(globalCtx, &this->dyna.actor, 10.0f, 10.0f, 10.0f, 4); - phi_s0->v.ob[1] = phi_s2->v.ob[1] = this->dyna.actor.floorHeight; + oddVtx->v.ob[1] = evenVtx->v.ob[1] = this->dyna.actor.floorHeight; this->dyna.actor.world.pos = actorPos; } } @@ -85,8 +85,8 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { u8 isPlayerOnTop = false; // sp127 s16 i; s16 j; - Vtx* phi_s0; - Vtx* phi_s3; + Vtx* carpetVtx; + Vtx* shadowVtx; Vtx* phi_s0_2; Vec3f sp108; Vec3f spFC; @@ -119,18 +119,18 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { u8 isInCreditsScene = false; // sp8B if (globalCtx->gameplayFrames % 2 != 0) { - phi_s0 = SEGMENTED_TO_VIRTUAL(gJsjutanCarpetOddVtx); - phi_s3 = SEGMENTED_TO_VIRTUAL(gJsjutanShadowOddVtx); + carpetVtx = SEGMENTED_TO_VIRTUAL(sCarpetOddVtx); + shadowVtx = SEGMENTED_TO_VIRTUAL(gShadowOddVtx); } else { - phi_s0 = SEGMENTED_TO_VIRTUAL(gJsjutanCarpetEvenVtx); - phi_s3 = SEGMENTED_TO_VIRTUAL(gJsjutanShadowEvenVtx); + carpetVtx = SEGMENTED_TO_VIRTUAL(sCarpetEvenVtx); + shadowVtx = SEGMENTED_TO_VIRTUAL(sShadowEvenVtx); } // Distance of player to carpet. spB8 = (player->actor.world.pos.x - this->dyna.actor.world.pos.x) * 50.0f; spB4 = (player->actor.world.pos.y - this->unk_168) * 50.0f; spB0 = (player->actor.world.pos.z - this->dyna.actor.world.pos.z) * 50.0f; - phi_s0_2 = phi_s0; + phi_s0_2 = carpetVtx; if ((fabsf(spB8) < 5500.0f) && (fabsf(spB4) < 3000.0f) && (fabsf(spB0) < 5500.0f)) { isPlayerOnTop = true; @@ -168,9 +168,6 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { actorBeanGuy = actorBeanGuy->next; } - // If somehow, neither of these two actors is not found, the game - // will dereference a NULL pointer, but this is unlikely to happen. - spD4[1] = 50.0f * (actorProfessor->world.pos.x - this->dyna.actor.world.pos.x); spC8[1] = 50.0f * (actorProfessor->world.pos.y - this->unk_168); spBC[1] = 50.0f * (actorProfessor->world.pos.z - this->dyna.actor.world.pos.z); @@ -203,11 +200,11 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { } // Fancy math to make a woobly and reactive carpet. - for (i = 0; i < ARRAY_COUNT(D_80A8EE10); i++, phi_s0++, phi_s3++) { + for (i = 0; i < ARRAY_COUNT(D_80A8EE10); i++, carpetVtx++, shadowVtx++) { if (isPlayerOnTop) { // Linear distance from j-th wave to player, in XZ plane. - dxVtx = phi_s0->n.ob[0] - spB8; - dzVtx = phi_s0->n.ob[2] - spB0; + dxVtx = carpetVtx->n.ob[0] - spB8; + dzVtx = carpetVtx->n.ob[2] - spB0; distVtx = sqrtf(SQ(dxVtx) + SQ(dzVtx)); // Distance percentage. 0.0f to 1.0f. 2500.0f is the max distance to an actor that this wave will consider. @@ -232,8 +229,8 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { for (j = 0; j < 3; j++) { if (spE0[j] != 0) { - dxVtx = phi_s0->n.ob[0] - spD4[j]; - dzVtx = phi_s0->n.ob[2] - spBC[j]; + dxVtx = carpetVtx->n.ob[0] - spD4[j]; + dzVtx = carpetVtx->n.ob[2] - spBC[j]; // Linear distance from j-th wave to whatever actor is there, in XZ plane. distVtx = sqrtf(SQ(dxVtx) + SQ(dzVtx)); @@ -278,21 +275,21 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { if (this->unk_174) { s16 phi_v1_4 = offset + waveform; - s16 temp_a0_3 = (phi_s3->n.ob[1] - this->unk_168) * 50.0f; + s16 temp_a0_3 = (shadowVtx->n.ob[1] - this->unk_168) * 50.0f; if (phi_v1_4 < temp_a0_3) { phi_v1_4 = temp_a0_3; } - phi_s0->n.ob[1] = phi_v1_4; + carpetVtx->n.ob[1] = phi_v1_4; } else { - phi_s0->n.ob[1] = offset + waveform; + carpetVtx->n.ob[1] = offset + waveform; - phi_s0->n.ob[0] = D_80A8EE10[i].x + (s16)(waveform * 0.5f); - phi_s0->n.ob[2] = D_80A8EE10[i].z + (s16)(waveform * 0.5f); + carpetVtx->n.ob[0] = D_80A8EE10[i].x + (s16)(waveform * 0.5f); + carpetVtx->n.ob[2] = D_80A8EE10[i].z + (s16)(waveform * 0.5f); - phi_s3->n.ob[0] = D_80A8EE10[i].x + (s16)waveform; - phi_s3->n.ob[2] = D_80A8EE10[i].z + (s16)waveform; + shadowVtx->n.ob[0] = D_80A8EE10[i].x + (s16)waveform; + shadowVtx->n.ob[2] = D_80A8EE10[i].z + (s16)waveform; } } @@ -316,36 +313,36 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { Math_ApproachF(&this->unk_170, -5000.0f, 1.0f, 100.0f); } - phi_s0 = phi_s0_2; + carpetVtx = phi_s0_2; sp108.x = 0.0f; sp108.y = 0.0f; sp108.z = 120.0f; // Fancy math to smooth each part of the wave considering its neighborhood. - for (i = 0; i < ARRAY_COUNT(gJsjutanCarpetOddVtx); i++, phi_s0++) { + for (i = 0; i < ARRAY_COUNT(sCarpetOddVtx); i++, carpetVtx++) { f32 rotX; f32 rotZ; s32 pad; // Carpet size is 12x12. if ((i % 12) == 11) { // Last column. j = i - 1; - dzVtx = phi_s0->n.ob[2] - phi_s0_2[j].n.ob[2]; + dzVtx = carpetVtx->n.ob[2] - phi_s0_2[j].n.ob[2]; } else { j = i + 1; - dzVtx = phi_s0_2[j].n.ob[2] - phi_s0->n.ob[2]; + dzVtx = phi_s0_2[j].n.ob[2] - carpetVtx->n.ob[2]; } - dyVtx = phi_s0_2[j].n.ob[1] - phi_s0->n.ob[1]; + dyVtx = phi_s0_2[j].n.ob[1] - carpetVtx->n.ob[1]; rotX = Math_Atan2F(dzVtx, dyVtx); if (i >= 132) { // Last row. j = i - 12; - dxVtx = phi_s0->n.ob[0] - phi_s0_2[j].n.ob[0]; + dxVtx = carpetVtx->n.ob[0] - phi_s0_2[j].n.ob[0]; } else { j = i + 12; - dxVtx = phi_s0_2[j].n.ob[0] - phi_s0->n.ob[0]; + dxVtx = phi_s0_2[j].n.ob[0] - carpetVtx->n.ob[0]; } rotZ = Math_Atan2F(dxVtx, dyVtx); @@ -354,9 +351,9 @@ void func_80A89A6C(EnJsjutan* this, GlobalContext* globalCtx) { Matrix_RotateZ(rotZ, MTXMODE_APPLY); Matrix_MultVec3f(&sp108, &spFC); - phi_s0->n.n[0] = spFC.x; - phi_s0->n.n[1] = spFC.y; - phi_s0->n.n[2] = spFC.z; + carpetVtx->n.n[0] = spFC.x; + carpetVtx->n.n[1] = spFC.y; + carpetVtx->n.n[2] = spFC.z; } } @@ -396,11 +393,11 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { func_80A89A6C(this, globalCtx); if (this->unk_164) { this->unk_164 = false; - for (i = 0; i < ARRAY_COUNT(gJsjutanShadowTex); i++) { - if (((u16*)gJsjutanCarpetTex)[i] != 0) { // Hack to bypass ZAPD exporting textures as u64. - gJsjutanShadowTex[i] = 0xFF; + for (i = 0; i < ARRAY_COUNT(sShadowTex); i++) { + if (((u16*)sCarpetTex)[i] != 0) { // Hack to bypass ZAPD exporting textures as u64. + sShadowTex[i] = 0xFF; } else { - gJsjutanShadowTex[i] = 0; + sShadowTex[i] = 0; } } } @@ -415,16 +412,16 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // Draws the carpet's shadow texture. - gSPDisplayList(POLY_OPA_DISP++, gJsjutanShadowVisualDL); + gSPDisplayList(POLY_OPA_DISP++, sShadowMaterialDL); gDPPipeSync(POLY_OPA_DISP++); // Draws the carpet's shadow vertices. Swaps them between frames to get a smoother result. if (globalCtx->gameplayFrames % 2 != 0) { - gSPSegment(POLY_OPA_DISP++, 0x0C, gJsjutanShadowOddVtx); + gSPSegment(POLY_OPA_DISP++, 0x0C, gShadowOddVtx); } else { - gSPSegment(POLY_OPA_DISP++, 0x0C, gJsjutanShadowEvenVtx); + gSPSegment(POLY_OPA_DISP++, 0x0C, sShadowEvenVtx); } - gSPDisplayList(POLY_OPA_DISP++, gJsjutanGeometryDL); + gSPDisplayList(POLY_OPA_DISP++, sModelDL); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(thisx->world.pos.x, this->unk_168 + 3.0f, thisx->world.pos.z, MTXMODE_NEW); @@ -433,17 +430,17 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 805), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // Draws the carpet's texture. - gSPDisplayList(POLY_OPA_DISP++, gJsjutanCarpetVisualDL); + gSPDisplayList(POLY_OPA_DISP++, sCarpetMaterialDL); gDPPipeSync(POLY_OPA_DISP++); // Draws the carpet vertices. if (globalCtx->gameplayFrames % 2 != 0) { - gSPSegment(POLY_OPA_DISP++, 0x0C, gJsjutanCarpetOddVtx); + gSPSegment(POLY_OPA_DISP++, 0x0C, sCarpetOddVtx); } else { - gSPSegment(POLY_OPA_DISP++, 0x0C, gJsjutanCarpetEvenVtx); + gSPSegment(POLY_OPA_DISP++, 0x0C, sCarpetEvenVtx); } - gSPDisplayList(POLY_OPA_DISP++, gJsjutanGeometryDL); + gSPDisplayList(POLY_OPA_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 823); } diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index b7e742dd84..0af726648e 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -781,26 +781,7 @@ static f32 sCutAngles[] = { static s32 sUnused[] = { 0, 0, 0 }; // Unused zero vector? -static Vtx sShadowVertices[] = { - VTX(-2000, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(2000, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(2000, 6000, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-2000, 6000, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sShadowDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(0x08000000, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), - gsDPSetCombineLERP(PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_OVL_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPVertex(sShadowVertices, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_En_Kanban/ovl_En_Kanban.c" void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { EnKanban* this = THIS; @@ -908,7 +889,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { } } gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(shadowTex)); - gSPDisplayList(POLY_XLU_DISP++, sShadowDList); + gSPDisplayList(POLY_XLU_DISP++, sShadowDL); } } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1857); diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index ef5891aa7f..0fbafc7cd0 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -86,31 +86,7 @@ static Vec3f D_80AFA288[] = { static u32 D_80AFA390[] = { 0, 0 }; -static Vtx D_80AFA398[] = { - VTX(-100, 0, -100, 0, 2048, 255, 255, 255, 255), - VTX(100, 0, -100, 2048, 2048, 255, 255, 255, 255), - VTX(100, 0, 100, 2048, 0, 255, 255, 255, 255), - VTX(-100, 0, 100, 0, 0, 255, 255, 255, 255), -}; - -static Gfx D_80AFA3D8[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsSPEndDisplayList(), -}; - -static Gfx D_80AFA3F8[] = { - gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, - COMBINED), - gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_DEC | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_ZB_XLU_DECAL2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPVertex(&D_80AFA398, 4, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_En_Sda/ovl_En_Sda.c" static Vec3f D_80AFA660[16]; diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 1a15def251..eae1c7814b 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -30,25 +30,7 @@ void EnSsh_Drop(EnSsh* this, GlobalContext* globalCtx); void EnSsh_Return(EnSsh* this, GlobalContext* globalCtx); void EnSsh_Start(EnSsh* this, GlobalContext* globalCtx); -static Vtx D_80B043C0[] = { - VTX(-1, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1, 100, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1, 100, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx D_80B04400[] = { - gsDPPipeSync(), - gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineLERP(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0, 0, 255, 255, 255, 255), - gsSPVertex(D_80B043C0, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_En_Ssh/ovl_En_Ssh.c" const ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, @@ -127,7 +109,7 @@ static ColliderJntSphInit sJntSphInit = { OC2_TYPE_1, COLSHAPE_JNTSPH, }, - 1, + ARRAY_COUNT(sJntSphElementsInit), sJntSphElementsInit, }; @@ -235,7 +217,8 @@ void EnSsh_InitColliders(EnSsh* this, GlobalContext* globalCtx) { f32 EnSsh_SetAnimation(EnSsh* this, s32 animIndex) { AnimationHeader* animation[] = { - 0x06005BE8, 0x06000304, 0x06000304, 0x060055F8, 0x06000304, 0x06000304, 0x06005BE8 + &object_ssh_Anim_005BE8, &object_ssh_Anim_000304, &object_ssh_Anim_000304, &object_ssh_Anim_0055F8, + &object_ssh_Anim_000304, &object_ssh_Anim_000304, &object_ssh_Anim_005BE8, }; f32 playbackSpeed[] = { 1.0f, 4.0f, 1.0f, 1.0f, 8.0f, 6.0f, 2.0f }; u8 mode[] = { 3, 3, 1, 3, 1, 1, 1 }; @@ -449,21 +432,21 @@ void EnSsh_Sway(EnSsh* this) { } void EnSsh_CheckBodyStickHit(EnSsh* this, GlobalContext* globalCtx) { - ColliderInfo* info0 = &this->colCylinder[0].info; + ColliderInfo* info = &this->colCylinder[0].info; Player* player = GET_PLAYER(globalCtx); if (player->unk_860 != 0) { - info0->bumper.dmgFlags |= 2; + info->bumper.dmgFlags |= 2; this->colCylinder[1].info.bumper.dmgFlags &= ~2; this->colCylinder[2].info.bumper.dmgFlags &= ~2; } else { - info0->bumper.dmgFlags &= ~2; + info->bumper.dmgFlags &= ~2; this->colCylinder[1].info.bumper.dmgFlags |= 2; this->colCylinder[2].info.bumper.dmgFlags |= 2; } } -s32 EnSsh_CheckHitLink(EnSsh* this, GlobalContext* globalCtx) { +s32 EnSsh_CheckHitPlayer(EnSsh* this, GlobalContext* globalCtx) { s32 i; s32 hit = false; @@ -540,7 +523,7 @@ s32 EnSsh_CheckHitBack(EnSsh* this, GlobalContext* globalCtx) { s32 EnSsh_CollisionCheck(EnSsh* this, GlobalContext* globalCtx) { if (this->stunTimer == 0) { - EnSsh_CheckHitLink(this, globalCtx); + EnSsh_CheckHitPlayer(this, globalCtx); } if (EnSsh_CheckHitFront(this)) { return false; diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 0ff03cb6f1..4e8aa2e70b 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -23,25 +23,7 @@ void EnSt_Die(EnSt* this, GlobalContext* globalCtx); void EnSt_BounceAround(EnSt* this, GlobalContext* globalCtx); void EnSt_FinishBouncing(EnSt* this, GlobalContext* globalCtx); -static Vtx sUnusedVertices[] = { - VTX(-1, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1, 100, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1, 100, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sUnusedDList[] = { - gsDPPipeSync(), - gsSPTexture(0, 0, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineLERP(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0, 0, 255, 255, 255, 255), - gsSPVertex(sUnusedVertices, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_En_St/ovl_En_St.c" const ActorInit En_St_InitVars = { ACTOR_EN_ST, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index ee591e47d6..105cf98c96 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -34,7 +34,7 @@ const ActorInit En_Sth_InitVars = { NULL, }; -#include "z_en_sth_gfx.c" +#include "overlays/ovl_En_Sth/ovl_En_Sth.c" static ColliderCylinderInit sCylinderInit = { { @@ -65,7 +65,7 @@ static FlexSkeletonHeader* sSkeletons[6] = { }; static AnimationHeader* sAnimations[6] = { - &gParentDanceAnim, &gChildDanceAnim, &gChildDanceAnim, &gChildDanceAnim, &gChildDanceAnim, &gChildDanceAnim, + &sParentDanceAnim, &sChildDanceAnim, &sChildDanceAnim, &sChildDanceAnim, &sChildDanceAnim, &sChildDanceAnim, }; static EnSthActionFunc sRewardObtainedWaitActions[6] = { @@ -323,6 +323,7 @@ void EnSth_Update2(Actor* thisx, GlobalContext* globalCtx) { } this->actionFunc(this, globalCtx); + // Likely an unused blink timer and eye index if (DECR(this->unk_2B6) == 0) { this->unk_2B6 = Rand_S16Offset(0x3C, 0x3C); } @@ -361,7 +362,7 @@ void EnSth_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve if (limbIndex == 15) { Matrix_MultVec3f(&D_80B0B49C, &this->actor.focus.pos); - if (this->actor.params != 0) { + if (this->actor.params != 0) { // Children OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sth.c", 2079); gSPDisplayList(POLY_OPA_DISP++, D_80B0A3C0); diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth_gfx.c b/src/overlays/actors/ovl_En_Sth/z_en_sth_gfx.c deleted file mode 100644 index bca6fdec48..0000000000 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth_gfx.c +++ /dev/null @@ -1,581 +0,0 @@ -#include "z_en_sth.h" - -static u64 D_80B08430[] = { - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767DEE5D6A3C5DF, 0xC5DFD6A3DEE5E767, - 0xE767CE61BDDDACD7, 0xACD7BDDDD6A3E767, 0xE767C5DFACD7ACD7, 0xACD7ACD7C5DFE767, - 0xE767C5DFACD7ACD7, 0xACD7ACD7C5DFE767, 0xE767CE61BDDDACD7, 0xACD7BDDDD6A3E767, - 0xE767DEE5D6A3C5DF, 0xC5DFD6A3DEE5E767, 0xE767E767E767E767, 0xE767E767E767E767, -}; - -static u64 D_80B084B0[] = { - 0xE767E767E767E767, 0xE767E767E767E767, 0xCE61E767CE61C661, 0xC5DFE767CE61E767, 0x4801941569C98C15, - 0x71898BD359C96ACF, 0x380150C5504140C5, 0x6801590550413001, 0x4801500158416185, 0x7001584370814801, - 0x8801700178418205, 0x9801700199418041, 0xA00188019881A283, 0xA8019001A9C19881, 0xC801B001B0C1CB43, - 0xB8018801BA83A941, 0xD981D901C981CB43, 0xB8C1A8C1CB43C2C3, 0xDB41ED59EE1BDB01, 0xC9C1CAC1FFFFDD59, - 0xB101E671DDDDC1C1, 0xB001A101EE2FAA87, 0x8001788171418801, 0x5801680198416001, 0x5801380120014801, - 0x2001480170015001, 0x3001180118014001, 0x2001200160013801, 0x0001000100011001, 0x0801000128012001, - 0x0001000100010001, 0x0001000100010001, -}; - -static u64 D_80B085B0[] = { - 0xEFA7EFA7EFA7EFA7, 0xEFA7EFA7EFA7EFA7, 0xEFA77B4F7289834D, 0xACD3D5D9E6A1EFA7, - 0xEFA740C1830BBD15, 0xFF65EFA9EFA7EFA7, 0xEFA7490351856209, 0xC599F767EFA7EFA7, - 0xEFA759C751859C11, 0xACD3D5D9F723EF67, 0xEFA77B0D6207DE9F, 0xE6E1CDD9DE9BF725, - 0xEFA7C599830BCD9B, 0xF7A7E767E723EF67, 0xEFA7EFA7EFA7EFA7, 0xEFA7EFA7EFA7EFA7, -}; - -static u64 D_80B08630[] = { - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xC59DB4D97ACB6183, 0x7247830D9391A455, 0xBD1BD661D6A3E727, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xB4D7A41359836183, 0x6183618361836183, 0x618369C57247938F, 0xA495AC97BD1BDEA3, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767CDDF, 0xB4D9B4D77ACB69C5, 0x6183618361836183, - 0x6183618361836183, 0x6183618369C57ACB, 0x9391BD1BE6E5E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767DEA3C55B, 0xBD1BB4D79BD19BD1, 0xA3CF9B8F8B4D82C9, 0x724769C569C56183, 0x6183618361836183, - 0x618369C39BD1E6E5, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767DEA3C55B, 0xBD1BB4D7B4D7B4D7, - 0xB4D7B4D7B4D7B4D7, 0xBD1BBD1BB4D79391, 0x7A89720769C56183, 0x6183618361838B4D, 0xD6A3E767E767E767, - 0xE767E767E767E767, 0xE767E767DEA3C59D, 0xBD1BB4D9B4D9BD1B, 0xC55BC59DC55BC55B, 0xCD9DD621DEA1DEA3, - 0xD661CDDFC59DB4D9, 0xA4558B4F724769C5, 0x7ACBDEA3E767E767, 0xE767E767E767E767, 0xE767E767DEA3C59D, - 0xBD1BB4D9BD1BC59D, 0xCDDFD621DEA1DEA3, 0xE6E5E6E5E727E767, 0xE767E767E767E767, 0xE767E727D621AC11, - 0x72478B4DE6E5E767, 0xE767E767E767E767, 0xE767E767E6E5CD9D, 0xC55BBD1BCD9DD621, 0xDEA3E6E5E6E5E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E6E5, 0xCD9D9BD1A495E767, 0xE767E767E767E767, - 0xE767E767E727D621, 0xCD9DCD9DD661DEA3, 0xE6E5E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E6E5CD9DCD9D, 0xE767E767E767E767, 0xE767E767E767DEA1, 0xDE61DE61DEA3E6E5, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767DE61, - 0xE6E5E767E767E767, 0xE767E767E767E727, 0xDEA3DEA3E6E5E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE6E5E6E5E727E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E725, - 0xD6A3C5E1B59FBD9D, 0xCE61E6E5E6E5E727, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767CE217351520B, 0x49CB398931493949, 0x418949CB5A4B7B51, - 0xBD5BE6E5E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E6E5, 0xE767E767D6A5B59F, - 0x7353314720C51885, 0x1885188518851885, 0x18851885188520C5, 0x31496B51C5DFE727, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E727E727, 0xE767B59F5ACF3149, 0x20C51885188520C5, 0x3149520D5A4D520B, - 0x49CB314920C720C5, 0x1885188539499C97, 0xE6E5E767E767E767, 0xE767E767E767E767, 0xE767E767E6E5E6E5, - 0xCE21524F20C520C5, 0x20C5290749CB6AD1, 0x9C15B4D9BD1BB51B, 0xB4D99C577B534A0D, 0x20C720C5188520C5, - 0x7353D661E767E767, 0xE767E767E767E767, 0xE767E767DEA3D621, 0x9457314920C52907, 0x5A4D8BD5ACD9BD1B, - 0xBD1BBD1BC55DC55B, 0xBD1BBD1BBD1BACD9, 0x8353520D290720C5, 0x20C55A8FC61FE767, 0xE767E767E767E767, - 0xE767E767DEA3C55B, 0x8C174A0D6AD1A499, 0xC59DD621DEA3DEA3, 0xD663D6A5DEE5DEA5, 0xE6E5E6E5D663D661, - 0xD621BD5D8BD55A8F, 0x290720C75A4DA51D, 0xDF25E767E767E767, 0xE767E767E725CE1F, 0xCE21D621E6A3E6E5, - 0xEF27E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767EF27E6E5D663, 0xAD1B5A8F314941CB, - 0xAD5DE767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xEF27DEA39C996B11, 0xB55DEF27E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767EF27E725, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, -}; - -static u64 D_80B08E30[] = { - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767EF21D65D, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xD65DEF21E767E767, 0xE767EF21DE1BCD99, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xCD99DE1BEF21E767, 0xE767E65DA411C517, - 0xEF21E767EF61EF21, 0xDEDFD65DD65DDE5D, 0xEF21E767E767E767, 0xE767E767E767EF21, 0xDE5DD65DD65DDEDF, - 0xEF21EF61E767EF21, 0xC517A411E65DE767, 0xE767D599938FACD5, 0xB559C61BB559A4D7, 0x94958C138BD383D1, - 0x83D19455ACD7B519, 0xB519ACD7945583D1, 0x83D18BD38C139495, 0xA4D7B559C61BB559, 0xACD5938FD599E767, - 0xE767DDDB61C561C5, 0x410528C531053945, 0x418751C741873945, 0x3105310531053105, 0x3105310531053105, - 0x3945418751C74187, 0x3945310528C54105, 0x61C561C5DDDBE767, 0xE767EE5F62496207, 0x418720C341897359, - 0xCE71DEF7AD274189, 0x839B9C63735949CB, 0x629373579C63839B, 0x4189AD27DEF7CE71, 0x7359418920C34187, - 0x62076249EE5FE767, 0xE767E76783916249, 0x6A8B83D1524B7399, 0x9461E739E739524F, 0xE739FFFFFFFF7317, - 0xAD29FFFFFFFFE739, 0x524FE739E7399461, 0x7399524B83D16A8B, 0x62498391E767E767, 0xE767E767ACD77ACD, - 0xCD99D65D8C116B0D, 0x7BDD9CE5CE7162D3, 0xDEF7FFFFFFFF9461, 0xD673FFFFFFFFDEF7, 0x62D3CE719CE57BDD, - 0x6B0D8C11D65DCD99, 0x7ACDACD7E767E767, 0xE767E767E7219413, 0xDE9FEF21E7679C95, 0x734F525163156B15, - 0xB5ABCE71EF7B83DD, 0xBDEDEF7BCE71B5AB, 0x6B1563155251734F, 0x9C95E767EF21DE9F, 0x9413E721E767E767, - 0xE767E767E767B517, 0xDEDFE767E767EF63, 0xAD19734F520B49CD, 0x6B577BDD94A36293, 0x946194A37BDD6B57, - 0x49CD520B734FAD19, 0xEF63E767E767DEDF, 0xB517E767E767E767, 0xE767E767E767CE1D, 0xDE9FE767E767E767, - 0xE767E6A1ACD7734F, 0x4A093145290328C5, 0x28C5290331454A09, 0x734FACD7E6A1E767, 0xE767E767E767DE9F, - 0xCE1DE767E767E767, 0xE767E767E767E767, 0xCE5DE767E767E767, 0xE767E767E6A1DE5F, 0xCD9DA49594179C59, - 0x9C599417A495CD9D, 0xDE5FE6A1E767E767, 0xE767E767E767CE5D, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767D65D, 0xD597D555E61DEEA3, 0xEEA3E61DD555D597, 0xD65DE767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE6A1CC91BBCBBBCB, 0xBBCBBBCBCC91E6A1, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767E767E767E767, -}; - -static u64 D_80B09230[] = { - 0xE767E767E767E767, 0xE767E767E767E767, 0xE767C62183D5CE61, 0xF7E9E767E767E767, - 0xE767414749876249, 0xD61FF7E9E767E767, 0xE7674105410530C5, 0x730DEFA7E767E767, - 0xE76751C939056ACD, 0x730DBD5BE767E767, 0xE76793D74105B599, 0xCE1B9C51E767E767, - 0xE767E76761C7B517, 0xF7E9D6DFE767E767, 0xE767E767E767E767, 0xE767E767E767E767, -}; - -static u64 D_80B092B0[] = { - 0x4841380138014841, 0x4841300130013001, 0x4841484148414841, 0x4841484148414841, 0x68C1608148414841, - 0x4841484168C16081, 0x9141814160816081, 0x68C1608170C170C1, 0x9981914168C18141, 0x998170C1814170C1, - 0xA9C1998181419981, 0xA9C1814181419141, 0xBA41B281A9C1B281, 0xB281998199C1A241, 0xBB45C307BB49BAC3, - 0xB2C1AAC5BC11AC11, 0xC40FCD1DCDA1C40F, 0xBB45BC11D6B5C563, 0xAB4BD6B5CDE5C40F, 0xB281AB4BD6B5B459, - 0x99C1AB4B9BD1A241, 0x81418A01AAC58A01, 0x8141814168C18141, 0x68C170C1914170C1, 0x70C168C1608170C1, - 0x608170C1814170C1, 0x60816081608170C1, 0x6081608170C168C1, 0x4841484138014841, 0x4841484160816081, - 0x3801380130013801, 0x3801380148414841, -}; - -static Vtx D_80B093B0[] = { - VTX(332, 65430, 554, 538, 135, 234, 3, 117, 255), VTX(380, 72, 468, 384, 128, 225, 22, 113, 255), - VTX(65462, 65303, 0, 1023, 243, 138, 236, 0, 255), VTX(380, 72, 65068, 1663, 128, 225, 22, 143, 255), - VTX(332, 65430, 64982, 1509, 135, 234, 3, 139, 255), VTX(424, 65394, 64791, 569, 626, 166, 239, 180, 255), - VTX(375, 65466, 65229, 534, 650, 209, 147, 12, 255), VTX(65531, 98, 65249, 457, 832, 166, 239, 180, 255), - VTX(293, 777, 0, 131, 695, 24, 117, 0, 255), VTX(413, 650, 0, 191, 637, 27, 116, 0, 255), - VTX(144, 673, 65386, 182, 765, 247, 106, 202, 255), VTX(65531, 98, 287, 457, 832, 166, 239, 76, 255), - VTX(375, 65466, 307, 534, 650, 209, 147, 244, 255), VTX(424, 65394, 745, 569, 626, 166, 239, 76, 255), - VTX(835, 548, 303, 243, 394, 31, 69, 92, 255), VTX(1196, 45, 0, 416, 270, 118, 18, 0, 255), - VTX(941, 619, 0, 202, 385, 66, 99, 0, 255), VTX(65266, 582, 0, 257, 962, 175, 88, 0, 255), - VTX(65330, 208, 65239, 406, 929, 164, 5, 180, 255), VTX(65330, 208, 297, 406, 929, 164, 5, 76, 255), - VTX(65330, 208, 65239, 65506, 487, 164, 5, 180, 255), VTX(65462, 65303, 0, 128, 450, 138, 236, 0, 255), - VTX(65330, 208, 297, 286, 487, 164, 5, 76, 255), VTX(835, 548, 65233, 243, 394, 31, 69, 164, 255), - VTX(965, 65119, 65122, 696, 366, 64, 194, 177, 255), VTX(965, 65119, 414, 696, 366, 64, 194, 79, 255), - VTX(965, 65119, 65122, 696, 366, 72, 201, 178, 255), VTX(1196, 45, 0, 416, 270, 119, 4, 0, 255), - VTX(965, 65119, 414, 696, 366, 74, 202, 76, 255), VTX(144, 673, 150, 182, 765, 247, 106, 54, 255), -}; - -static Vtx D_80B09590[] = { - VTX(65462, 65303, 0, 20, 65168, 138, 236, 0, 255), VTX(380, 72, 468, 65427, 232, 225, 22, 113, 255), - VTX(86, 140, 455, 156, 209, 220, 239, 113, 255), VTX(65330, 208, 297, 390, 83, 164, 5, 76, 255), - VTX(155, 597, 248, 65078, 65480, 240, 65, 99, 255), VTX(86, 140, 455, 65437, 236, 220, 239, 113, 255), - VTX(380, 72, 468, 120, 207, 225, 22, 113, 255), VTX(65330, 208, 297, 65217, 264, 164, 5, 76, 255), - VTX(380, 72, 468, 120, 207, 225, 22, 113, 255), VTX(389, 320, 417, 65441, 53, 250, 52, 107, 255), - VTX(155, 597, 248, 65078, 65480, 240, 65, 99, 255), VTX(835, 548, 303, 874, 65461, 31, 69, 92, 255), - VTX(389, 320, 417, 174, 22, 250, 52, 107, 255), VTX(380, 72, 468, 103, 346, 225, 22, 113, 255), - VTX(332, 65430, 554, 622, 247, 234, 3, 117, 255), VTX(965, 65119, 414, 1093, 43, 64, 194, 79, 255), - VTX(835, 548, 303, 218, 65507, 31, 69, 92, 255), VTX(380, 72, 468, 471, 205, 225, 22, 113, 255), - VTX(332, 65430, 64982, 2449, 247, 234, 3, 139, 255), VTX(65231, 65183, 65023, 2432, 523, 195, 157, 229, 255), - VTX(65462, 65303, 0, 3072, 419, 138, 236, 0, 255), VTX(835, 548, 65233, 2853, 65507, 31, 69, 164, 255), - VTX(965, 65119, 65122, 1978, 43, 64, 194, 177, 255), VTX(380, 72, 65068, 2600, 205, 225, 22, 143, 255), - VTX(65462, 65303, 0, 0, 419, 138, 236, 0, 255), VTX(65231, 65183, 513, 639, 523, 195, 157, 27, 255), - VTX(65438, 65158, 65174, 2369, 447, 211, 161, 201, 255), VTX(65438, 65158, 362, 702, 447, 211, 161, 55, 255), - VTX(65346, 64969, 0, 1536, 506, 174, 169, 0, 255), VTX(380, 72, 65068, 103, 346, 225, 22, 143, 255), - VTX(389, 320, 65119, 174, 22, 250, 52, 149, 255), VTX(835, 548, 65233, 874, 65461, 31, 69, 164, 255), -}; - -static Vtx D_80B09790[] = { - VTX(155, 597, 65288, 65078, 65480, 240, 65, 157, 255), VTX(389, 320, 65119, 65441, 53, 250, 52, 149, 255), - VTX(380, 72, 65068, 120, 207, 225, 22, 143, 255), VTX(380, 72, 65068, 120, 207, 225, 22, 143, 255), - VTX(86, 140, 65081, 65437, 236, 220, 239, 143, 255), VTX(155, 597, 65288, 65078, 65480, 240, 65, 157, 255), - VTX(65330, 208, 65239, 65217, 264, 164, 5, 180, 255), VTX(86, 140, 65081, 156, 209, 220, 239, 143, 255), - VTX(65462, 65303, 0, 20, 65168, 138, 236, 0, 255), VTX(65330, 208, 65239, 390, 83, 164, 5, 180, 255), - VTX(380, 72, 65068, 65427, 232, 225, 22, 143, 255), VTX(332, 65042, 328, 1032, 296, 245, 168, 80, 255), - VTX(965, 65119, 414, 1093, 43, 64, 194, 79, 255), VTX(332, 65430, 554, 622, 247, 234, 3, 117, 255), - VTX(65231, 65183, 513, 639, 523, 195, 157, 27, 255), VTX(65438, 65158, 362, 702, 447, 211, 161, 55, 255), - VTX(965, 65119, 65122, 1978, 43, 64, 194, 177, 255), VTX(482, 64837, 0, 1536, 265, 6, 137, 0, 255), - VTX(65346, 64969, 0, 1536, 506, 174, 169, 0, 255), VTX(332, 65042, 65208, 2039, 296, 245, 168, 176, 255), - VTX(65438, 65158, 65174, 2369, 447, 211, 161, 201, 255), VTX(332, 65430, 64982, 2449, 247, 234, 3, 139, 255), - VTX(65231, 65183, 65023, 2432, 523, 195, 157, 229, 255), VTX(65531, 98, 287, 10, 343, 166, 239, 76, 255), - VTX(424, 65394, 745, 252, 20, 166, 239, 76, 255), VTX(412, 132, 355, 65452, 65515, 237, 96, 68, 255), - VTX(412, 132, 65181, 65452, 65515, 237, 96, 188, 255), VTX(424, 65394, 64791, 252, 20, 166, 239, 180, 255), - VTX(65531, 98, 65249, 10, 343, 166, 239, 180, 255), -}; - -static Vtx D_80B09960[] = { - VTX(835, 548, 303, 903, 64403, 31, 69, 92, 255), VTX(413, 650, 0, 65335, 624, 27, 116, 0, 255), - VTX(398, 568, 210, 487, 674, 12, 96, 70, 255), VTX(144, 673, 150, 227, 1540, 247, 106, 54, 255), - VTX(155, 597, 248, 590, 1507, 240, 65, 99, 255), VTX(389, 320, 417, 1227, 728, 250, 52, 107, 255), - VTX(398, 568, 210, 487, 674, 12, 96, 70, 255), VTX(155, 597, 248, 590, 1507, 240, 65, 99, 255), - VTX(835, 548, 303, 903, 64403, 31, 69, 92, 255), VTX(144, 673, 65386, 227, 1540, 247, 106, 202, 255), - VTX(398, 568, 65326, 487, 674, 12, 96, 186, 255), VTX(155, 597, 65288, 590, 1507, 240, 65, 157, 255), - VTX(155, 597, 65288, 590, 1507, 240, 65, 157, 255), VTX(398, 568, 65326, 487, 674, 12, 96, 186, 255), - VTX(389, 320, 65119, 1227, 728, 250, 52, 149, 255), VTX(835, 548, 65233, 903, 64403, 31, 69, 164, 255), - VTX(835, 548, 65233, 903, 64403, 31, 69, 164, 255), VTX(941, 619, 0, 65314, 64341, 66, 99, 0, 255), - VTX(65266, 582, 0, 512, 938, 175, 88, 0, 255), VTX(65479, 559, 190, 917, 504, 209, 73, 81, 255), - VTX(144, 673, 150, 832, 30, 247, 106, 54, 255), VTX(155, 597, 248, 1043, 43, 240, 65, 99, 255), - VTX(144, 673, 65386, 191, 30, 247, 106, 202, 255), VTX(65479, 559, 65346, 106, 504, 209, 73, 175, 255), - VTX(155, 597, 65288, 65517, 43, 240, 65, 157, 255), VTX(65330, 208, 65239, 65415, 974, 164, 5, 180, 255), - VTX(65330, 208, 297, 1145, 974, 164, 5, 76, 255), VTX(144, 673, 65386, 65216, 222, 247, 106, 202, 255), - VTX(144, 673, 150, 320, 222, 247, 106, 54, 255), VTX(293, 777, 0, 0, 65427, 24, 117, 0, 255), -}; - -static Vtx D_80B09B40[] = { - VTX(956, 595, 373, 65483, 191, 61, 89, 51, 255), VTX(914, 58, 476, 394, 202, 60, 7, 103, 255), - VTX(1071, 435, 220, 80, 65476, 102, 51, 35, 255), VTX(956, 595, 373, 65322, 80, 61, 89, 51, 255), - VTX(507, 627, 448, 169, 479, 14, 113, 37, 255), VTX(741, 395, 489, 160, 266, 6, 43, 111, 255), - VTX(956, 595, 373, 280, 144, 61, 89, 51, 255), VTX(835, 548, 303, 65518, 147, 17, 116, 21, 255), - VTX(507, 627, 448, 130, 590, 14, 113, 37, 255), VTX(1071, 435, 220, 65501, 65365, 102, 51, 35, 255), - VTX(741, 395, 489, 160, 266, 6, 43, 111, 255), VTX(914, 58, 476, 201, 20, 60, 7, 103, 255), - VTX(941, 619, 0, 19, 113, 69, 97, 251, 255), VTX(562, 749, 109, 211, 491, 245, 119, 9, 255), - VTX(951, 782, 162, 384, 184, 64, 95, 32, 255), VTX(1071, 435, 220, 122, 65449, 102, 51, 35, 255), - VTX(835, 548, 303, 504, 218, 17, 116, 21, 255), VTX(1071, 435, 220, 412, 65528, 102, 51, 35, 255), - VTX(951, 782, 162, 65492, 129, 64, 95, 32, 255), VTX(562, 749, 109, 137, 493, 245, 119, 9, 255), - VTX(863, 746, 65338, 200, 270, 55, 95, 209, 255), VTX(1127, 437, 65442, 443, 89, 104, 57, 243, 255), - VTX(996, 435, 65191, 65337, 65431, 84, 45, 185, 255), VTX(996, 435, 65191, 65094, 65435, 84, 45, 185, 255), - VTX(835, 548, 65233, 65338, 166, 43, 109, 232, 255), VTX(863, 746, 65338, 227, 218, 55, 95, 209, 255), - VTX(573, 746, 65243, 202, 536, 8, 116, 230, 255), VTX(941, 619, 0, 214, 214, 69, 97, 251, 255), - VTX(863, 746, 65338, 65361, 310, 55, 95, 209, 255), VTX(573, 746, 65243, 42, 470, 8, 116, 230, 255), - VTX(941, 619, 0, 65337, 65431, 69, 97, 251, 255), -}; - -static Vtx D_80B09D30[] = { - VTX(996, 435, 65191, 15, 65425, 84, 45, 185, 255), VTX(741, 395, 65047, 355, 112, 26, 32, 144, 255), - VTX(940, 595, 65144, 65412, 123, 68, 92, 223, 255), VTX(996, 435, 65191, 201, 11, 84, 45, 185, 255), - VTX(940, 595, 65144, 6, 183, 68, 92, 223, 255), VTX(835, 548, 65233, 236, 160, 43, 109, 232, 255), - VTX(490, 627, 65085, 202, 489, 13, 111, 213, 255), VTX(490, 627, 65085, 159, 586, 13, 111, 213, 255), - VTX(1066, 64895, 0, 1919, 198, 87, 174, 2, 255), VTX(965, 65119, 65122, 2317, 220, 66, 211, 168, 255), - VTX(1168, 65504, 65212, 2520, 84, 96, 3, 185, 255), VTX(1243, 51, 68, 1659, 40, 118, 6, 14, 255), - VTX(1243, 51, 68, 5499, 40, 118, 6, 14, 255), VTX(1127, 437, 65442, 3618, 51, 104, 57, 243, 255), - VTX(1071, 435, 220, 4269, 77, 102, 51, 35, 255), VTX(1071, 435, 220, 429, 77, 102, 51, 35, 255), - VTX(1158, 65504, 268, 1371, 88, 100, 252, 65, 255), VTX(965, 65119, 414, 1522, 220, 72, 212, 85, 255), - VTX(891, 58, 65062, 2798, 202, 46, 4, 146, 255), VTX(741, 395, 65047, 3214, 234, 26, 32, 144, 255), - VTX(941, 619, 0, 3840, 117, 69, 97, 251, 255), VTX(996, 435, 65191, 3294, 112, 84, 45, 185, 255), - VTX(389, 320, 417, 572, 405, 219, 54, 100, 255), VTX(586, 9, 563, 1004, 348, 248, 23, 117, 255), - VTX(741, 395, 489, 625, 234, 6, 43, 111, 255), VTX(914, 58, 476, 1047, 191, 60, 7, 103, 255), - VTX(576, 65083, 580, 1387, 404, 251, 200, 105, 255), VTX(586, 9, 64973, 2835, 348, 249, 22, 139, 255), - VTX(576, 65083, 64956, 2452, 404, 251, 201, 150, 255), VTX(389, 320, 65119, 3267, 405, 219, 54, 156, 255), - VTX(835, 548, 303, 378, 174, 223, 96, 62, 255), VTX(835, 548, 65233, 3461, 174, 223, 96, 194, 255), -}; - -static Vtx D_80B09F30[] = { - VTX(586, 9, 64973, 2835, 348, 249, 22, 139, 255), VTX(380, 72, 65068, 2968, 436, 220, 40, 150, 255), - VTX(389, 320, 65119, 3267, 405, 219, 54, 156, 255), VTX(389, 320, 417, 572, 405, 219, 54, 100, 255), - VTX(380, 72, 468, 871, 436, 220, 40, 106, 255), VTX(586, 9, 563, 1004, 348, 248, 23, 117, 255), - VTX(332, 65430, 554, 1063, 478, 215, 5, 112, 255), VTX(332, 65430, 64982, 2776, 478, 215, 5, 144, 255), - VTX(482, 64837, 0, 1920, 474, 234, 139, 0, 255), VTX(1066, 64895, 0, 1919, 198, 87, 174, 2, 255), - VTX(723, 64928, 382, 1604, 352, 20, 154, 59, 255), VTX(965, 65119, 414, 1522, 220, 72, 212, 85, 255), - VTX(723, 64928, 65154, 2235, 352, 20, 154, 197, 255), VTX(965, 65119, 65122, 2317, 220, 66, 211, 168, 255), - VTX(576, 65083, 580, 1387, 404, 251, 200, 105, 255), VTX(576, 65083, 64956, 2452, 404, 251, 201, 150, 255), - VTX(332, 65042, 328, 1629, 520, 199, 177, 68, 255), VTX(332, 65042, 65208, 2210, 520, 199, 177, 188, 255), -}; - -static Gfx D_80B0A050[] = { - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPPipeSync(), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B08430), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 63, 1024), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x001C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x001C), - gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF), - gsSPSetGeometryMode(G_LIGHTING), - gsSPSetGeometryMode(G_CULL_BACK), - gsSPClearGeometryMode(G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPVertex(D_80B093B0, 30, 0), - gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0), - gsSP2Triangles(5, 6, 7, 0, 8, 9, 10, 0), - gsSP2Triangles(11, 12, 13, 0, 14, 15, 16, 0), - gsSP2Triangles(17, 18, 19, 0, 20, 21, 22, 0), - gsSP2Triangles(16, 15, 23, 0, 15, 24, 23, 0), - gsSP2Triangles(24, 15, 25, 0, 14, 25, 15, 0), - gsSP2Triangles(26, 27, 28, 0, 29, 9, 8, 0), - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B084B0), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 4, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 127, 1024), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 4, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x003C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x003C), - gsSPVertex(D_80B09590, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 0, 2, 0), - gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0), - gsSP2Triangles(8, 9, 10, 0, 11, 12, 13, 0), - gsSP2Triangles(14, 15, 16, 0, 16, 17, 14, 0), - gsSP2Triangles(18, 19, 20, 0, 21, 22, 18, 0), - gsSP2Triangles(18, 23, 21, 0, 24, 25, 14, 0), - gsSP2Triangles(19, 26, 20, 0, 24, 27, 25, 0), - gsSP2Triangles(20, 26, 28, 0, 28, 27, 24, 0), - gsSP1Triangle(29, 30, 31, 0), - gsSPVertex(D_80B09790, 29, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(4, 6, 5, 0, 7, 8, 9, 0), - gsSP2Triangles(7, 10, 8, 0, 11, 12, 13, 0), - gsSP2Triangles(14, 15, 13, 0, 15, 11, 13, 0), - gsSP2Triangles(16, 12, 17, 0, 17, 12, 11, 0), - gsSP2Triangles(18, 11, 15, 0, 18, 17, 11, 0), - gsSP2Triangles(19, 16, 17, 0, 20, 19, 18, 0), - gsSP2Triangles(19, 17, 18, 0, 16, 19, 21, 0), - gsSP2Triangles(19, 20, 21, 0, 20, 22, 21, 0), - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B085B0), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 63, 1024), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x001C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x001C), - gsSP2Triangles(23, 24, 25, 0, 26, 27, 28, 0), - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B08630), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C), - gsSPVertex(D_80B09960, 30, 0), - gsSP2Triangles(0, 1, 2, 0, 2, 3, 4, 0), - gsSP2Triangles(5, 6, 7, 0, 8, 6, 5, 0), - gsSP2Triangles(9, 1, 10, 0, 11, 9, 10, 0), - gsSP2Triangles(12, 13, 14, 0, 14, 13, 15, 0), - gsSP2Triangles(10, 1, 16, 0, 16, 1, 17, 0), - gsSP2Triangles(17, 1, 0, 0, 2, 1, 3, 0), - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B08E30), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 4, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 511, 256), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 4, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x003C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x003C), - gsSP2Triangles(18, 19, 20, 0, 19, 21, 20, 0), - gsSP2Triangles(20, 22, 18, 0, 22, 23, 18, 0), - gsSP2Triangles(22, 24, 23, 0, 18, 23, 25, 0), - gsSP2Triangles(23, 24, 25, 0, 26, 19, 18, 0), - gsSP1Triangle(26, 21, 19, 0), - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B09230), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD, - G_TX_MIRROR | G_TX_WRAP, 3, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 63, 1024), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 3, G_TX_NOLOD, - G_TX_MIRROR | G_TX_WRAP, 3, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x001C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x001C), - gsSP1Triangle(27, 28, 29, 0), - gsSPEndDisplayList(), -}; - -static Gfx D_80B0A3C0[] = { - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPPipeSync(), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, PRIMITIVE, 0, COMBINED, 0, 0, 0, 0, COMBINED), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_80B092B0), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOLOD), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 127, 1024), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 2, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 4, G_TX_NOLOD, - G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOLOD), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x003C), - gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x001C, 0x003C), - gsDPSetPrimColor(0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF), - gsSPSetGeometryMode(G_LIGHTING), - gsSPSetGeometryMode(G_CULL_BACK), - gsSPClearGeometryMode(G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPVertex(D_80B09B40, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(6, 7, 8, 0, 9, 7, 6, 0), - gsSP2Triangles(10, 11, 3, 0, 12, 13, 14, 0), - gsSP2Triangles(15, 12, 14, 0, 16, 17, 18, 0), - gsSP2Triangles(16, 18, 19, 0, 20, 21, 22, 0), - gsSP2Triangles(23, 24, 25, 0, 25, 24, 26, 0), - gsSP2Triangles(27, 28, 29, 0, 30, 21, 20, 0), - gsSPVertex(D_80B09D30, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(5, 4, 6, 0, 1, 7, 2, 0), - gsSP2Triangles(8, 9, 10, 0, 11, 8, 10, 0), - gsSP2Triangles(12, 10, 13, 0, 13, 14, 12, 0), - gsSP2Triangles(15, 16, 11, 0, 16, 8, 11, 0), - gsSP2Triangles(16, 17, 8, 0, 10, 18, 19, 0), - gsSP2Triangles(20, 14, 13, 0, 10, 21, 13, 0), - gsSP2Triangles(19, 21, 10, 0, 22, 23, 24, 0), - gsSP2Triangles(24, 23, 25, 0, 17, 25, 26, 0), - gsSP2Triangles(25, 23, 26, 0, 25, 17, 16, 0), - gsSP2Triangles(16, 15, 25, 0, 10, 9, 18, 0), - gsSP2Triangles(27, 18, 28, 0, 18, 9, 28, 0), - gsSP2Triangles(19, 27, 29, 0, 18, 27, 19, 0), - gsSP2Triangles(22, 24, 30, 0, 31, 19, 29, 0), - gsSPVertex(D_80B09F30, 18, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(6, 5, 4, 0, 7, 1, 0, 0), - gsSP2Triangles(8, 9, 10, 0, 9, 11, 10, 0), - gsSP2Triangles(9, 12, 13, 0, 9, 8, 12, 0), - gsSP2Triangles(8, 10, 14, 0, 10, 11, 14, 0), - gsSP2Triangles(15, 12, 8, 0, 15, 13, 12, 0), - gsSP2Triangles(14, 16, 8, 0, 8, 17, 15, 0), - gsSP2Triangles(5, 6, 14, 0, 16, 14, 6, 0), - gsSP2Triangles(7, 15, 17, 0, 15, 7, 0, 0), - gsSPEndDisplayList(), -}; - -static s16 sChildDanceAnimFrameData[] = { - 0x0000, 0x08FF, 0xC000, 0x08FF, 0x09DD, 0x0B7C, 0x0C62, 0x0B95, 0x0A10, 0x094C, 0x09E6, 0x0B1E, 0x0C60, 0x0D1C, - 0x0D53, 0x0D6D, 0x0D6E, 0x0D5C, 0x0D3A, 0x0D0C, 0x0CD7, 0x0CA0, 0x0C5C, 0x0C05, 0x0B9E, 0x0B2F, 0x0ABC, 0x0A4B, - 0x09E3, 0x0988, 0x093F, 0x0910, 0x08FF, 0x0000, 0x002F, 0x0087, 0x00B7, 0x0087, 0x002F, 0x0000, 0x001D, 0x005B, - 0x009A, 0x00B7, 0x00B0, 0x009E, 0x0084, 0x0065, 0x0045, 0x0027, 0x000F, 0x0000, 0xFFF8, 0xFFF3, 0xFFF1, 0xFFF0, - 0xFFF2, 0xFFF4, 0xFFF7, 0xFFFA, 0xFFFD, 0xFFFF, 0x0000, 0x0C81, 0x0506, 0xF8FC, 0xF308, 0xF854, 0x0374, 0x09DD, - 0x04CE, 0xFB9E, 0xF32F, 0xEE40, 0xEC9C, 0xEBBE, 0xEBC7, 0xEC8C, 0xEDBB, 0xEF1E, 0xF095, 0xF20A, 0xF3C1, 0xF5F6, - 0xF891, 0xFB7D, 0xFE9F, 0x01DA, 0x0504, 0x07E9, 0x0A4C, 0x0BEA, 0x0C81, 0xDD2B, 0xDE1C, 0xE1B2, 0xE4E4, 0xE200, - 0xDE75, 0xDD7B, 0xDE3A, 0xE0B3, 0xE4D8, 0xE8AC, 0xEA53, 0xEB50, 0xEB53, 0xEA8A, 0xE966, 0xE82F, 0xE706, 0xE5F8, - 0xE4D8, 0xE391, 0xE245, 0xE10D, 0xDFF7, 0xDF0D, 0xDE54, 0xDDCB, 0xDD70, 0xDD3C, 0xDD2B, 0xCC69, 0xD5FA, 0xE662, - 0xEF82, 0xE741, 0xD7CF, 0xCF65, 0xD5D7, 0xE233, 0xEED7, 0xF75C, 0xFA5C, 0xFBDB, 0xFB74, 0xF97F, 0xF6CB, 0xF3DD, - 0xF0FE, 0xEE5E, 0xEB8E, 0xE82C, 0xE470, 0xE07F, 0xDC7C, 0xD889, 0xD4D0, 0xD181, 0xCED6, 0xCD0E, 0xCC69, 0x471F, - 0x4037, 0x303A, 0x2450, 0x2F13, 0x3E80, 0x44D4, 0x3FED, 0x345D, 0x248D, 0x16E4, 0x110F, 0x0D94, 0x0D8D, 0x1062, - 0x147C, 0x18DD, 0x1D16, 0x20EF, 0x2515, 0x29DF, 0x2EDA, 0x33BB, 0x3850, 0x3C74, 0x400B, 0x42FE, 0x4536, 0x469F, - 0x471F, 0xE9BF, 0xEABE, 0xECA4, 0xEDD2, 0xED52, 0xEC19, 0xEB60, 0xEBE3, 0xECE6, 0xED69, 0xED52, 0xED32, 0xED09, - 0xECD9, 0xECA4, 0xEC69, 0xEC2B, 0xEBEB, 0xEBA9, 0xEB67, 0xEB25, 0xEAE6, 0xEAAA, 0xEA73, 0xEA40, 0xEA15, 0xE9F1, - 0xE9D6, 0xE9C5, 0xE9BF, 0xFD3D, 0xFB20, 0xF869, 0xF761, 0xF84E, 0xFAC2, 0xFC81, 0xFB22, 0xF903, 0xF77C, 0xF6D7, - 0xF6B8, 0xF6B4, 0xF6C6, 0xF6E6, 0xF712, 0xF746, 0xF77D, 0xF7B4, 0xF7F5, 0xF84D, 0xF8BD, 0xF944, 0xF9E1, 0xFA91, - 0xFB4B, 0xFC01, 0xFCA1, 0xFD12, 0xFD3D, 0xB14B, 0xB21B, 0xB631, 0xBA68, 0xB6A1, 0xB293, 0xB1BB, 0xB275, 0xB53A, - 0xBA9F, 0xC043, 0xC2FF, 0xC4CD, 0xC514, 0xC413, 0xC288, 0xC0E3, 0xBF4F, 0xBDD8, 0xBC3B, 0xBA63, 0xB88A, 0xB6D0, - 0xB549, 0xB401, 0xB2FC, 0xB239, 0xB1B3, 0xB165, 0xB14B, 0xF374, 0xFAF2, 0x0701, 0x0CF6, 0x07A9, 0xFC85, 0xF61A, - 0xFB2B, 0x045E, 0x0CCF, 0x11C0, 0x1366, 0x1443, 0x143B, 0x1375, 0x1245, 0x10E2, 0x0F6B, 0x0DF5, 0x0C3D, 0x0A07, - 0x076B, 0x047F, 0x015C, 0xFE20, 0xFAF5, 0xF80E, 0xF5AB, 0xF40C, 0xF374, 0x22D8, 0x21E7, 0x1E52, 0x1B1F, 0x1E04, - 0x218F, 0x2288, 0x21C9, 0x1F51, 0x1B2B, 0x1756, 0x15AE, 0x14B2, 0x14AE, 0x1578, 0x169D, 0x17D4, 0x18FD, 0x1A0B, - 0x1B2B, 0x1C73, 0x1DBE, 0x1EF7, 0x200D, 0x20F6, 0x21B0, 0x2238, 0x2293, 0x22C7, 0x22D8, 0xCC5E, 0xD5F3, 0xE660, - 0xEF82, 0xE73E, 0xD7C8, 0xCF5B, 0xD5CF, 0xE230, 0xEED6, 0xF75E, 0xFA5E, 0xFBDE, 0xFB77, 0xF981, 0xF6CC, 0xF3DE, - 0xF0FE, 0xEE5E, 0xEB8C, 0xE82A, 0xE46C, 0xE07B, 0xDC77, 0xD883, 0xD4C8, 0xD178, 0xCECC, 0xCD04, 0xCC5E, 0x4721, - 0x4039, 0x303B, 0x2450, 0x2F13, 0x3E82, 0x44D7, 0x3FEF, 0x345E, 0x248D, 0x16E2, 0x110B, 0x0D8E, 0x0D87, 0x105E, - 0x1479, 0x18DB, 0x1D14, 0x20EF, 0x2515, 0x29DF, 0x2EDB, 0x33BD, 0x3852, 0x3C76, 0x400D, 0x4300, 0x4539, 0x46A2, - 0x4721, 0x1525, 0x1449, 0x12B3, 0x11E3, 0x12DA, 0x1496, 0x158D, 0x14BE, 0x1329, 0x124B, 0x124C, 0x1258, 0x126D, - 0x128B, 0x12B0, 0x12DB, 0x130B, 0x133F, 0x1375, 0x13AD, 0x13E4, 0x141B, 0x1450, 0x1482, 0x14AF, 0x14D6, 0x14F7, - 0x1510, 0x1520, 0x1525, 0x0133, 0x0349, 0x05F3, 0x06F4, 0x060D, 0x03A4, 0x01EB, 0x0345, 0x055A, 0x06D7, 0x0777, - 0x0794, 0x0795, 0x0782, 0x0760, 0x0733, 0x06FF, 0x06C8, 0x0692, 0x0653, 0x05FD, 0x0591, 0x050E, 0x0476, 0x03CC, - 0x0318, 0x0266, 0x01CB, 0x015D, 0x0133, 0xAFF7, 0xB0CE, 0xB4F3, 0xB933, 0xB565, 0xB14A, 0xB06C, 0xB12C, 0xB3FC, - 0xB96E, 0xBF1A, 0xC1DA, 0xC3AC, 0xC3F6, 0xC2F7, 0xC16D, 0xBFC8, 0xBE34, 0xBCBB, 0xBB1B, 0xB940, 0xB761, 0xB5A1, - 0xB413, 0xB2C4, 0xB1B8, 0xB0EE, 0xB064, 0xB012, 0xAFF7, 0x85B4, 0x82A4, 0x7CF4, 0x79E3, 0x7CE3, 0x8283, 0x85B4, - 0x858E, 0x84AE, 0x834F, 0x81AC, 0x8000, 0x7E86, 0x7D78, 0x7D11, 0x7D2D, 0x7D7C, 0x7DF7, 0x7E94, 0x7F4E, 0x801B, - 0x80F4, 0x81D1, 0x82AA, 0x8377, 0x8430, 0x84CE, 0x8549, 0x8598, 0x85B4, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, - 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xE4AB, 0xD131, 0xD321, - 0xE71D, 0xD4D8, 0xCDC2, 0xE021, 0xD7CC, 0xC4D1, 0xD19B, 0xE444, 0xEBF5, 0xEB10, 0xE8E1, 0xE593, 0xE14E, 0xDC3C, - 0xD687, 0xD058, 0xC9D9, 0xC333, 0xC370, 0xC9E7, 0xD008, 0xD5A9, 0xDAA1, 0xDEC7, 0xE1F1, 0xE3F6, 0xE4AB, 0x8000, - 0x8000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, - 0x8000, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, 0x8000, - 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x1B55, 0x2ECF, 0x2CDF, 0x18E3, 0x2B28, 0x323E, 0x1FDF, 0x2834, 0x3B2F, 0x2E65, 0x1BBC, - 0x140B, 0x14F0, 0x171F, 0x1A6D, 0x1EB2, 0x23C4, 0x2979, 0x2FA8, 0x3627, 0x3CCD, 0x3C90, 0x3619, 0x2FF8, 0x2A57, - 0x255F, 0x2139, 0x1E0F, 0x1C0A, 0x1B55, 0x8000, 0x8000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, 0x8000, 0x8000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, - 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x0289, 0x073E, 0x09C7, 0x089B, 0x05D5, 0x0297, - 0x0000, 0xFE01, 0xFBE4, 0xF9D2, 0xF7F1, 0xF669, 0xF561, 0xF500, 0xF524, 0xF589, 0xF625, 0xF6EE, 0xF7DA, 0xF8DF, - 0xF9F3, 0xFB0D, 0xFC21, 0xFD26, 0xFE12, 0xFEDB, 0xFF77, 0xFFDC, 0x0000, 0x0000, -}; - -static JointIndex sChildDanceAnimJointIndices[] = { - { 0x0000, 0x0003, 0x0021 }, { 0x0002, 0x0000, 0x0002 }, { 0x003F, 0x005D, 0x007B }, { 0x0000, 0x0000, 0x0099 }, - { 0x00B7, 0x00D5, 0x00F3 }, { 0x0111, 0x012F, 0x014D }, { 0x0000, 0x0000, 0x016B }, { 0x0189, 0x01A7, 0x01C5 }, - { 0x0000, 0x0000, 0x01E3 }, { 0x0201, 0x021F, 0x023D }, { 0x0000, 0x0000, 0x0000 }, { 0x0000, 0x0000, 0x0000 }, - { 0x025B, 0x0279, 0x0297 }, { 0x0000, 0x0000, 0x0000 }, { 0x0000, 0x0000, 0x0000 }, { 0x0000, 0x0000, 0x02B5 }, -}; - -static AnimationHeader gChildDanceAnim = { { 30 }, sChildDanceAnimFrameData, sChildDanceAnimJointIndices, 3 }; - -static s16 sParentDanceAnimFrameData[] = { - 0xFF73, 0x0E5D, 0x0032, 0xC000, 0x0000, 0x8000, 0xFF73, 0xFF47, 0xFF1D, 0xFEF6, 0xFED6, 0xFEBD, 0xFEAF, 0xFEAE, - 0xFEBB, 0xFEE8, 0xFF39, 0xFF9E, 0x0006, 0x0062, 0x00A2, 0x00CA, 0x00ED, 0x010A, 0x011F, 0x012C, 0x0130, 0x012B, - 0x011B, 0x00F2, 0x00AD, 0x0057, 0xFFFE, 0xFFAD, 0x0E5D, 0x0E59, 0x0E4D, 0x0E3D, 0x0E2B, 0x0E18, 0x0E08, 0x0DFD, - 0x0DF8, 0x0E00, 0x0E12, 0x0E2B, 0x0E43, 0x0E56, 0x0E5D, 0x0E59, 0x0E4D, 0x0E3D, 0x0E2B, 0x0E18, 0x0E08, 0x0DFD, - 0x0DF8, 0x0E00, 0x0E12, 0x0E2B, 0x0E43, 0x0E56, 0x024A, 0x023C, 0x023E, 0x024E, 0x0266, 0x027E, 0x028C, 0x0285, - 0x0260, 0x020F, 0x0196, 0x0107, 0x007D, 0x0000, 0x0001, 0x0000, 0x000D, 0x0017, 0x0014, 0x0010, 0x000F, 0x0015, - 0x0024, 0x0043, 0x00A7, 0x013F, 0x01D9, 0x023B, 0xF514, 0xF47F, 0xF407, 0xF3B0, 0xF381, 0xF37E, 0xF3AC, 0xF412, - 0xF4B3, 0xF5C9, 0xF75F, 0xF934, 0xFB08, 0xFC9F, 0xFDBE, 0xFE4F, 0xFECC, 0xFF32, 0xFF7E, 0xFFAD, 0xFFBC, 0xFFA8, - 0xFF6E, 0xFEDC, 0xFD3E, 0xFAF2, 0xF878, 0xF655, 0xFDD5, 0xFE67, 0xFE9C, 0xFE7F, 0xFE26, 0xFDAB, 0xFD2A, 0xFCC0, - 0xFC8C, 0xFC9F, 0xFD13, 0xFE1B, 0x0007, 0x03D2, 0x0393, 0x03AF, 0x020B, 0xFF2B, 0xFD5B, 0xFBFA, 0xFAF5, 0xFA4E, - 0xFA15, 0xFA8A, 0xFAB0, 0xFAED, 0xFBA5, 0xFCC8, 0x1105, 0x0FC4, 0x0F2B, 0x0F23, 0x0F83, 0x1018, 0x10AE, 0x1113, - 0x1108, 0x1071, 0x0F1A, 0x0C91, 0x0834, 0x0000, 0x0037, 0x0000, 0x036E, 0x096C, 0x0D3C, 0x1026, 0x124F, 0x13B0, - 0x142B, 0x1331, 0x139A, 0x1450, 0x141B, 0x12C8, 0x0225, 0x0131, 0xFF48, 0xFD50, 0xFC34, 0xFBE4, 0xFBB5, 0xFBA2, - 0xFBA6, 0xFBBF, 0xFBE8, 0xFC1C, 0xFC59, 0xFC99, 0xFCD9, 0xFD4E, 0xFE0D, 0xFEDE, 0xFF8B, 0xFFDD, 0xFF9F, 0xFEF6, - 0xFE31, 0xFD9C, 0xFD84, 0xFE6A, 0x000A, 0x018F, 0xE79B, 0xE7A3, 0xE7B7, 0xE7CC, 0xE7D5, 0xE7D4, 0xE7CF, 0xE7C9, - 0xE7C1, 0xE7B8, 0xE7B0, 0xE7A8, 0xE7A1, 0xE79D, 0xE79B, 0xE7A1, 0xE7AD, 0xE7BD, 0xE7CC, 0xE7D7, 0xE7DE, 0xE7E4, - 0xE7E8, 0xE7E8, 0xE7E4, 0xE7D5, 0xE7BD, 0xE7A7, 0xBE3E, 0xC0F2, 0xC400, 0xC67F, 0xC787, 0xC762, 0xC6F9, 0xC654, - 0xC57C, 0xC47B, 0xC359, 0xC220, 0xC0D7, 0xBF89, 0xBE3E, 0xBC8A, 0xBA44, 0xB7DD, 0xB5C2, 0xB465, 0xB3D0, 0xB3B9, - 0xB40F, 0xB4BF, 0xB5B9, 0xB740, 0xB96A, 0xBBDD, 0xFFE6, 0xFFDA, 0xFFD6, 0xFFDF, 0xFFEE, 0x0000, 0x000C, 0x000F, - 0x0002, 0xFFD7, 0xFF5F, 0xFEB4, 0xFE13, 0xFDC0, 0xFDC2, 0xFDD2, 0xFDC8, 0xFDA8, 0xFD7D, 0xFD55, 0xFD3E, 0xFD40, - 0xFD64, 0xFDB8, 0xFE35, 0xFEC2, 0xFF46, 0xFFAB, 0x028E, 0x01F2, 0x015A, 0x00CF, 0x005A, 0x0001, 0xFFCE, 0xFFC9, - 0xFFF9, 0x009B, 0x0263, 0x04E6, 0x0797, 0x09E4, 0x0B37, 0x0BC2, 0x0C20, 0x0C51, 0x0C56, 0x0C2E, 0x0BDA, 0x0B5A, - 0x0AB0, 0x09AC, 0x0841, 0x06A4, 0x0507, 0x039A, 0x020F, 0x0091, 0xFED6, 0xFD40, 0xFBDE, 0xFAB8, 0xF9D5, 0xF941, - 0xF90A, 0xF96C, 0xF9B4, 0xFA3E, 0xFB5A, 0xFCE5, 0xFE33, 0xFEC0, 0xFEC6, 0xFE5E, 0xFDB0, 0xFCE7, 0xFC27, 0xFB90, - 0xFB3F, 0xFB4C, 0xFBC4, 0xFCB6, 0xFE2C, 0x001D, 0x0366, 0x0682, 0x0A1F, 0x0D75, 0x1061, 0x12D0, 0x14B2, 0x15EE, - 0x1663, 0x1591, 0x15B4, 0x15C6, 0x14BA, 0x1288, 0x1041, 0x0F0D, 0x0ED4, 0x0F66, 0x1073, 0x11AA, 0x12C6, 0x138C, - 0x13C0, 0x1336, 0x11D5, 0x0F7A, 0x0C12, 0x07B3, 0x034A, 0x032F, 0x02F6, 0x02B2, 0x0273, 0x024C, 0x023F, 0x0241, - 0x024D, 0x025D, 0x026E, 0x0283, 0x02A0, 0x02BD, 0x02D1, 0x02DE, 0x02EB, 0x02F9, 0x0307, 0x0315, 0x0323, 0x032F, - 0x033A, 0x0343, 0x034A, 0x034F, 0x0351, 0x034F, 0x102E, 0x1025, 0x1017, 0x1008, 0x0FFC, 0x0FF4, 0x0FF0, 0x0FEF, - 0x0FF0, 0x0FF6, 0x1001, 0x1019, 0x103D, 0x105E, 0x106E, 0x1070, 0x1070, 0x106E, 0x106C, 0x1068, 0x1063, 0x105E, - 0x1058, 0x1051, 0x104A, 0x1043, 0x103C, 0x1035, 0xBAF6, 0xB9F8, 0xB852, 0xB66C, 0xB4AF, 0xB383, 0xB2D9, 0xB26C, - 0xB251, 0xB2A2, 0xB376, 0xB595, 0xB8D8, 0xBBEE, 0xBD88, 0xBDE3, 0xBE21, 0xBE44, 0xBE4D, 0xBE3F, 0xBE1C, 0xBDE6, - 0xBD9E, 0xBD47, 0xBCE3, 0xBC74, 0xBBFB, 0xBB7B, 0xFBED, 0xFB2F, 0xFA9C, 0xFA56, 0xFA7D, 0xFB30, 0xFC80, 0xFE4C, - 0x0068, 0x02A8, 0x04E2, 0x06EA, 0x0896, 0x09B9, 0x0A2A, 0x0A09, 0x099D, 0x08F1, 0x080D, 0x06FC, 0x05C8, 0x047B, - 0x031F, 0x01BE, 0x0062, 0xFF15, 0xFDE1, 0xFCD1, 0x0342, 0x0349, 0x0310, 0x02B0, 0x0242, 0x01DE, 0x017A, 0x0102, - 0x007F, 0xFFFA, 0xFF7C, 0xFF0E, 0xFEB9, 0xFE86, 0xFE7D, 0xFE99, 0xFECC, 0xFF13, 0xFF69, 0xFFCD, 0x0039, 0x00AB, - 0x011F, 0x0192, 0x0200, 0x0266, 0x02C0, 0x030A, 0x8000, 0x8001, 0x7FF5, 0x7FDF, 0x7FC7, 0x7FB0, 0x7F9A, 0x7F7F, - 0x7F62, 0x7F44, 0x7F28, 0x7F10, 0x7EFD, 0x7EF1, 0x7EEF, 0x7EF6, 0x7F01, 0x7F11, 0x7F24, 0x7F3A, 0x7F52, 0x7F6C, - 0x7F86, 0x7F9F, 0x7FB8, 0x7FCF, 0x7FE3, 0x7FF3, 0x0000, 0xFFF2, 0xFFCB, 0xFF8E, 0xFF3D, 0xFEDB, 0xFE6A, 0xFDEF, - 0xFD6B, 0xFCE2, 0xFC55, 0xFBC9, 0xFB3F, 0xFABC, 0xFA40, 0xF9D0, 0xF96E, 0xF91D, 0xF8DF, 0xF8B8, 0xF8AB, 0xF8FB, - 0xF9D0, 0xFAFD, 0xFC55, 0xFDAE, 0xFEDB, 0xFFAF, 0xF3BF, 0xF3AF, 0xF384, 0xF340, 0xF2E6, 0xF279, 0xF1FC, 0xF173, - 0xF0E0, 0xF047, 0xEFAC, 0xEF10, 0xEE77, 0xEDE4, 0xED5B, 0xECDE, 0xEC71, 0xEC17, 0xEBD3, 0xEBA8, 0xEB99, 0xEBF2, - 0xECDE, 0xEE2D, 0xEFAC, 0xF12B, 0xF279, 0xF365, 0xF3E6, 0xF40E, 0xF4EB, 0xF650, 0xF813, 0xFA09, 0xFC06, 0xFDE0, - 0xFF6A, 0x00F5, 0x02AE, 0x0436, 0x052B, 0x0530, 0x047C, 0x038B, 0x0268, 0x011D, 0xFFB5, 0xFE39, 0xFCB3, 0xFB2D, - 0xF9B3, 0xF84D, 0xF705, 0xF5E7, 0xF4FC, 0xF44D, 0x0D48, 0x0E07, 0x0F6B, 0x113C, 0x1342, 0x1546, 0x1710, 0x1868, - 0x1917, 0x1883, 0x16B2, 0x145B, 0x1231, 0x10EB, 0x1056, 0x0FC6, 0x0F3C, 0x0EBB, 0x0E45, 0x0DDA, 0x0D7D, 0x0D2F, - 0x0CF2, 0x0CC7, 0x0CB1, 0x0CB1, 0x0CC9, 0x0CFB, 0xBAAA, 0xBAA8, 0xBAAA, 0xBAAE, 0xBAB5, 0xBABD, 0xBAC6, 0xBAD0, - 0xBAD9, 0xBAE8, 0xBAFD, 0xBB12, 0xBB23, 0xBB28, 0xBB24, 0xBB1F, 0xBB18, 0xBB0F, 0xBB06, 0xBAFB, 0xBAF0, 0xBAE5, - 0xBADA, 0xBAD0, 0xBAC6, 0xBABD, 0xBAB5, 0xBAAE, 0x0F8A, 0x0F68, 0x0F09, 0x0E72, 0x0DAD, 0x0CC1, 0x0BB7, 0x0A94, - 0x0963, 0x0829, 0x06EF, 0x05BE, 0x049B, 0x0390, 0x02A5, 0x01E0, 0x0149, 0x00E9, 0x00C8, 0x0132, 0x0251, 0x03F8, - 0x05FA, 0x0829, 0x0A58, 0x0C5A, 0x0E01, 0x0F20, 0x0368, 0x03AC, 0x046E, 0x059E, 0x072C, 0x090A, 0x0B26, 0x0D71, - 0x0FDC, 0x1256, 0x14D1, 0x173B, 0x1986, 0x1BA3, 0x1D80, 0x1F0E, 0x203E, 0x2100, 0x2145, 0x206E, 0x1E29, 0x1AD1, - 0x16C1, 0x1256, 0x0DEB, 0x09DB, 0x0683, 0x043E, 0x015D, 0x0134, 0x00BE, 0x0006, 0xFF14, 0xFDF3, 0xFCAC, 0xFB48, - 0xF9D1, 0xF850, 0xF6CF, 0xF558, 0xF3F4, 0xF2AD, 0xF18C, 0xF09A, 0xEFE2, 0xEF6C, 0xEF43, 0xEFC5, 0xF125, 0xF32C, - 0xF5A2, 0xF850, 0xFAFE, 0xFD74, 0xFF7B, 0x00DB, 0x0AA0, 0x0B8D, 0x0CEA, 0x0E7D, 0x100C, 0x115D, 0x1236, 0x125E, - 0x11C8, 0x10A8, 0x0F25, 0x0D65, 0x0B8F, 0x09C9, 0x083A, 0x0709, 0x065B, 0x0615, 0x05FC, 0x060C, 0x063F, 0x0691, - 0x06FD, 0x077F, 0x0811, 0x08AF, 0x0954, 0x09FC, 0xFCE2, 0xFCDA, 0xFCCE, 0xFCC1, 0xFCB2, 0xFCA3, 0xFC95, 0xFC8A, - 0xFC82, 0xFC7F, 0xFC80, 0xFC84, 0xFC8B, 0xFC93, 0xFC9C, 0xFCA6, 0xFCB1, 0xFCBC, 0xFCC6, 0xFCCF, 0xFCD7, 0xFCDE, - 0xFCE2, 0xFCE6, 0xFCE9, 0xFCEA, 0xFCE9, 0xFCE7, 0x022F, 0x01BA, 0x0107, 0x002A, 0xFF37, 0xFE41, 0xFD5C, 0xFC9C, - 0xFC13, 0xFBD7, 0xFBDC, 0xFC07, 0xFC53, 0xFCBA, 0xFD35, 0xFDBE, 0xFE50, 0xFEE5, 0xFF76, 0xFFFD, 0x0075, 0x00D7, - 0x0133, 0x0193, 0x01ED, 0x0235, 0x025F, 0x0261, 0xCC20, 0xCB32, 0xCA17, 0xC8E4, 0xC7AF, 0xC68D, 0xC595, 0xC4DB, - 0xC477, 0xC47C, 0xC4EC, 0xC5B1, 0xC6B9, 0xC7F4, 0xC953, 0xCAC5, 0xCC3A, 0xCDA3, 0xCEEE, 0xD00B, 0xD0EC, 0xD17F, - 0xD198, 0xD12C, 0xD060, 0xCF55, 0xCE2F, 0xCD12, 0x06B3, 0x0681, 0x05F5, 0x051B, 0x0401, 0x02B3, 0x013F, 0xFFB0, - 0xFE15, 0xFC79, 0xFAEB, 0xF976, 0xF828, 0xF70E, 0xF634, 0xF5A8, 0xF577, 0xF5CE, 0xF6BE, 0xF828, 0xF9EF, 0xFBF2, - 0xFE15, 0x0037, 0x023B, 0x0401, 0x056C, 0x065C, 0x01C6, 0x018B, 0x00E4, 0xFFE1, 0xFE91, 0xFD04, 0xFB48, 0xF96D, - 0xF783, 0xF59A, 0xF3BF, 0xF203, 0xF076, 0xEF26, 0xEE23, 0xED7C, 0xED41, 0xEDA8, 0xEEC6, 0xF076, 0xF293, 0xF4F9, - 0xF783, 0xFA0E, 0xFC74, 0xFE91, 0x0041, 0x015E, 0xF58D, 0xF579, 0xF541, 0xF4E9, 0xF477, 0xF3F0, 0xF35A, 0xF2B9, - 0xF213, 0xF16D, 0xF0CC, 0xF035, 0xEFAE, 0xEF3C, 0xEEE4, 0xEEAC, 0xEE98, 0xEEBB, 0xEF1C, 0xEFAE, 0xF066, 0xF136, - 0xF213, 0xF2EF, 0xF3C0, 0xF477, 0xF50A, 0xF56A, 0x0000, 0xFFD3, 0xFF57, 0xFE97, 0xFDA2, 0xFC85, 0xFB4D, 0xFA07, - 0xF8C2, 0xF78A, 0xF66D, 0xF578, 0xF4B8, 0xF43B, 0xF40F, 0xF43B, 0xF4B8, 0xF578, 0xF66D, 0xF78A, 0xF8C2, 0xFA07, - 0xFB4D, 0xFC85, 0xFDA2, 0xFE97, 0xFF57, 0xFFD3, 0x0000, 0x0016, 0x0053, 0x00B1, 0x0129, 0x01B5, 0x024E, 0x02ED, - 0x038D, 0x0426, 0x04B2, 0x052A, 0x0588, 0x05C5, 0x05DB, 0x05C5, 0x0588, 0x052A, 0x04B2, 0x0426, 0x038D, 0x02ED, - 0x024E, 0x01B5, 0x0129, 0x00B1, 0x0053, 0x0016, 0x0000, 0xFFF9, 0xFFE7, 0xFFCB, 0xFFA7, 0xFF7D, 0xFF4F, 0xFF1F, - 0xFEEF, 0xFEC1, 0xFE97, 0xFE73, 0xFE56, 0xFE44, 0xFE3E, 0xFE44, 0xFE56, 0xFE73, 0xFE97, 0xFEC1, 0xFEEF, 0xFF1F, - 0xFF4F, 0xFF7D, 0xFFA7, 0xFFCB, 0xFFE7, 0xFFF9, -}; - -static JointIndex sParentDanceAnimJointIndices[] = { - { 0x0006, 0x0022, 0x0002 }, { 0x0003, 0x0004, 0x0003 }, { 0x003E, 0x005A, 0x0076 }, { 0x0004, 0x0004, 0x0092 }, - { 0x00AE, 0x00CA, 0x00E6 }, { 0x0102, 0x011E, 0x013A }, { 0x0004, 0x0004, 0x0156 }, { 0x0172, 0x018E, 0x01AA }, - { 0x01C6, 0x01E2, 0x01FE }, { 0x021A, 0x0236, 0x0005 }, { 0x0252, 0x026E, 0x028A }, { 0x02A6, 0x02C2, 0x02DE }, - { 0x0004, 0x02FA, 0x0005 }, { 0x0316, 0x0332, 0x034E }, { 0x036A, 0x0386, 0x03A2 }, { 0x03BE, 0x03DA, 0x03F6 }, -}; - -static AnimationHeader gParentDanceAnim = { { 28 }, sParentDanceAnimFrameData, sParentDanceAnimJointIndices, 6 }; diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index b6a74f3f9e..a98e94a5e1 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -185,7 +185,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { if (!setup) { if (1) {} gDPPipeSync(POLY_XLU_DISP++); - gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesVisualDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0); setup = true; } @@ -195,7 +195,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 242), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesGeometryDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesModelDL); } effect++; } @@ -214,7 +214,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_BUBBLE) { if (!setup) { if (1) {} - gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesVisualDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesMaterialDL); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); @@ -228,7 +228,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 281), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesGeometryDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesModelDL); } effect++; } @@ -248,7 +248,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { if (effect->type == ENZO_EFFECT_SPLASH) { if (!setup) { if (1) {} - gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesVisualDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesMaterialDL); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0); setup = true; @@ -261,7 +261,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 325), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesGeometryDL); + gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesModelDL); } effect++; } diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 087ab0b617..6337c66d75 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -13,8 +13,8 @@ void EndTitle_Init(Actor* thisx, GlobalContext* globalCtx); void EndTitle_Destroy(Actor* thisx, GlobalContext* globalCtx); void EndTitle_Update(Actor* thisx, GlobalContext* globalCtx); -void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx); -void func_80B65DA8(Actor* thisx, GlobalContext* globalCtx); +void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx); +void EndTitle_DrawNintendoLogo(Actor* thisx, GlobalContext* globalCtx); const ActorInit End_Title_InitVars = { ACTOR_END_TITLE, @@ -25,10 +25,10 @@ const ActorInit End_Title_InitVars = { (ActorFunc)EndTitle_Init, (ActorFunc)EndTitle_Destroy, (ActorFunc)EndTitle_Update, - (ActorFunc)EndTitle_Draw, + (ActorFunc)EndTitle_DrawFull, }; -#include "z_end_title_gfx.c" +#include "overlays/ovl_End_Title/ovl_End_Title.c" void EndTitle_Init(Actor* thisx, GlobalContext* globalCtx) { EndTitle* this = THIS; @@ -37,7 +37,7 @@ void EndTitle_Init(Actor* thisx, GlobalContext* globalCtx) { this->tlozAlpha = 0; this->ootAlpha = 0; if (this->actor.params == 1) { - this->actor.draw = func_80B65DA8; + this->actor.draw = EndTitle_DrawNintendoLogo; } } @@ -47,7 +47,8 @@ void EndTitle_Destroy(Actor* thisx, GlobalContext* globalCtx) { void EndTitle_Update(Actor* thisx, GlobalContext* globalCtx) { } -void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { +// Used in the castle courtyard +void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) { MtxF* mf; EndTitle* this = THIS; s32 frameCount = globalCtx->csCtx.frames; @@ -66,7 +67,7 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(0.0f, MTXMODE_APPLY); Matrix_RotateZ(0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_end_title.c", 412), G_MTX_LOAD); - gSPDisplayList(POLY_XLU_DISP++, sTriforceDList); + gSPDisplayList(POLY_XLU_DISP++, sTriforceDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 417); @@ -92,18 +93,18 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->endAlpha); - gDPLoadTextureTile(OVERLAY_DISP++, D_80B670E0, G_IM_FMT_IA, G_IM_SIZ_8b, 80, 24, 0, 0, 80, 24, 0, + gDPLoadTextureTile(OVERLAY_DISP++, sTheEndTex, G_IM_FMT_IA, G_IM_SIZ_8b, 80, 24, 0, 0, 80, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); gSPTextureRectangle(OVERLAY_DISP++, 120 << 2, 90 << 2, 200 << 2, 113 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); gDPPipeSync(OVERLAY_DISP++); gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha); - gDPLoadTextureTile(OVERLAY_DISP++, D_80B65EA0, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120, 24, 0, + gDPLoadTextureTile(OVERLAY_DISP++, sTheLegendOfZeldaTex, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); gSPTextureRectangle(OVERLAY_DISP++, 100 << 2, 160 << 2, 220 << 2, 183 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); gDPPipeSync(OVERLAY_DISP++); gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha); - gDPLoadTextureTile(OVERLAY_DISP++, D_80B669E0, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112, 16, 0, + gDPLoadTextureTile(OVERLAY_DISP++, sOcarinaOfTimeTex, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0); gSPTextureRectangle(OVERLAY_DISP++, 104 << 2, 177 << 2, 216 << 2, 192 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); @@ -111,11 +112,8 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) { CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 515); } -/** - * This function is never executed in normal gameplay because actor params are never set to 1 - * Produces the same results as the main draw function, except without the title cards on the end screen - */ -void func_80B65DA8(Actor* thisx, GlobalContext* globalCtx) { +// Used in the Temple of Time +void EndTitle_DrawNintendoLogo(Actor* thisx, GlobalContext* globalCtx) { EndTitle* this = THIS; s32 pad; s32 frames = globalCtx->csCtx.frames; @@ -128,7 +126,7 @@ void func_80B65DA8(Actor* thisx, GlobalContext* globalCtx) { OVERLAY_DISP = func_80093F34(OVERLAY_DISP); gDPSetPrimColor(OVERLAY_DISP++, 0, 0x80, 0, 0, 0, this->endAlpha); - gSPDisplayList(OVERLAY_DISP++, dList_80B69720); + gSPDisplayList(OVERLAY_DISP++, sPresentedByNintendoDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 600); } diff --git a/src/overlays/actors/ovl_End_Title/z_end_title_gfx.c b/src/overlays/actors/ovl_End_Title/z_end_title_gfx.c deleted file mode 100644 index 0dc2558c43..0000000000 --- a/src/overlays/actors/ovl_End_Title/z_end_title_gfx.c +++ /dev/null @@ -1,459 +0,0 @@ -#include "z_end_title.h" - -static UNK_TYPE D_80B65EA0[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000001, 0x03050707, 0x06050301, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000103, 0x060A0C0C, 0x0C0A0604, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000306, 0x0A0DDFDF, 0xDF0D0B07, - 0x00000000, 0x00000000, 0x01010101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x01010000, 0x00000000, 0x00000000, - 0x01010202, 0x01010101, 0x01010100, 0x00000001, 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x01020509, 0x0DCF1F1F, 0x0FEF0E0A, 0x01030404, 0x04040404, 0x05060605, 0x02000000, 0x00000000, 0x00000002, - 0x03030302, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010406, - 0x06050200, 0x00000000, 0x00000002, 0x05070807, 0x07060505, 0x05050404, 0x04040405, 0x05050504, 0x03030101, - 0x02030304, 0x03030302, 0x01000001, 0x0306090C, 0xCE0FEFEF, 0xAF0FCF0D, 0x04080A0A, 0x0A0A0A0A, 0x0B0C0C0A, - 0x06020000, 0x00000000, 0x00000206, 0x08090806, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x0104090B, 0x0C0A0702, 0x00000000, 0x00000307, 0x0B0D0D0D, 0x0C0C0B0B, 0x0B0B0B0A, - 0x0A0A0A0B, 0x0B0B0B0A, 0x0A080604, 0x06090A0A, 0x0A0A0907, 0x05020204, 0x080B0D0E, 0xEF0FEF4F, 0xEF1FDF0E, - 0x080C0E0E, 0x0E0E0E0E, 0x0E3F8E0D, 0x09040100, 0x00010100, 0x0001050A, 0x0D0E0D0A, 0x05010000, 0x01010000, - 0x00000101, 0x01000000, 0x00010100, 0x00000101, 0x01000000, 0x02070C3E, 0x8E0D0A04, 0x01000001, 0x0102070B, - 0x1E8FBF9F, 0x2F0E0E0E, 0x0E0E0E0E, 0x0E0E0E0E, 0x0E0E0E0E, 0x0E0D0A08, 0x0B0D0E0E, 0x0E0E0D0D, 0x0A070609, - 0x0D1E3F0F, 0xEF0FFFBF, 0x4F0FDF0E, 0x090DFFEF, 0xDFFFDFEF, 0xFFBFFF0E, 0x0B070403, 0x04050504, 0x0202060C, - 0x8EFF8E0C, 0x06020103, 0x04050403, 0x03030405, 0x05040404, 0x04050504, 0x04040505, 0x05040303, 0x050A0EBF, - 0xFF0E0B05, 0x02030405, 0x05070A0E, 0xBFDF2F8F, 0x1F4FFFEF, 0xBFBFFFFF, 0x6FFFFFBF, 0xBFFF8FBF, 0xFF4E0C0B, - 0x0D8EFFDF, 0xBFFFBF6F, 0x0E0C0B0D, 0x1EFFDF0F, 0xAF0FEF1F, 0xDF2FAF0E, 0x080C0E0F, 0x8FFF8F0F, 0x0FBFFF0F, - 0x0D0C0A09, 0x0A0B0B0A, 0x0705080D, 0x8FFF8F0C, 0x07040609, 0x0A0B0A09, 0x090A0B0B, 0x0B0A0A0A, 0x0B0B0B0A, - 0x0A0A0B0B, 0x0B0A0909, 0x0B0D0FBF, 0xFF0E0C07, 0x06080A0B, 0x0B0C0D3F, 0xFF8F0F0F, 0x0E0E0E0F, 0x0F7FFFDF, - 0x0FFFFF0F, 0x0F0F0FBF, 0xFF4F0D0B, 0x0D8FFF8F, 0x0F1F8FFF, 0xCF0E0E0E, 0x8FFFFF6F, 0x0FDF0F0F, 0x0FDF0F0C, - 0x04090C0E, 0x8FFF8F0F, 0x0FBFFF0F, 0x3F0E0E0E, 0x0E1E2E0E, 0x0C09090D, 0x8FFF8F0D, 0x09080B0D, 0x0E4E0E0E, - 0x0D0E1E3E, 0x0E0E0E0E, 0x0E2E1E0E, 0x0E0E1E0E, 0x3E0E0E0D, 0x0E2F1FBF, 0xFF0E0C0A, 0x0B0D0E3E, 0x1E0E0F5F, - 0xFF8F0F0E, 0x0D0C0D0E, 0x1FEFFF4F, 0x0FFFFF0F, 0x0F0F0FBF, 0xFF4F0D0B, 0x0D8FFF8F, 0x0E0E0F9F, 0xFF7F0F0F, - 0xDF6FFFCF, 0x0F0FDFDF, 0xDF0F0D09, 0x0104090D, 0x8FFF8F0F, 0x0FBFFFDF, 0xDFFF5F1F, 0xBFCFBFDF, 0x3E0C0B0D, - 0x8FFF8F0D, 0x0A0B0E8F, 0xEF9FEF6F, 0x0F9FEF8F, 0xDFCF8F3F, 0xDFAFDFBF, 0x1FFFEFCF, 0xEFEF3F3F, 0xCFCF9FFF, - 0xFF0F0D0D, 0x0E8FEF9F, 0xEF9F3FDF, 0xFFCF8F0E, 0x0B090C0E, 0x8FFFBF0F, 0x0FFFFF4F, 0x4F3F0FBF, 0xFF4F0D0B, - 0x0D8FFF8F, 0x0E0C0E4F, 0xFFBF0F6F, 0xBF0FCFFF, 0x4F0E0E0D, 0x0C0B0905, 0x0002070D, 0x8FFF8F0F, 0x0FBFFF1F, - 0x2FFFAFAF, 0xFF1F1FFF, 0xAF0E0C0E, 0x8FFF8F0D, 0x0C0D6FFF, 0x6F0FBFEF, 0x7FFF6F0F, 0x5FFF8FEF, 0xCF0F5FFF, - 0x7FFFDF1F, 0x5FFF8FBF, 0xEF1F0FBF, 0xFF0F0E0E, 0x4FFF6F0F, 0x6FFF8F8F, 0xFF4F0F0C, 0x09090D2F, 0xFFFF2F0F, - 0x0FFFFFBF, 0xBF8F0FBF, 0xFF4F0D0C, 0x0D8FFF8F, 0x0D0C0D1F, 0xFFBF0FBF, 0x6F0F6FFF, 0x9F0E0C0A, 0x08060402, - 0x0001070C, 0x8FFF8F0F, 0x0FBFFF0F, 0x0FFFBFFF, 0xFFBFBFFF, 0xFF0E0D0E, 0x8FFF8F0E, 0x0D0EAFFF, 0xCFBFDFFF, - 0xEFFF4F0F, 0x4FFFBFFF, 0xEFBFCFFF, 0xBFFFBF0F, 0x4FFF8FFF, 0xBF0F0FBF, 0xFF0F0E0F, 0x8FFF4F0F, 0x1FFFBF8F, - 0xFF4F0E0B, 0x080B0EBF, 0xFF9F0F0F, 0x0FFFFF0F, 0x0F0F0FBF, 0xFF4F0E0C, 0x0E8FFF8F, 0x0E0C0D4F, 0xFFBF3FFF, - 0xBFBFCFFF, 0xFF2F0D08, 0x04020101, 0x0001070C, 0x8FFF8F0F, 0x0FBFFF0F, 0x0FFFBFFF, 0xFF0F0F0F, 0x0F0E0D0E, - 0x8FFF8F0E, 0x0E0FAFFF, 0x4F0F0F0F, 0x9FFF4F0F, 0x4FFFBFFF, 0xBF0F0F0F, 0x0FFFBF0F, 0x4FFF9FFF, 0xBF0F0FBF, - 0xFF0F0E0F, 0x8FFF4F0F, 0x0FFFBF8F, 0xFF4F0D0A, 0x0A0D4FFF, 0xEF1F0F0F, 0x0FFFFF0F, 0x0F0F0FBF, 0xFF4F0E0E, - 0x0E8FFF8F, 0x0E0E0E8F, 0xFF8F9F8F, 0x0F0F0F9F, 0xFF8F0D09, 0x04010000, 0x0001070C, 0x8FFF8F0F, 0x0FBFFF0F, - 0x0FFFBFAF, 0xFF7F0F1F, 0x8F0E0D0E, 0x8FFF8F0F, 0x0F0F6FFF, 0xAF0F0F8F, 0x7FFFAF3F, 0x9FFF8FEF, 0xFF3F0F3F, - 0x6FFFBF0F, 0x4FFF8FEF, 0xEF1F0FCF, 0xFF0F0E0E, 0x6FFF8F0F, 0x2FFF9F8F, 0xFF4F0D0A, 0x0C0EDFFF, 0x8F0F0F0F, - 0x0FFFFF0F, 0x0F0F0FBF, 0xFF4F0F0F, 0x0F8FFF8F, 0x0F0F4FEF, 0xEF2FFF2F, 0x0D0D0E4F, 0xFFEF1E0B, 0x05010000, - 0x0001060C, 0x8EFF8F0F, 0x0FBFFF0F, 0x0FFFBF3F, 0xDFFFBFDF, 0x6F0D0C0D, 0x8FFFDFBF, 0xBFFF4F9F, 0xFFCFCF9F, - 0x0F5FBFBF, 0xAFFF8F6F, 0xEFEFBFDF, 0x3FFFBF0F, 0x4FFF8F6F, 0xFFDFCFEF, 0xFF0E0D0D, 0x0E9FEF8F, 0xCFBF1F8F, - 0xFF4E0D0B, 0x0D7EFFFF, 0xBFBFBFFF, 0x8FFFFFBF, 0xBFCFFFBF, 0xFFCFBFBF, 0xFFBFFFDF, 0xBFCFEF9F, 0x2F8FAF0E, - 0x0B090B0E, 0xDFFF7E0C, 0x06010000, 0x0001050A, 0x2D4E2E0E, 0x0E3E4E0E, 0x0E4E3E0E, 0x0E4E4E2E, 0x0D0B090B, - 0x2D4E4E4E, 0x4E4E1E0E, 0x2E4F3F0F, 0x0F0F0F0F, 0x7FFF4F0F, 0x1E4E4E1E, 0x0E4E3E0E, 0x1E4E2E0E, 0x2E4E3E2E, - 0x4E0D0A09, 0x0B0D2E4E, 0x3E0E0E2E, 0x4E1D0B0A, 0x0C3E4E4E, 0x4E4E4E4E, 0x2E4E4E4E, 0x4E4E4E3E, 0x4E4E4E4E, - 0x4E3E4E4E, 0x4E0E0E0E, 0x0E3E2E0B, 0x0705080C, 0x2E4E2E0B, 0x06010000, 0x00000207, 0x0A0B0B0A, 0x0A0B0B0B, - 0x0B0B0B0B, 0x0B0C0C0B, 0x09060507, 0x0A0B0B0B, 0x0B0B0B0B, 0x0C0C0D0E, 0x0F9F4F5F, 0xEFCF0E0D, 0x0C0C0C0B, - 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0C0C0B, 0x0B090604, 0x06090B0C, 0x0B0B0A0B, 0x0B0A0706, 0x080A0B0B, 0x0B0B0B0B, - 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0A0A, 0x0A0A0A07, 0x03020408, 0x0A0B0A08, 0x03000000, - 0x00000002, 0x04050404, 0x04050505, 0x05050504, 0x05060605, 0x03010102, 0x04050505, 0x05050505, 0x0606080B, - 0x0E7F9F9F, 0x7F1E0C09, 0x06060605, 0x05050505, 0x05050505, 0x05060605, 0x05040201, 0x02030506, 0x05040404, - 0x05040202, 0x03040505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050404, 0x04040402, - 0x01000103, 0x04050403, 0x01000000, 0x00000000, 0x00010100, 0x00010101, 0x01010101, 0x01010101, 0x00000000, - 0x00010101, 0x01010101, 0x01010307, 0x0B0C0D0D, 0x0C0B0804, 0x02010101, 0x01010101, 0x01010101, 0x01010101, - 0x01000000, 0x00000101, 0x01010001, 0x01000000, 0x00010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, - 0x01010101, 0x01010000, 0x00010000, 0x00000000, 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x05070808, 0x07050201, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x01010202, 0x01010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -}; - -static UNK_TYPE D_80B669E0[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010101, 0x01000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01010202, - 0x01010101, 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x02020302, 0x02010000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x02040506, - 0x05040201, 0x00000000, 0x00000000, 0x00000001, 0x02020201, 0x00000000, 0x00000000, 0x00000000, 0x00000001, - 0x04060707, 0x06050505, 0x05050404, 0x02010000, 0x00000000, 0x00000105, 0x090B0B0B, 0x09070401, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000104, - 0x070A0B0C, 0x0B0A0703, 0x01000000, 0x00000000, 0x00000204, 0x07080704, 0x02010000, 0x00000000, 0x00000000, - 0x00000205, 0x090C0D0D, 0x0C0B0B0B, 0x0B0B0A09, 0x07040100, 0x00000000, 0x0001060B, 0x0E0E0F0E, 0x0E0C0804, - 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00010409, 0x0C0E4E4E, 0x4E0D0C08, 0x05030302, 0x02030303, 0x03040609, 0x0C0D0C09, 0x06040302, 0x02030302, - 0x01000102, 0x0304060A, 0x0D5EBF9F, 0x0F4E4E4E, 0x4E4E2E0D, 0x0C090504, 0x03030302, 0x02050B0E, 0xBFBFBFBF, - 0x3FBE0C07, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x01010101, 0x0103080C, 0x3EDF9F7F, 0xCFDF3E0D, 0x0B090908, 0x08090909, 0x09090B0D, 0x3EFF3E0D, 0x0B0A0908, - 0x08090907, 0x05030507, 0x09090B0D, 0x4EFF2F6F, 0x0FBF8FFF, 0xBF8FAFEF, 0x2E0D0B09, 0x09090908, 0x090C0E0F, - 0x0FBF0FBF, 0x8FBF0D09, 0x04010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000102, 0x04060505, 0x05070B0E, 0xDFAF0F0E, 0x1FDFCF0F, 0x0E0E0D0D, 0x0D0D0E0D, 0x0D0E0E0F, 0x2FBF2F0F, - 0x0E0E0D0D, 0x0D0D0D0C, 0x0A090A0C, 0x0D0E0E0F, 0x8FCF0F0F, 0x0E0E0FFF, 0x8F0F3FBF, 0x1F0F0E0E, 0x0E0E0D0D, - 0x0E0E0F0F, 0x0FBF0FBF, 0x5FBF0E0B, 0x06020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000307, 0x0A0B0B0B, 0x0B0B0D4E, 0xFF5F0E0D, 0x0E8FFF2F, 0x8FBFAF7F, 0x7FAFCFAF, 0x3FCFCFDF, - 0x6FCF4FBF, 0xBFDFBF3F, 0x9FAFCF8F, 0x0E0D0E5E, 0xBFCF9F7F, 0xEFDFAF0E, 0x0D0D0EFF, 0x8F0F3FCF, 0x3FCFCFDF, - 0x8FCFCF3F, 0x5FBFBF8F, 0x0F0F0F0F, 0x0F0F0F0D, 0x0A050100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x0001050B, 0x2D7E3E0E, 0x2E0E0E4F, 0xFF4F0D0C, 0x0E6FFF9F, 0xFF1F0F6F, 0x7F1F4FFF, - 0x8FFF5F3F, 0x6FFF4FFF, 0x8F1FFF8F, 0x8F0F8FFF, 0x0F0F2FFF, 0x5F1FEF8F, 0xBFBF0F0D, 0x0B0B0EFF, 0x8F0F4FFF, - 0x4FFF5FBF, 0xCF0FFF9F, 0xFF6F2FFF, 0x5F0F0F2F, 0x7F4F0F2E, 0x0C070200, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0001060C, 0x8EBFEFBF, 0xBF0E0E4F, 0xFF7F0E0D, 0x0E8FFF9F, 0xFF0F0F0F, - 0x5FCFCFFF, 0x8FFF4F0F, 0x4FFF4FFF, 0x8F0FFF8F, 0x8FCFDFFF, 0x0F0F7FFF, 0x1F0FBFBF, 0xBFBF0E0B, 0x080A0EFF, - 0x8F0F4FFF, 0x4FFF4FBF, 0xBF0FFFBF, 0xFFCFBFBF, 0x6F0F0F8F, 0xBFEFBFBF, 0x0D070200, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0001050B, 0x0D0E1E4E, 0x1E0D0D0E, 0xDFDF0F0E, 0x0FBFCF8F, - 0xFF2F0F5F, 0xEF7F4FFF, 0x8FFF4F0F, 0x4FFF4FFF, 0x8F0FFFBF, 0xFF3F8FFF, 0x0F0F4FFF, 0x5F0FBFAF, 0xBFBF0E0A, - 0x070A0EFF, 0x8F0F4FFF, 0x4FFF4FBF, 0xBF0FFFAF, 0xFF8F0F1F, 0x3F0F0F0F, 0x0F1F4F1E, 0x0B060100, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000307, 0x090A0B0B, 0x0A09090C, 0x3EDFBF8F, - 0xAFDF3F1F, 0xCFDF9FBF, 0xDFCFBFFF, 0x9FFF4F0F, 0x4FFF4FFF, 0x8F0FFFAF, 0xFFAFEFFF, 0x2F0F0FAF, 0xCF8FEF3F, - 0xBFBF0D09, 0x06090DFF, 0x8F0F4FFF, 0x4FFF4FBF, 0xBF0FFF8F, 0x9FFF8FCF, 0x2E0D0C0C, 0x0C0C0C0A, 0x07030000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000102, 0x04040505, 0x04030509, - 0x0C0E4E4E, 0x3E0E0D0D, 0x0E4E4E0E, 0x1E4E2E3E, 0x2E4E1E0E, 0x1E4E1E4E, 0x2E0E4E2E, 0x2E4E2E4E, 0x0D0D0D0D, - 0x3E4E1E0E, 0x3E3E0C07, 0x05080C4E, 0x2E0E1E4E, 0x1E4E1E3E, 0x3E0E4E2E, 0x0E2E4E1E, 0x0C090706, 0x05050504, - 0x02010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010101, - 0x01000104, 0x070A0B0C, 0x0B0A0808, 0x090A0B0B, 0x0B0B0B0B, 0x0B0B0A0A, 0x0A0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, - 0x0A080809, 0x0A0B0A0A, 0x0A0A0804, 0x0204080A, 0x0B0A0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0A, 0x07040201, - 0x01010101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x02040506, 0x05040302, 0x04040505, 0x05050505, 0x05050404, 0x04050505, 0x05050505, - 0x05050505, 0x04020203, 0x04050404, 0x04040301, 0x00010304, 0x04040405, 0x05050505, 0x05050505, 0x04050404, - 0x02010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00010101, 0x01000000, 0x00010101, 0x01010101, 0x01010100, 0x01010101, - 0x01010101, 0x01010101, 0x00000000, 0x01010101, 0x01010000, 0x00000001, 0x01010101, 0x01010101, 0x01010101, - 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, -}; - -static UNK_TYPE D_80B670E0[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x01020201, 0x01000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000101, 0x02020100, 0x00000000, 0x00000102, 0x03030404, 0x04040404, 0x04040405, 0x06070706, - 0x04010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000203, 0x03040404, 0x04040404, 0x03010000, - 0x00000000, 0x00000000, 0x00000000, 0x00020406, 0x07070603, 0x01000000, 0x00010307, 0x090A0A0A, 0x0A0A0A0A, - 0x0A0A0A0B, 0x0C0D0D0C, 0x09040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030609, 0x0A0A0A0A, - 0x0A0A0A0A, 0x08050100, 0x00000000, 0x00000000, 0x00000000, 0x01050A0C, 0x0D0D0B07, 0x02000000, 0x0002070C, - 0x0D0E0E0E, 0x0E0E0E0E, 0x0E0E0E0E, 0x3F8F9F3E, 0x0B060100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x01060B0D, 0x0E0E0E0E, 0x0E0E0E0E, 0x0C090300, 0x00000000, 0x00000000, 0x00000000, 0x02080D5E, 0x8FAF0E0A, - 0x04010000, 0x0003090D, 0xBFFFFFFF, 0xFFFFFFFF, 0xFFFFFFBF, 0x8FFFFF4F, 0x0C070100, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x02070DBF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0E0A0401, 0x00000000, 0x00000000, 0x00000000, - 0x03090EBF, 0xFFFF0E0B, 0x05010000, 0x0003080D, 0x7F8F7F4F, 0x9FFFFF9F, 0x4F8F8F7F, 0x8FFFFF4F, 0x0D070201, - 0x00000000, 0x00000101, 0x01000000, 0x00000000, 0x02080DBF, 0xFFFF7F4F, 0x4F5F8F8F, 0x0E0A0502, 0x01010101, - 0x01000000, 0x00000001, 0x040A0EBF, 0xFFFF0E0B, 0x05010000, 0x0001060B, 0x0D0D0E0F, 0x8FFFFF8F, 0x0F0E0E0F, - 0x8FFFFF4F, 0x0D0A0604, 0x03010001, 0x02030405, 0x05040201, 0x00000000, 0x02080DBF, 0xFFFF4F0F, 0x0E0D0D0D, - 0x0C090605, 0x05050505, 0x04030200, 0x00010305, 0x080C0EBF, 0xFFFF0E0B, 0x05010000, 0x00000205, 0x07080B0E, - 0x8FFFFF8F, 0x0E0C0C0E, 0x8FFFFF4F, 0x0E0D0C0A, 0x09060404, 0x07090B0B, 0x0B0A0805, 0x02000000, 0x02080DBF, - 0xFFFF4F0E, 0x0B090909, 0x0A0A0A0B, 0x0B0B0B0B, 0x0B090604, 0x0406090B, 0x0C0E0FBF, 0xFFFF0E0B, 0x05010000, - 0x00000001, 0x0203080D, 0x8FFFFF8F, 0x0E0A090D, 0x8FFFFF4F, 0x0F2F3E0E, 0x0D0B090A, 0x0C0D0E3E, 0x2E0E0D0A, - 0x06020000, 0x02080DBF, 0xFFFF4F0E, 0x0C0A090A, 0x0B0D0E0E, 0x2E0E1E4E, 0x0E0D0C09, 0x090B0D0E, 0x3E2F0FBF, - 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0002070D, 0x8FFFFF8F, 0x0D09090D, 0x8FFFFF8F, 0xDFFFFFFF, 0x8F0E0D0E, - 0x3EAFFFDF, 0xFFDF6F0D, 0x0A050100, 0x02080DBF, 0xFFFF4F0F, 0x0E0E0D0D, 0x0E3EDFFF, 0xAFBFFFFF, 0xFFBF1E0D, - 0x0D1E8FFF, 0xFFDFEFEF, 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001070C, 0x8FFFFF8F, 0x0D09080D, 0x8FFFFFEF, - 0x6F4FCFFF, 0xFF5F0F3F, 0xEFFF6F0F, 0x3FFFFF7F, 0x0D080300, 0x02080DBF, 0xFFFF9F8F, 0x8FBFBF0F, 0x0F4FFFFF, - 0xFF8F4F9F, 0xFFFF8F0F, 0x0FCFFFCF, 0x1F0F3FDF, 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001070C, 0x8FFFFF8F, - 0x0D09080D, 0x8FFFFF5F, 0x0F0F5FFF, 0xFF8F0FBF, 0xFFDF0F0F, 0x0FAFFFEF, 0x1E0B0501, 0x02080DBF, 0xFFFFCFBF, - 0xBFBFDF0F, 0x0F4FFFFF, 0x8F0F0F1F, 0xFFFFBF0F, 0x7FFFFF2F, 0x0E0E0F8F, 0xFFFF0E0B, 0x05010000, 0x00000000, - 0x0001070C, 0x8FFFFF8F, 0x0D09080D, 0x8FFFFF4F, 0x0F0E4FFF, 0xFF8F2FFF, 0xFF9F0F0F, 0x0F8FFFFF, 0x5E0C0601, - 0x02080DBF, 0xFFFF4F0F, 0x0E0E0E0E, 0x0E4FFFFF, 0x8F0F0E0F, 0xFFFFBF0F, 0xDFFFCF0E, 0x0C0C0E8F, 0xFFFF0E0B, - 0x05010000, 0x00000000, 0x0001070C, 0x8FFFFF8F, 0x0D09080D, 0x8FFFFF4F, 0x0E0E4FFF, 0xFF8F4FFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0x8F0C0601, 0x02080DBF, 0xFFFF4F0E, 0x0C0A0A0B, 0x0D4FFFFF, 0x8F0F0E0F, 0xFFFFBF0F, 0xFFFFBF0E, - 0x0B0B0E8F, 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001070C, 0x8FFFFF8F, 0x0D09080D, 0x8FFFFF4F, 0x0E0E4FFF, - 0xFF8F4FFF, 0xFFBF0F0F, 0x0F0F0F0F, 0x0F0C0601, 0x02080DBF, 0xFFFF4F0D, 0x09060608, 0x0C4EFFFF, 0x8F0E0E0E, - 0xFFFFBF0F, 0xFFFFBF0E, 0x0B0B0E8F, 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001070C, 0x8FFFFF8F, 0x0D09080D, - 0x8FFFFF4F, 0x0E0E4FFF, 0xFF8F3FFF, 0xFFEF0F0F, 0x0E0E0F0F, 0x0E0C0601, 0x02080DBF, 0xFFFF4F0D, 0x0A08080A, - 0x0D4FFFFF, 0x8F0E0E0E, 0xFFFFBF0F, 0xFFFFDF0E, 0x0C0C0E8F, 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001070C, - 0x8FFFFF8F, 0x0D09080D, 0x8FFFFF4F, 0x0E0E4FFF, 0xFF8F0FDF, 0xFFFF7F0F, 0x0E0F0FAF, 0x3E0B0501, 0x02080DBF, - 0xFFFF4F0E, 0x0D0D0D0D, 0x0E4FFFFF, 0x8F0E0E0E, 0xFFFFBF0F, 0xBFFFFF4F, 0x0E0E0FCF, 0xFFFF0E0B, 0x05010000, - 0x00000000, 0x0001070C, 0x8FFFFF8F, 0x0D09080D, 0x8FFFFF4F, 0x0E0E4FFF, 0xFF8F0F4F, 0xFFFFFF7F, 0x1F3FAFCF, - 0x0E0A0401, 0x02080DBF, 0xFFFF7F4F, 0x4F4F4F8F, 0x8F4FFFFF, 0x8F0E0E0E, 0xFFFFBF0F, 0x4FFFFFCF, 0x2F0F7FFF, - 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001060C, 0x8EFFFF8F, 0x0D09080C, 0x8EFFFF4F, 0x0E0D4EFF, 0xFF8F0F0F, - 0x4FDFFFFF, 0xFFFFCF3E, 0x0C070200, 0x02080DBF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFF4FFFFF, 0x8F0E0D0E, 0xFFFFBF0F, - 0x0F6FEFFF, 0xFFFFEFAF, 0xFFFF0E0B, 0x05010000, 0x00000000, 0x0001050B, 0x2D4E4E2E, 0x0B07060B, 0x2D4E4E1D, - 0x0C0C1D4E, 0x4E2E0D0C, 0x0D0E3E4F, 0x4F3E0E0C, 0x08030100, 0x01060C3E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E1E4E4E, - 0x2E0D0C0D, 0x4E4E3E0E, 0x0D0D1E4E, 0x4F4F0E2E, 0x4E4E0D09, 0x03000000, 0x00000000, 0x00000307, 0x0A0B0B0A, - 0x07040307, 0x0A0B0B0A, 0x08080A0B, 0x0B0A0907, 0x080A0C0C, 0x0C0C0A07, 0x03010000, 0x0003080A, 0x0B0B0B0B, - 0x0B0B0B0B, 0x0B0B0B0B, 0x0A080709, 0x0B0B0B0A, 0x08090B0C, 0x0C0C0C0B, 0x0B0B0905, 0x02000000, 0x00000000, - 0x00000102, 0x04050504, 0x02010102, 0x04050504, 0x03030405, 0x05040302, 0x02040606, 0x06060402, 0x00000000, - 0x00010304, 0x05050505, 0x05050505, 0x05050505, 0x04030203, 0x05050504, 0x03030506, 0x06060505, 0x05050302, - 0x00000000, 0x00000000, 0x00000000, 0x00010101, 0x00000000, 0x00010100, 0x00000001, 0x01010000, 0x00000101, - 0x01010000, 0x00000000, 0x00000001, 0x01010101, 0x01010101, 0x01010101, 0x01000000, 0x01010100, 0x00000101, - 0x01010101, 0x01010000, 0x00000000, -}; - -static UNK_TYPE D_80B67860[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01010202, 0x02020202, - 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, - 0x02020202, 0x02020202, 0x00000000, 0x00000000, 0x00010202, 0x03040506, 0x06060606, 0x06060606, 0x06060606, - 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, - 0x00000000, 0x00000001, 0x02030506, 0x0809090A, 0x0A0A0A0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, - 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x00000000, 0x00000103, - 0x0507090A, 0x0B0C2D4D, 0x6D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, - 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x00000000, 0x00020406, 0x090B0C5D, 0x9EEEFEFE, - 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0204070A, 0x0C5DDEFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0x00000002, 0x04070A1C, 0xAEFEFFFF, 0xFFFFFFFF, 0xFFFFFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, - 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0x00000104, - 0x070A1DCE, 0xFFFFFFFF, 0xFFDE8E4E, 0x1E0E0E0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0E0D0D0D, 0x0D0D0D0D, 0x0D0D0D0C, - 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x00010306, 0x0A1CCEFF, 0xFFFFFFBE, - 0x4D0D0D0D, 0x0D0D0D0D, 0x0C0B0A0A, 0x0B0C0C0D, 0x0D0D0C0C, 0x0C0C0C0C, 0x0C0B0A09, 0x09080808, 0x08080808, - 0x08080909, 0x090A0A0A, 0x0A090909, 0x09080808, 0x00020508, 0x0CAEFFFF, 0xFFFE7E0D, 0x0B0B0B0C, 0x0D0D0D0D, - 0x0C0A0908, 0x090B0C0D, 0x0D0D0D0D, 0x0D0D0C0C, 0x0B0A0705, 0x04040404, 0x04040404, 0x04050506, 0x07080808, - 0x08080706, 0x05040404, 0x0103070A, 0x4DFEFFFF, 0xFE6D0C0A, 0x09090A0C, 0x8D8E8E8E, 0x4D0B0908, 0x0A2C8D8E, - 0x8E8E0E0E, 0x6E8E8E8D, 0x4C0A0704, 0x02020101, 0x02020202, 0x02030406, 0x08090A0A, 0x0A090705, 0x04030202, - 0x0104080C, 0xBEFFFFFF, 0x7E0C0907, 0x06070A0C, 0xFEFFFFFF, 0xEE1D0B0A, 0x0B4DFEFF, 0xFFFF0F0F, 0xBFFFFFFE, - 0x8D0B0804, 0x02020202, 0x02020203, 0x03040609, 0x0B4C4D4D, 0x4C1B0A08, 0x05040303, 0x02060A3D, 0xFEFFFFBE, - 0x0D0A0704, 0x03060A0D, 0xFEFFFFFF, 0xFF8E0C0C, 0x0C4DFEFF, 0xFFFF0F0F, 0xBFFFFFFF, 0x8E0C0906, 0x05040405, - 0x05060606, 0x06080A0C, 0x0DFEFEFE, 0xFE4D0C0B, 0x09070707, 0x03070B8D, 0xFFFFFF5D, 0x0B080402, 0x02050A0D, - 0xFEFFFFFF, 0xFFFE3E0D, 0x0D4EFFFF, 0xFFFF0F0F, 0x3F4F4F4F, 0x2E0D0B0A, 0x09090909, 0x090A0A0A, 0x0A0B2C8D, - 0x8EFFFFFF, 0xFF9F8E4D, 0x0C0B0B0B, 0x04080CBE, 0xFFFFEE0D, 0x0A060201, 0x02050A0D, 0xFEFFFFFF, 0xFFFFBE0E, - 0x0E4EFFFF, 0xFFFF0F0F, 0x0F0F0F0F, 0x0F0E0D0D, 0x0C0C0C0C, 0x1D5D8D5D, 0x0D0D4EFE, 0xFFFFFFFF, 0xFFFFFF8E, - 0x0E0D5D8D, 0x04090CFE, 0xFFFFBE0C, 0x09040101, 0x02050A0D, 0xFEFFFFFF, 0xAFFFFF5F, 0x0F4FFFFF, 0xFFFF0F0F, - 0xBFFFFFFF, 0x8F0F4EFE, 0xFEFEFE8E, 0xFEFEFEFE, 0xEE4F1F4F, 0x4FFFFFFF, 0xFF7F4F2F, 0x3FDFFFFF, 0x05090CFE, - 0xFFFF8E0C, 0x08040100, 0x02050A0D, 0xFEFFFFFF, 0x4FCFFFDF, 0x1F4FFFFF, 0xFFFF0F0F, 0xBFFFFFFF, 0x8F0F4FFF, - 0xFFFFFFFF, 0x9FBFFFFF, 0xFFEF3F0F, 0x0FFFFFFF, 0xFF4F0F3F, 0xEFFFFF9F, 0x05090DFE, 0xFFFF8E0C, 0x08040100, - 0x02050A0D, 0xFEFFFFFF, 0x4F4FFFFF, 0x8F4FFFFF, 0xFFFF0F0F, 0xBFFFFFFF, 0x8F0F4FFF, 0xFFFFFF4F, 0x0E0EAFFF, - 0xFFFFAF0F, 0x0FFFFFFF, 0xFF4F0FBF, 0xFFFFFF4F, 0x05090CFE, 0xFFFFAE0C, 0x08040100, 0x02050A0D, 0xFEFFFFFF, - 0x4F0F9FFF, 0xFF6FFFFF, 0xFFFF0F0F, 0xBFFFFFFF, 0x8F0F4FFF, 0xFFFFFF0E, 0x0E0E8FFF, 0xFFFFDF0F, 0x0FFFFFFF, - 0xFF4F0FFF, 0xFFFFFFFF, 0x04080CDE, 0xFFFFCE0C, 0x09050201, 0x02050A0D, 0xFEFFFFFF, 0x4F0E1EEF, 0xFFEFFFFF, - 0xFFFF0F0F, 0xBFFFFFFF, 0x8F0F4FFF, 0xFFFFFF0E, 0x0D0E8EFF, 0xFFFFFF0F, 0x0FFFFFFF, 0xFF4F4FFF, 0xFFFFFF9F, - 0x03080BAE, 0xFFFFFE2D, 0x0A070301, 0x02050A0D, 0xFEFFFFFF, 0x4E0E0E8E, 0xFFFFFFFF, 0xFFFF0F0F, 0xBFFFFFFF, - 0x8F0F4FFF, 0xFFFFFF0E, 0x0D0D8EFF, 0xFFFFFF0F, 0x0FFFFFFF, 0xFF4F0FFF, 0xFFFFFF4F, 0x03070B6D, 0xFFFFFF8E, - 0x0C090503, 0x03050A0D, 0xFEFFFFFF, 0x4E0D0C0D, 0xDEFFFFFF, 0xFFFF0F0F, 0xBFFFFFFF, 0x8F0F4FFF, 0xFFFFFF0E, - 0x0D0D8EFF, 0xFFFFFF0F, 0x0FFFFFFF, 0xFF4F0FBF, 0xFFFFFF4F, 0x0205091C, 0xFEFFFFEE, 0x2D0B0805, 0x04060A0D, - 0xFEFFFFFE, 0x4D0B0B0C, 0x4DFEFFFF, 0xFFFF0F0F, 0xBFFFFFFF, 0x8F0F4FFF, 0xFFFFFE0D, 0x0D0D8EFE, 0xFFFFFF0F, - 0x0FFFFFFF, 0xFF4F0E4E, 0xFFFFFFAF, 0x0104080B, 0x9DFFFFFF, 0xBE0D0B08, 0x07080A0C, 0xFEFEFEFE, 0x4C0A090A, - 0x0CADFEFF, 0xFFFF0F0E, 0xBFFFFFFF, 0x8F0F4FFF, 0xFFFEFE0D, 0x0C0C8DFE, 0xFEFFFF0F, 0x0FFFFFFE, 0xFE4E0D0D, - 0x4EDEFFFF, 0x0002060A, 0x1CEEFFFF, 0xFF9E1D0B, 0x0A0A0B0C, 0x4D4E4D4D, 0x1C0A0809, 0x0B1C4D4E, 0x4E4E0E0E, - 0x3E4E4E4E, 0x2E0E1E4E, 0x4E4D4D0C, 0x0B0C2C4D, 0x4E4E4E0E, 0x0E4E4E4E, 0x4D1D0C0C, 0x0D0D5E8E, 0x00010408, - 0x0B6DFEFF, 0xFFFFCE4D, 0x0D0C0C0C, 0x0D0D0D0C, 0x0B0A090A, 0x0B0C0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, - 0x0D0D0C0C, 0x0B0B0C0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0C0B0B, 0x0C0D0D0E, 0x00000205, 0x090C8DFE, 0xFFFFFFFF, - 0xAE5E0D0D, 0x0D0D0D0D, 0x0C0C0B0C, 0x0C0C0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0C, 0x0C0C0D0D, - 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0C0C, 0x0C0D0D0E, 0x00000103, 0x06090C8D, 0xFEFFFFFF, 0xFFFFEEBE, 0x8E8E4E4E, - 0x4E4E4D4D, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, - 0x4E4E4E4E, 0x4E4E4E4E, 0x00000001, 0x0306090B, 0x4DDEFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0x00000000, 0x01030608, 0x0B1C7DDE, 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00010305, - 0x07090B0C, 0x3D8DAECE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, - 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0x00000000, 0x00000102, 0x03050709, 0x0A0B0B0C, - 0x0C0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, - 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x00000000, 0x00000000, 0x01020304, 0x06070808, 0x09090909, 0x0A0A0A0A, - 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, - 0x0A0A0A0A, 0x00000000, 0x00000000, 0x00000101, 0x02030304, 0x04050505, 0x05050505, 0x05050505, 0x05050505, - 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x00000000, - 0x00000000, 0x00000000, 0x00000101, 0x01010202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, - 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, -}; - -static UNK_TYPE D_80B68460[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, - 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020101, 0x00000000, - 0x00000000, 0x00000000, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, - 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06050403, 0x02020100, 0x00000000, 0x00000000, - 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, - 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0A0A0A, 0x0A090908, 0x06050302, 0x01000000, 0x00000000, 0x8D8D8D8D, 0x8D8D8D8D, - 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, 0x8D8D8D8D, - 0x8D8D8D6D, 0x4D2D0C0B, 0x0A090705, 0x03010000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFEFEEE9E, - 0x5D0C0B09, 0x06040200, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEDE6D0C, 0x0A070402, - 0x00000000, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, - 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFF, 0xFFFFFFFF, 0xFFFFFEBE, 0x1C0A0804, 0x02000000, 0x0C0C0C0C, - 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0C0C0C0C, - 0x0C0C0C0C, 0x0D0D0E1E, 0x4E8FDFFF, 0xFFFFFFFF, 0xCE1D0A07, 0x04010000, 0x08080808, 0x08080808, 0x08080808, - 0x08080808, 0x08080808, 0x08080808, 0x0809090A, 0x0B0C0D0D, 0x0C0C0B0A, 0x09090808, 0x08080909, 0x0A0B0C0D, - 0x0E0E0F4F, 0xBFFFFFFF, 0xFFCE1C0A, 0x06030100, 0x04040404, 0x04040404, 0x04040404, 0x04040404, 0x04040404, - 0x04040404, 0x04050608, 0x0B0C0D0D, 0x0D0B0907, 0x05040404, 0x04040506, 0x080A0CDD, 0xDEDE0E0E, 0x0E7EFFFF, - 0xFFFFAE0C, 0x08050200, 0x02020202, 0x02010101, 0x01010101, 0x01020202, 0x02020101, 0x01010101, 0x02030508, - 0x0B8D8E8E, 0x8D2C0906, 0x03020202, 0x02020305, 0x070BCD1E, 0x1F0FEE1E, 0x0D0D6EFF, 0xFFFFFE4D, 0x0A070301, - 0x03030303, 0x02010101, 0x01010101, 0x02020202, 0x02020101, 0x00000101, 0x02030609, 0x0CFEFFFF, 0xFE4D0A07, - 0x04030303, 0x03030406, 0x09CC0EEF, 0xEFAF0ECE, 0x0C0C0D7E, 0xFFFFFFBE, 0x0C080401, 0x07070706, 0x05040303, - 0x03040404, 0x04050506, 0x06050403, 0x02020203, 0x0506080B, 0x0DFEFFFF, 0xFE4D0B08, 0x06060607, 0x07070809, - 0x0BED0EEF, 0x4FEF1EDD, 0x0C0A0B0D, 0xBEFFFFFE, 0x3D0A0602, 0x0B0B0B0A, 0x09080707, 0x08080808, 0x09090A0A, - 0x0A090806, 0x05040507, 0x090A0B0D, 0x0EFFFFFF, 0xFF4E0C0A, 0x090A0A0B, 0x0B0B0B0C, 0x0DEE0FFF, 0xBF4F0EDD, - 0x0A09090B, 0x5DFFFFFF, 0x8D0B0703, 0xAEAD8D5D, 0x0C0B0B0B, 0x0B0C0C0C, 0x0C0D3D7D, 0x7D3C0B0A, 0x0808090B, - 0x1C6D8D6E, 0x2FFFFFFF, 0xFF4E0D0C, 0x0C1C6D8D, 0xBD9D8D3E, 0x0EAF0FEF, 0x1FDE2DAC, 0x0907070A, 0x0DEEFFFF, - 0xBE0C0804, 0xCFCFFFFE, 0xEE5E0D0D, 0xBEFEFEFE, 0xAECEFEFE, 0xFEFEAD1D, 0x0C0C0C8D, 0xFEFEFFFF, 0xFFFFFFFF, - 0xFF4F0E0E, 0x8EEEFEEE, 0xBEDEFEFF, 0xBF1FDF0F, 0x0E0DDC0A, 0x07050509, 0x0CBEFFFF, 0xFE0C0904, 0x0F0F8FFF, - 0xFFFF4F0F, 0xBFFFFFFF, 0xFFDF8FEF, 0xFFFFFFAE, 0x0E0E7EFE, 0xFFFFCF4F, 0x9FFFFFFF, 0xFF4F0F8F, 0xFFFFFF3F, - 0x0E1EEFFF, 0xFFCF0FDE, 0xDDDB0907, 0x04030408, 0x0C8EFFFF, 0xFE0C0905, 0x0F0F4FFF, 0xFFFFCF0F, 0xBFFFFFFF, - 0xDF0F0E3F, 0xFFFFFFFF, 0x3F1FEFFF, 0xFFFF4F0F, 0x0FFFFFFF, 0xFF4F2FFF, 0xFFFFFF0E, 0x0E0EBFFF, 0xFFFF6E0D, - 0x0B080603, 0x02020408, 0x0C8EFFFF, 0xFE0D0905, 0xFFFFFFFF, 0xFFFFFF0F, 0xBFFFFFFF, 0x8F0E0E0E, 0xCFFFFFFF, - 0x7F5FFFFF, 0xFFFF0F0E, 0x0FFFFFFF, 0xFF4F8FFF, 0xFFFFCF0E, 0x0D0EBEFF, 0xFFFFAE0C, 0x09050301, 0x01010408, - 0x0C9EFFFF, 0xFE0C0905, 0x8F8F8F8F, 0x8F8F8F2F, 0xBFFFFFFF, 0x8E0E0D0E, 0xBFFFFFFF, 0x8F8FFFFF, 0xFFFF0F0E, - 0x0FFFFFFF, 0xFF4F8FFF, 0xFFFFBF0E, 0x0D0EBEFF, 0xFFFFBE0B, 0x08040100, 0x00020509, 0x0CCEFFFF, 0xEE0C0804, - 0x0F0F1F4F, 0x4F4F4F0F, 0xBFFFFFFF, 0x8E0D0D0E, 0xBFFFFFFF, 0x8F5FFFFF, 0xFFFF0F0E, 0x0FFFFFFF, 0xFF4F8FFF, - 0xFFFFBF0E, 0x0D0EBEFF, 0xFFFFAD0B, 0x07030100, 0x0103070A, 0x2DFEFFFF, 0xAE0B0803, 0x0F0F4FFF, 0xFFFFBF0F, - 0xBFFFFFFF, 0x8E0D0D0E, 0xBEFFFFFF, 0x8F1FEFFF, 0xFFFF4F0F, 0x0FFFFFFF, 0xFF4F3FFF, 0xFFFFFF0E, 0x0E0EBFFF, - 0xFFFE6D0A, 0x06020101, 0x0205090C, 0x8EFFFFFF, 0x6D0B0703, 0x0F0FAFFF, 0xFFFF4F0F, 0xBFFFFFFF, 0x8E0D0C0D, - 0xBEFFFFFF, 0x8F0F7FFF, 0xFFFFCF5F, 0xAFFFFFFF, 0xFF4F0F9F, 0xFFFFFF3F, 0x0E1FEFFF, 0xFECD0C08, 0x05020202, - 0x05080B1D, 0xEEFFFFFE, 0x1C090502, 0xCFCFFFFF, 0xDE4E0E0E, 0xBEFEFEFE, 0x8D0C0C0D, 0xBEFEFEFE, 0x8E0E0E7E, - 0xEEFFFFFF, 0xFFFFFFFF, 0xFE4E0E0E, 0x8EFEFFEF, 0xBFEFFFFE, 0xAE1C0A07, 0x04030405, 0x080B0DBE, 0xFFFFFF9E, - 0x0B080401, 0x9E9E8E5E, 0x0D0D0C0D, 0x3D4D4E4D, 0x2D0C0B0C, 0x3D4D4E4D, 0x2D0C0C0D, 0x1D5E8E6E, 0x1E4E4E4E, - 0x4D1D0D0D, 0x0D2E7E8E, 0xAE8E7E2E, 0x0D0B0907, 0x06060709, 0x0B1D9EFF, 0xFFFFEE1D, 0x0A060200, 0x0E0E0E0D, - 0x0D0C0C0C, 0x0C0D0D0D, 0x0C0B0B0C, 0x0C0D0D0D, 0x0C0C0C0C, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0C0C0C, 0x0C0D0D0E, - 0x0E0E0E0D, 0x0C0B0A09, 0x090A0B0C, 0x4DCEFFFF, 0xFFFE6D0B, 0x08040100, 0x0E0E0E0D, 0x0D0C0C0C, 0x0D0D0D0D, - 0x0D0C0C0C, 0x0D0D0D0D, 0x0D0C0C0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0C0C, 0x0D0D0E0E, 0x0E0E0E0D, 0x0D0C0C0C, - 0x0C0D5DAE, 0xFEFFFFFF, 0xFE9D0C09, 0x05020000, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, - 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E4E4E, 0x4E4E8E8E, 0xBEEEFFFF, 0xFFFFFFFE, - 0x8D0C0906, 0x03010000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEDE5D, 0x0B090603, 0x01000000, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xDE7D1C0B, 0x08060301, 0x00000000, 0xFEFEFEFE, 0xFEFEFEFE, - 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, - 0xFEFEFEFE, 0xCEAE8D3D, 0x0C0B0907, 0x05030100, 0x00000000, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, - 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0D, 0x0D0D0D0C, 0x0C0B0B0A, - 0x09070503, 0x02010000, 0x00000000, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, - 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x09090909, 0x08080706, 0x04030201, 0x00000000, - 0x00000000, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, - 0x05050505, 0x05050505, 0x05050505, 0x05050504, 0x04030302, 0x01010000, 0x00000000, 0x00000000, 0x02020202, - 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, - 0x02020202, 0x02020101, 0x01010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, -}; - -static UNK_TYPE D_80B69060[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x01000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01020202, - 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020203, 0x03020202, 0x02020203, 0x03030202, 0x02010101, - 0x02020203, 0x03030303, 0x03030303, 0x03030303, 0x03020202, 0x01010000, 0x00000101, 0x02020202, 0x02020202, - 0x01010101, 0x01000000, 0x00000000, 0x00000000, 0x00000001, 0x03050606, 0x06060505, 0x06060606, 0x06050506, - 0x06060606, 0x06060607, 0x07060606, 0x06060606, 0x06060606, 0x05040404, 0x05060606, 0x06060606, 0x06060606, - 0x06060606, 0x06060606, 0x05030201, 0x01010304, 0x06060606, 0x06060605, 0x04040404, 0x03020100, 0x00000000, - 0x00000000, 0x00000103, 0x06080A0A, 0x0A0A0A0A, 0x0A0A0A0A, 0x0A09090A, 0x0A0A0A0A, 0x0A0A0A0B, 0x0B0A0A0A, - 0x0A0A0A0A, 0x0A0A0A0A, 0x09080708, 0x090A0A0A, 0x0B0B0B0B, 0x0B0B0B0B, 0x0A0A0A0A, 0x0A0A0A0A, 0x09070503, - 0x02030508, 0x0A0A0A0A, 0x0A0A0A09, 0x08080808, 0x06030100, 0x00000000, 0x00000000, 0x00000205, 0x086BACAD, - 0xAD9D1D0D, 0x8DADADAD, 0x9D1D0D6D, 0xADADADCD, 0x4D0D9DDD, 0xDDDD8D0D, 0x6DADADAD, 0xCD8D3DDD, 0xBC0C0B0B, - 0x6C6C8DAD, 0xADADADAD, 0x8D6DADAD, 0xADCD8D3D, 0xADADADAC, 0x7C0B0906, 0x0405086B, 0xACADAD7D, 0x0D6DAD7C, - 0x0C0B1BAA, 0x08050200, 0x00000000, 0x00000000, 0x00000206, 0x0AACFE9E, 0x8EFEFE1E, 0xDEFE6E9E, 0xFEEE0EAE, - 0xFE9E6E6E, 0x1EAEFE4E, 0x0E6EDE0E, 0xAEFE9E6E, 0x6E3E6EFE, 0xFE9D0D0D, 0xADAE4E6E, 0x9EFECE6E, 0x4EAEFE9E, - 0x6E6E3E6E, 0xFECE6D9D, 0xFDED3B09, 0x060709AC, 0xFE9EBEFE, 0x7E3EFEFE, 0x1E0DADCC, 0x09050200, 0x00000000, - 0x00000000, 0x00000206, 0x0AADFE6F, 0x0FBFFF6F, 0xDFFF0F0F, 0xDFFF4FAF, 0xFF6F0E0E, 0x0EDEFF1F, 0x0E0E0E0E, - 0xAFFF6F0E, 0x0E0E6EEF, 0xFFFE4E0E, 0xAEAE0E0E, 0x6EFEAE0E, 0x0EAEFF6E, 0x0E0E0E6E, 0xFEAE0D0D, 0x4DFDDD0B, - 0x08080AAD, 0xFE6F6FFF, 0xAF0FBFFF, 0xAE1EFD3C, 0x09050200, 0x00000000, 0x00000000, 0x00000306, 0x0BADFE6F, - 0x0FCFFF6F, 0xDFFF0F0F, 0xEFFF1FAF, 0xFF6F4E4E, 0x0EAEFEFF, 0xAF3E0E0E, 0xAFFF6F3E, 0x4E0E6EDF, 0x7FFFEF1F, - 0xAEAE0D0D, 0x6EFEAE0E, 0x0EAEFF6F, 0x4E4E0E6E, 0xFEAE0D0C, 0x0DDEFD3C, 0x09080AAD, 0xFE9FCFFF, 0x6F0F1FFF, - 0xFFAECD0B, 0x07030100, 0x00000000, 0x00000000, 0x00000307, 0x0BADFE9F, 0xAFFEEE0F, 0xDFFFAFEF, 0xFFAF0FAF, - 0xFFEFDEBE, 0x0D1EBEFE, 0xFFFFBF0F, 0xAFFFEFDE, 0xBE0E6EDF, 0x0FBFFFBF, 0xAEAE0D0D, 0x6EFEAE0D, 0x0DAEFFEE, - 0xDEBE0E6E, 0xFEAD0C0C, 0x0DADFD6C, 0x0A090AAD, 0xFECFCFFF, 0xAF0E0EAF, 0xFFFE3D0A, 0x06020000, 0x00000000, - 0x00000000, 0x00000307, 0x0BADFECE, 0xAE7D0D0E, 0xDFFFDFFF, 0x3F0F0FAF, 0xFF6E0E0D, 0x0D0D0D1E, 0xAEFFFF9F, - 0xAFFF6F0E, 0x0E0E6EDE, 0x0E1EEEFF, 0xEEAE0D0D, 0x6DFEAE0D, 0x0DAEFE6E, 0x0E0E0E6E, 0xFEAE0D0C, 0x0DCEFD4C, - 0x09090AAD, 0xFE6F0FAF, 0xFF6E0E1E, 0xFEDE0C08, 0x04010000, 0x00000000, 0x00000000, 0x00000206, 0x0AADFE6D, - 0x0C0B0C0D, 0xDEFF6FFF, 0xDF0F0FAF, 0xFF6E0E0D, 0x0D0D0D0E, 0x0E6FFFAF, 0xAFFF6F0E, 0x0E0E6EDE, 0x0D0D4DFE, - 0xFEAD0C0C, 0x6DFEAD0D, 0x0DAEFE6E, 0x0E0E0E6E, 0xFEAE0D0D, 0x1DFDFD0B, 0x09080AAD, 0xFE6F0F7F, 0xFEAE0E0E, - 0xFEDD0B07, 0x03010000, 0x00000000, 0x00000000, 0x00000206, 0x0AACFD6C, 0x0A09090B, 0xDDFE0ECE, 0xFE8E0EAF, - 0xFF6E0E3D, 0x4DCD6D0E, 0x0E9EFE9F, 0xAFFF6E0E, 0x3E6E6DDD, 0x0C0B0C9D, 0xFDAD0C0C, 0x6DFDAD0C, 0x0CADFE6E, - 0x0E3E4E6E, 0xFEAE0E4D, 0xEDFD7C09, 0x070709AC, 0xFE6E1EEE, 0xFE3D0D0D, 0xFDDC0A06, 0x02000000, 0x00000000, - 0x00000000, 0x00000205, 0x098BDC4A, 0x08060709, 0xBCDD0D0D, 0x9DFEBE9E, 0xDEDDDDDD, 0xBD7DDDFD, 0xEDEDAD0D, - 0x8DDDDDDD, 0xDDDD4DBC, 0x0A09090B, 0xCB8B0A0A, 0x4BDC8C0B, 0x0B8CDDDD, 0xDDDDBD4D, 0xDDDDDDDD, 0xBC3B0A07, - 0x0505088B, 0xDDDDDDDD, 0x6C0B0B0C, 0xDCBB0905, 0x02000000, 0x00000000, 0x00000000, 0x00000103, 0x06080908, - 0x05040407, 0x090A0A0A, 0x0B1C8C3C, 0x0C0C0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0B0B0A09, 0x07060607, - 0x09080808, 0x09090908, 0x090A0B0B, 0x0B0B0B0B, 0x0B0B0B0B, 0x0A080604, 0x03030609, 0x0A0B0B0A, 0x09080809, - 0x09090603, 0x01000000, 0x00000000, 0x00000000, 0x00000002, 0x03050504, 0x03020204, 0x05060606, 0x07080809, - 0x08080807, 0x07070707, 0x07070707, 0x07070707, 0x07070706, 0x04030304, 0x05050404, 0x05060505, 0x05060707, - 0x07070707, 0x07070707, 0x06040302, 0x01020305, 0x06070706, 0x05040405, 0x05050302, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x01020202, 0x01010101, 0x02020203, 0x03040404, 0x04040303, 0x03030303, 0x03030303, - 0x03030303, 0x03030302, 0x01010101, 0x02020202, 0x02020202, 0x02020303, 0x03030303, 0x03030303, 0x02010100, - 0x00000102, 0x03030302, 0x02010102, 0x02020100, 0x00000000, 0x00000000, -}; - -static UNK_TYPE D_80B69660[] = { - 0xFC18FE6B, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000FE6B, 0x00000000, 0x00000000, 0xFFFFFFFF, - 0x03E8FE6B, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFE0C0195, 0x00000000, 0x00000000, 0xFFFFFFFF, - 0x01F40195, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000500, 0x00000000, 0x00000000, 0xFFFFFFFF, -}; - -static Gfx sTriforceDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, 1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPVertex(D_80B69660, 6, 0), - gsDPSetPrimColor(0x00, 0x80, 128, 128, 50, 255), - gsSP2Triangles(0, 1, 3, 0, 3, 4, 5, 0), - gsDPSetPrimColor(0x00, 0x80, 255, 255, 150, 255), - gsSP1Triangle(1, 2, 4, 0), - gsSPEndDisplayList(), -}; - -static Gfx dList_80B69720[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetRenderMode(G_RM_PASS, G_RM_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, - COMBINED), - gsDPSetEnvColor(200, 230, 225, 255), - gsDPLoadTextureTile(D_80B67860, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0), - gsSPTextureRectangle((97 << 2), (90 << 2), (160 << 2), (137 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)), - gsDPLoadTextureTile(D_80B68460, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), - gsSPTextureRectangle((160 << 2), (90 << 2), (223 << 2), (137 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)), - gsDPLoadTextureTile(D_80B69060, G_IM_FMT_IA, G_IM_SIZ_8b, 96, 16, 0, 0, 95, 15, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), - gsSPTextureRectangle((113 << 2), (80 << 2), (208 << 2), (95 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index e9c6be72a8..73d48405fc 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1184,7 +1184,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { for (i = 0; i < 100; i++) { if (effect->type == FS_EFF_RIPPLE) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingRippleSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRippleMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0); flag++; } @@ -1197,7 +1197,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2305), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingRippleVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL); } effect++; } @@ -1207,7 +1207,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { for (i = 0; i < 100; i++) { if (effect->type == FS_EFF_DUST_SPLASH) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0); flag++; } @@ -1221,7 +1221,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2346), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashModelDL); } effect++; } @@ -1231,7 +1231,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { for (i = 0; i < 100; i++) { if (effect->type == FS_EFF_WATER_DUST) { if (flag == 0) { - gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustMaterialDL); gDPSetEnvColor(POLY_OPA_DISP++, 40, 90, 80, 128); flag++; } @@ -1249,7 +1249,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2394), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustVtxDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustModelDL); } effect++; } @@ -1259,7 +1259,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { for (i = 0; i < 100; i++) { if (effect->type == FS_EFF_BUBBLE) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); flag++; @@ -1272,7 +1272,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2423), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleModelDL); } effect++; } @@ -1297,7 +1297,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2467), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropModelDL); } effect++; } @@ -1309,7 +1309,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { for (i = 30; i < EFFECT_COUNT; i++) { if (effect->type == FS_EFF_RAIN_RIPPLE) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingRippleSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRippleMaterialDL); gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 130); flag++; @@ -1321,7 +1321,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2504), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingRippleVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL); } effect++; } @@ -1331,7 +1331,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { for (i = 30; i < EFFECT_COUNT; i++) { if (effect->type == FS_EFF_RAIN_SPLASH) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashMaterialDL); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, KREG(19) + 80); flag++; } @@ -1350,7 +1350,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2541), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashModelDL); } effect++; } @@ -1744,7 +1744,7 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { if (sLurePos.y < WATER_SURFACE_Y(globalCtx)) { func_80093D18(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentMaterialDL); for (i = SINKING_LURE_SEG_COUNT - 1; i >= 0; i--) { if ((i + D_80B7FEA0) < SINKING_LURE_SEG_COUNT) { @@ -1755,13 +1755,13 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3239), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentVtxDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentModelDL); } } } else { func_80093D84(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentMaterialDL); for (i = SINKING_LURE_SEG_COUNT - 1; i >= 0; i--) { if ((i + D_80B7FEA0) < SINKING_LURE_SEG_COUNT) { @@ -1772,7 +1772,7 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3265), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentModelDL); } } } @@ -1885,7 +1885,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3444), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingLineVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL); } else { for (i = spB4; i < LINE_SEG_COUNT - 1; i++) { if ((i == LINE_SEG_COUNT - 3) && (D_80B7E0B6 == 0) && (D_80B7A694 == 3)) { @@ -1913,7 +1913,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3475), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingLineVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL); break; } @@ -1924,7 +1924,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3492), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingLineVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL); } } @@ -2026,7 +2026,7 @@ void Fishing_DrawRod(GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, gFishingRodSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingRodMaterialDL); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 0, 255); @@ -4392,7 +4392,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { for (i = 0; i < POND_PROP_COUNT; i++) { if (prop->type == FS_PROP_REED) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingReedSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingReedMaterialDL); flag++; } @@ -4405,7 +4405,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7726), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingReedVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingReedModelDL); } } @@ -4417,7 +4417,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { for (i = 0; i < POND_PROP_COUNT; i++) { if (prop->type == FS_PROP_WOOD_POST) { if (flag == 0) { - gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostMaterialDL); flag++; } @@ -4427,7 +4427,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7748), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostVtxDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostModelDL); } } @@ -4439,7 +4439,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { for (i = 0; i < POND_PROP_COUNT; i++) { if (prop->type == FS_PROP_LILY_PAD) { if (flag == 0) { - gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadSetupDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadMaterialDL); flag++; } @@ -4452,7 +4452,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7774), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadVtxDL); + gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadModelDL); } } @@ -4464,7 +4464,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { for (i = 0; i < POND_PROP_COUNT; i++) { if (prop->type == FS_PROP_ROCK) { if (flag == 0) { - gSPDisplayList(POLY_OPA_DISP++, gFishingRockSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingRockMaterialDL); flag++; } @@ -4475,7 +4475,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7798), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gFishingRockVtxDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingRockModelDL); } } @@ -4693,7 +4693,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { for (i = 0; i < GROUP_FISH_COUNT; i++) { if (fish->type != FS_GROUP_FISH_NONE) { if (flag == 0) { - gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishSetupDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishMaterialDL); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 155, 155, 155, 255); flag++; } @@ -4706,7 +4706,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 8093), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishVtxDL); + gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishModelDL); } } fish++; diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index c0f305bda5..0d4ad9d701 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -32,7 +32,7 @@ const ActorInit Magic_Dark_InitVars = { (ActorFunc)MagicDark_OrbDraw, }; -#include "z_magic_dark_gfx.c" +#include "overlays/ovl_Magic_Dark/ovl_Magic_Dark.c" // unused static Color_RGBA8 D_80B88B10[] = { { 50, 100, 150, 200 }, { 255, 200, 150, 100 } }; @@ -111,7 +111,7 @@ void MagicDark_DiamondUpdate(Actor* thisx, GlobalContext* globalCtx) { if (nayrusLoveTimer >= 1180) { this->primAlpha = 15595 - (nayrusLoveTimer * 13); if (nayrusLoveTimer & 1) { - this->primAlpha = (u8)(this->primAlpha >> 1); + this->primAlpha = this->primAlpha >> 1; } } else if (nayrusLoveTimer >= 1100) { this->primAlpha = (u8)(nayrusLoveTimer << 7) + 127; @@ -225,11 +225,11 @@ void MagicDark_DiamondDraw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 255, 255, (s32)(this->primAlpha * 0.6f) & 0xFF); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 128); - gSPDisplayList(POLY_XLU_DISP++, sDiamondTexDList); + gSPDisplayList(POLY_XLU_DISP++, sDiamondMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 2, gameplayFrames * -4, 32, 32, 1, 0, gameplayFrames * -16, 64, 32)); - gSPDisplayList(POLY_XLU_DISP++, sDiamondVertsDList); + gSPDisplayList(POLY_XLU_DISP++, sDiamondModelDL); } CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_magic_dark.c", 570); diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c deleted file mode 100644 index 6326e3766a..0000000000 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c +++ /dev/null @@ -1,42 +0,0 @@ -#include "z_magic_dark.h" -#include "objects/gameplay_keep/gameplay_keep.h" - -static u64 sDiamondTex[] = { -#include "assets/overlays/ovl_Magic_Dark/diamond_texture.i8.inc.c" -}; - -static Vtx sDiamondVerts[] = { - VTX(0, 0, 64, 1024, 512, 0x00, 0x00, 0x78, 0xFF), VTX(55, 0, 32, 1707, 512, 0x67, 0x00, 0x3C, 0xFF), - VTX(0, 108, 0, 1365, 0, 0x00, 0x78, 0x00, 0xFF), VTX(55, 0, -32, 2389, 512, 0x67, 0x00, 0xC4, 0xFF), - VTX(0, 108, 0, 2048, 0, 0x00, 0x78, 0x00, 0xFF), VTX(0, 0, -64, 3072, 512, 0x00, 0x00, 0x88, 0xFF), - VTX(0, 108, 0, 2731, 0, 0x00, 0x78, 0x00, 0xFF), VTX(-55, 0, -32, 3755, 512, 0x99, 0x00, 0xC4, 0xFF), - VTX(0, 108, 0, 3413, 0, 0x00, 0x78, 0x00, 0xFF), VTX(-55, 0, 32, 4437, 512, 0x98, 0x00, 0x3C, 0xFF), - VTX(0, 108, 0, 4096, 0, 0x00, 0x78, 0x00, 0xFF), VTX(-55, 0, 32, 341, 512, 0x98, 0x00, 0x3C, 0xFF), - VTX(0, 108, 0, 683, 0, 0x00, 0x78, 0x00, 0xFF), VTX(0, -108, 0, 683, 1024, 0x00, 0x88, 0x00, 0xFF), - VTX(0, -108, 0, 3413, 1024, 0x00, 0x88, 0x00, 0xFF), VTX(0, -108, 0, 2731, 1024, 0x00, 0x88, 0x00, 0xFF), - VTX(0, -108, 0, 2048, 1024, 0x00, 0x88, 0x00, 0xFF), VTX(0, -108, 0, 1365, 1024, 0x00, 0x88, 0x00, 0xFF), - VTX(-55, 0, 32, 2389, 512, 0x98, 0x00, 0x3C, 0xFF), VTX(-55, 0, -32, 1707, 512, 0x99, 0x00, 0xC4, 0xFF), -}; - -static Gfx sDiamondTexDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(gEffUnknown10Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, 1), - gsDPLoadMultiBlock(sDiamondTex, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_MIRROR | G_TX_WRAP, 5, 6, 13, 13), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_CULL_BACK | G_LIGHTING), - gsSPEndDisplayList(), -}; - -static Gfx sDiamondVertsDList[] = { - gsSPVertex(sDiamondVerts, 20, 0), gsSP2Triangles(0, 1, 2, 0, 1, 3, 4, 0), - gsSP2Triangles(3, 5, 6, 0, 5, 7, 8, 0), gsSP2Triangles(7, 9, 10, 0, 11, 0, 12, 0), - gsSP2Triangles(13, 0, 11, 0, 14, 7, 5, 0), gsSP2Triangles(15, 5, 3, 0, 16, 3, 1, 0), - gsSP2Triangles(17, 1, 0, 0, 16, 18, 19, 0), gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index d38cc019a1..651deb673a 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -44,249 +44,7 @@ const ActorInit Magic_Fire_InitVars = { (ActorFunc)MagicFire_Draw, }; -static u64 sTexture[] = { - 0x144849353C7496B7, 0xB18E6A462F170702, 0x07193C4D618CB0AE, 0x896E685931273E21, 0x204A36355385C9DE, - 0xB3856F5A492D0F03, 0x07152C46678BAA9D, 0x6D647F856028140B, 0x175B6A4E4A799BB6, 0xAF946A43250F0403, - 0x0C20425B79A9CAA8, 0x6E5B5E522E294D2D, 0x1A4841425B8BD3D8, 0xAE7F61473F290E05, 0x0E213C5A81A0C6AE, - 0x7A749C9E61161112, 0x175C816B5D7FA4B4, 0xB5A57245200C0206, 0x142A4B6B94C5DD9F, 0x60454A4727235030, - 0x1946464B628FD1C7, 0x9C735542301C0906, 0x162F4A7199BDD9BA, 0x9089B2B87D1D1618, 0x1A5E90887583A8AD, - 0xB2B78550240C030A, 0x1D38597DABDCE891, 0x523637361B18422C, 0x193F44536B8FC2B2, 0x86624F3C200F070C, - 0x203C5B85B0D5E6C2, 0xA8A3B4B88E25171E, 0x1C5D99A08F8EADA3, 0xACC2955D2F120611, 0x29476B92C3EEEF8F, - 0x4D2F2C2A1310342A, 0x1D39435C7892B6A0, 0x7555513913060914, 0x2D4B6E9CC9E9ECC4, 0xBCB4A8A698331621, - 0x215B95ABA59DB196, 0x9EB69260391B0C1A, 0x365880AAD9F9F4A2, 0x5B362F2C1A1D3B39, 0x2F3E4D6B899BB493, - 0x6A535B390B040D1F, 0x3B5C83B4E0F8EABB, 0xC1B59295A7481625, 0x2A5589AAB1ACB48C, 0x859174513D251627, - 0x456C97C1ECFEF9C0, 0x8455454342455759, 0x5157617B97AAAE88, 0x6A636A3A0907152D, 0x4C6F9CCCF1FFDCA6, - 0xA99D7A8DAF5D172B, 0x33517CA0B5BBBC84, 0x69604834362E2335, 0x5580AED9F8FFFDDF, 0xB384696B68616A6E, - 0x68767B88A2B4A47D, 0x77837F400D0E203B, 0x5E83B5E1FBFFCE8D, 0x867B6891B1761C32, 0x3C537599B5C6BF7E, - 0x5036211A2D383548, 0x6895C4EBFEFFFEF5, 0xDCAD928F81727479, 0x77919695AAB49374, 0x8AA8964916182C4C, - 0x7198CDF2FFFFC87E, 0x6A64679CAA882838, 0x485C7898B9CFBB75, 0x40200D0D29454C5E, 0x7CA8D8F7FFFFFAF3, - 0xF2C9B0A98D736F7B, 0x81A5ADA3B3AF806F, 0x9AC6AF5D27253D5C, 0x84ACE3FCFFFFD08E, 0x726D7BA49C954142, - 0x5C6C84A1C3D0AB68, 0x3C200D1030586876, 0x8FBAE2F8FDFFF7EB, 0xEDCCBCB17A5B6681, 0x89B2C1B4BCA67B71, - 0x9DCCC68142384C6C, 0x95BBEFFFFFFFE1AE, 0x8E818BA4949E625C, 0x778194AFCFCB8F59, 0x43331B1C43728891, - 0xA4C5DCE7F3FDF7E5, 0xDEBDB9A86C4F728B, 0x96B9D0C6C29A7E77, 0x8FB9D7AC674E5D7F, 0xA5BBECFBFEFFF3CE, - 0xB0999599929A706C, 0x8F9CA6C1DFC4774A, 0x4E4E32325D90A6A7, 0xB3C8CBCDE0F5F8E1, 0xCFB2AC9C6B4B8598, - 0xA8C4DCD7C591827B, 0x7A9FE3D48E667091, 0xADAFD4EAF7FDFAE5, 0xCAAF92868D8E6C71, 0x98B8BED6EDC06943, - 0x5B66474A7FB0B9B5, 0xBDC7B6AFC1E7F6DF, 0xC2AAA18E70549BA4, 0xB5D0E7E6C0857F74, 0x6384E5F1AB7A81A5, - 0xAC99B2CFE6F3F6E4, 0xC9AC7F6E7F735667, 0x93D1D7E6F6C96E46, 0x5E6F565FA1C5C2C2, 0xC7C3A6959ECEEFD4, - 0xBAA29783806CADAB, 0xBBD6EEF1B8797063, 0x5277DEF6B78896B8, 0xA37F8DABCBE5EFD8, 0xC5A7715C6756364B, - 0x8CE5E4E9FADA8954, 0x5C675C75BDCEC3CD, 0xCEBF9D837EB6E3C3, 0xB69F917E8D8BB4B3, 0xCAE2F5F7AF6B594C, - 0x4975D5EBB593A9C7, 0x976D6D88AFD7E0C6, 0xB7A0674F52412739, 0x8FF2E7D9F3EBAF6E, 0x5C5A5F89CFCBBFD6, - 0xCFB6957666A0D3B0, 0xB49A878399A8AEAC, 0xD4EEFAFBAB624439, 0x4675CADDAC9CBBC9, 0x89605E76A0CFCDB2, - 0xA9955F4747382233, 0xA2F9E0BEDCF3D491, 0x6053699DD1BEBDD9, 0xC4A183685C94C9A5, 0xB596768AA5B29493, - 0xD4F8FDFDB1643A31, 0x477BC7D1A8A9C0BC, 0x7C5B5D7BA5CAB89B, 0x9C925F484839203C, 0xC0FDD9A2BAE3EBBA, - 0x755D7FB4CAB0B9CE, 0xA87E67575D99C6A6, 0xB5956380979D6A6B, 0xC8FEFFFEC4744337, 0x4C7ECACBADB1B3A1, - 0x6F5E6F98B6C0A588, 0x96976D52513B1D50, 0xDAFFDA8C93C1E5DB, 0x92719DC0BDA7AFB5, 0x825949486EA6C2AB, - 0xB48D4F6B7E774042, 0xB1FEFFFFDB955D4B, 0x5585D0C8B1B09D7F, 0x626890BABFB59A7B, 0x959D83605737196A, - 0xECFFDD7D729CC9ED, 0xB389B7C2B0A2A396, 0x5F3C2F3F86B0C0B2, 0xAB7F3F4C5E4C2329, 0x93F8FFFFEEBD886C, - 0x6793D4C4B2A67E62, 0x5472B2D1BFA39170, 0x96A7956C562E1A86, 0xF8FFD66B6383A5EC, 0xCE9FC6BCA7A29278, - 0x4A2F24439DAFB4AE, 0x9369362E3A2D191F, 0x6FE9FFFFFCDFB899, 0x88A8CFB9AC94674E, 0x4575CBD8B3928465, - 0x899F9771522421A3, 0xFAF8B352698886DA, 0xDFAEC9ADA3A58260, 0x483C2F54AB9F9B96, 0x74502E212D221E28, - 0x4AC7FFFFFBEDDBC4, 0xAFBCC6ACA2805943, 0x366CD3D0AB8F7A5B, 0x708282694C1D2BB4, 0xEDE1833877A175C6, - 0xE9B8BF9F9EA3714F, 0x5458466DA986817A, 0x563E281C2D21283F, 0x319DFCFFF3DBEBE5, 0xD2CAB99F96714C3A, - 0x2854C4C7A8917A56, 0x5763615B481833B4, 0xCFBA512281B876BB, 0xE8BAB09193965B3E, 0x5B715D81A1746A5D, - 0x4439221B2A1F2D51, 0x296CF9FFEAB9DAEA, 0xE9D0AB9288643F30, 0x1C3BA9BD9D897E60, 0x3F4041504E1A309F, - 0xA08B2B137ABA84C4, 0xE4B6A385807D4730, 0x557665849B78674B, 0x3C392124271A2953, 0x2C41F3FFE59BB7D0, - 0xE1CD9D8578563425, 0x142284AA8E7F7F74, 0x3D293150602D2872, 0x68601C0B5BA2A0D1, 0xDBB49E826E633925, - 0x405D557285797452, 0x3733304836171E41, 0x332AE9FFE88D91A3, 0xBFC98F7564482A1B, 0x10105D8F7B6E757F, - 0x593A3C6381542E46, 0x3A441A073776B9DC, 0xD1B5A3886A583926, 0x2A393B53696E7968, 0x342B4F8061211229, - 0x341CDDFFF09D6E6F, 0x96C0836651392112, 0x0C083C6D6B5C6283, 0x7860587DA5894C2B, 0x1D3A1C061A4BCADD, - 0xCABDAE9679634A31, 0x211B20384D607E84, 0x342B7CB79B3E0D1A, 0x2E1CCAFFF9B45944, 0x6CB8805A452F1A0C, - 0x09042454685B547E, 0x9B8C738FB9B67A28, 0x123D20050C2ED3CF, 0xC5BFB9A190816642, 0x210B162B2F497E9E, - 0x4649B0E5D4620F19, 0x2A1FAFFEFECA4C28, 0x4CA9855A4835190A, 0x070418476D665779, 0xBAA77E87B0BF9C30, - 0x164821050E20CDC2, 0xC3B6BCA0A49E8252, 0x260A20312A3E81A8, 0x707DD5FAF884141F, 0x29248BF9FFD8421A, - 0x3E99926D624E2C11, 0x0906184774776A89, 0xB5986B66849D982F, 0x21581F07131BC7BB, 0xBDA4B596AEAF985E, - 0x240F3B47334791A5, 0x9CADEDFCFF9E1821, 0x272A61ECFED53516, 0x38929F837D734D22, 0x0C081D4C7D8A84A3, - 0x9C6E463D4E657227, 0x2E621E08161AC1B9, 0xB18EA986ACB3A764, 0x1F135A664457A29C, 0xC4D7F8FEFFB0171E, - 0x24283ECBF5C02A19, 0x3C8EA79594967239, 0x120C2351839B9FB6, 0x7C3C231A222E3F19, 0x3A5E1B09171AB7BB, - 0xA47FA17BA9ACB36C, 0x201C76885B6CAD94, 0xDFEAFBFFFCC4161A, 0x1B2324A0CD942420, 0x4D99ABA1A5AF8D4C, - 0x1D152A5585A2B2C9, 0x59190C070A0F1814, 0x3A4C1A0C161AA9BE, 0x987B9E7EA8A6BC79, 0x2B258AA27B8AB498, - 0xE5F0FEF6F1D81619, 0x1318186F9269302A, 0x639DABA5A6AC8A54, 0x2D24315381A1B8D1, 0x4E0F0508160E071A, - 0x2F311B10161A99BF, 0x947BA18CA6A5C789, 0x3D2B8EB29BABBFAB, 0xE7F8FDE7E5E91819, 0x0D0D18435A534C35, - 0x7798AAABA0957456, 0x46403E557D9DB9D6, 0x611408163B200420, 0x201B19161A1F87BE, 0x9882A59DA6ABD49C, - 0x513587BBB7C8D0C9, 0xECFEFCDADEEC181B, 0x0B0816282D4F6E41, 0x858EADB4987A5D58, 0x6561505B7C9CB7DE, - 0x7F1E1433733F061E, 0x1310181A212875BA, 0x9F8EA4A7ABBADCAB, 0x653E7DB6C7DADDE2, 0xF1FFFCD9E1E0161A, - 0x0A0715181E58894D, 0x8984ADB98C5D5165, 0x8A85636684A1AFDB, 0x9F2C3066AF630B17, 0x1513161B2F3766B3, - 0x9F9A9FA8B5C4DBB5, 0x734B72ABC5DBE6F5, 0xF7FFFCE2EAC11118, 0x0B0E161421579157, 0x868DA7B9814F5E89, - 0xB3A5757592A4A4D3, 0xB64060A0DC851A16, 0x2B20141A434A5FAC, 0x96A497A3C2C6D3B7, 0x7E596EA1BED7E7F9, - 0xFDFFFEF1EE980C12, 0x0F1D1C15284A8D64, 0x829BA2B87E4E77B1, 0xD4BA8283A2A392C6, 0xC75899D1F6A13B29, - 0x4E30161E56585AA5, 0x8BA893A4D0C7C8B5, 0x83647198B9D3DAEB, 0xFEFFFFFEF07D1315, 0x1E332A19303D8271, - 0x81A99EBB815191D3, 0xEDCA8C91AC9A7EBA, 0xD57DCBF2FEBB7157, 0x7A40212A645D5DA0, 0x82AB97AFDBCCC5B0, - 0x816D7A9ABBD4CBD5, 0xFCFFFFFFEF853E34, 0x3F4C371E3A3A7E7F, 0x80B39EC183559CE5, 0xF7D1989EB19077BB, - 0xE3ABEDFEFED4AB95, 0xA050364369576C9F, 0x89AEA2C3E7DAD0AD, 0x7E7488A7C8DCB8B7, 0xF6FFFFFFF1A77B6C, - 0x6D613E22403F878C, 0x81B6A8CD825396DA, 0xF1D4A4ACB5958BCA, 0xF1D2FCFFFFEAD8C6, 0xB86258676A4F73A3, - 0x9AB1B0D9F2EDDEAB, 0x7B7D95B7D9E39D96, 0xEFFFFFFEF6CEAF9D, 0x9B6B40273F489297, 0x8ABCB7D9825286C3, - 0xE2D3AFB6B6A5AFDD, 0xF9F0FEFFFFF9EEDF, 0xC87D818A714D77A3, 0xA8B6BFEAF9FBECAB, 0x7D87A4C2DFD88177, - 0xE1FEFFFCF7E7D6C2, 0xB9683C2D40599E9F, 0x91C1C6E7895878AB, 0xD0CCB7BAB4B4D2F2, 0xFBF3F3FDFFFEEDE0, - 0xCA999D9F815C7CA0, 0xB1BCCFF7FFFFF2AE, 0x8796ADBDCFBB6359, 0xC4F6FFFCF6E8D8C7, 0xC35F3C3B4D739DA3, - 0x9EC5D6F39763779D, 0xBFC5BEB8A7B4EAFC, 0xEBD7DBF6FFFCE2D2, 0xC4A4A4A0886C82A2, 0xB2C6E0FDFFFFF2B2, - 0x97A3A9A7A98D433E, 0x9AE2FEFCF5DBC5B2, 0xB752425469828EA0, 0xAECFE5F9B07D8BA0, 0xB4C0C7B28D99DEF4, - 0xCFB2B8E2FCF8DCC9, 0xB99D948B806B779E, 0xB7D5EEFFFFFFF0B9, 0xA6A69B8677592726, 0x6DC6FCFEF5D2B6A6, - 0xA1454B6F7E827A99, 0xBDDCF2FECEA1ADAE, 0xB3C3D6AC6B6EBDDD, 0xAE8992CBF3F1DCC4, 0xA1827269665C6593, - 0xC0E4F9FFFFFFECBE, 0xADA1846449301416, 0x45A4F9FFF8CDA99C, 0x9040548A8A756693, 0xCEEBFAFFE5C6CEBC, - 0xB5CCE7A54B4494BE, 0x8D6D77B4E6E4DABC, 0x885F5248403E4D80, 0xC4EFFFFEFFFFE7C0, 0xAB926C492B17090D, - 0x2C85F3FFF5C59C94, 0x85415B988D626096, 0xDFF9FFFFF7E5E4C1, 0xB5D8F4A133246B9E, 0x79626BA2D4D1D1AC, - 0x6D473A2D25242E64, 0xB7F1FFFDFFFFDEBB, 0x9F7E5D3B1C0B040B, 0x256FEEFEEFBD928D, 0x8A4D5D968C6268A9, - 0xECFEFFFFFEF7EABB, 0xACDDFA9724165285, 0x73656FA0C4B9BD94, 0x563B2B1C161D294E, 0x9EEAFFFDFFFAD2B0, - 0x906F53321506040F, 0x2663E4F8E7B58986, 0x955E5F8E97737CC4, 0xF7FFFFFFFFF8DDAA, 0x9ACEEE891B0E4078, - 0x77727CA4B8A2A078, 0x463624120E22334C, 0x88E2FFFEFFF1BFA0, 0x81644C2D12050715, 0x2E61D7EAD9AB8582, - 0x9F736486AB8D98E0, 0xFEFDFFFFFFEEC896, 0x81ADCD72150B3673, 0x83858DABAA8C805E, 0x3B33210C0B2A445D, - 0x86E0FFFFFCE3AC8D, 0x735D472B14090C1F, 0x3B67CBD5C39F8281, 0xA2896D86BCA8B7F3, 0xFDFAFFFFFBDCB281, - 0x667F9C540F0B3575, 0x999B9DB19D7B664A, 0x352D1C080B335A7C, 0xA5E7FFFFF3CF9979, 0x6558402A1E14162B, - 0x4975BDBAAA918184, 0x9F9B7B90C8BFD3FD, 0xFEFAFFFEF1C59A6D, 0x4F5064370A0C357E, 0xB4B1ABB28D6C533F, - 0x2E2415050C396FA3, 0xC9F2FFFBE4B98565, 0x57543B2B31272139, 0x5D83B6A38F7F7C83, 0x99A88FA0D3D1E8FF, - 0xFEFAFFF9DFAD855C, 0x3C2D361F08113B88, 0xC9BDB3AE7C5E4738, 0x27190D030D3C85C8, 0xEAFCFEF3CEA17150, - 0x484E372F453A2F4B, 0x6F95B391786A6D7D, 0x93B1A4B3D7DCF6FF, 0xFEFCFEEDC995714B, 0x2C1818130A1A4396, - 0xD4BEB2A66D514235, 0x1F0E07040F419EE6, 0xFDFFFAE3B4885E3F, 0x39463435574A3D5D, 0x82A6AF8667555668, - 0x8DB2AEB5CFE2FDFF, 0xFFFFF7DAB07F603E, 0x1F0D0B0F11264EA0, 0xD1B5AB9B664D4636, 0x1608050B1143AFF7, - 0xFFFFF1CD9C724C2F, 0x2B3A353E5F534D71, 0x98B3A77D5D49404A, 0x85AEA5A1BAE3FFFF, 0xFFFCE8C3976B4E30, - 0x150707131D385DA3, 0xC3A69D9268585436, 0x0F0905141546BFFE, 0xFFFDE2B685603C22, 0x1D2D36475E555D85, - 0xABBA9C745943332E, 0x7AA78A7F9CDAFFFF, 0xFFF1D5B184583E25, 0x0D04081B2C4A6DAA, 0xB4968C8A766E6431, - 0x0B0D071C1B4FC8FE, 0xFFF4CD9F71502F17, 0x1221384D58586F9A, 0xBFBC906E54412E19, 0x6A9664537CCEFDFF, - 0xFCE3C1A879492D1B, 0x08030D243C5C7FAC, 0xA6887D868C896B26, 0x090F08202256BBEE, 0xEDD7AB805D41200D, - 0x0B19394B4F5A7BA8, 0xC7AC80664A382C0E, 0x567E413260B2E5F3, 0xE4C3AA9D6B3A1E12, 0x05040F28426983A1, - 0x8F766B7F958F5D19, 0x0D2517222960ACDB, 0xD5B890694C321606, 0x06153A494B6589AE, 0xB99D7A5F3F2F2B0E, - 0x40652E255296D3EC, 0xD5A897896235180B, 0x0307172D4C6F8D9F, 0x7C6B626F7F72410E, 0x11372F29326DA1C8, - 0xC3A07C573D240E03, 0x05153A4953769CB4, 0xA688745D37293316, 0x2E542D294E8BCDE8, 0xC697847459321306, - 0x040D2039597D9B9D, 0x72646B746C4D2508, -}; - -static Vtx sFireSphereVertices[] = { - VTX(-707, 1732, 707, 1792, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 1732, 1000, 2048, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 1920, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-663, 1000, 1600, 1920, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(663, 1000, 1600, 2176, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, 2000, 2048, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, 2000, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1414, 0, 1414, 256, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(663, 1000, 1600, 128, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(663, -1000, 1600, 128, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1600, -1000, 663, 384, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(707, -1732, 707, 256, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(1000, -1732, 0, 512, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 384, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-1000, 1732, 0, 1536, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 1664, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-1600, 1000, 663, 1664, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1414, 0, 1414, 1792, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-663, -1000, 1600, 1920, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(663, -1000, 1600, 2176, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -1732, 1000, 2048, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -1732, 1000, 0, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 128, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-707, 1732, -707, 1280, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 1408, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-1600, 1000, -663, 1408, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-2000, 0, 0, 1536, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1600, -1000, 663, 1664, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-707, -1732, 707, 1792, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 1920, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 1732, -1000, 1024, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 1152, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-663, 1000, -1600, 1152, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-707, 1732, -707, 1280, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 1732, -1000, 1024, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(-1600, 1000, -663, 1408, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1414, 0, -1414, 1280, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-2000, 0, 0, 1536, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1600, -1000, -663, 1408, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1600, -1000, 663, 1664, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-1000, -1732, 0, 1536, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(-707, -1732, 707, 1792, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 1664, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(707, 1732, -707, 768, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 896, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(663, 1000, -1600, 896, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -2000, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-663, -1000, -1600, 1152, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-707, -1732, -707, 1280, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 1408, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(1000, 1732, 0, 512, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 640, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(1600, 1000, -663, 640, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1414, 0, -1414, 768, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(663, -1000, -1600, 896, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -1732, -1000, 1024, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 1152, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(707, 1732, 707, 256, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 384, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(1600, 1000, 663, 384, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(2000, 0, 0, 512, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1600, -1000, -663, 640, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(707, -1732, -707, 768, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 896, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 1732, 1000, 0, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(707, 1732, 707, 256, 137, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, 2000, 0, 128, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(663, 1000, 1600, 128, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1600, 1000, 663, 384, 512, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1414, 0, 1414, 256, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(2000, 0, 0, 512, 1024, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1600, -1000, 663, 384, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1600, -1000, -663, 640, 1536, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(1000, -1732, 0, 512, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(707, -1732, -707, 768, 1911, 0xFF, 0xFF, 0xFF, 0x4C), - VTX(0, -2000, 0, 640, 2048, 0xFF, 0xFF, 0xFF, 0x00), -}; - -static Gfx sTextureDList[] = { - gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, 1, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPEndDisplayList(), -}; - -static Gfx sVertexDList[] = { - gsSPVertex(sFireSphereVertices, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), - gsSP2Triangles(3, 4, 1, 0, 5, 4, 3, 0), - gsSP2Triangles(6, 7, 8, 0, 9, 7, 6, 0), - gsSP2Triangles(9, 10, 7, 0, 11, 10, 9, 0), - gsSP2Triangles(11, 12, 10, 0, 12, 11, 13, 0), - gsSP2Triangles(14, 0, 15, 0, 16, 0, 14, 0), - gsSP2Triangles(16, 3, 0, 0, 17, 3, 16, 0), - gsSP2Triangles(17, 5, 3, 0, 18, 5, 17, 0), - gsSP2Triangles(18, 19, 5, 0, 20, 19, 18, 0), - gsSP2Triangles(21, 11, 9, 0, 11, 21, 22, 0), - gsSP2Triangles(23, 14, 24, 0, 25, 14, 23, 0), - gsSP2Triangles(25, 16, 14, 0, 26, 16, 25, 0), - gsSP2Triangles(26, 17, 16, 0, 27, 17, 26, 0), - gsSP2Triangles(27, 18, 17, 0, 28, 18, 27, 0), - gsSP2Triangles(28, 20, 18, 0, 20, 28, 29, 0), - gsSP1Triangle(30, 23, 31, 0), - gsSPVertex(&sFireSphereVertices[0x20], 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSP2Triangles(4, 3, 0, 0, 4, 5, 3, 0), - gsSP2Triangles(6, 5, 4, 0, 6, 7, 5, 0), - gsSP2Triangles(8, 7, 6, 0, 8, 9, 7, 0), - gsSP2Triangles(9, 8, 10, 0, 11, 2, 12, 0), - gsSP2Triangles(13, 2, 11, 0, 13, 0, 2, 0), - gsSP2Triangles(14, 0, 13, 0, 14, 4, 0, 0), - gsSP2Triangles(15, 4, 14, 0, 15, 6, 4, 0), - gsSP2Triangles(16, 6, 15, 0, 16, 8, 6, 0), - gsSP2Triangles(8, 16, 17, 0, 18, 11, 19, 0), - gsSP2Triangles(20, 11, 18, 0, 20, 13, 11, 0), - gsSP2Triangles(21, 13, 20, 0, 21, 14, 13, 0), - gsSP2Triangles(22, 14, 21, 0, 22, 15, 14, 0), - gsSP2Triangles(23, 15, 22, 0, 23, 16, 15, 0), - gsSP2Triangles(16, 23, 24, 0, 25, 18, 26, 0), - gsSP2Triangles(27, 18, 25, 0, 27, 20, 18, 0), - gsSP2Triangles(28, 20, 27, 0, 28, 21, 20, 0), - gsSP2Triangles(29, 21, 28, 0, 29, 22, 21, 0), - gsSP2Triangles(30, 22, 29, 0, 30, 23, 22, 0), - gsSP1Triangle(23, 30, 31, 0), - gsSPVertex(&sFireSphereVertices[0x40], 12, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 1, 0, 0), - gsSP2Triangles(3, 4, 1, 0, 5, 4, 3, 0), - gsSP2Triangles(5, 6, 4, 0, 7, 6, 5, 0), - gsSP2Triangles(7, 8, 6, 0, 9, 8, 7, 0), - gsSP2Triangles(9, 10, 8, 0, 10, 9, 11, 0), - gsSPEndDisplayList(), -}; +#include "overlays/ovl_Magic_Fire/ovl_Magic_Fire.c" static ColliderCylinderInit sCylinderInit = { { @@ -477,27 +235,27 @@ void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE); - gDPLoadTextureBlock(POLY_XLU_DISP++, sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 15, G_TX_NOLOD); + gDPLoadTextureBlock(POLY_XLU_DISP++, sTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 15, G_TX_NOLOD); gDPSetTile(POLY_XLU_DISP++, G_IM_FMT_I, G_IM_SIZ_8b, 8, 0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, 14, G_TX_NOMIRROR | G_TX_WRAP, 6, 14); gDPSetTileSize(POLY_XLU_DISP++, 1, 0, 0, 252, 252); - gSPDisplayList(POLY_XLU_DISP++, sTextureDList); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 511 - ((gameplayFrames * 5) % 512), 64, 64, 1, (gameplayFrames * 2) % 256, 255 - ((gameplayFrames * 20) % 256), 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, sVertexDList); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_magic_fire.c", 750); alpha = (s32)(this->alphaMultiplier * 255); for (i = 0; i < 36; i++) { - sFireSphereVertices[sVertexIndices[i]].n.a = alpha; + sSphereVtx[sVertexIndices[i]].n.a = alpha; } alpha = (s32)(this->alphaMultiplier * 76); for (i = 36; i < 60; i++) { - sFireSphereVertices[sVertexIndices[i]].n.a = alpha; + sSphereVtx[sVertexIndices[i]].n.a = alpha; } } } diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index a26af637c1..b94d731888 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -33,90 +33,7 @@ const ActorInit Magic_Wind_InitVars = { (ActorFunc)MagicWind_Draw, }; -#include "z_magic_wind_gfx.c" - -static u8 sTransformRefIdx[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -static s16 sCopyValues[] = { - 0x0400, 0x0400, 0x0400, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0200, 0x0200, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x02CD, 0x02CD, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -}; - -static TransformData sTransformData[] = { - { - 0x000C, - 0x0001, - 0x0001, - 0x0001, - 0.0f, - }, - { - 0x0014, - 0x003C, - 0x0000, - 0x0000, - 1.5f, - }, - { - 0x000C, - 0x0001, - 0x0001, - 0x0001, - 0.0f, - }, - { - 0x0014, - 0x003C, - 0x0000, - 0x0000, - 1.0f, - }, -}; - -static TransformUpdateIndex sTransformUpdIdx = { - sTransformRefIdx, sTransformData, sCopyValues, 0x0001, 0x0003C, -}; - -static SkelCurveLimb sRootLimb = { - 0x01, - 0xFF, - { - NULL, - NULL, - }, -}; - -static SkelCurveLimb sInnerCylinder = { - 0xFF, - 0x02, - { - NULL, - sInnerCylinderDList, - }, -}; - -static SkelCurveLimb sOuterCylinder = { - 0xFF, - 0xFF, - { - NULL, - sOuterCylinderDList, - }, -}; - -static SkelCurveLimb* sLimbs[] = { - &sRootLimb, - &sInnerCylinder, - &sOuterCylinder, -}; - -static SkelCurveLimbList sLimbList = { - sLimbs, - 0x03, -}; +#include "overlays/ovl_Magic_Wind/ovl_Magic_Wind.c" static u8 sAlphaUpdVals[] = { 0x00, 0x03, 0x04, 0x07, 0x09, 0x0A, 0x0D, 0x0F, 0x11, 0x12, 0x15, 0x16, 0x19, 0x1B, 0x1C, 0x1F, 0x21, 0x23, @@ -130,19 +47,19 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) { MagicWind* this = THIS; Player* player = GET_PLAYER(globalCtx); - if (SkelCurve_Init(globalCtx, &this->skelCurve, &sLimbList, &sTransformUpdIdx) == 0) { + if (SkelCurve_Init(globalCtx, &this->skelCurve, &sSkel, &sAnim) == 0) { // "Magic_Wind_Actor_ct (): Construct failed" osSyncPrintf("Magic_Wind_Actor_ct():コンストラクト失敗\n"); } this->actor.room = -1; switch (this->actor.params) { case 0: - SkelCurve_SetAnim(&this->skelCurve, &sTransformUpdIdx, 0.0f, 60.0f, 0.0f, 1.0f); + SkelCurve_SetAnim(&this->skelCurve, &sAnim, 0.0f, 60.0f, 0.0f, 1.0f); this->timer = 29; MagicWind_SetupAction(this, MagicWind_WaitForTimer); break; case 1: - SkelCurve_SetAnim(&this->skelCurve, &sTransformUpdIdx, 60.0f, 0.0f, 60.0f, -1.0f); + SkelCurve_SetAnim(&this->skelCurve, &sAnim, 60.0f, 0.0f, 60.0f, -1.0f); MagicWind_SetupAction(this, MagicWind_Shrink); // "Means start" LOG_STRING("表示開始", "../z_magic_wind.c", 486); @@ -161,6 +78,7 @@ void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) { void MagicWind_UpdateAlpha(f32 alpha) { s32 i; + for (i = 0; i < ARRAY_COUNT(sAlphaUpdVals); i++) { sCylinderVtx[sAlphaUpdVals[i]].n.a = alpha * 255.0f; } diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c deleted file mode 100644 index 86231c92dd..0000000000 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind_gfx.c +++ /dev/null @@ -1,315 +0,0 @@ -#include "global.h" - -static Vtx sCylinderVtx[] = { - VTX(0, 0, -6000, 1024, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-4243, 12800, -4243, 1280, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 12800, -6000, 1024, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-4243, 0, -4243, 1280, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, 6000, 0, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(4243, 12800, 4243, 256, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 12800, 6000, 0, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(4243, 0, 4243, 256, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-6000, 12800, 0, 1536, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-6000, 0, 0, 1536, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(4243, 0, -4243, 768, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(4243, 12800, -4243, 768, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-4243, 12800, 4243, 1792, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-4243, 0, 4243, 1792, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(6000, 12800, 0, 512, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(6000, 0, 0, 512, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 12800, 6000, 2048, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 0, 6000, 2048, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - - // 2nd Set - VTX(0, 0, -6000, 1024, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-4243, 12800, -4243, 1280, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 12800, -6000, 1024, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-4243, 0, -4243, 1280, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, 6000, 0, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(4243, 12800, 4243, 256, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 12800, 6000, 0, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(4243, 0, 4243, 256, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-6000, 12800, 0, 1536, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-6000, 0, 0, 1536, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(4243, 0, -4243, 768, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(4243, 12800, -4243, 768, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-4243, 12800, 4243, 1792, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-4243, 0, 4243, 1792, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(6000, 12800, 0, 512, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(6000, 0, 0, 512, 2048, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 12800, 6000, 2048, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 0, 6000, 2048, 2048, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static char sWindEffTexture[] = { - 0x06, 0x19, 0x28, 0x43, 0x66, 0x82, 0xA0, 0xAE, 0xA3, 0x93, 0x76, 0x56, 0x32, 0x12, 0x00, 0x00, 0x03, 0x15, 0x25, - 0x39, 0x57, 0x81, 0xAD, 0xBC, 0xA4, 0x7B, 0x5D, 0x45, 0x33, 0x20, 0x24, 0x38, 0x33, 0x1F, 0x26, 0x4F, 0x71, 0x8C, - 0xB2, 0xC9, 0xC7, 0xAE, 0x87, 0x57, 0x33, 0x24, 0x11, 0x00, 0x00, 0x05, 0x1C, 0x3B, 0x5E, 0x7D, 0x90, 0x93, 0x85, - 0x76, 0x78, 0x81, 0x70, 0x3E, 0x14, 0x01, 0x16, 0x27, 0x33, 0x4F, 0x6C, 0x84, 0x96, 0x9A, 0x9B, 0x8C, 0x70, 0x4F, - 0x27, 0x09, 0x00, 0x00, 0x05, 0x15, 0x29, 0x43, 0x68, 0x96, 0xB9, 0xB7, 0x99, 0x6E, 0x4C, 0x34, 0x2A, 0x20, 0x26, - 0x31, 0x2B, 0x20, 0x2F, 0x4D, 0x66, 0x8F, 0xB5, 0xC0, 0xB4, 0x97, 0x6B, 0x46, 0x31, 0x1E, 0x07, 0x00, 0x00, 0x0C, - 0x27, 0x4C, 0x6B, 0x8C, 0x9E, 0x9A, 0x8B, 0x7A, 0x7A, 0x7C, 0x66, 0x42, 0x1E, 0x0B, 0x27, 0x30, 0x3E, 0x61, 0x7C, - 0x8F, 0x97, 0xA0, 0xA2, 0x87, 0x6F, 0x51, 0x2A, 0x0C, 0x00, 0x00, 0x09, 0x1D, 0x35, 0x59, 0x83, 0xAC, 0xC0, 0xB5, - 0x8E, 0x5E, 0x3E, 0x2E, 0x28, 0x25, 0x24, 0x27, 0x26, 0x28, 0x39, 0x4D, 0x6C, 0xA0, 0xB8, 0xB3, 0xA0, 0x7A, 0x58, - 0x40, 0x2E, 0x13, 0x00, 0x00, 0x06, 0x1B, 0x3B, 0x5D, 0x84, 0xA9, 0xB2, 0xAD, 0x99, 0x8B, 0x8F, 0x87, 0x67, 0x43, - 0x25, 0x1C, 0x2D, 0x3A, 0x4F, 0x73, 0x8D, 0x9D, 0xA8, 0xAB, 0x9F, 0x85, 0x72, 0x5B, 0x36, 0x16, 0x03, 0x00, 0x11, - 0x29, 0x48, 0x72, 0xA0, 0xC6, 0xC7, 0xAC, 0x80, 0x52, 0x36, 0x28, 0x27, 0x23, 0x1B, 0x1E, 0x24, 0x2E, 0x3A, 0x50, - 0x7B, 0xA6, 0xB3, 0xA6, 0x8F, 0x68, 0x4D, 0x39, 0x24, 0x08, 0x00, 0x00, 0x11, 0x2D, 0x4F, 0x73, 0xA2, 0xC1, 0xC8, - 0xBD, 0xAF, 0xB2, 0xB4, 0x95, 0x65, 0x40, 0x2B, 0x25, 0x30, 0x48, 0x5E, 0x7D, 0x96, 0xA9, 0xB4, 0xAC, 0x9B, 0x8A, - 0x79, 0x60, 0x3A, 0x1B, 0x0B, 0x0A, 0x1A, 0x35, 0x5C, 0x8B, 0xBC, 0xD6, 0xC9, 0xA0, 0x73, 0x4D, 0x2F, 0x1E, 0x20, - 0x1D, 0x11, 0x19, 0x28, 0x31, 0x38, 0x53, 0x83, 0xA2, 0xA9, 0x9D, 0x81, 0x5B, 0x42, 0x30, 0x1D, 0x02, 0x00, 0x06, - 0x1D, 0x3C, 0x61, 0x8D, 0xBA, 0xD8, 0xDB, 0xC7, 0xC7, 0xCE, 0xC1, 0x8C, 0x5C, 0x44, 0x35, 0x27, 0x3A, 0x58, 0x6C, - 0x84, 0x9B, 0xAF, 0xB4, 0xAE, 0xA3, 0x91, 0x78, 0x52, 0x2E, 0x17, 0x11, 0x14, 0x26, 0x48, 0x72, 0xA4, 0xD4, 0xDF, - 0xC7, 0x99, 0x72, 0x53, 0x32, 0x1C, 0x1F, 0x1B, 0x19, 0x2A, 0x39, 0x3C, 0x46, 0x63, 0x8A, 0xA0, 0xA3, 0x96, 0x73, - 0x51, 0x3D, 0x30, 0x1C, 0x02, 0x00, 0x10, 0x2A, 0x4D, 0x79, 0xA6, 0xD5, 0xEF, 0xE6, 0xD5, 0xD0, 0xC8, 0xAB, 0x77, - 0x57, 0x4F, 0x3F, 0x2E, 0x44, 0x63, 0x77, 0x87, 0x9F, 0xAD, 0xB3, 0xB7, 0xAF, 0x90, 0x64, 0x39, 0x1C, 0x11, 0x14, - 0x1F, 0x38, 0x5C, 0x8A, 0xBF, 0xE8, 0xE7, 0xC6, 0x9E, 0x7F, 0x64, 0x48, 0x31, 0x2B, 0x31, 0x3F, 0x4C, 0x4E, 0x53, - 0x66, 0x80, 0x96, 0xA4, 0xA3, 0x8E, 0x66, 0x4F, 0x47, 0x3B, 0x1F, 0x06, 0x06, 0x1C, 0x3A, 0x63, 0x93, 0xC2, 0xEF, - 0xFC, 0xED, 0xDD, 0xC2, 0xA4, 0x85, 0x64, 0x5A, 0x5A, 0x43, 0x38, 0x48, 0x66, 0x7A, 0x8A, 0xA0, 0xAA, 0xB2, 0xBC, - 0xAB, 0x78, 0x45, 0x21, 0x10, 0x0D, 0x19, 0x2F, 0x4D, 0x72, 0xA3, 0xD7, 0xF7, 0xED, 0xCC, 0xAE, 0x94, 0x7F, 0x69, - 0x53, 0x52, 0x63, 0x65, 0x5E, 0x5C, 0x69, 0x80, 0x97, 0xA4, 0xAA, 0xA1, 0x80, 0x60, 0x5B, 0x5E, 0x4C, 0x27, 0x0D, - 0x12, 0x2B, 0x4E, 0x7B, 0xAB, 0xDE, 0xFF, 0xFD, 0xEC, 0xD2, 0xA5, 0x7A, 0x69, 0x62, 0x66, 0x61, 0x45, 0x40, 0x4D, - 0x62, 0x79, 0x8D, 0xA3, 0xAB, 0xB3, 0xB0, 0x89, 0x52, 0x28, 0x12, 0x0A, 0x10, 0x25, 0x43, 0x63, 0x8C, 0xBE, 0xEA, - 0xFF, 0xF7, 0xDE, 0xC4, 0xB0, 0x9F, 0x8B, 0x7C, 0x8B, 0x89, 0x6F, 0x62, 0x66, 0x77, 0x8C, 0xA3, 0xB2, 0xAF, 0x99, - 0x73, 0x67, 0x73, 0x72, 0x58, 0x33, 0x1C, 0x23, 0x3D, 0x65, 0x91, 0xC4, 0xF2, 0xFF, 0xF5, 0xDD, 0xBA, 0x8A, 0x66, - 0x6E, 0x79, 0x79, 0x66, 0x4A, 0x47, 0x57, 0x65, 0x7D, 0x95, 0xAA, 0xB5, 0xB3, 0x94, 0x5C, 0x2E, 0x16, 0x0B, 0x0B, - 0x1B, 0x39, 0x59, 0x7D, 0xA6, 0xD5, 0xF9, 0xFF, 0xFF, 0xF5, 0xE0, 0xCC, 0xB8, 0xAC, 0xAB, 0xA9, 0x8D, 0x6F, 0x66, - 0x71, 0x86, 0x9D, 0xAE, 0xBC, 0xAE, 0x8E, 0x76, 0x80, 0x8A, 0x7C, 0x60, 0x44, 0x33, 0x38, 0x52, 0x7B, 0xAA, 0xDD, - 0xFE, 0xFF, 0xE7, 0xC9, 0xA4, 0x7F, 0x76, 0x90, 0x9B, 0x86, 0x6B, 0x52, 0x50, 0x63, 0x76, 0x8B, 0xA1, 0xB9, 0xC0, - 0xAA, 0x75, 0x3A, 0x19, 0x12, 0x12, 0x19, 0x2E, 0x50, 0x75, 0x9B, 0xC1, 0xE7, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0xDF, - 0xCC, 0xC7, 0xB6, 0x9A, 0x7D, 0x67, 0x69, 0x85, 0xA0, 0xB0, 0xC0, 0xC1, 0xA8, 0x8C, 0x87, 0x99, 0x96, 0x7B, 0x65, - 0x5B, 0x52, 0x52, 0x6B, 0x90, 0xC2, 0xEC, 0xFF, 0xFB, 0xDD, 0xBD, 0xA1, 0x90, 0x9B, 0xB2, 0xA9, 0x82, 0x68, 0x61, - 0x5E, 0x6B, 0x81, 0x9E, 0xB4, 0xCA, 0xC4, 0x9D, 0x5C, 0x28, 0x15, 0x1C, 0x27, 0x30, 0x47, 0x6E, 0x96, 0xB8, 0xD7, - 0xF2, 0xFB, 0xF9, 0xFA, 0xFF, 0xF9, 0xE7, 0xD6, 0xBF, 0x9E, 0x7F, 0x67, 0x5D, 0x75, 0xA1, 0xB0, 0xBE, 0xCC, 0xC0, - 0xA3, 0x94, 0x9B, 0xA8, 0x96, 0x78, 0x70, 0x78, 0x73, 0x71, 0x80, 0xA6, 0xD6, 0xF1, 0xF6, 0xF2, 0xDD, 0xC4, 0xB7, - 0xB4, 0xBD, 0xB9, 0xA0, 0x79, 0x6D, 0x6F, 0x6B, 0x6D, 0x87, 0xAC, 0xCA, 0xD5, 0xC0, 0x8E, 0x4F, 0x28, 0x23, 0x31, - 0x3F, 0x4C, 0x69, 0x93, 0xB5, 0xCE, 0xE3, 0xED, 0xEA, 0xE5, 0xE6, 0xEC, 0xF1, 0xE5, 0xCD, 0xAA, 0x8A, 0x6F, 0x5E, - 0x67, 0x8D, 0xB2, 0xB7, 0xC8, 0xD1, 0xBF, 0xA4, 0x99, 0xA1, 0xA4, 0x8E, 0x7D, 0x86, 0x95, 0x8F, 0x87, 0x94, 0xBD, - 0xDF, 0xE6, 0xE7, 0xE9, 0xE1, 0xDD, 0xD6, 0xD0, 0xC8, 0xAC, 0x98, 0x7B, 0x76, 0x75, 0x69, 0x6E, 0x8E, 0xB7, 0xDD, - 0xDB, 0xB9, 0x84, 0x54, 0x39, 0x39, 0x45, 0x53, 0x68, 0x8D, 0xB6, 0xCB, 0xD6, 0xDF, 0xDE, 0xD7, 0xD3, 0xD4, 0xDE, - 0xE2, 0xD7, 0xBD, 0x9F, 0x80, 0x69, 0x6C, 0x87, 0xA3, 0xBA, 0xC4, 0xD4, 0xD6, 0xC2, 0xA9, 0x96, 0x93, 0x90, 0x87, - 0x8D, 0x9E, 0xAA, 0xA0, 0x96, 0xA6, 0xC9, 0xD8, 0xD1, 0xD2, 0xDC, 0xE5, 0xE9, 0xE1, 0xD4, 0xBD, 0xA0, 0x94, 0x82, - 0x77, 0x67, 0x5E, 0x71, 0x95, 0xC7, 0xEB, 0xDC, 0xB0, 0x87, 0x69, 0x54, 0x4E, 0x51, 0x63, 0x84, 0xAE, 0xD0, 0xD1, - 0xD0, 0xD3, 0xCE, 0xC9, 0xC7, 0xC7, 0xCE, 0xD0, 0xC7, 0xAF, 0x96, 0x79, 0x6F, 0x82, 0x9F, 0xB5, 0xC7, 0xD7, 0xE3, - 0xDD, 0xC8, 0xA9, 0x87, 0x76, 0x77, 0x89, 0x9F, 0xB0, 0xB4, 0xA5, 0xA0, 0xB2, 0xC7, 0xC8, 0xB8, 0xBC, 0xCA, 0xD8, - 0xDB, 0xD8, 0xC8, 0xAC, 0x97, 0x86, 0x76, 0x62, 0x51, 0x59, 0x73, 0xA1, 0xDF, 0xF7, 0xD3, 0xA8, 0x95, 0x86, 0x73, - 0x5C, 0x59, 0x71, 0x9F, 0xC8, 0xD3, 0xCA, 0xC9, 0xCA, 0xC2, 0xBA, 0xB8, 0xB7, 0xBA, 0xBF, 0xB7, 0xA3, 0x90, 0x76, - 0x7B, 0x94, 0xAA, 0xC3, 0xD3, 0xE1, 0xF0, 0xE2, 0xC6, 0xA2, 0x73, 0x58, 0x65, 0x8C, 0xAB, 0xB7, 0xB3, 0xA5, 0xA9, - 0xB4, 0xBC, 0xAF, 0xA0, 0xA4, 0xB3, 0xC1, 0xD0, 0xD1, 0xB7, 0x99, 0x85, 0x70, 0x53, 0x40, 0x47, 0x5A, 0x7B, 0xB8, - 0xF6, 0xF6, 0xC8, 0xA3, 0xA0, 0x9F, 0x85, 0x65, 0x63, 0x85, 0xB6, 0xCE, 0xCB, 0xC9, 0xCC, 0xC4, 0xB0, 0xA2, 0xA1, - 0xA4, 0xAA, 0xB2, 0xAD, 0x9D, 0x8E, 0x79, 0x89, 0xA5, 0xBC, 0xCB, 0xCE, 0xDE, 0xF2, 0xDE, 0xBD, 0x96, 0x61, 0x46, - 0x60, 0x8D, 0xAE, 0xB3, 0xAE, 0xAB, 0xB4, 0xB5, 0xAA, 0x90, 0x86, 0x8D, 0xA0, 0xBA, 0xD2, 0xCA, 0xA4, 0x82, 0x70, - 0x5B, 0x36, 0x30, 0x46, 0x5C, 0x8D, 0xD2, 0xFC, 0xEC, 0xC4, 0xA8, 0xA5, 0xA4, 0x8B, 0x71, 0x75, 0x9E, 0xC1, 0xCC, - 0xCA, 0xCD, 0xCD, 0xB6, 0x91, 0x80, 0x85, 0x93, 0xA0, 0xAB, 0xAA, 0x9A, 0x90, 0x85, 0x97, 0xB7, 0xC6, 0xBD, 0xB9, - 0xD6, 0xEB, 0xD8, 0xB4, 0x86, 0x5A, 0x45, 0x62, 0x8D, 0xA6, 0xAB, 0xB2, 0xB9, 0xBF, 0xB3, 0x8E, 0x72, 0x6E, 0x7D, - 0xA2, 0xCA, 0xD0, 0xB5, 0x8E, 0x70, 0x65, 0x50, 0x38, 0x34, 0x43, 0x5D, 0xA0, 0xE0, 0xF4, 0xE6, 0xCA, 0xAE, 0xA3, - 0x9A, 0x8D, 0x83, 0x90, 0xB2, 0xC9, 0xCC, 0xCC, 0xCD, 0xBF, 0x98, 0x6B, 0x5D, 0x6F, 0x85, 0xA1, 0xB2, 0xAC, 0x9B, - 0x95, 0x8F, 0x9F, 0xAE, 0xA5, 0x97, 0xA5, 0xCE, 0xE5, 0xD4, 0xAC, 0x83, 0x63, 0x56, 0x6B, 0x8C, 0x9E, 0xAC, 0xBF, - 0xCA, 0xC3, 0x9F, 0x70, 0x5A, 0x62, 0x86, 0xBF, 0xD7, 0xBD, 0x9A, 0x80, 0x6D, 0x65, 0x54, 0x4C, 0x3F, 0x40, 0x63, - 0xAD, 0xDD, 0xEA, 0xE2, 0xCE, 0xAC, 0x9A, 0x93, 0x90, 0x9A, 0xAF, 0xC1, 0xCC, 0xC8, 0xC8, 0xBF, 0x9E, 0x70, 0x48, - 0x47, 0x63, 0x84, 0xB0, 0xB9, 0xAD, 0x9A, 0x91, 0x8E, 0x8D, 0x7D, 0x6F, 0x76, 0x99, 0xC4, 0xDE, 0xD4, 0xAF, 0x8D, - 0x73, 0x70, 0x7C, 0x91, 0xA2, 0xB7, 0xCB, 0xD0, 0xB0, 0x7F, 0x5A, 0x52, 0x6D, 0xAA, 0xDC, 0xCA, 0xA1, 0x8D, 0x7D, - 0x71, 0x6F, 0x68, 0x5C, 0x40, 0x42, 0x71, 0xB6, 0xD8, 0xE2, 0xDB, 0xC4, 0x9F, 0x95, 0x94, 0x98, 0xB3, 0xC9, 0xC9, - 0xC3, 0xBE, 0xB8, 0xA1, 0x76, 0x4D, 0x33, 0x3D, 0x66, 0x96, 0xC0, 0xB6, 0xA5, 0x97, 0x82, 0x77, 0x60, 0x42, 0x46, - 0x65, 0x91, 0xBD, 0xD5, 0xD9, 0xBD, 0x9E, 0x8D, 0x8B, 0x97, 0xA6, 0xB4, 0xC6, 0xCD, 0xBA, 0x90, 0x66, 0x52, 0x5D, - 0x8C, 0xCB, 0xD7, 0xAD, 0x93, 0x8A, 0x80, 0x76, 0x7B, 0x7B, 0x5B, 0x3C, 0x4A, 0x80, 0xC2, 0xDF, 0xD9, 0xC6, 0xA0, - 0x8E, 0x9A, 0x9E, 0xA4, 0xC7, 0xD4, 0xC2, 0xB7, 0xB0, 0xA2, 0x80, 0x52, 0x34, 0x2E, 0x47, 0x7F, 0xAB, 0xBF, 0xAC, - 0x94, 0x7C, 0x5E, 0x4E, 0x30, 0x1D, 0x35, 0x60, 0x8D, 0xB6, 0xCE, 0xDD, 0xCD, 0xB6, 0xA8, 0xA4, 0xB4, 0xC4, 0xCC, - 0xCD, 0xBC, 0x9A, 0x76, 0x5A, 0x57, 0x73, 0xA8, 0xCA, 0xBF, 0x9E, 0x8F, 0x89, 0x7D, 0x7B, 0x81, 0x71, 0x4A, 0x3B, - 0x58, 0x8D, 0xD0, 0xE1, 0xC9, 0x99, 0x72, 0x87, 0xA9, 0xB0, 0xB3, 0xD1, 0xD2, 0xB7, 0xAC, 0xA2, 0x8C, 0x65, 0x3B, - 0x29, 0x3C, 0x6C, 0x9B, 0xB4, 0xB0, 0x9B, 0x72, 0x4C, 0x38, 0x2A, 0x15, 0x11, 0x33, 0x5D, 0x8A, 0xB3, 0xC7, 0xDB, - 0xE2, 0xD0, 0xBE, 0xB6, 0xCE, 0xDE, 0xD8, 0xC3, 0xA2, 0x81, 0x65, 0x56, 0x5E, 0x85, 0xA5, 0xAD, 0xAE, 0x9B, 0x8D, - 0x86, 0x82, 0x7D, 0x70, 0x51, 0x36, 0x3B, 0x63, 0x99, 0xD0, 0xD1, 0xA1, 0x64, 0x58, 0x89, 0xB7, 0xBD, 0xBA, 0xD0, - 0xC9, 0xB0, 0xA2, 0x95, 0x79, 0x52, 0x2F, 0x2F, 0x5E, 0x91, 0xA5, 0xA9, 0x9A, 0x79, 0x4C, 0x2D, 0x25, 0x1C, 0x0F, - 0x12, 0x30, 0x59, 0x87, 0xAB, 0xBF, 0xDC, 0xF5, 0xE3, 0xC9, 0xC0, 0xE1, 0xE7, 0xD3, 0xB3, 0x8F, 0x71, 0x59, 0x4F, - 0x5E, 0x80, 0x8D, 0x95, 0xA3, 0x97, 0x86, 0x83, 0x85, 0x6F, 0x50, 0x39, 0x26, 0x3B, 0x6F, 0xA2, 0xB9, 0xA0, 0x67, - 0x46, 0x54, 0x8C, 0xB6, 0xB9, 0xC1, 0xD0, 0xBF, 0xA9, 0x99, 0x84, 0x63, 0x42, 0x30, 0x44, 0x79, 0x99, 0x9A, 0x93, - 0x80, 0x58, 0x38, 0x27, 0x23, 0x1A, 0x12, 0x16, 0x25, 0x52, 0x7B, 0x9B, 0xB8, 0xDB, 0xFE, 0xEB, 0xD0, 0xCA, 0xDF, - 0xD6, 0xC4, 0xA4, 0x82, 0x64, 0x4A, 0x42, 0x54, 0x6C, 0x77, 0x86, 0x96, 0x89, 0x79, 0x77, 0x75, 0x5B, 0x39, 0x28, - 0x20, 0x47, 0x7F, 0xA3, 0x8D, 0x5A, 0x3D, 0x45, 0x5C, 0x85, 0xA3, 0xB2, 0xCE, 0xD1, 0xB3, 0xA0, 0x8F, 0x71, 0x4E, - 0x3A, 0x3E, 0x56, 0x7A, 0x83, 0x7C, 0x78, 0x66, 0x4E, 0x3D, 0x2D, 0x20, 0x1A, 0x1C, 0x20, 0x23, 0x45, 0x67, 0x8A, - 0xAF, 0xD3, 0xF6, 0xE7, 0xD7, 0xCD, 0xC8, 0xBC, 0xAE, 0x99, 0x72, 0x56, 0x3A, 0x31, 0x45, 0x58, 0x6C, 0x7B, 0x82, - 0x75, 0x66, 0x62, 0x58, 0x4C, 0x35, 0x24, 0x2D, 0x5E, 0x8B, 0x9D, 0x60, 0x29, 0x2D, 0x4F, 0x5D, 0x70, 0x8D, 0xB5, - 0xDC, 0xC4, 0xA8, 0x9A, 0x83, 0x5D, 0x40, 0x42, 0x4C, 0x59, 0x65, 0x60, 0x5D, 0x60, 0x54, 0x50, 0x47, 0x32, 0x1C, - 0x1A, 0x2D, 0x3E, 0x34, 0x33, 0x51, 0x79, 0xA4, 0xC3, 0xE3, 0xE1, 0xD6, 0xC3, 0xAB, 0x9D, 0x97, 0x8B, 0x62, 0x44, - 0x27, 0x1F, 0x34, 0x49, 0x61, 0x6C, 0x6C, 0x64, 0x5C, 0x50, 0x44, 0x43, 0x43, 0x3A, 0x4A, 0x75, 0x90, 0x8E, 0x48, - 0x17, 0x28, 0x51, 0x50, 0x5A, 0x8C, 0xBC, 0xD3, 0xB3, 0xA0, 0x98, 0x77, 0x50, 0x46, 0x4F, 0x4E, 0x4F, 0x4C, 0x47, - 0x4C, 0x4F, 0x4D, 0x4D, 0x46, 0x32, 0x1B, 0x26, 0x50, 0x66, 0x4A, 0x2A, 0x42, 0x73, 0x9D, 0xB2, 0xD4, 0xD9, 0xCB, - 0xB2, 0x8C, 0x7F, 0x84, 0x7A, 0x52, 0x32, 0x1B, 0x10, 0x23, 0x3B, 0x4C, 0x53, 0x59, 0x5D, 0x5B, 0x48, 0x40, 0x4C, - 0x5D, 0x66, 0x6B, 0x81, 0x8D, 0x80, 0x42, 0x16, 0x24, 0x44, 0x3B, 0x58, 0x94, 0xB3, 0xC1, 0xAA, 0xA2, 0x94, 0x6F, - 0x54, 0x54, 0x56, 0x47, 0x3D, 0x3D, 0x3C, 0x43, 0x45, 0x47, 0x4A, 0x45, 0x36, 0x2D, 0x52, 0x7C, 0x79, 0x53, 0x29, - 0x3F, 0x73, 0x99, 0xAB, 0xC7, 0xCD, 0xBD, 0x98, 0x70, 0x6C, 0x73, 0x6B, 0x47, 0x27, 0x14, 0x08, 0x11, 0x28, 0x32, - 0x39, 0x4D, 0x5D, 0x5A, 0x4F, 0x51, 0x68, 0x8D, 0x8E, 0x80, 0x81, 0x85, 0x71, 0x38, 0x13, 0x1C, 0x2F, 0x33, 0x62, - 0x8F, 0xA6, 0xBD, 0xB0, 0xA8, 0x8C, 0x77, 0x64, 0x5E, 0x56, 0x3F, 0x2F, 0x2E, 0x31, 0x3F, 0x43, 0x45, 0x4D, 0x4E, - 0x50, 0x6B, 0x99, 0x9B, 0x7D, 0x5A, 0x2D, 0x3F, 0x71, 0x9B, 0xAB, 0xBC, 0xC0, 0xA3, 0x80, 0x5D, 0x5E, 0x63, 0x5C, - 0x44, 0x2A, 0x1C, 0x0B, 0x0B, 0x19, 0x21, 0x2D, 0x44, 0x60, 0x63, 0x67, 0x71, 0x97, 0xB4, 0x9D, 0x84, 0x79, 0x73, - 0x5B, 0x21, 0x10, 0x17, 0x24, 0x34, 0x62, 0x86, 0xA3, 0xC2, 0xBD, 0xA8, 0x8D, 0x86, 0x75, 0x6B, 0x58, 0x3C, 0x21, - 0x15, 0x24, 0x42, 0x4C, 0x4E, 0x57, 0x65, 0x8A, 0xC3, 0xCB, 0xAB, 0x84, 0x60, 0x31, 0x3E, 0x6E, 0x98, 0xAD, 0xB3, - 0xB2, 0x8C, 0x71, 0x50, 0x54, 0x5A, 0x58, 0x4D, 0x3E, 0x2F, 0x1E, 0x15, 0x15, 0x1E, 0x2F, 0x45, 0x62, 0x7A, 0x87, - 0xA0, 0xBD, 0xAA, 0x8D, 0x7B, 0x69, 0x52, 0x3C, 0x11, 0x15, 0x1E, 0x1E, 0x32, 0x5B, 0x82, 0xA4, 0xC8, 0xBE, 0xA5, - 0x97, 0x91, 0x83, 0x79, 0x5D, 0x3C, 0x1A, 0x0F, 0x25, 0x4C, 0x60, 0x61, 0x65, 0x8C, 0xCA, 0xF7, 0xDE, 0xB9, 0x8D, - 0x64, 0x36, 0x3B, 0x66, 0x90, 0xAA, 0xA8, 0x9F, 0x81, 0x62, 0x46, 0x50, 0x5A, 0x64, 0x61, 0x52, 0x42, 0x35, 0x25, - 0x19, 0x20, 0x38, 0x4F, 0x68, 0x8D, 0xAC, 0xC3, 0xAB, 0x77, 0x6B, 0x67, 0x4E, 0x30, 0x1D, 0x14, 0x23, 0x25, 0x17, - 0x32, 0x58, 0x7C, 0xA3, 0xC0, 0xB3, 0xA1, 0x9A, 0x97, 0x8D, 0x82, 0x60, 0x3C, 0x1E, 0x1E, 0x39, 0x5C, 0x7A, 0x76, - 0x82, 0xBA, 0xE5, 0xFF, 0xEB, 0xC2, 0x94, 0x68, 0x3D, 0x32, 0x5C, 0x82, 0x9E, 0x9B, 0x8C, 0x69, 0x48, 0x44, 0x56, - 0x6E, 0x81, 0x76, 0x63, 0x57, 0x4A, 0x2F, 0x1F, 0x2A, 0x44, 0x5B, 0x78, 0xA0, 0xC6, 0xAF, 0x72, 0x42, 0x42, 0x44, - 0x2E, 0x11, 0x0A, 0x21, 0x2A, 0x21, 0x13, 0x32, 0x53, 0x79, 0x9A, 0xB0, 0xA5, 0x96, 0x97, 0x9D, 0x91, 0x83, 0x5C, - 0x43, 0x33, 0x39, 0x4F, 0x73, 0x90, 0x90, 0xAC, 0xD3, 0xE6, 0xFF, 0xF4, 0xC4, 0x98, 0x6B, 0x40, 0x28, 0x4F, 0x6F, - 0x8E, 0x8B, 0x6C, 0x39, 0x30, 0x4E, 0x6C, 0x93, 0x9B, 0x87, 0x79, 0x6F, 0x56, 0x31, 0x26, 0x38, 0x51, 0x68, 0x87, - 0xB2, 0xB3, 0x7B, 0x47, 0x1F, 0x19, 0x1E, 0x0F, 0x00, 0x0F, 0x2A, 0x27, 0x16, 0x0B, 0x30, 0x51, 0x77, 0x8C, 0xA0, - 0x98, 0x8E, 0x96, 0xA2, 0x99, 0x7F, 0x5E, 0x54, 0x50, 0x51, 0x61, 0x8A, 0x9E, 0xAE, 0xC8, 0xD9, 0xF0, 0xFF, 0xF9, - 0xC7, 0x93, 0x67, 0x44, 0x1C, 0x3C, 0x60, 0x7F, 0x6E, 0x36, 0x14, 0x35, 0x67, 0x87, 0xA8, 0xA2, 0x9D, 0x96, 0x7A, - 0x4D, 0x2D, 0x2E, 0x45, 0x61, 0x76, 0x96, 0xAA, 0x87, 0x5D, 0x39, 0x12, 0x00, 0x03, 0x00, 0x0D, 0x21, 0x27, 0x19, - 0x08, 0x06, 0x2E, 0x52, 0x71, 0x80, 0x95, 0x91, 0x8F, 0x9A, 0xAA, 0xA0, 0x80, 0x6B, 0x6F, 0x6B, 0x65, 0x70, 0x97, - 0xAB, 0xC3, 0xD4, 0xE9, 0xFE, 0xFF, 0xFB, 0xC2, 0x89, 0x66, 0x44, 0x0D, 0x2B, 0x50, 0x64, 0x38, 0x0F, 0x1D, 0x58, - 0x84, 0x94, 0x9F, 0xA0, 0xB3, 0xA2, 0x69, 0x38, 0x29, 0x39, 0x58, 0x6F, 0x81, 0x9D, 0x95, 0x77, 0x5D, 0x3F, 0x17, - 0x00, 0x00, 0x11, 0x2D, 0x35, 0x17, 0x05, 0x01, 0x06, 0x2F, 0x52, 0x6B, 0x7A, 0x8F, 0x94, 0x99, 0xA4, 0xAF, 0xA3, - 0x8B, 0x80, 0x85, 0x7D, 0x75, 0x7F, 0xA5, 0xBA, 0xD1, 0xE5, 0xFC, 0xFF, 0xFF, 0xF6, 0xBA, 0x8C, 0x6C, 0x39, 0x06, - 0x1C, 0x3B, 0x33, 0x0C, 0x15, 0x42, 0x79, 0x91, 0x8C, 0x95, 0xA9, 0xB8, 0x8F, 0x4F, 0x2F, 0x34, 0x4F, 0x6E, 0x7B, - 0x89, 0x9A, 0x91, 0x81, 0x68, 0x4A, 0x23, 0x06, 0x1A, 0x3B, 0x4D, 0x3D, 0x07, 0x00, 0x05, 0x0B, 0x2E, 0x50, 0x6B, - 0x7B, 0x8F, 0x9A, 0xA5, 0xAB, 0xAD, 0xA8, 0xA2, 0x96, 0x8C, 0x89, 0x81, 0x90, 0xB4, 0xC3, 0xDE, 0xF4, 0xFF, 0xFF, - 0xFF, 0xEF, 0xC0, 0x9E, 0x6B, 0x29, 0x02, 0x11, 0x19, 0x0A, 0x11, 0x34, 0x5B, 0x7F, 0x8C, 0x87, 0x9E, 0xB3, 0xA0, - 0x70, 0x46, 0x3A, 0x51, 0x70, 0x83, 0x85, 0x8B, 0xA1, 0xA1, 0x8F, 0x6E, 0x50, 0x31, 0x29, 0x51, 0x6C, 0x60, 0x33, - 0x08, 0x07, 0x10, 0x12, 0x29, 0x50, 0x73, 0x81, 0x93, 0xA4, 0xA9, 0xA9, 0xAC, 0xB9, 0xB8, 0x98, 0x8C, 0x8C, 0x8D, - 0xA2, 0xB9, 0xC8, 0xE3, 0xF6, 0xFF, 0xFF, 0xF3, 0xF4, 0xD1, 0xA2, 0x5C, 0x17, 0x01, 0x06, 0x02, 0x0D, 0x30, 0x45, - 0x5E, 0x70, 0x81, 0x8E, 0xA8, 0xA9, 0x7F, 0x63, 0x4F, 0x59, 0x7D, 0x97, 0x97, 0x8D, 0x90, 0xB2, 0xB4, 0x91, 0x6C, - 0x58, 0x54, 0x66, 0x8F, 0x89, 0x5E, 0x27, 0x23, 0x24, 0x21, 0x16, 0x29, 0x59, 0x7D, 0x85, 0x97, 0xA8, 0xA0, 0xA4, - 0xB8, 0xCC, 0xBD, 0x93, 0x8C, 0x8C, 0x95, 0xA6, 0xBA, 0xCE, 0xE3, 0xFA, 0xFF, 0xFA, 0xF5, 0xFF, 0xD5, 0x94, 0x48, - 0x0C, 0x00, 0x00, 0x09, 0x2A, 0x44, 0x44, 0x5B, 0x66, 0x81, 0x9B, 0xA4, 0x93, 0x72, 0x67, 0x66, 0x82, 0xAB, 0xB5, - 0xA5, 0x98, 0xA0, 0xBE, 0xB5, 0x8B, 0x6C, 0x6C, 0x8F, 0xAD, 0xB6, 0x8E, 0x5A, 0x2E, 0x4F, 0x49, 0x31, 0x1E, 0x34, - 0x64, 0x82, 0x87, 0x94, 0xA0, 0x99, 0xAD, 0xC8, 0xD1, 0xB9, 0x99, 0x8D, 0x8D, 0x91, 0xA2, 0xB9, 0xD4, 0xEB, 0xFD, - 0xFA, 0xF5, 0xFF, 0xFF, 0xC6, 0x7D, 0x3E, 0x11, 0x05, 0x0D, 0x21, 0x3A, 0x44, 0x44, 0x5C, 0x69, 0x8B, 0xA2, 0x9A, - 0x8B, 0x78, 0x78, 0x85, 0xAA, 0xC7, 0xC0, 0xAF, 0xA8, 0xAD, 0xB7, 0xAA, 0x85, 0x77, 0x94, 0xCE, 0xE1, 0xC0, 0x8F, - 0x65, 0x4F, 0x7B, 0x62, 0x3E, 0x2F, 0x48, 0x6D, 0x7D, 0x81, 0x8F, 0x96, 0x9F, 0xBC, 0xCC, 0xCE, 0xBF, 0xA8, 0x93, - 0x87, 0x89, 0x9E, 0xBA, 0xDC, 0xF2, 0xF4, 0xEC, 0xF5, 0xFF, 0xFA, 0xB0, 0x73, 0x48, 0x30, 0x31, 0x3C, 0x3D, 0x39, - 0x40, 0x47, 0x5E, 0x72, 0x96, 0xA0, 0x98, 0x93, 0x89, 0x90, 0xA4, 0xC0, 0xC8, 0xC2, 0xB8, 0xB4, 0xAD, 0xAA, 0xA2, - 0x8A, 0x97, 0xCC, 0xFC, 0xF6, 0xC4, 0x9D, 0x87, 0x82, 0x94, 0x68, 0x4E, 0x49, 0x5D, 0x72, 0x70, 0x7C, 0x90, 0x9A, - 0xB2, 0xC3, 0xCD, 0xD6, 0xCD, 0xB4, 0x97, 0x83, 0x87, 0xA3, 0xC6, 0xE3, 0xEF, 0xE9, 0xDF, 0xEF, 0xFF, 0xE7, 0xA8, - 0x7F, 0x67, 0x68, 0x70, 0x6B, 0x53, 0x39, 0x3F, 0x49, 0x5E, 0x7F, 0x9B, 0xA0, 0xA2, 0x9F, 0x9A, 0xA9, 0xB3, 0xBD, - 0xBF, 0xBD, 0xBC, 0xB7, 0xA5, 0xA2, 0xA4, 0xA4, 0xCB, 0xFB, 0xFF, 0xFB, 0xD4, 0xBE, 0xB7, 0xAF, 0x97, 0x6C, 0x62, - 0x67, 0x72, 0x76, 0x6D, 0x80, 0x95, 0xAB, 0xC1, 0xCA, 0xD9, 0xE7, 0xD7, 0xB9, 0x9A, 0x87, 0x91, 0xB2, 0xD2, 0xE5, - 0xE7, 0xDB, 0xD1, 0xE7, 0xFE, 0xE0, 0xB4, 0x9D, 0x97, 0xA0, 0x99, 0x7B, 0x5D, 0x3B, 0x3F, 0x4A, 0x63, 0x8E, 0x9F, - 0xAA, 0xAE, 0xA6, 0xA8, 0xB2, 0xAD, 0xB3, 0xB4, 0xB6, 0xBE, 0xB6, 0xA2, 0xA2, 0xB8, 0xD0, 0xFB, 0xFF, 0xFF, 0xFE, - 0xEC, 0xE5, 0xDF, 0xC8, 0x96, 0x78, 0x7D, 0x87, 0x7D, 0x7C, 0x7B, 0x8B, 0x9F, 0xB3, 0xC9, 0xDB, 0xEF, 0xF1, 0xDB, - 0xBA, 0x9F, 0x91, 0xA2, 0xC3, 0xD9, 0xDC, 0xD3, 0xBF, 0xC0, 0xDE, 0xFB, 0xEC, 0xD5, 0xC9, 0xC6, 0xBD, 0xA2, 0x79, - 0x5B, 0x38, 0x3C, 0x54, 0x76, 0x9E, 0xA5, 0xB7, 0xB8, 0xAC, 0xAC, 0xAD, 0xA8, 0xAC, 0xAD, 0xB6, 0xBE, 0xB4, 0xA5, - 0xAF, 0xD7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFB, 0xFC, 0xFF, 0xF3, 0xCA, 0x9E, 0x90, 0x9D, 0x96, 0x81, 0x86, 0x8A, 0x9D, - 0xAA, 0xB7, 0xD4, 0xF2, 0xFF, 0xF5, 0xD9, 0xBA, 0xA4, 0xA1, 0xB7, 0xD5, 0xD6, 0xBD, 0xA6, 0x9F, 0xAF, 0xD0, 0xEF, - 0xFB, 0xFA, 0xED, 0xDF, 0xC1, 0x9B, 0x70, 0x51, 0x32, 0x44, 0x6E, 0x94, 0xA6, 0xA9, 0xBF, 0xC1, 0xB3, 0xAC, 0xA8, - 0xA5, 0xA9, 0xAF, 0xBC, 0xBE, 0xB7, 0xB5, 0xC8, 0xE0, 0xF2, 0xFF, 0xFF, 0xF3, 0xEA, 0xF7, 0xFF, 0xF3, 0xC7, 0xB0, - 0xB0, 0xAB, 0x8A, 0x81, 0x89, 0x91, 0xA2, 0xAC, 0xC6, 0xE5, 0xFF, 0xFF, 0xF7, 0xD9, 0xBD, 0xAD, 0xB3, 0xCC, 0xD8, - 0xB9, 0x86, 0x76, 0x81, 0x9D, 0xBC, 0xDB, 0xF9, 0xFF, 0xF7, 0xE0, 0xBA, 0x8E, 0x65, 0x45, 0x34, 0x61, 0x94, 0xA4, - 0x9F, 0xA6, 0xC4, 0xCC, 0xC0, 0xAF, 0xA9, 0xAA, 0xB2, 0xBE, 0xC0, 0xBF, 0xC2, 0xCB, 0xCD, 0xCC, 0xDE, 0xF3, 0xEA, - 0xD2, 0xD5, 0xE5, 0xF1, 0xEA, 0xC7, 0xC8, 0xC0, 0x9D, 0x79, 0x78, 0x7F, 0x8A, 0x93, 0xA5, 0xD2, 0xF5, 0xFF, 0xFF, - 0xF7, 0xD9, 0xC3, 0xBC, 0xC4, 0xCD, 0xBA, 0x83, 0x52, 0x52, 0x68, 0x85, 0xA4, 0xC9, 0xEB, 0xFB, 0xED, 0xD7, 0xAE, - 0x80, 0x59, 0x40, 0x48, 0x87, 0xA9, 0x93, 0x8F, 0xA5, 0xCE, 0xDE, 0xD0, 0xBA, 0xB3, 0xBA, 0xC7, 0xCB, 0xC2, 0xC3, - 0xCD, 0xCE, 0xB8, 0xB0, 0xC2, 0xCB, 0xBD, 0xB7, 0xC1, 0xD2, 0xE0, 0xE1, 0xCC, 0xCA, 0xAB, 0x84, 0x6C, 0x66, 0x69, - 0x72, 0x80, 0xA1, 0xD5, 0xFF, 0xFF, 0xFF, 0xF6, 0xDD, 0xCE, 0xCA, 0xC2, 0xAC, 0x86, 0x50, 0x2E, 0x36, 0x4F, 0x6E, - 0x94, 0xBD, 0xE1, 0xF3, 0xE1, 0xCC, 0x9F, 0x70, 0x54, 0x50, 0x6E, 0x98, 0x97, 0x7C, 0x89, 0xAD, 0xE0, 0xF0, 0xDC, - 0xCB, 0xC8, 0xD4, 0xD9, 0xD0, 0xC7, 0xC8, 0xC8, 0xB8, 0x9A, 0x93, 0x98, 0x97, 0x9A, 0xA1, 0xB3, 0xC7, 0xD5, 0xDC, - 0xD0, 0xAA, 0x81, 0x6B, 0x5A, 0x51, 0x51, 0x5B, 0x76, 0xA2, 0xD5, 0xFC, 0xFF, 0xFF, 0xF6, 0xE5, 0xD9, 0xC7, 0xA5, - 0x80, 0x58, 0x30, 0x16, 0x1C, 0x36, 0x5C, 0x8A, 0xB8, 0xDC, 0xEC, 0xD9, 0xC0, 0x8D, 0x67, 0x60, 0x6E, 0x86, 0x85, - 0x7A, 0x7B, 0x90, 0xBF, 0xF4, 0xFD, 0xEA, 0xE1, 0xE3, 0xE8, 0xDF, 0xD2, 0xCB, 0xC3, 0xB4, 0x9A, 0x7F, 0x70, 0x6B, - 0x71, 0x83, 0x94, 0xAD, 0xC2, 0xD0, 0xD2, 0xC4, 0x7B, 0x5B, 0x4A, 0x3E, 0x38, 0x3A, 0x4D, 0x73, 0xA4, 0xD1, 0xEF, - 0xFF, 0xFF, 0xF9, 0xEA, 0xD7, 0xAF, 0x85, 0x5E, 0x3C, 0x1F, 0x09, 0x08, 0x25, 0x51, 0x84, 0xB5, 0xD7, 0xE7, 0xD1, - 0xAF, 0x80, 0x67, 0x6E, 0x85, 0x7F, 0x6B, 0x70, 0x89, 0xA6, 0xD9, 0xFF, 0xFF, 0xFB, 0xFA, 0xFB, 0xEF, 0xDD, 0xD4, - 0xCB, 0xB4, 0x98, 0x7F, 0x65, 0x50, 0x50, 0x5D, 0x73, 0x91, 0xAD, 0xC1, 0xCA, 0xC0, 0xA3, 0x58, 0x3F, 0x2F, 0x21, - 0x1B, 0x27, 0x46, 0x76, 0xA4, 0xC6, 0xE3, 0xFF, 0xFF, 0xFB, 0xE8, 0xC4, 0x97, 0x70, 0x4D, 0x2E, 0x15, 0x02, 0x00, - 0x1B, 0x4E, 0x83, 0xB3, 0xD4, 0xDC, 0xC2, 0xA2, 0x7A, 0x6C, 0x7B, 0x87, 0x70, 0x66, 0x78, 0x9B, 0xC4, 0xF1, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xD6, 0xD0, 0xC1, 0xA1, 0x7C, 0x62, 0x48, 0x3D, 0x47, 0x57, 0x73, 0x96, 0xAE, 0xC0, - 0xBF, 0xA6, 0x7B, 0x3F, 0x2D, 0x1F, 0x13, 0x0B, 0x1A, 0x43, 0x76, 0x9F, 0xC1, 0xE3, 0xFF, 0xFF, 0xF7, 0xDB, 0xAE, - 0x84, 0x61, 0x42, 0x26, 0x0F, 0x00, 0x00, 0x17, 0x4D, 0x84, 0xB6, 0xD0, 0xCC, 0xB3, 0x98, 0x79, 0x75, 0x83, 0x82, - 0x73, 0x72, 0x8B, 0xB8, 0xE1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE0, 0xC8, 0xC1, 0xAF, 0x89, 0x5B, 0x3F, 0x31, - 0x35, 0x44, 0x5A, 0x7D, 0xA0, 0xB3, 0xBA, 0xAD, 0x86, 0x5C, 0x31, 0x23, 0x19, 0x0D, 0x08, 0x13, 0x40, 0x71, 0x9F, - 0xC9, 0xF3, 0xFF, 0xFF, 0xEF, 0xC8, 0x9A, 0x73, 0x53, 0x39, 0x21, 0x0C, 0x02, 0x06, 0x1C, 0x51, 0x8B, 0xB7, 0xC7, - 0xBC, 0xA2, 0x8E, 0x7F, 0x7C, 0x85, 0x85, 0x84, 0x86, 0xA5, 0xD6, 0xF4, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xCB, - 0xB2, 0xAC, 0x96, 0x66, 0x35, 0x20, 0x25, 0x31, 0x47, 0x67, 0x91, 0xB3, 0xB6, 0xAF, 0x94, 0x69, 0x48, 0x2A, 0x1F, - 0x13, 0x09, 0x08, 0x19, 0x3E, 0x73, 0xAD, 0xE3, 0xFF, 0xFF, 0xFD, 0xDE, 0xB2, 0x87, 0x64, 0x48, 0x32, 0x1F, 0x0C, - 0x08, 0x14, 0x27, 0x5B, 0x8F, 0xB3, 0xBC, 0xAA, 0x8F, 0x87, 0x82, 0x81, 0x86, 0x91, 0x98, 0xA0, 0xC3, 0xEB, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xDD, 0xAD, 0x96, 0x8E, 0x71, 0x3E, 0x17, 0x0F, 0x1D, 0x32, 0x52, 0x7C, 0xAA, 0xC3, - 0xB5, 0xA0, 0x7C, 0x56, 0x3C, 0x28, 0x1C, 0x0B, 0x05, 0x0C, 0x21, 0x45, 0x83, 0xCB, 0xFF, 0xFF, 0xFF, 0xF2, 0xCA, - 0x9B, 0x73, 0x54, 0x3D, 0x2D, 0x1C, 0x10, 0x16, 0x28, 0x3A, 0x64, 0x94, 0xAF, 0xAF, 0x9B, 0x82, 0x82, 0x81, 0x82, - 0x89, 0x9D, 0xAA, 0xBC, 0xDF, 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0xC1, 0x8F, 0x76, 0x69, 0x48, 0x1D, 0x05, - 0x06, 0x1A, 0x3B, 0x65, 0x95, 0xBE, 0xC7, 0xAB, 0x8E, 0x69, 0x46, 0x33, 0x28, 0x15, 0x00, 0x01, 0x13, 0x2F, 0x57, - 0xA1, 0xED, 0xFF, 0xFF, 0xFF, 0xDF, 0xB2, 0x83, 0x60, 0x46, 0x35, 0x27, 0x1D, 0x1C, 0x29, 0x3C, 0x49, 0x6E, 0x97, - 0xA9, 0xA5, 0x8E, 0x79, 0x7A, 0x7B, 0x7C, 0x89, 0xA5, 0xBD, 0xD4, 0xEF, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, - 0xA4, 0x77, 0x58, 0x44, 0x25, 0x08, 0x00, 0x02, 0x1E, 0x4A, 0x7C, 0xA9, 0xC7, 0xBC, 0x9D, 0x7C, 0x5A, 0x3B, 0x2F, - 0x27, 0x0C, 0x00, 0x02, 0x1A, 0x3F, 0x73, 0xC3, 0xFE, 0xFF, 0xFF, 0xF4, 0xC9, 0x97, 0x6B, 0x4E, 0x3B, 0x2D, 0x23, - 0x25, 0x2D, 0x3C, 0x48, 0x57, 0x7C, 0x9A, 0xA6, 0x9B, 0x81, 0x71, 0x6D, 0x70, 0x73, 0x85, 0xB2, 0xCE, 0xDC, 0xE5, - 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xBD, 0x8B, 0x62, 0x3E, 0x26, 0x0F, 0x00, 0x00, 0x07, 0x2B, 0x5E, 0x91, 0xB4, - 0xC0, 0xAC, 0x8D, 0x6D, 0x4E, 0x38, 0x32, 0x26, 0x03, 0x00, 0x06, 0x21, 0x52, 0x94, 0xD6, 0xFF, 0xFF, 0xFF, 0xE1, - 0xAE, 0x7B, 0x56, 0x3F, 0x2E, 0x23, 0x24, 0x30, 0x3D, 0x47, 0x50, 0x67, 0x8C, 0xA3, 0xA6, 0x8F, 0x73, 0x64, 0x5E, - 0x65, 0x6D, 0x87, 0xBA, 0xCD, 0xC7, 0xCE, 0xEB, 0xFF, 0xFF, 0xFF, 0xFE, 0xD3, 0xA1, 0x77, 0x4E, 0x2B, 0x13, 0x02, - 0x00, 0x00, 0x10, 0x3A, 0x72, 0x9F, 0xB3, 0xB4, 0x9D, 0x7B, 0x60, 0x4A, 0x43, 0x3E, 0x20, 0x00, 0x00, 0x0A, 0x2A, - 0x66, 0xA4, 0xD9, 0xFF, 0xFF, 0xF4, 0xCB, 0x93, 0x65, 0x45, 0x32, 0x21, 0x1B, 0x28, 0x3A, 0x46, 0x4D, 0x5A, 0x78, - 0x9E, 0xAF, 0xA2, 0x81, 0x64, 0x54, 0x52, 0x5D, 0x6F, 0x8D, 0xB3, 0xB0, 0xA8, 0xBF, 0xE3, 0xFF, 0xFF, 0xFF, 0xE9, - 0xB8, 0x8D, 0x67, 0x3F, 0x1D, 0x07, 0x00, 0x00, 0x02, 0x1D, 0x48, 0x82, 0xA0, 0xAD, 0xAB, 0x8D, 0x6F, 0x59, 0x57, - 0x5A, 0x48, 0x11, 0x00, 0x00, 0x0D, 0x35, 0x72, 0xAA, 0xDE, 0xFF, 0xFF, 0xE0, 0xAC, 0x79, 0x51, 0x34, 0x24, 0x16, - 0x16, 0x2A, 0x3D, 0x47, 0x50, 0x66, 0x8B, 0xAF, 0xB4, 0x9D, 0x71, 0x52, 0x48, 0x45, 0x53, 0x6E, 0x83, 0x8F, 0x87, - 0x8F, 0xB3, 0xD9, 0xFB, 0xFF, 0xF6, 0xCC, 0xA0, 0x7D, 0x5D, 0x32, 0x10, 0x00, 0x00, 0x00, 0x0D, 0x2A, 0x5A, 0x86, - 0x9E, 0xA6, 0x9D, 0x7D, 0x65, 0x62, 0x70, 0x6E, 0x45, 0x00, 0x00, 0x03, 0x15, 0x3D, 0x77, 0xAF, 0xDD, 0xF0, 0xE6, - 0xBA, 0x86, 0x5E, 0x39, 0x23, 0x14, 0x0C, 0x14, 0x2A, 0x3C, 0x46, 0x54, 0x72, 0x9E, 0xB6, 0xAF, 0x8C, 0x63, 0x49, - 0x3A, 0x35, 0x47, 0x5B, 0x61, 0x61, 0x68, 0x7F, 0xA6, 0xD0, 0xE9, 0xED, 0xD7, 0xAC, 0x89, 0x71, 0x4A, 0x21, 0x07, - 0x00, 0x00, 0x05, 0x1A, 0x3A, 0x62, 0x87, 0x9A, 0x97, 0x87, 0x6D, 0x66, 0x76, 0x7D, 0x60, 0x26, 0x00, 0x01, 0x0B, - 0x25, 0x4A, 0x7F, 0xB0, 0xD3, 0xDB, 0xC1, 0x95, 0x6B, 0x49, 0x2A, 0x14, 0x06, 0x07, 0x14, 0x2A, 0x39, 0x46, 0x5E, - 0x83, 0xAD, 0xB7, 0x9F, 0x75, 0x5D, 0x49, 0x2D, 0x29, 0x3B, 0x46, 0x3E, 0x3C, 0x54, 0x76, 0xA0, 0xC1, 0xD5, 0xD7, - 0xBF, 0x9B, 0x7C, 0x5C, 0x31, 0x17, 0x05, 0x00, 0x00, 0x0C, 0x26, 0x45, 0x69, 0x8B, 0x91, 0x8B, 0x78, 0x69, 0x76, - 0x85, 0x6D, 0x30, 0x02, 0x00, 0x09, 0x1A, 0x35, 0x5D, 0x85, 0xA9, 0xC6, 0xBF, 0xA1, 0x80, 0x5E, 0x3D, 0x1F, 0x07, - 0x00, 0x05, 0x16, 0x27, 0x35, 0x4C, 0x6D, 0x99, 0xB9, 0xB2, 0x8A, 0x68, 0x58, 0x42, 0x25, 0x24, 0x39, 0x3C, 0x28, - 0x29, 0x4E, 0x77, 0x98, 0xB5, 0xCC, 0xD0, 0xB7, 0x98, 0x70, 0x40, 0x26, 0x15, 0x05, 0x00, 0x02, 0x14, 0x30, 0x51, - 0x78, 0x8C, 0x8F, 0x86, 0x73, 0x72, 0x82, 0x83, 0x4E, 0x12, 0x00, -}; - -static Gfx sInnerCylinderDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sWindEffTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), - gsDPLoadMultiBlock(sWindEffTexture, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 14, 14), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255), - gsDPSetEnvColor(150, 255, 0, 0), - gsSPDisplayList(0x08000000), - gsSPVertex(&sCylinderVtx[0], 18, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0), - gsSP2Triangles(3, 8, 1, 0, 3, 9, 8, 0), - gsSP2Triangles(10, 2, 11, 0, 10, 0, 2, 0), - gsSP2Triangles(9, 12, 8, 0, 9, 13, 12, 0), - gsSP2Triangles(7, 14, 5, 0, 7, 15, 14, 0), - gsSP2Triangles(15, 11, 14, 0, 15, 10, 11, 0), - gsSP2Triangles(13, 16, 12, 0, 13, 17, 16, 0), - gsSPEndDisplayList(), -}; - -static Gfx sOuterCylinderDList[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sWindEffTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, G_TX_NOLOD, G_TX_NOLOD), - gsDPLoadMultiBlock(sWindEffTexture, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 15, 15), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0, 0x80, 255, 255, 170, 255), - gsDPSetEnvColor(0, 150, 0, 0), - gsSPDisplayList(0x09000000), - gsSPVertex(&sCylinderVtx[18], 18, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 3, 1, 0), - gsSP2Triangles(4, 5, 6, 0, 4, 7, 5, 0), - gsSP2Triangles(3, 8, 1, 0, 3, 9, 8, 0), - gsSP2Triangles(10, 2, 11, 0, 10, 0, 2, 0), - gsSP2Triangles(9, 12, 8, 0, 9, 13, 12, 0), - gsSP2Triangles(7, 14, 5, 0, 7, 15, 14, 0), - gsSP2Triangles(15, 11, 14, 0, 15, 10, 11, 0), - gsSP2Triangles(13, 16, 12, 0, 13, 17, 16, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 65f54a1250..c750e95d41 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -30,7 +30,7 @@ const ActorInit Oceff_Spot_InitVars = { (ActorFunc)OceffSpot_Draw, }; -#include "z_oceff_spot_gfx.c" +#include "overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.c" static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), @@ -61,7 +61,7 @@ void OceffSpot_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.scale.y = 0.3f; } - this->unk_174 = 0; + this->unk_174 = 0.0f; } void OceffSpot_Destroy(Actor* thisx, GlobalContext* globalCtx) { @@ -78,7 +78,7 @@ void OceffSpot_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void OceffSpot_End(OceffSpot* this, GlobalContext* globalCtx) { - if (this->unk_174 > 0) { + if (this->unk_174 > 0.0f) { this->unk_174 -= 0.05f; } else { Actor_Kill(&this->actor); @@ -156,10 +156,10 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 469), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1, 0, scroll * (-8), 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, sCylinderDL); + gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 485); } diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c deleted file mode 100644 index 6e5f6496fd..0000000000 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c +++ /dev/null @@ -1,92 +0,0 @@ -#include "z_oceff_spot.h" - -static u32 sTexture[] = { - 0x354D5AAC, 0xA5561C01, 0x124688B5, 0x74583231, 0x313D71D6, 0x9F5B3507, 0x104089AD, 0x748F440C, 0x408176AC, - 0xB4661301, 0x2261C0BE, 0x49392533, 0x2C497FC4, 0x80451D06, 0x2466BBD0, 0x9CB85411, 0x40A09DA3, 0xB37F210B, - 0x3D8AEAC7, 0x3F241930, 0x2F5591A7, 0x6441080F, 0x4191E8DB, 0xB7A76B18, 0x4094BAA0, 0x76532D22, 0x60BAFEE8, - 0x8253545F, 0x6078A896, 0x73540723, 0x66C2FEBB, 0x87888723, 0x4B87C79E, 0x33123048, 0x88E3FFFC, 0xD39F7E72, - 0x8DA2AE80, 0xA77B1940, 0x90EBFFA9, 0x6289973E, 0x6F9ACD83, 0x2D104B7F, 0xAEEBFDF3, 0xD8B26772, 0xA7C7AD77, - 0xB1B34A61, 0xB0F8FFD5, 0x9496986B, 0x9EC6D25D, 0x503E85B3, 0xC0C1E1EE, 0xBD9B618E, 0xBFE4A975, 0x86E18B86, - 0xABCFF7F2, 0xBC837E69, 0xB5EFE465, 0x5B66BACB, 0xC794AADC, 0xAC8982AE, 0xD3F59754, 0x65E2AAAD, 0x8C85D0E1, - 0xAF634D39, 0xC7E2EDA3, 0x527ECACF, 0xBF777FC0, 0xA284A5A5, 0xE3FE8A2F, 0x60CCAFBE, 0x7164B8BA, 0x97553A2B, - 0xE8BCBCDA, 0x76A1BBBA, 0x844D83BD, 0x9C6B875B, 0xD9FFAA3F, 0x6AC9B59B, 0x6592BD94, 0x956D3D3B, 0xFFA773D3, - 0xB5B9AB90, 0x4033A0BC, 0x873E3E1D, 0xB5FFE48D, 0x8CC9A761, 0x62CBAF79, 0x98883457, 0xF3766FAF, 0xD5B2A26B, - 0x44549D8B, 0x56232221, 0x7DFFF2DD, 0xC6B68840, 0x4ECCA267, 0x696D296E, 0xA8328AAD, 0xD3998447, 0x5E7D8C5B, - 0x391F1E35, 0x4EF6CDD3, 0xDD9B6C2D, 0x27A09571, 0x37443656, 0x4C1265C9, 0xCA91612E, 0x3B5A7A65, 0x2F4F3421, - 0x36EAC380, 0xB6814A1B, 0x0C607075, 0x5860803B, 0x27102CCD, 0xC9A87A47, 0x16204B80, 0x44B3860F, 0x28DAE042, - 0x7F773710, 0x0235616D, 0xA089BE60, 0x34161EBC, 0xBBAAA972, 0x172A3B91, 0x96F6C319, 0x21B7F02A, 0x618F662A, - 0x02327A8C, 0x97577B5C, 0x48171FB3, 0xA090AF87, 0x1F65609D, 0xD8FFD41E, 0x177CC522, 0x69A8A462, 0x0D3A93B6, - 0x4F0C1821, 0x39151CA7, 0x928EAA9A, 0x33919BAF, 0xEBFBDA23, 0x093B6937, 0x80AEA66C, 0x304491C7, 0x3A031710, - 0x16162197, 0x9B9FB5BA, 0x4C95CED8, 0xF8F0D425, 0x05144066, 0x84B17F5A, 0x725E8DCD, 0x5D376910, 0x19183886, - 0xA3A1C4C6, 0x6584D1F1, 0xFFFABF12, 0x0E123F77, 0x88AF6881, 0xB97F98BB, 0x879BBC23, 0x4A20557C, 0x9BA5D0BB, - 0x7583C6E0, 0xFEFFB322, 0x34283976, 0x95B06EB8, 0xE29B999F, 0xBDE9E582, 0x814C5C82, 0xA1C0ECBE, 0x789ED6B2, - 0xF4FFD78F, 0x73324087, 0xA0C26FAB, 0xE0B1A5B9, 0xF2FFFADE, 0xAC906A89, 0xB3DDFFCB, 0x86B8CD75, 0xDFFFF1D7, - 0x8F31579C, 0xAFDE7B87, 0xC8BAB4EB, 0xF0F2FFE4, 0xB29B798B, 0xC3F4FFD2, 0xA0A17C32, 0xA9FFE8BD, 0x784D7A91, - 0xC7F5AB9B, 0xBEBB86D9, 0xB0BCF9D4, 0x835C4C70, 0xD8FFFFD7, 0xA2682907, 0x68FFE29F, 0x61707B7A, 0xE5FFE7C8, - 0xCCC33C8E, 0x768CE0C7, 0x51281940, 0xCBFFFFCB, 0x87450C00, 0x4BF3D58E, 0x6D767B92, 0xFAFFFFC8, 0xC7BF175B, - 0x708BBA9A, 0x3A161542, 0xB4FFF5A9, 0x6D39090C, 0x50D8BC86, 0x897AA1C8, 0xFFFFF4A1, 0x8C880B50, 0x91A49762, - 0x2D0C1E78, 0xD4FFD97F, 0x58351E23, 0x6BB49283, 0x9B95C9EE, 0xFFFFD377, 0x4336075E, 0xBFB27641, 0x1B0224B5, - 0xFCF7AC55, 0x41384344, 0x8FA06468, 0x9FB5DBFD, 0xFFF1A553, 0x190B1275, 0xCCA75D3A, 0x0C042ED9, 0xFFD97C33, - 0x28405669, 0xB0914C3A, 0x9199C6FF, 0xFECF7835, 0x080C308B, 0xB38F6D47, 0x0A0D3DDB, 0xF3A75519, 0x1341558E, - 0xBE7B4321, 0x6B4D94F8, 0xE4AC591A, 0x02175096, 0x8E7A9145, 0x1D224BBF, 0xC1723508, 0x0D3E5FA5, 0xA568351E, - 0x422B6EE0, 0xBB85480B, 0x04256799, 0x716D6D21, -}; - -static Vtx sCylinderVtx[] = { - VTX(35, 0, -35, 1280, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(35, 150, -35, 1280, 512, 0xFF, 0xFF, 0xFF, 0x7E), - VTX(50, 150, 0, 1024, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(50, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(35, 500, -35, 1280, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(50, 500, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 0, -50, 1536, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(0, 150, -50, 1536, 512, 0xFF, 0xFF, 0xFF, 0x7E), - VTX(0, 500, -50, 1536, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-35, 0, -35, 1792, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-35, 150, -35, 1792, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(-35, 500, -35, 1792, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-50, 0, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-50, 150, 0, 2048, 512, 0xFF, 0xFF, 0xFF, 0x7E), - VTX(-50, 500, 0, 2048, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-35, 0, 35, 256, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-35, 150, 35, 256, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(-50, 150, 0, 0, 512, 0xFF, 0xFF, 0xFF, 0x7E), - VTX(-50, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-35, 500, 35, 256, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-50, 500, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 0, 50, 512, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 150, 50, 512, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(0, 500, 50, 512, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(35, 0, 35, 768, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(35, 150, 35, 768, 512, 0xFF, 0xFF, 0xFF, 0x7E), - VTX(35, 500, 35, 768, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0), - gsDPTileSync(), - gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, 15, G_TX_NOMIRROR | G_TX_WRAP, 5, - 0), - gsDPSetTileSize(1, 0, 0, (31 << 2), (31 << 2)), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetPrimColor(0x00, 0x00, 255, 255, 170, 255), - gsDPSetEnvColor(200, 255, 0, 128), - gsSPEndDisplayList(), -}; - -static Gfx sCylinderDL[] = { - gsSPVertex(sCylinderVtx, 27, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), - gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0), - gsSP2Triangles(7, 8, 4, 0, 7, 4, 1, 0), - gsSP2Triangles(9, 10, 7, 0, 9, 7, 6, 0), - gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0), - gsSP2Triangles(12, 13, 10, 0, 12, 10, 9, 0), - gsSP2Triangles(13, 14, 11, 0, 13, 11, 10, 0), - gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), - gsSP2Triangles(16, 19, 20, 0, 16, 20, 17, 0), - gsSP2Triangles(21, 22, 16, 0, 21, 16, 15, 0), - gsSP2Triangles(22, 23, 19, 0, 22, 19, 16, 0), - gsSP2Triangles(24, 25, 22, 0, 24, 22, 21, 0), - gsSP2Triangles(25, 26, 23, 0, 25, 23, 22, 0), - gsSP2Triangles(3, 2, 25, 0, 3, 25, 24, 0), - gsSP2Triangles(2, 5, 26, 0, 2, 26, 25, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index ad8d960e01..e1b66b8f28 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -32,8 +32,6 @@ const ActorInit Oceff_Storm_InitVars = { (ActorFunc)OceffStorm_Draw, }; -#include "z_oceff_storm_gfx.c" - void OceffStorm_SetupAction(OceffStorm* this, OceffStormActionFunc actionFunc) { this->actionFunc = actionFunc; } @@ -124,6 +122,8 @@ void OceffStorm_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } +#include "overlays/ovl_Oceff_Storm/ovl_Oceff_Storm.c" + void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->state.frames & 0xFFF; OceffStorm* this = THIS; @@ -138,7 +138,7 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 150, this->primColorAlpha); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 8, scroll * 4, 64, 64, 1, scroll * 4, scroll * 4, 64, 64)); gSPTextureRectangle(POLY_XLU_DISP++, 0, 0, (SCREEN_WIDTH << 2), (SCREEN_HEIGHT << 2), G_TX_RENDERTILE, 0, 0, 140, @@ -167,10 +167,10 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 498), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, sCylinderTexDL); + gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 4, (0 - scroll) * 8, 32, 32, 1, scroll * 8, (0 - scroll) * 12, 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, sCylinderDL); + gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 512); diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c deleted file mode 100644 index 19be5c56b9..0000000000 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c +++ /dev/null @@ -1,190 +0,0 @@ -#include "z_oceff_storm.h" -#include "objects/gameplay_keep/gameplay_keep.h" - -static u32 sTexture[] = { - 0x2F6E6F59, 0x6197B3CC, 0xC8AD8E6C, 0x5333170A, 0x17366173, 0x86ABC7C6, 0xA9928C7E, 0x55496341, 0x40705B59, - 0x79A5DAE8, 0xC9A5927F, 0x6F50270D, 0x17304F6C, 0x8BAAC3B9, 0x9189A0A5, 0x854A2F1F, 0x33808E74, 0x709BB7CC, - 0xC6B18E69, 0x4627100D, 0x21406880, 0x9BC2DAC1, 0x92808378, 0x514B7350, 0x386E6768, 0x80AAE1E4, 0xC6A0866D, - 0x644B2513, 0x2541617F, 0xA2BBD7C6, 0x9C97B8B9, 0x86322A2C, 0x3381A28F, 0x82A0BECA, 0xCBBF956B, 0x40210A15, - 0x2F4D718F, 0xB1D7E8BA, 0x856B706D, 0x49447654, 0x366C6C71, 0x87ADDFD8, 0xB8967B68, 0x543A1B15, 0x32537094, - 0xB5D1E5CF, 0xAEA9C9CD, 0x9F3C3235, 0x3883AEA8, 0x98A4C1C5, 0xC9CCA576, 0x45210D1D, 0x3C5D7E9F, 0xC3E7EFAF, - 0x785B5C5B, 0x3935684F, 0x36646A79, 0x8FADD5C9, 0xA6877561, 0x40271721, 0x406180A5, 0xC7E2EED5, 0xC1BDCACD, - 0xAD46333D, 0x3A82B5BB, 0xADADC5BD, 0xC4D5B282, 0x532C152A, 0x4B6D8FB0, 0xD5F4F4AD, 0x73534F4D, 0x2D28584D, - 0x3C5E6981, 0x9AB0CCBB, 0x987B775E, 0x2D151B2F, 0x507192B8, 0xDAF0F2D6, 0xD0CAC1C0, 0xB5573241, 0x4180B2C3, - 0xBFB9C8B3, 0xB9CCB085, 0x5E392138, 0x5B7DA1C3, 0xE5FBF8BC, 0x805B534F, 0x383C605E, 0x5363738F, 0xA9B7CAB1, - 0x8E79805E, 0x1F10233F, 0x6081A4CA, 0xEAFAF1CF, 0xD4CBB0B2, 0xC06E3246, 0x4D7BA9C3, 0xC8C4CAAB, 0xA5AF9777, - 0x62463249, 0x6B90B4D4, 0xF2FEFBD3, 0xA47B6B69, 0x686B7D7E, 0x777D869D, 0xB4C3C6A8, 0x8E888E5F, 0x1B173050, - 0x7292B8DC, 0xF6FFE7C0, 0xC2B99CAC, 0xC682334E, 0x57779EBB, 0xCBCFD0A4, 0x8D856E58, 0x5B514459, 0x7BA1C6E5, - 0xFAFFFEE9, 0xC9A48D8F, 0x8C868E92, 0x8C999DA8, 0xBCCABE9F, 0x99A4A065, 0x23254060, 0x83A4CBEB, 0xFCFFDDAC, - 0xA69D8CAF, 0xC8993A56, 0x617998B5, 0xCBD7D29F, 0x765B4138, 0x505D596E, 0x8CB2D6F1, 0xFEFFFEF8, 0xE7C5B0AD, - 0xA295979B, 0x99AFB3B2, 0xC3CAB197, 0xA9C1B36F, 0x32354F72, 0x94B5DCF6, 0xFFFFD99F, 0x8E898BB8, 0xC3A84A5D, - 0x6E819AB5, 0xCEDECF98, 0x65402323, 0x4B6B7283, 0x9EC1E4FA, 0xFFFFFCF7, 0xF6DAC7C2, 0xAC96929D, 0xA2BFC5BD, - 0xC9C6A192, 0xB6D7C682, 0x49466281, 0xA4C4ECFD, 0xFFFFDFAD, 0x95919DBE, 0xB8B26768, 0x8190A4BC, 0xD5DFC38C, - 0x61402328, 0x547D8C99, 0xADCFEBFA, 0xFEFFFAF1, 0xF3DCD0C8, 0x9C808AA2, 0xA9C9D4CA, 0xD0C09D94, 0xB9DCD7A2, - 0x685D7290, 0xB2CFF4FF, 0xFFFFEBC6, 0xADA2AABE, 0xB1B98781, 0x99A2B1C6, 0xDEDBAD7E, 0x6957393A, 0x6995A8AF, - 0xBED7E7EF, 0xF7FEFAED, 0xE8D1CEC1, 0x907595AA, 0xB3CEDFD7, 0xD5B69F99, 0xADCEE4C4, 0x8B7482A0, 0xBFCFF2FC, - 0xFEFFF7DD, 0xC7B5B2B5, 0xB0B69390, 0xADB8C0D4, 0xE9D69970, 0x74745656, 0x82AEC0C0, 0xC9D9DBDC, 0xEAF8FAEB, - 0xDEC9C4B8, 0x8F71A5B5, 0xC1D6E7E4, 0xD7AFA39D, 0x9CBAECE1, 0xAD8A93AF, 0xC5C6E1F1, 0xFAFEFCED, 0xDAC6B0A6, - 0xACAD9094, 0xB5CDD2E3, 0xF3D38D69, 0x808A6D70, 0xA0C7CECB, 0xD1D8CCC6, 0xD4EFF9E9, 0xD5C3BCAD, 0x937AB7BE, - 0xCBDFEFEE, 0xD3A5A097, 0x88A4EDF6, 0xC39CA2BF, 0xC4B5C9DE, 0xEEF7F9ED, 0xDAC4A092, 0xA0967C8B, 0xB1DFE4EE, - 0xF9DA926C, 0x83927C84, 0xBCD7D5D5, 0xD8D5C0B2, 0xB9DDF4E1, 0xCFBCB4A4, 0xA190C5C3, 0xCFE3F4F6, 0xCD9B9388, - 0x7899E8F9, 0xCCA8B3CD, 0xBDA0ACC3, 0xDBEDF4E4, 0xD7C09481, 0x8B7C5B71, 0xABEDEDF0, 0xFCE6A97A, 0x818B8198, - 0xD1DDD5DC, 0xDDD2B9A4, 0x9FCCECD5, 0xCCBAAF9F, 0xACAACAC9, 0xDAEBF8FA, 0xC68F7E72, 0x6F98E2F1, 0xCBB1C2D8, - 0xB49191A8, 0xC6E4EAD7, 0xCCBB8B75, 0x7867495E, 0xADF6EFE5, 0xF7F1C692, 0x817F84A9, 0xDEDBD2E3, 0xDECCB299, - 0x8ABBE1C7, 0xCAB6A7A4, 0xB5C1C6C4, 0xE1F4FCFC, 0xC3876A5E, 0x6C98DAE8, 0xC4B8CFDA, 0xA9858399, 0xBBDEDCC9, - 0xC2B2846D, 0x6D5D4357, 0xBCFBEAD2, 0xE7F7E1AF, 0x85798DB9, 0xDFD2D1E5, 0xD6BCA48C, 0x81B1DABF, 0xCBB399A9, - 0xBFC9B1B1, 0xE1FAFEFE, 0xC8895F55, 0x6D9DD8DF, 0xC1C2D3D0, 0x9E80829D, 0xBFDACDB7, 0xB8B0846E, 0x6E5E4061, - 0xD3FEE5BC, 0xCFECF1CF, 0x9882A0CA, 0xDAC7CEDD, 0xC19F8B7D, 0x82B5D7C0, 0xCBB288A1, 0xB4B98E8F, 0xD9FEFFFE, - 0xD697695C, 0x729FDADB, 0xC5C8C9BC, 0x928392B5, 0xCCD3BFA8, 0xB3B49178, 0x77603C76, 0xE6FFE6AB, 0xB1D4EDE6, - 0xB094B9D3, 0xD1C0C6CB, 0xA37E6F6E, 0x92C0D5C3, 0xCAAC758F, 0x9F996568, 0xC8FEFFFF, 0xE6B28271, 0x7BA5DFD9, - 0xC8C7B9A0, 0x878CAECF, 0xD2CBB69D, 0xB2B9A485, 0x7D5C368E, 0xF2FFE89F, 0x95B8DAF3, 0xC9A9CCD5, 0xC7BCBDB3, - 0x84615364, 0xA6C7D3C9, 0xC3A06472, 0x8372444B, 0xB1FAFFFF, 0xF4D1A890, 0x8BB1E1D6, 0xC9C09F87, 0x7A95C9DF, - 0xD2BDAF93, 0xB3C0B290, 0x7C5138A6, 0xFAFFE38F, 0x88A4BFF2, 0xDDBAD7D0, 0xC0BCB09A, 0x70534569, 0xB9C6CAC6, - 0xB18D5B51, 0x5F50363F, 0x92F0FFFF, 0xFDE9CDB5, 0xA8C1DECE, 0xC4B18B74, 0x6B98DBE4, 0xC9B0A48A, 0xA9BAB494, - 0x784541BD, 0xFCFAC978, 0x8DA8A6E6, 0xE9C6DAC5, 0xBDBFA385, 0x6E61537A, 0xC3BAB7B3, 0x97765141, 0x50433D4A, - 0x70D8FFFF, 0xFCF3E6D6, 0xC6D0D7C4, 0xBCA17E69, 0x5B90E1DF, 0xC3AD9C80, 0x93A3A38D, 0x723C4ECA, 0xF3EBA45D, - 0x99BC98D7, 0xF0CDD2BA, 0xB9BD9475, 0x7A7D6C91, 0xC2A6A29C, 0x7C634A3A, 0x50414A64, 0x55B9FDFF, 0xF7E6F1ED, - 0xE0DACEBA, 0xB394725F, 0x4A7AD6D8, 0xC1AF9C7C, 0x7D888680, 0x6E3557CA, 0xDECF7743, 0xA2CD99CF, 0xEFCFC7AF, - 0xB1B38063, 0x809482A2, 0xBC978E82, 0x6A5E4339, 0x4D3F5077, 0x4B90FBFF, 0xF1CEE6F1, 0xF0DFC3B0, 0xA8896454, - 0x3A60C2D1, 0xB9A99F85, 0x64656776, 0x743854BA, 0xBBAA4E2D, 0x9CCFA4D6, 0xEDCCBDA5, 0xA19F6D54, 0x7B998AA4, - 0xB79A8B71, 0x615E4145, 0x49384B79, 0x4F67F7FF, 0xEDB7CCDF, 0xEBDCB9A5, 0x9A7C5846, 0x2F43A4C3, 0xADA0A097, - 0x624B5576, 0x85504A95, 0x8C853A1F, 0x80BCBBDF, 0xE6CAB9A3, 0x92885E46, 0x65827B95, 0xA59B9778, 0x5C57546E, - 0x5B333D67, 0x574DF0FF, 0xEFACAFBD, 0xD2DAAD98, 0x896E4D39, 0x282882AD, 0x9D9298A0, 0x7E5F6188, 0xA27A516C, - 0x5F6A3817, 0x5C99CEE7, 0xDFCBBDA8, 0x8E7D5E48, 0x4D5E6079, 0x8D929B8C, 0x584E75A1, 0x86412C4B, 0x583AE8FF, - 0xF5B99292, 0xB3D3A48A, 0x775E412C, 0x21196191, 0x8F8187A4, 0x9A857D9F, 0xBFA9724E, 0x3C5F3A15, 0x3871DAE8, - 0xDAD1C6B3, 0x9B887055, 0x4139405D, 0x73859FA4, 0x584E9ECC, 0xB7632338, 0x513ADAFF, 0xFBCA7E6A, 0x90CDA17F, - 0x6B533821, 0x1B10457A, 0x8C807A9F, 0xB7AB96AD, 0xCECC9C4A, 0x2C624013, 0x2151E1DE, 0xD7D2CEBC, 0xAEA28A68, - 0x411F324E, 0x536F9FB9, 0x6C6FC7ED, 0xE1872736, 0x4D3FC6FE, 0xFEDA724A, 0x72C2A57F, 0x6E59361D, 0x1710356D, - 0x918A7D9B, 0xCFC09FA7, 0xC7D2B854, 0x326E4113, 0x2540DCD5, 0xD5CCD0BB, 0xBEB9A378, 0x481D4055, 0x4D63A2C1, - 0x939FE2FC, 0xFAA42F3F, 0x4B45AAFB, 0xFFE46838, 0x63B5B091, 0x87744F2A, 0x1B15356D, 0x97998EA9, 0xCBB58F8A, - 0xA4B9B553, 0x417D3F17, 0x2D39D8CF, 0xD1BECBB3, 0xC6C6B583, 0x4527606D, 0x576DAFBF, 0xB8C5F3FD, 0xFFB93541, - 0x494D86F2, 0xFEE25932, 0x5DB0BAA4, 0x9F967343, 0x21193C72, 0x9FA9A4BD, 0xB8926C62, 0x748A9549, 0x51873D19, - 0x3238D4CE, 0xC8ADC2A6, 0xC4C9C089, 0x3F2D7F8A, 0x6A7DBCB8, 0xD6E4FAFE, 0xFFC7333D, 0x454A63DB, 0xF8D34D36, - 0x61ADC0B2, 0xB1B3955E, 0x2C214477, 0xA4B7BACC, 0x9E614438, 0x43516436, 0x5F83391B, 0x3338CCCF, 0xBEA0BC9D, - 0xC2C4C990, 0x403A99A8, 0x8090C5B1, 0xE9F1FCFF, 0xFDD63238, 0x394445BB, 0xDCB14540, 0x73B5C3BC, 0xBFC6AC72, - 0x3C304D7B, 0xA5BCC9DA, 0x7E362117, 0x1D27352F, 0x5F723821, 0x3238C2D2, 0xB59DB99F, 0xC1C0D09B, 0x4E46A9BC, - 0x9DA9CAB5, 0xEDF5FEF9, 0xF6E43236, 0x2D353592, 0xB08D544D, 0x88B9C3BF, 0xC0C4A97A, 0x50455579, 0xA2BCCDDF, - 0x74271319, 0x32251738, 0x53553928, 0x3238B5D2, 0xB19DBCAB, 0xC0BFD8A9, 0x624EADC9, 0xB7C3D2C3, 0xEFFAFEEF, - 0xEDF03536, 0x23233569, 0x7F797259, 0x99B5C3C3, 0xBBB2977C, 0x6C65637B, 0x9FB9CEE3, 0x862F1932, 0x60401040, - 0x40393632, 0x383FA7D2, 0xB5A3BFB9, 0xC0C3E1B8, 0x7759A7CF, 0xCCD9DFDA, 0xF2FEFDE6, 0xE8F23539, 0x1F19324A, - 0x50759267, 0xA5ADC5CA, 0xB59C827D, 0x8A867680, 0x9EB8CCE8, 0xA03D2F57, 0x9664153D, 0x2D283538, 0x414A98CF, - 0xBAADBEC0, 0xC3CFE7C3, 0x8A639FCC, 0xD8E6E8EB, 0xF6FFFDE5, 0xEBEA3238, 0x1D173035, 0x3D7DA973, 0xA9A4C5CE, - 0xAB82778A, 0xA9A5888A, 0xA4BCC6E6, 0xBA4F548A, 0xC6881F33, 0x302D3239, 0x535C8AC9, 0xBAB6BAC1, 0xCBD6E6CB, - 0x967195C3, 0xD7E6EEF8, 0xFAFFFDEB, 0xF1D42A35, 0x1F25322F, 0x417DAF7D, 0xA6ACC0CE, 0xA27583A9, 0xC9BF9898, - 0xB0BEBEE1, 0xCC6585BB, 0xE7A53832, 0x4E402F38, 0x697084C4, 0xB3BEB4BD, 0xD5D7E1CC, 0x9F7E92BC, 0xD2E4EFFB, - 0xFEFFFEF6, 0xF4B5212C, 0x273C3A30, 0x4A70AC89, 0xA3B7BCCD, 0x9F7499C8, 0xE1CFA3A4, 0xBCBDB0D7, 0xD87DB5DF, - 0xF9BC604B, 0x7454323D, 0x7C7D7FBF, 0xAAC1B1BE, 0xDFD8D9CB, 0xA48994B5, 0xCEE1E6F1, 0xFEFFFFFE, 0xF59F2D30, - 0x3D574D36, 0x5462A394, 0xA2C2B9CF, 0xA277AFE1, 0xF3DAABAF, 0xC4B69FCF, 0xE29FDBF6, 0xFECF947D, 0x9C65414D, - 0x898282BB, 0xA3C3B4C6, 0xE6DCD7C7, 0xA2919CB6, 0xCFE1DBE2, 0xFDFFFFFF, 0xF4A56358, 0x64725C3D, 0x5F5F9FA0, - 0xA1C9B9D4, 0xA47BB8ED, 0xFADFB5B9, 0xC8AE99CF, 0xECC3F3FE, 0xFEE1C3B2, 0xBB765B69, 0x8D7D90BA, 0xA9C6BCD5, - 0xEFE6DFC5, 0x9F97A8C0, 0xD9E7CDCC, 0xF9FFFFFF, 0xF6C09D90, 0x91866343, 0x6564A7AB, 0xA2CCC1DC, 0xA379B3E6, - 0xF6E1BEC4, 0xCBB2AADA, 0xF6E0FDFF, 0xFFF1E4D7, 0xCD877D8B, 0x8E7596BD, 0xB6C8C7E5, 0xF6F3E8C3, 0x9D9FB2CC, - 0xE5ECB9B3, 0xF4FFFFFE, 0xF9DDC6B9, 0xB78F6549, 0x646EB0B4, 0xA9D0CCE5, 0xA378A6D5, 0xEBE1C6CC, 0xCCBFC6E8, - 0xFBF5FEFF, 0xFFFBF4E9, 0xD99FA2A9, 0x947399BD, 0xC1CCD2F1, 0xFBFCF2C3, 0x9FA7BED5, 0xE9E4A299, 0xEBFEFFFD, - 0xFAEFE3D5, 0xCE8C6150, 0x657EB9BA, 0xAFD4D7EF, 0xA97D9AC3, 0xDFDCCCCF, 0xCACAE0F6, 0xFCF7F7FE, 0xFFFEF3EA, - 0xDAB5B9BA, 0xA2819EBB, 0xC8D0DEFA, 0xFFFFF6C6, 0xA7B3C5D1, 0xDECF887E, 0xD6F9FFFD, 0xF9EFE4D8, 0xD5846160, - 0x7396B9BD, 0xB9D7E3F7, 0xB48899B9, 0xD2D7D2CD, 0xC0CAF1FD, 0xF1E4E6F9, 0xFFFDEBE0, 0xD6BEBEBB, 0xA890A3BC, - 0xC9D7EAFE, 0xFFFFF6C9, 0xB4BDC2C0, 0xC2AC6963, 0xB6EBFEFD, 0xF8E6D7C9, 0xCC78687A, 0x8DA3ADBB, 0xC6DEEDFB, - 0xC79FAABB, 0xCAD3D8C9, 0xACB5E8F8, 0xDEC9CDEB, 0xFDFAE7DA, 0xCEB9B1AA, 0xA18F99B9, 0xCCE2F4FF, 0xFFFFF5CE, - 0xC0C0B7A6, 0x997E4948, 0x91D7FDFE, 0xF8E0CCC0, 0xBC6B7192, 0x9FA39CB5, 0xD1E7F6FE, 0xDDBCC5C6, 0xC9D5E3C4, - 0x8F92D1E8, 0xC6A9B0DB, 0xF7F6E7D6, 0xBCA3958D, 0x8A818AB1, 0xD3EDFBFF, 0xFFFFF2D2, 0xC5BCA489, 0x6F542F32, - 0x6BBEFBFF, 0xFADCC2B8, 0xAE657AA9, 0xA9988AB1, 0xDDF1FCFF, 0xEDD7DDD0, 0xCBDCEFBF, 0x716AB1D2, 0xAC9199CA, - 0xEEEDE6D0, 0xA884786E, 0x656373A1, 0xD6F4FFFE, 0xFFFFEFD3, 0xC3B0906F, 0x4E331B23, 0x4FA5F7FF, 0xF8D7B8B1, - 0xA56780B5, 0xAC8785B3, 0xE9FBFFFF, 0xFAEDEDD4, 0xCBE4F8BC, 0x57458FB9, 0x9B878FBC, 0xE1DFDFC4, 0x916D5F50, - 0x46455189, 0xCCF6FFFE, 0xFFFFE8CF, 0xBA9F8260, 0x3A1F101F, 0x4692F4FE, 0xF4D1B0AC, 0xA97382B3, 0xAB878CC2, - 0xF2FEFFFF, 0xFEFAF1CF, 0xC4E8FCB4, 0x453278A5, 0x968A92BB, 0xD6CED1B1, 0x7C604E3A, 0x323C4B74, 0xB9F1FFFE, - 0xFFFCE0C7, 0xAE927956, 0x30151027, 0x4888EDFA, 0xEFCBA9A6, 0xB28384AD, 0xB4969ED6, 0xFAFFFFFF, 0xFFFAE8C3, - 0xB6DDF4A9, 0x3925659A, 0x99959EBE, 0xCDBCBB9A, 0x6C5B452C, 0x25435772, 0xA8EBFFFE, 0xFFF6D2BB, 0xA2897250, - 0x2C131730, 0x5186E4F1, 0xE5C3A5A3, 0xBA9689A6, 0xC3ACB5EA, 0xFEFEFFFF, 0xFFF4D9B3, 0xA2C5DC95, 0x301F5B96, - 0xA4A5ACC3, 0xC3ABA183, 0x60574121, 0x1F4D6A82, 0xA6EAFFFF, 0xFDECC4AC, 0x96826D4E, 0x2F1B213F, 0x608BDBE2, - 0xD5BAA3A2, 0xBCA991A6, 0xD0C1CCF7, 0xFEFCFFFF, 0xFCE7C9A2, 0x8AA0B87A, 0x271F5998, 0xB5B7B9C8, 0xB99D8A70, - 0x59503A19, 0x1F577F9E, 0xBFEFFFFF, 0xF7DEB59B, 0x8A7D654D, 0x3D2F324E, 0x6F98D1CF, 0xC3AFA2A4, 0xBAB79DAE, - 0xD9D2E1FE, 0xFEFCFFFE, 0xF6D7B691, 0x7576895C, 0x1D21599F, 0xCAC8C3C9, 0xAC907964, 0x51453013, 0x215E92BD, - 0xDAF6FFFC, 0xEDCEA58A, 0x7D7A604E, 0x5549415E, 0x82A4CCBD, 0xADA09EA4, 0xB5C1ADBB, 0xE1DFEFFF, 0xFEFCFFFB, - 0xE9C5A581, 0x61505B3F, 0x192A60A8, 0xDAD1C9C6, 0x9E836D5D, 0x4936230D, 0x2361A5D9, 0xF1FDFEF7, 0xDDBC9476, - 0x6E745C53, 0x6B5F5371, 0x92B2C9AF, 0x9A8E919F, 0xB1C8BEC9, 0xE4E7F9FF, 0xFEFDFEF3, 0xDAB29471, 0x4F35352D, - 0x1D3869B3, 0xE1D2C9C0, 0x91776859, 0x3F251710, 0x2767B9EE, 0xFEFFFCEC, 0xCAA88364, 0x5E6C5859, 0x7D706282, - 0xA3C0C6A6, 0x8B7B7C8C, 0xACC9C6CB, 0xDEEBFEFF, 0xFFFFFAE6, 0xC7A08563, 0x3F231F27, 0x2A4874BB, 0xDFCBC3B7, - 0x8A736C5B, 0x3219131F, 0x2A69C6FA, 0xFFFFF6DC, 0xB8957253, 0x4E5F5963, 0x84797394, 0xB5C9C09F, 0x826F6570, - 0xA5C6BFBC, 0xCFECFFFF, 0xFFFDEFD5, 0xB48F7454, 0x3017172D, 0x3C5D82BD, 0xD5C0B9B0, 0x8C7D7A5B, 0x271B132F, - 0x306CD2FE, 0xFFFEEBCC, 0xA5856143, 0x3C505B6D, 0x837B82A5, 0xC3CFB897, 0x7E695751, 0x9CC0A9A0, 0xB8E6FFFF, - 0xFFF6E2C8, 0xA47D6346, 0x23101939, 0x4F7091C3, 0xCAB3ABA9, 0x99928955, 0x1F23173A, 0x3975D9FE, 0xFFF8DCBA, - 0x94765333, 0x2C415D73, 0x7D7D92B6, 0xD2D0AE92, 0x7A675136, 0x8EB38979, 0x9EDDFEFF, 0xFDECD4C1, 0x9B6F5039, - 0x190D2345, 0x6181A0C4, 0xC0A89FA6, 0xABA98F48, 0x1B271940, 0x437CCFF4, 0xF3E4C3A1, 0x82674023, 0x1F365E71, - 0x757F9DC1, 0xD8C4A18A, 0x705D4F25, 0x7C9F6756, 0x85C9EDF7, 0xEDD5C3B9, 0x8F5F3D2C, 0x1310274A, 0x688DA4BC, - 0xAD998FA0, 0xB2AD8236, 0x23463343, 0x4B85C4E6, 0xE2CDAE8D, 0x72563215, 0x15305F6F, 0x718AA9C6, 0xCEB99C84, - 0x64534E25, 0x658A5146, 0x78B3E1F2, 0xE2C1B4A9, 0x8759351F, 0x0D173350, 0x7292ACBA, 0x9E8F8792, 0xA0956725, - 0x2A5C534B, 0x5691BCD9, 0xD5BB9E7D, 0x6245250D, 0x13305F6F, 0x7999B8CA, 0xC0A89782, 0x5C4B5732, 0x517A504B, - 0x74AADCEF, 0xD7B4A497, 0x7E562D15, 0x1023405E, 0x7E9FB7B9, 0x95898F97, 0x90734619, -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsDPSetRenderMode(IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_CLD_SURF2), - gsDPSetEnvColor(50, 50, 0, 0), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), - gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 3, 1), - gsDPLoadMultiBlock(sTexture, 0x0, 1, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 2, 0), - gsSPEndDisplayList(), -}; - -static Vtx sCylinderVtx[] = { - VTX(-35, 150, -35, 1792, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(-35, 500, -35, 1792, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 500, -50, 1536, 0, 0xFF, 0xFF, 0xFF, 0x00), VTX(35, 0, -35, 1280, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(50, 150, 0, 1024, 512, 0xFF, 0xFF, 0xFF, 0x00), VTX(50, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(35, 150, -35, 1280, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(35, 500, -35, 1280, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(50, 500, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0x00), VTX(0, 0, -50, 1536, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 150, -50, 1536, 512, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-35, 0, -35, 1792, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-50, 0, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-50, 150, 0, 2048, 512, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-50, 500, 0, 2048, 0, 0xFF, 0xFF, 0xFF, 0x00), VTX(-35, 0, 35, 256, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-35, 150, 35, 256, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(-50, 150, 0, 0, 512, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-50, 0, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-35, 500, 35, 256, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-50, 500, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0x00), VTX(0, 0, 50, 512, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, 150, 50, 512, 512, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 500, 50, 512, 0, 0xFF, 0xFF, 0xFF, 0x00), - VTX(35, 0, 35, 768, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(35, 150, 35, 768, 512, 0xFF, 0xFF, 0xFF, 0x7E), - VTX(35, 500, 35, 768, 0, 0xFF, 0xFF, 0xFF, 0x00), -}; - -static Gfx sCylinderTexDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(gEffUnknown10Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 13), - gsDPLoadMultiBlock(gEffUnknown11Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 12), - gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_ZB_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPEndDisplayList(), -}; - -static Gfx sCylinderDL[] = { - gsSPVertex(sCylinderVtx, 27, 0), - gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), - gsSP2Triangles(6, 7, 8, 0, 6, 8, 4, 0), - gsSP2Triangles(9, 10, 6, 0, 9, 6, 3, 0), - gsSP2Triangles(10, 2, 7, 0, 10, 7, 6, 0), - gsSP2Triangles(11, 0, 10, 0, 11, 10, 9, 0), - gsSP2Triangles(3, 6, 4, 0, 0, 2, 10, 0), - gsSP2Triangles(12, 13, 0, 0, 12, 0, 11, 0), - gsSP2Triangles(13, 14, 1, 0, 13, 1, 0, 0), - gsSP2Triangles(15, 16, 17, 0, 15, 17, 18, 0), - gsSP2Triangles(16, 19, 20, 0, 16, 20, 17, 0), - gsSP2Triangles(21, 22, 16, 0, 21, 16, 15, 0), - gsSP2Triangles(22, 23, 19, 0, 22, 19, 16, 0), - gsSP2Triangles(24, 25, 22, 0, 24, 22, 21, 0), - gsSP2Triangles(25, 26, 23, 0, 25, 23, 22, 0), - gsSP2Triangles(5, 4, 25, 0, 5, 25, 24, 0), - gsSP2Triangles(4, 8, 26, 0, 4, 26, 25, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 360dbe85e7..f56b241256 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -28,18 +28,11 @@ const ActorInit Oceff_Wipe_InitVars = { (ActorFunc)OceffWipe_Draw, }; -#include "z_oceff_wipe_gfx.c" - -static u8 sOceffWipeAlphaIndices[] = { - 0x01, 0x10, 0x22, 0x01, 0x20, 0x12, 0x01, 0x20, 0x12, 0x01, - 0x10, 0x22, 0x01, 0x20, 0x12, 0x01, 0x12, 0x21, 0x01, 0x02, -}; - void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx) { OceffWipe* this = THIS; Actor_SetScale(&this->actor, 0.1f); - this->counter = 0; + this->timer = 0; this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; osSyncPrintf(VT_FGCOL(CYAN) " WIPE arg_data = %d\n" VT_RST, this->actor.params); } @@ -58,13 +51,20 @@ void OceffWipe_Update(Actor* thisx, GlobalContext* globalCtx) { OceffWipe* this = THIS; this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; - if (this->counter < 100) { - this->counter++; + if (this->timer < 100) { + this->timer++; } else { Actor_Kill(&this->actor); } } +#include "overlays/ovl_Oceff_Wipe/ovl_Oceff_Wipe.c" + +static u8 sAlphaIndices[] = { + 0x01, 0x10, 0x22, 0x01, 0x20, 0x12, 0x01, 0x20, 0x12, 0x01, + 0x10, 0x22, 0x01, 0x20, 0x12, 0x01, 0x12, 0x21, 0x01, 0x02, +}; + void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->state.frames & 0xFF; OceffWipe* this = THIS; @@ -81,16 +81,16 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 346); - if (this->counter < 32) { - z = Math_SinS(this->counter << 9) * 1400; + if (this->timer < 32) { + z = Math_SinS(this->timer << 9) * 1400; } else { z = 1400; } - if (this->counter >= 80) { + if (this->timer >= 80) { alphaTable[0] = 0; - alphaTable[1] = (0x64 - this->counter) * 8; - alphaTable[2] = (0x64 - this->counter) * 12; + alphaTable[1] = (0x64 - this->timer) * 8; + alphaTable[2] = (0x64 - this->timer) * 12; } else { alphaTable[0] = 0; alphaTable[1] = 0xA0; @@ -99,8 +99,8 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { for (i = 0; i < 20; i++) { vtxPtr = sFrustumVtx; - vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[((sOceffWipeAlphaIndices[i] & 0xF0) >> 4)]; - vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sOceffWipeAlphaIndices[i] & 0xF]; + vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[(sAlphaIndices[i] & 0xF0) >> 4]; + vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sAlphaIndices[i] & 0xF]; } func_80093D84(globalCtx->state.gfxCtx); @@ -121,7 +121,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 100, 0, 255, 128); } - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 - scroll, scroll * (-2), 32, 32, 1, 0 - scroll, scroll * (-2), 32, 32)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h index 589120a296..0b26239bad 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h @@ -13,7 +13,7 @@ struct OceffWipe; typedef struct OceffWipe { /* 0x0000 */ Actor actor; - /* 0x014C */ s16 counter; + /* 0x014C */ s16 timer; } OceffWipe; // size = 0x0150 #endif diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe_gfx.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe_gfx.c deleted file mode 100644 index bf693e4abf..0000000000 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe_gfx.c +++ /dev/null @@ -1,101 +0,0 @@ -#include "z_oceff_wipe.h" - -static u32 sTexture[] = { - 0x354D5AAC, 0xA5561C01, 0x124688B5, 0x74583231, 0x313D71D6, 0x9F5B3507, 0x104089AD, 0x748F440C, 0x408176AC, - 0xB4661301, 0x2261C0BE, 0x49392533, 0x2C497FC4, 0x80451D06, 0x2466BBD0, 0x9CB85411, 0x40A09DA3, 0xB37F210B, - 0x3D8AEAC7, 0x3F241930, 0x2F5591A7, 0x6441080F, 0x4191E8DB, 0xB7A76B18, 0x4094BAA0, 0x76532D22, 0x60BAFEE8, - 0x8253545F, 0x6078A896, 0x73540723, 0x66C2FEBB, 0x87888723, 0x4B87C79E, 0x33123048, 0x88E3FFFC, 0xD39F7E72, - 0x8DA2AE80, 0xA77B1940, 0x90EBFFA9, 0x6289973E, 0x6F9ACD83, 0x2D104B7F, 0xAEEBFDF3, 0xD8B26772, 0xA7C7AD77, - 0xB1B34A61, 0xB0F8FFD5, 0x9496986B, 0x9EC6D25D, 0x503E85B3, 0xC0C1E1EE, 0xBD9B618E, 0xBFE4A975, 0x86E18B86, - 0xABCFF7F2, 0xBC837E69, 0xB5EFE465, 0x5B66BACB, 0xC794AADC, 0xAC8982AE, 0xD3F59754, 0x65E2AAAD, 0x8C85D0E1, - 0xAF634D39, 0xC7E2EDA3, 0x527ECACF, 0xBF777FC0, 0xA284A5A5, 0xE3FE8A2F, 0x60CCAFBE, 0x7164B8BA, 0x97553A2B, - 0xE8BCBCDA, 0x76A1BBBA, 0x844D83BD, 0x9C6B875B, 0xD9FFAA3F, 0x6AC9B59B, 0x6592BD94, 0x956D3D3B, 0xFFA773D3, - 0xB5B9AB90, 0x4033A0BC, 0x873E3E1D, 0xB5FFE48D, 0x8CC9A761, 0x62CBAF79, 0x98883457, 0xF3766FAF, 0xD5B2A26B, - 0x44549D8B, 0x56232221, 0x7DFFF2DD, 0xC6B68840, 0x4ECCA267, 0x696D296E, 0xA8328AAD, 0xD3998447, 0x5E7D8C5B, - 0x391F1E35, 0x4EF6CDD3, 0xDD9B6C2D, 0x27A09571, 0x37443656, 0x4C1265C9, 0xCA91612E, 0x3B5A7A65, 0x2F4F3421, - 0x36EAC380, 0xB6814A1B, 0x0C607075, 0x5860803B, 0x27102CCD, 0xC9A87A47, 0x16204B80, 0x44B3860F, 0x28DAE042, - 0x7F773710, 0x0235616D, 0xA089BE60, 0x34161EBC, 0xBBAAA972, 0x172A3B91, 0x96F6C319, 0x21B7F02A, 0x618F662A, - 0x02327A8C, 0x97577B5C, 0x48171FB3, 0xA090AF87, 0x1F65609D, 0xD8FFD41E, 0x177CC522, 0x69A8A462, 0x0D3A93B6, - 0x4F0C1821, 0x39151CA7, 0x928EAA9A, 0x33919BAF, 0xEBFBDA23, 0x093B6937, 0x80AEA66C, 0x304491C7, 0x3A031710, - 0x16162197, 0x9B9FB5BA, 0x4C95CED8, 0xF8F0D425, 0x05144066, 0x84B17F5A, 0x725E8DCD, 0x5D376910, 0x19183886, - 0xA3A1C4C6, 0x6584D1F1, 0xFFFABF12, 0x0E123F77, 0x88AF6881, 0xB97F98BB, 0x879BBC23, 0x4A20557C, 0x9BA5D0BB, - 0x7583C6E0, 0xFEFFB322, 0x34283976, 0x95B06EB8, 0xE29B999F, 0xBDE9E582, 0x814C5C82, 0xA1C0ECBE, 0x789ED6B2, - 0xF4FFD78F, 0x73324087, 0xA0C26FAB, 0xE0B1A5B9, 0xF2FFFADE, 0xAC906A89, 0xB3DDFFCB, 0x86B8CD75, 0xDFFFF1D7, - 0x8F31579C, 0xAFDE7B87, 0xC8BAB4EB, 0xF0F2FFE4, 0xB29B798B, 0xC3F4FFD2, 0xA0A17C32, 0xA9FFE8BD, 0x784D7A91, - 0xC7F5AB9B, 0xBEBB86D9, 0xB0BCF9D4, 0x835C4C70, 0xD8FFFFD7, 0xA2682907, 0x68FFE29F, 0x61707B7A, 0xE5FFE7C8, - 0xCCC33C8E, 0x768CE0C7, 0x51281940, 0xCBFFFFCB, 0x87450C00, 0x4BF3D58E, 0x6D767B92, 0xFAFFFFC8, 0xC7BF175B, - 0x708BBA9A, 0x3A161542, 0xB4FFF5A9, 0x6D39090C, 0x50D8BC86, 0x897AA1C8, 0xFFFFF4A1, 0x8C880B50, 0x91A49762, - 0x2D0C1E78, 0xD4FFD97F, 0x58351E23, 0x6BB49283, 0x9B95C9EE, 0xFFFFD377, 0x4336075E, 0xBFB27641, 0x1B0224B5, - 0xFCF7AC55, 0x41384344, 0x8FA06468, 0x9FB5DBFD, 0xFFF1A553, 0x190B1275, 0xCCA75D3A, 0x0C042ED9, 0xFFD97C33, - 0x28405669, 0xB0914C3A, 0x9199C6FF, 0xFECF7835, 0x080C308B, 0xB38F6D47, 0x0A0D3DDB, 0xF3A75519, 0x1341558E, - 0xBE7B4321, 0x6B4D94F8, 0xE4AC591A, 0x02175096, 0x8E7A9145, 0x1D224BBF, 0xC1723508, 0x0D3E5FA5, 0xA568351E, - 0x422B6EE0, 0xBB85480B, 0x04256799, 0x716D6D21, -}; - -static Vtx sFrustumVtx[] = { - VTX(-165, 227, 0, 1229, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-206, 283, 300, 1229, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(0, 350, 300, 1024, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(0, 280, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-294, 405, 1000, 1229, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 500, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-266, 87, 0, 1434, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-333, 108, 300, 1434, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(-476, 155, 1000, 1434, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-266, -87, 0, 1638, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(-333, -108, 300, 1638, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(-476, -155, 1000, 1638, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-165, -227, 0, 1843, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-206, -283, 300, 1843, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(-294, -405, 1000, 1843, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, -280, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(0, -350, 300, 2048, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(0, -500, 1000, 2048, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(165, -227, 0, 205, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(206, -283, 300, 205, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(0, -350, 300, 0, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(0, -280, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(294, -405, 1000, 205, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, -500, 1000, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(266, -87, 0, 410, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(333, -108, 300, 410, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(476, -155, 1000, 410, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(266, 87, 0, 614, 1024, 0xFF, 0xFF, 0xFF, 0x00), - VTX(333, 108, 300, 614, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(476, 155, 1000, 614, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(165, 227, 0, 819, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(206, 283, 300, 819, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(206, 283, 300, 819, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(294, 405, 1000, 819, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(476, 155, 1000, 614, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(333, 108, 300, 614, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(0, 280, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(0, 350, 300, 1024, 512, 0xFF, 0xFF, 0xFF, 0xA0), - VTX(165, 227, 0, 819, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(0, 500, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0), - gsDPTileSync(), - gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, 15, G_TX_NOMIRROR | G_TX_WRAP, 5, - 0), - gsDPSetTileSize(1, 0, 0, (31 << 2), (31 << 2)), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, - ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPEndDisplayList(), -}; - -static Gfx sFrustumDL[] = { - gsSPVertex(sFrustumVtx, 32, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0), - gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0), - gsSP2Triangles(7, 8, 4, 0, 7, 4, 1, 0), - gsSP2Triangles(9, 10, 7, 0, 9, 7, 6, 0), - gsSP2Triangles(10, 11, 8, 0, 10, 8, 7, 0), - gsSP2Triangles(12, 13, 10, 0, 12, 10, 9, 0), - gsSP2Triangles(13, 14, 11, 0, 13, 11, 10, 0), - gsSP2Triangles(15, 16, 13, 0, 15, 13, 12, 0), - gsSP2Triangles(16, 17, 14, 0, 16, 14, 13, 0), - gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0), - gsSP2Triangles(19, 22, 23, 0, 19, 23, 20, 0), - gsSP2Triangles(24, 25, 19, 0, 24, 19, 18, 0), - gsSP2Triangles(25, 26, 22, 0, 25, 22, 19, 0), - gsSP2Triangles(27, 28, 25, 0, 27, 25, 24, 0), - gsSP2Triangles(28, 29, 26, 0, 28, 26, 25, 0), - gsSP2Triangles(30, 31, 28, 0, 30, 28, 27, 0), - gsSPVertex(sFrustumVtx + 32, 8, 0), - gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), - gsSP2Triangles(4, 5, 0, 0, 4, 0, 6, 0), - gsSP2Triangles(5, 7, 1, 0, 5, 1, 0, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index f7541c959a..aad0819549 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -28,12 +28,11 @@ const ActorInit Oceff_Wipe2_InitVars = { (ActorFunc)OceffWipe2_Draw, }; -#include "z_oceff_wipe2_gfx.c" - void OceffWipe2_Init(Actor* thisx, GlobalContext* globalCtx) { OceffWipe2* this = THIS; + Actor_SetScale(&this->actor, 0.1f); - this->counter = 0; + this->timer = 0; this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; osSyncPrintf(VT_FGCOL(CYAN) " WIPE2 arg_data = %d\n" VT_RST, this->actor.params); } @@ -50,14 +49,17 @@ void OceffWipe2_Destroy(Actor* thisx, GlobalContext* globalCtx) { void OceffWipe2_Update(Actor* thisx, GlobalContext* globalCtx) { OceffWipe2* this = THIS; + this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; - if (this->counter < 100) { - this->counter++; + if (this->timer < 100) { + this->timer++; } else { Actor_Kill(&this->actor); } } +#include "overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.c" + void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->state.frames & 0xFF; OceffWipe2* this = THIS; @@ -70,15 +72,15 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { eye = GET_ACTIVE_CAM(globalCtx)->eye; Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(globalCtx)); - if (this->counter < 32) { - z = Math_SinS(this->counter << 9) * 1330; + if (this->timer < 32) { + z = Math_SinS(this->timer << 9) * 1330; } else { z = 1330; } vtxPtr = sFrustumVtx; - if (this->counter >= 80) { - alpha = 12 * (100 - this->counter); + if (this->timer >= 80) { + alpha = 12 * (100 - this->timer); } else { alpha = 255; } @@ -101,7 +103,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64, 1, scroll * (-6), 0, 64, 64)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h index d94a0fc58f..c7f9c7b870 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -8,7 +8,7 @@ struct OceffWipe2; typedef struct OceffWipe2 { /* 0x0000 */ Actor actor; - /* 0x014C */ s16 counter; + /* 0x014C */ s16 timer; } OceffWipe2; // size = 0x0150 #endif diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2_gfx.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2_gfx.c deleted file mode 100644 index a3a72c8cca..0000000000 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2_gfx.c +++ /dev/null @@ -1,167 +0,0 @@ -#include "z_oceff_wipe2.h" - -static u32 sTexture[] = { - 0x55211122, 0x22223333, 0x34444444, 0x44555566, 0x66666666, 0x66665555, 0x55554446, 0x99864323, 0x54211222, - 0x22223333, 0x44444444, 0x45555566, 0x66666666, 0x66666666, 0x66555458, 0xa9742224, 0x63212222, 0x22233334, - 0x44444445, 0x55555566, 0x66666666, 0x66666666, 0x66665569, 0xb9532225, 0x53222222, 0x22333344, 0x44445555, - 0x55555566, 0x66666666, 0x66666777, 0x77766569, 0xb9432235, 0x52222222, 0x33333444, 0x44445555, 0x55555556, - 0x66666666, 0x66666777, 0x77776668, 0xb9432236, 0x42222333, 0x33344444, 0x44455544, 0x44555556, 0x66666666, - 0x66666777, 0x77776667, 0xa9432346, 0x42223334, 0x44444444, 0x55555444, 0x44455556, 0x66666666, 0x66666777, - 0x77776666, 0x89532356, 0x32333444, 0x44555555, 0x55554444, 0x44445555, 0x66666666, 0x66666677, 0x77776655, - 0x68532366, 0x43334445, 0x55555555, 0x55554444, 0x44444555, 0x66666666, 0x66666667, 0x77776655, 0x56633476, - 0x64444555, 0x66666666, 0x65555444, 0x44444455, 0x56666666, 0x66666666, 0x66666655, 0x45533477, 0x88654556, - 0x67777776, 0x66555444, 0x44444445, 0x56666666, 0x66666666, 0x66666554, 0x44333578, 0x99975566, 0x77788777, - 0x76655444, 0x43334445, 0x55666666, 0x66666666, 0x66665554, 0x43323578, 0x99aa6667, 0x78888887, 0x77665544, - 0x43333444, 0x55666666, 0x66666556, 0x66655554, 0x43323578, 0x89ab8667, 0x88888888, 0x87765544, 0x43333344, - 0x45566676, 0x66666555, 0x55555544, 0x43322478, 0x89ab8667, 0x88899988, 0x88776554, 0x43333334, 0x45566677, - 0x66666555, 0x55555444, 0x33322357, 0x78996667, 0x88999998, 0x88876654, 0x43333333, 0x44556667, 0x76666555, - 0x55544444, 0x33222235, 0x46655567, 0x88899999, 0x88877655, 0x43333333, 0x44556667, 0x76666555, 0x55444443, - 0x33222223, 0x23334567, 0x78899999, 0x98887665, 0x44333333, 0x44578767, 0x77666555, 0x54444443, 0x33222222, - 0x22234456, 0x78889999, 0x99887765, 0x44333333, 0x457bc866, 0x77666655, 0x54444433, 0x33222222, 0x22233456, - 0x77889999, 0x99888766, 0x54433334, 0x69bdda76, 0x77766655, 0x54444333, 0x33222222, 0x22223445, 0x67888999, - 0x99988776, 0x54433458, 0xacdeeb77, 0x77776665, 0x54444333, 0x33222222, 0x22223345, 0x67788999, 0x99988876, - 0x5544579b, 0xcdeefd87, 0x77777665, 0x55444333, 0x33222222, 0x22222344, 0x56778899, 0x99988876, 0x65689abc, - 0xcddded97, 0x77777666, 0x55444433, 0x33322222, 0x22222334, 0x55678889, 0x99998877, 0x89abbccc, 0xcb99cd98, - 0x77777766, 0x65544443, 0x33322222, 0x22222233, 0x45677888, 0x9999888a, 0xcdddcccb, 0x9777beb8, 0x88887776, - 0x65554444, 0x33332222, 0x22222233, 0x44567788, 0x9999989d, 0xffeedb97, 0x6667aed9, 0x88888777, 0x66655544, - 0x44333222, 0x22222223, 0x34566788, 0x8999989c, 0xfffda866, 0x66779eea, 0x88888877, 0x76665554, 0x44433332, - 0x22222223, 0x34456778, 0x8999989b, 0xffd97666, 0x67789eea, 0x99988887, 0x77666555, 0x54444333, 0x32222222, - 0x33455678, 0x8899999a, 0xed976667, 0x7788aeea, 0x99988887, 0x77766665, 0x55544433, 0x33322222, 0x33445677, - 0x8889999a, 0xee977777, 0x78889dec, 0x99988888, 0x77776666, 0x65555444, 0x43332222, 0x33445567, 0x8889999a, - 0xeea88788, 0x88889ced, 0xbaa98887, 0x77776666, 0x66655544, 0x44433333, 0x33345567, 0x7888999a, 0xeeb98888, - 0x88899aef, 0xeeeca877, 0x77776666, 0x66665555, 0x54443333, 0x33344566, 0x78889999, 0xcec98888, 0x89999aef, - 0xffffda87, 0x77666666, 0x66666655, 0x55544433, 0x33444566, 0x77889999, 0xbeea9999, 0x99999aef, 0xfffffd97, - 0x66666666, 0x66666666, 0x65554444, 0x44444556, 0x77888999, 0xaeea9999, 0x999999bf, 0xfffffea6, 0x65555555, - 0x66666666, 0x66555544, 0x44444556, 0x67888999, 0xaeea9999, 0x999999ad, 0xfffffe96, 0x55555555, 0x55556666, - 0x66665555, 0x44445556, 0x67788899, 0xaeeb9999, 0x9999999a, 0xdeeeeb75, 0x44444444, 0x55555566, 0x66666655, - 0x55555556, 0x67788889, 0xadecaaa9, 0x99999988, 0x99aa9654, 0x44444444, 0x44455555, 0x56666666, 0x55555556, - 0x67778889, 0x9cffeeeb, 0xa9999888, 0x77766544, 0x43333333, 0x44444555, 0x55666666, 0x66555566, 0x66778888, - 0x9aefffff, 0xda998888, 0x77655443, 0x33333333, 0x33344455, 0x55666666, 0x66665566, 0x66777888, 0x8aefffff, - 0xfda88888, 0x76655443, 0x33222222, 0x33334444, 0x55566666, 0x66666666, 0x66677888, 0x89cfffff, 0xffb98887, - 0x76654433, 0x32222222, 0x22333444, 0x55566666, 0x66666666, 0x66677788, 0x88aeffff, 0xffc98887, 0x76654433, - 0x22222222, 0x22233344, 0x45566666, 0x66666556, 0x66667778, 0x889befff, 0xfda88877, 0x76654433, 0x22222222, - 0x22223344, 0x45556666, 0x66665555, 0x56666777, 0x8889acee, 0xda888877, 0x76554433, 0x22222222, 0x22223334, - 0x45555666, 0x66655555, 0x55566677, 0x78888999, 0x98888777, 0x66554432, 0x22221111, 0x22222334, 0x44555666, - 0x65555555, 0x55556667, 0x77888888, 0x88887777, 0x66554332, 0x22211111, 0x12222333, 0x44555555, 0x55555444, - 0x45555666, 0x77788888, 0x88887777, 0x66544332, 0x22211111, 0x11222333, 0x44555555, 0x55544444, 0x44455566, - 0x67778888, 0x88887776, 0x65544332, 0x22211111, 0x11222233, 0x44455555, 0x55444444, 0x44444556, 0x66777888, - 0x88887776, 0x65544322, 0x22211111, 0x11222233, 0x34455555, 0x54444333, 0x33444455, 0x66677788, 0x88887766, - 0x55443322, 0x22111111, 0x11122223, 0x34455555, 0x44443333, 0x33344445, 0x56677778, 0x88877766, 0x55443322, - 0x22111111, 0x11122223, 0x34445555, 0x44433333, 0x33334445, 0x55667777, 0x88777766, 0x54433222, 0x21111111, - 0x11112222, 0x33444444, 0x44333332, 0x23333444, 0x55566777, 0x77777665, 0x54433222, 0x21111111, 0x11112222, - 0x33344444, 0x43333222, 0x22333344, 0x45566677, 0x77777665, 0x54332222, 0x11111111, 0x11112222, 0x23444444, - 0x33332222, 0x22233334, 0x44556667, 0x77776665, 0x44332221, 0x11111111, 0x11111222, 0x23564333, 0x33332222, - 0x22233334, 0x44555666, 0x77776655, 0x44332221, 0x11111111, 0x11111222, 0x46763333, 0x33322222, 0x22233334, - 0x44455666, 0x67766655, 0x44332222, 0x21111111, 0x11111122, 0x67743333, 0x33222222, 0x22233334, 0x44455566, - 0x66666655, 0x44332222, 0x22211111, 0x11112235, 0x77632222, 0x22222222, 0x22333334, 0x44455566, 0x66666655, - 0x44333222, 0x22222222, 0x11223466, 0x77532222, 0x22222222, 0x23333344, 0x44455566, 0x66666655, 0x54433332, - 0x22222222, 0x22346677, 0x76422222, 0x22222223, 0x33333444, 0x44455566, 0x66666665, 0x55444333, 0x33322222, - 0x24567777, 0x66322222, 0x22222233, 0x33334444, 0x44455556, 0x66666665, 0x55544444, 0x43333323, 0x46777766, - 0x65211222, 0x22222333, 0x33444444, 0x44555556, 0x66666666, 0x55555544, 0x44443334, 0x78876544, -}; - -static u32 tex1[] = { - 0x64446975, 0x568a8666, 0x66667777, 0x77777777, 0x76666666, 0x66666555, 0x55797444, 0x68644468, 0x44469755, - 0x58a86667, 0x77777777, 0x77777777, 0x76666666, 0x66666555, 0x57975446, 0x86444686, 0x44697555, 0x8a877777, - 0x77777777, 0x77777777, 0x76666666, 0x66666655, 0x79755568, 0x64446864, 0x46875558, 0xa8777777, 0x77777777, - 0x77777777, 0x76666666, 0x66666668, 0xa7555797, 0x44468644, 0x6865557a, 0x86777777, 0x77777777, 0x77777777, - 0x76666666, 0x6666668a, 0x85557975, 0x45686444, 0x864557a8, 0x66777777, 0x77777777, 0x77777777, 0x76666666, - 0x666668a8, 0x66689755, 0x57974446, 0x64457976, 0x67777777, 0x77777777, 0x77777777, 0x76666666, 0x66668a86, - 0x668a8655, 0x79755578, 0x44479756, 0x66777777, 0x77777777, 0x77777777, 0x66666666, 0x6668a866, 0x68a86668, - 0xa8555797, 0x44797556, 0x66777777, 0x77777777, 0x77777777, 0x66666555, 0x568a8666, 0x8b97668a, 0x86657975, - 0x46975556, 0x66677777, 0x77777777, 0x77777776, 0x66665555, 0x68a86669, 0xb97779b9, 0x76689754, 0x69655555, - 0x66677777, 0x77777777, 0x77777776, 0x66655555, 0x7a86669b, 0x97779b97, 0x778a8555, 0x86444555, 0x66667777, - 0x77667777, 0x77777766, 0x66555557, 0xa86669b9, 0x788aca87, 0x79b86557, 0x64444555, 0x66666666, 0x66667777, - 0x77777766, 0x65555579, 0x86669b98, 0x88aca888, 0x9b966579, 0x44444555, 0x56666666, 0x66667777, 0x77777666, - 0x55555797, 0x6669b988, 0x8aca888a, 0xc9766797, 0x44444555, 0x56666666, 0x66667777, 0x77777666, 0x55557975, - 0x568b9888, 0xadb888ac, 0xa7768974, 0x44444555, 0x55666666, 0x66677777, 0x77776665, 0x55579755, 0x68b9788a, - 0xdb888bca, 0x8778a754, 0x44444555, 0x55566666, 0x66677777, 0x77766665, 0x55797556, 0x8b9788ad, 0xb888bda8, - 0x778a7544, 0x44444555, 0x55555666, 0x66677777, 0x77766655, 0x57975558, 0xa9778adb, 0x888bda88, 0x79a85544, - 0x44444455, 0x55555666, 0x66677777, 0x77766655, 0x7975557a, 0x8778ada8, 0x88bdb888, 0x9b855444, 0x44444455, - 0x55555666, 0x66777777, 0x77766667, 0x975557a8, 0x778acb88, 0x8bda8889, 0xb8655444, 0x44444455, 0x55555666, - 0x66777777, 0x77766689, 0x75557a86, 0x77aca888, 0xbdb888ab, 0x96555444, 0x44444555, 0x55555666, 0x67777777, - 0x777768a8, 0x55579866, 0x79ca888b, 0xdb888ab9, 0x65554444, 0x44444555, 0x55556666, 0x67777777, 0x77779a86, - 0x55797667, 0x9ca888bd, 0xb888ab96, 0x65544444, 0x44445555, 0x55566667, 0x77778888, 0x8779b966, 0x68a86669, - 0xba888bdb, 0x888ac976, 0x55544444, 0x44445555, 0x55666667, 0x77788888, 0x88ab9766, 0x8a86668b, 0x9888bdb8, - 0x88ac9766, 0x55444444, 0x44555555, 0x66666677, 0x77888888, 0x8aca7779, 0xa86668b9, 0x888bdb88, 0x8ac97665, - 0x55444444, 0x44555556, 0x66666777, 0x78888888, 0xaca8879b, 0x96668b97, 0x88adb888, 0xaca77665, 0x54444444, - 0x55555666, 0x66677777, 0x8888888b, 0xda888ac9, 0x7779b978, 0x8adb888a, 0xca776655, 0x54444444, 0x55566666, - 0x67777777, 0x888888bd, 0xb888aca7, 0x779b9788, 0xada888ac, 0xa7766555, 0x54444455, 0x55666667, 0x77777778, - 0x88888bdb, 0x888aca88, 0x8aca888a, 0xcb888aca, 0x87766555, 0x44444555, 0x66666777, 0x77777778, 0x8888adb8, - 0x88bda888, 0xaca888ad, 0xa888bda8, 0x77666555, 0x54455555, 0x66667777, 0x77777777, 0x788aca88, 0x8bdb888a, - 0xca888adb, 0x888bda87, 0x77665555, 0x55555566, 0x66677777, 0x77777777, 0x78aca888, 0xbdb888bd, 0xa888adb8, - 0x88bda887, 0x77665555, 0x55555666, 0x77777777, 0x77777777, 0x79ba888a, 0xdb888bdb, 0x888bdb88, 0x8bda8887, - 0x76665555, 0x55556666, 0x77777776, 0x66666667, 0x9b9778ac, 0xa888bdb8, 0x88bdb888, 0xbdb88887, 0x76665555, - 0x55666666, 0x77766666, 0x66666668, 0xa9777aca, 0x888bdb88, 0x8bdb888b, 0xdb888877, 0x76666555, 0x66666677, - 0x76666666, 0x6666668a, 0x86679ba8, 0x88bdb888, 0xbdb888bd, 0xb8888877, 0x76666666, 0x66667777, 0x66666665, - 0x555557a8, 0x6669b978, 0x8adb888b, 0xdb888bdb, 0x88888777, 0x76666666, 0x66677777, 0x66666555, 0x55557975, - 0x568a9778, 0xaca888bd, 0xb888bdb8, 0x88888777, 0x76666666, 0x67777776, 0x66655555, 0x55579755, 0x58a8677a, - 0xca888ada, 0x888bdb88, 0x88888777, 0x76666667, 0x77777766, 0x66555555, 0x55797555, 0x7986679c, 0xa888aca8, - 0x88ada888, 0x88887777, 0x76666777, 0x77777766, 0x65555544, 0x46864457, 0x976669b9, 0x888aca88, 0x8aca8888, - 0x88877777, 0x76667777, 0x77777666, 0x55555444, 0x68644479, 0x75568b97, 0x78aca888, 0xaca88888, 0x88877777, - 0x76667777, 0x77777666, 0x55554446, 0x86444687, 0x5558a977, 0x8aca888a, 0xca888888, 0x88777777, 0x66667777, - 0x77776666, 0x55554468, 0x64446865, 0x557a8777, 0xaca888ac, 0xa8888888, 0x87777766, 0x66666777, 0x77776666, - 0x55544686, 0x44468644, 0x57986679, 0xba888aca, 0x88888888, 0x77777666, 0x66666677, 0x77766666, 0x55546864, - 0x44686444, 0x7976669b, 0x9888aca8, 0x88888887, 0x77776666, 0x66666667, 0x77766666, 0x55568644, 0x46864446, - 0x975568b9, 0x778aca88, 0x88888877, 0x77666666, 0x66666666, 0x66666666, 0x55786444, 0x68644468, 0x75558a97, - 0x77aca888, 0x88888777, 0x76666666, 0x66666666, 0x66666665, 0x57964446, 0x86444686, 0x4557a867, 0x79ca8888, - 0x88887777, 0x66666555, 0x55556666, 0x66666665, 0x79744468, 0x64446864, 0x45798667, 0x9b988888, 0x88877776, - 0x66665555, 0x55555666, 0x66666655, 0x97444686, 0x44468644, 0x47975668, 0xb9778888, 0x88877776, 0x66655555, - 0x55555566, 0x66666657, 0x74446864, 0x44686444, 0x6975568a, 0x97778888, 0x88777766, 0x66555555, 0x55555556, - 0x66666679, 0x44468644, 0x46864446, 0x864557a8, 0x67777888, 0x77777666, 0x65555555, 0x45555555, 0x66666797, - 0x44686444, 0x68644468, 0x64457986, 0x67777777, 0x77776666, 0x55555544, 0x44555555, 0x56668975, 0x46864446, - 0x86444686, 0x44479756, 0x66777777, 0x77766666, 0x55555544, 0x44455555, 0x55579754, 0x68644468, 0x64446864, - 0x44697556, 0x66777777, 0x77766665, 0x55555544, 0x44445555, 0x55797544, 0x86444686, 0x44468644, 0x46875556, - 0x66777777, 0x77666665, 0x55555544, 0x44444555, 0x57975446, 0x64446864, 0x44686444, 0x68655556, 0x66777777, - 0x77666665, 0x55555544, 0x44444555, 0x79754468, 0x44468644, 0x46864446, 0x87555556, 0x66777777, 0x76666665, - 0x55555554, 0x44444457, 0x97544686, 0x44686444, 0x68644469, 0x75555566, 0x66777777, 0x76666665, 0x55555554, - 0x44444479, 0x74446864, 0x46864446, 0x86445797, 0x55555666, 0x67777777, 0x76666665, 0x55555555, 0x55444686, - 0x44468644, 0x68644469, 0x75557975, 0x55666666, 0x67777777, 0x76666666, 0x65555555, 0x55557864, 0x44686444, - 0x86444687, 0x55579866, 0x66666666, 0x77777777, 0x76666666, 0x66555555, 0x55579644, 0x46864446, -}; - -static Vtx sFrustumVtx[] = { - VTX(88, 121, 0, 1638, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, 176, 1000, 1434, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(143, 46, 0, 1229, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(300, 0, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 150, 0, 2048, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, 285, 1000, 1843, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-88, 121, 0, 2458, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-93, 285, 1000, 2253, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-143, 46, 0, 2867, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-243, 176, 1000, 2662, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-143, -46, 0, 3277, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-300, 0, 1000, 3072, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-88, -121, 0, 3686, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-243, -176, 1000, 3482, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -150, 0, 4096, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-93, -285, 1000, 3891, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(93, -285, 1000, 4301, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(143, -46, 0, 819, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(243, -176, 1000, 614, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(88, -121, 0, 410, 2048, 0xFF, 0xFF, 0xFF, 0x00), - VTX(93, -285, 1000, 205, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, -150, 0, 0, 2048, 0xFF, 0xFF, 0xFF, 0x00), -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock_4b(sTexture, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, - 14, 14), - gsDPLoadMultiBlock_4b(tex1, 0x100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, - 6, 6, 1, 14), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPEndDisplayList(), -}; - -static Gfx sFrustumDL[] = { - gsSPVertex(&sFrustumVtx, 22, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0), - gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0), - gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0), - gsSP2Triangles(10, 11, 8, 0, 11, 9, 8, 0), - gsSP2Triangles(12, 13, 10, 0, 13, 11, 10, 0), - gsSP2Triangles(14, 15, 12, 0, 15, 13, 12, 0), - gsSP2Triangles(16, 15, 14, 0, 17, 18, 19, 0), - gsSP2Triangles(18, 20, 19, 0, 2, 3, 17, 0), - gsSP2Triangles(3, 18, 17, 0, 19, 20, 21, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 73f21facd5..b84d0e0ab5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -28,10 +28,11 @@ const ActorInit Oceff_Wipe3_InitVars = { (ActorFunc)OceffWipe3_Draw, }; -#include "z_oceff_wipe3_gfx.c" +#include "overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.c" void OceffWipe3_Init(Actor* thisx, GlobalContext* globalCtx) { OceffWipe3* this = THIS; + Actor_SetScale(&this->actor, 0.1f); this->counter = 0; this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; @@ -51,6 +52,7 @@ void OceffWipe3_Destroy(Actor* thisx, GlobalContext* globalCtx) { void OceffWipe3_Update(Actor* thisx, GlobalContext* globalCtx) { OceffWipe3* this = THIS; + this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; if (this->counter < 100) { this->counter++; @@ -102,7 +104,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 128); - gSPDisplayList(POLY_XLU_DISP++, sTextureDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64, 64, 1, scroll * 8, scroll * (-8), 64, 64)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3_gfx.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3_gfx.c deleted file mode 100644 index f2e80d7c2d..0000000000 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3_gfx.c +++ /dev/null @@ -1,166 +0,0 @@ -#include "z_oceff_wipe3.h" - -static u32 sTexture[] = { - 0x91A69C82, 0x9CAC7448, 0x4246484B, 0x4D505153, 0x53545454, 0x54545556, 0x57585859, 0x59595857, 0x56545350, - 0x4F4E4C4C, 0x4C4B4A49, 0x49474544, 0x42403E3C, 0x3D549BB3, 0xB4B4B3B3, 0xB2AD966F, 0xAEB3B2A8, 0x98B19B62, - 0x4F4B4C4F, 0x51535556, 0x56565656, 0x56565656, 0x57585859, 0x59595857, 0x56545350, 0x4F4E4D4C, 0x4C4B4B4A, - 0x4A484644, 0x43403F3C, 0x3B416EA7, 0xB4B4B3AD, 0xA5937E98, 0xB5B5B6B8, 0xB5B9B3A5, 0x895D5154, 0x56585A5B, - 0x5B5A5A59, 0x58585757, 0x57585859, 0x58585857, 0x56545351, 0x504E4E4C, 0x4C4C4C4B, 0x4B494846, 0x4442403E, - 0x3C3B4985, 0xADB5B097, 0x818EA5B0, 0xB6B6B8B9, 0xB2A18A94, 0xA1735859, 0x5B5D5F5F, 0x5F5E5D5B, 0x5A595857, - 0x57575858, 0x58585857, 0x56545250, 0x504E4E4D, 0x4D4D4D4C, 0x4C4B4A48, 0x46444240, 0x3E3C3E55, 0x90B0B4AB, - 0xAAAEB3B4, 0xB7B6B2A7, 0x825C5057, 0x686B5B5B, 0x5D606161, 0x605F5E5C, 0x5A595756, 0x56575758, 0x58585857, - 0x56545250, 0x4F4E4D4D, 0x4D4D4D4D, 0x4C4B4A49, 0x48464442, 0x413F3E40, 0x5890ADB4, 0xB6B6B6B6, 0xACA38862, - 0x4B44464B, 0x5158595C, 0x5F616262, 0x615F5E5C, 0x5A585656, 0x56565758, 0x58585857, 0x5653514F, 0x4E4C4C4C, - 0x4C4C4C4D, 0x4C4C4C4A, 0x4A494846, 0x45444241, 0x43527C9F, 0xACAFAEAE, 0x6A53463F, 0x3F42464C, 0x4F55585C, - 0x5E616161, 0x605F5D5B, 0x59575656, 0x56565758, 0x58595857, 0x5552504E, 0x4C4B4A4B, 0x4A4B4C4C, 0x4C4D4C4C, - 0x4C4B4A49, 0x49484645, 0x44434A58, 0x6E797977, 0x3F3A393B, 0x3E42454B, 0x4F54585C, 0x5E606060, 0x5F5D5C59, - 0x57565556, 0x56575859, 0x59595856, 0x54514F4C, 0x4B494848, 0x494A4B4C, 0x4C4E4E4E, 0x4F4F4F4F, 0x4F4E4D4B, - 0x49474444, 0x46454342, 0x3838393B, 0x3D41444A, 0x4E53565A, 0x5C5E5E5E, 0x5D5C5A58, 0x56555556, 0x5658595A, - 0x5A595855, 0x53504E4B, 0x49484747, 0x48494A4C, 0x4D4E5051, 0x52535354, 0x54535250, 0x4E4B4845, 0x423E3C3A, - 0x3838393A, 0x3C404449, 0x4D525558, 0x5A5C5C5C, 0x5B595856, 0x56555556, 0x57595A5A, 0x5A595754, 0x514E4B48, - 0x47454545, 0x46484A4C, 0x4E515355, 0x56585A5B, 0x5B5A5956, 0x54504D48, 0x45403D3B, 0x3838383A, 0x3B3F4348, - 0x4C505457, 0x58595A5A, 0x58585656, 0x55565657, 0x585A5B5B, 0x5A585652, 0x4F4C4946, 0x45444444, 0x46484A4D, - 0x4F535658, 0x5A5D5E5F, 0x605F5E5B, 0x5854504A, 0x46413E3B, 0x38383839, 0x3A3E4246, 0x4A4F5254, 0x56565656, - 0x56555555, 0x55565758, 0x5A5B5C5B, 0x5A575450, 0x4D484644, 0x42424244, 0x46484B4F, 0x52575A5E, 0x60626465, - 0x66656460, 0x5D58534D, 0x48423E3B, 0x38373738, 0x3A3E4146, 0x494E5053, 0x54545454, 0x54545454, 0x5557585A, - 0x5B5C5C5B, 0x5955524E, 0x4B464442, 0x41414244, 0x46494D52, 0x555A5E62, 0x64676869, 0x69686763, 0x605A544E, - 0x49423E3B, 0x37363638, 0x3A3D4045, 0x484B4E50, 0x50515252, 0x52535354, 0x56585A5B, 0x5C5C5C5A, 0x57534F4A, - 0x48444240, 0x40404144, 0x474C4F55, 0x595F6266, 0x686B6C6C, 0x6C6B6A66, 0x625B564E, 0x49423D3A, 0x36363637, - 0x3A3D4044, 0x464A4C4E, 0x4E4F5050, 0x51525355, 0x56585A5C, 0x5D5C5B58, 0x56514D48, 0x4642403F, 0x3F404145, - 0x484D5258, 0x5C626669, 0x6B6C6D6D, 0x6D6C6A66, 0x625B564E, 0x48413C39, 0x35353537, 0x393C3F42, 0x4548494B, - 0x4C4D4E4F, 0x50525356, 0x575A5B5D, 0x5D5C5A56, 0x534E4B46, 0x43403F3E, 0x3E404246, 0x4A50555C, 0x6066696C, - 0x6D6E6E6E, 0x6E6D6B66, 0x615A544C, 0x463F3B38, 0x35353537, 0x393C3E42, 0x44464849, 0x4A4B4C4E, 0x4F525356, - 0x585B5C5D, 0x5C5B5955, 0x524D4944, 0x42403E3E, 0x3E404348, 0x4C53585E, 0x63686B6D, 0x6E6E6E6E, 0x6E6D6B66, - 0x6059524A, 0x443E3A37, 0x34353537, 0x393B3D40, 0x42444547, 0x484A4B4D, 0x4F525457, 0x595C5D5D, 0x5C5A5853, - 0x504B4844, 0x413F3E3E, 0x3F42454A, 0x4F565C62, 0x666A6C6E, 0x6E6E6E6E, 0x6E6C6963, 0x5E564F47, 0x423C3836, - 0x34343537, 0x383B3D40, 0x41434446, 0x47494A4D, 0x4F525458, 0x5A5C5D5D, 0x5C5A5753, 0x504B4743, 0x413E3E3E, - 0x3F43464C, 0x51585E64, 0x686C6D6E, 0x6E6E6E6E, 0x6D6B6761, 0x5B534D45, 0x403B3836, 0x34343537, 0x383B3C3F, - 0x40424345, 0x46494A4E, 0x50545659, 0x5B5D5E5D, 0x5C5A5753, 0x504B494C, 0x514C4440, 0x4044484E, 0x545C6167, - 0x6A6D6E6E, 0x6E6E6E6D, 0x6C68645D, 0x574F4942, 0x3D393635, 0x34343536, 0x383A3C3F, 0x40424245, 0x46494B4E, - 0x5154575A, 0x5C5E5E5E, 0x5D5A5854, 0x504D537B, 0xA0936C4F, 0x45464A50, 0x565D6268, 0x6C6E6E6E, 0x6E6E6E6C, - 0x6A66615A, 0x544C4640, 0x3C383634, 0x34343537, 0x393B3D3F, 0x40424346, 0x474A4D50, 0x53575A5D, 0x5E60605F, - 0x5E5C5A56, 0x535775B1, 0xBDBBAF8C, 0x5F4D4D52, 0x5860656A, 0x6C6E6E6E, 0x6E6E6D6B, 0x68625D55, 0x4F47423C, - 0x39363534, 0x34353638, 0x3A3C3E40, 0x41434447, 0x494C4E52, 0x54585B5E, 0x60626261, 0x605E5C58, 0x5B79B1C2, - 0xACB6C0BB, 0xA3705454, 0x5A61666B, 0x6D6E6E6E, 0x6E6D6C69, 0x655E5952, 0x4C45403B, 0x38353434, 0x3536373A, - 0x3B3E3F42, 0x43454749, 0x4B4F5155, 0x585C5E61, 0x63646464, 0x6361605E, 0x75B3CDCA, 0xB69FBFC6, 0xC1AD6E5A, - 0x5C63686C, 0x6D6E6E6E, 0x6E6C6A65, 0x605A544C, 0x47403C38, 0x36343434, 0x3637393B, 0x3D3F4144, 0x4547494C, - 0x4E515358, 0x5A5E6063, 0x65666666, 0x66646370, 0xAAD0D4D0, 0xC195BFC6, 0xB7C4A469, 0x5F64686C, 0x6D6E6E6E, - 0x6D6B6862, 0x5D565049, 0x443E3A37, 0x35343434, 0x38393B3E, 0x40424547, 0x494B4D50, 0x5255575B, 0x5D616366, - 0x686A6A6A, 0x69686E9A, 0xD0DAD4D3, 0xC8A1C1C0, 0x9FC8C686, 0x66676A6D, 0x6D6E6E6D, 0x6C68645E, 0x58514C45, - 0x403B3936, 0x35353536, 0x3A3B3E40, 0x4346484A, 0x4C4E5052, 0x54585A5D, 0x60636668, 0x6A6C6C6C, 0x6B6C83CA, - 0xE1DAC3CA, 0xCBB0B1AA, 0xADD0D3A9, 0x6F686B6E, 0x6E6E6E6C, 0x6A66625B, 0x554E4942, 0x3E3A3836, 0x36363637, - 0x3E3F4245, 0x474A4C4F, 0x50525456, 0x585C5D60, 0x6266686A, 0x6C6D6E6E, 0x6D75ABDF, 0xE7E0C7AC, 0xBDB59F9B, - 0xC9DADAC3, 0x766A6C6E, 0x6E6E6D6B, 0x68625D56, 0x514A453F, 0x3C383736, 0x3637393A, 0x41424549, 0x4B4E4F52, - 0x53555659, 0x5B5E5F62, 0x6466696B, 0x6C6E6E6E, 0x6F80CCE8, 0xE9E6DECB, 0xADA086B8, 0xD9DAD4CF, 0x7C6C6D6E, - 0x6E6E6C69, 0x66605A53, 0x4E47433E, 0x3B383837, 0x38393B3D, 0x46484A4E, 0x50525356, 0x5658595C, 0x5D5F6163, - 0x6567696B, 0x6C6E6E6E, 0x7397DEEC, 0xE9E8E7E1, 0xD7C5A5D3, 0xDDC6C8D3, 0x846E6E6E, 0x6E6D6B66, 0x625C5650, - 0x4B45413D, 0x3B393939, 0x3A3D3F41, 0x4A4C4E51, 0x53555658, 0x585A5B5C, 0x5D5F6162, 0x6466686A, 0x6C6D6E6E, - 0x76ABE4E9, 0xD7E2E8E7, 0xE6D9B6DB, 0xD5B2DADA, 0x896F6E6E, 0x6E6C6964, 0x605A544E, 0x4944403D, 0x3B3A3A3B, - 0x3D404345, 0x4E505255, 0x56585859, 0x5A5A5B5C, 0x5C5E5F60, 0x62646568, 0x696B6C6E, 0x77AEE5E5, 0xBDC4DEE8, - 0xEAE0BBD3, 0xBDCAE7DA, 0x826E6E6E, 0x6D6A6762, 0x5E57524C, 0x4743403E, 0x3D3C3D3F, 0x4245484A, 0x52535557, - 0x58585859, 0x59595A5A, 0x5A5C5C5E, 0x5F616265, 0x676A6B6D, 0x77ADE5EC, 0xDFC3BED8, 0xE1DCB3BB, 0xC2E3EACD, - 0x7E6E6E6E, 0x6C696660, 0x5C55514B, 0x4743413F, 0x3E3F4043, 0x45494C4E, 0x55565758, 0x58575757, 0x57575757, - 0x57585859, 0x5A5C5E61, 0x6367696C, 0x74A5E3EE, 0xEDE5D6BE, 0xBDC09EB6, 0xE0EDE6B2, 0x786E6E6D, 0x6C68645E, - 0x5A54504A, 0x47444241, 0x42434548, 0x4A4E5152, 0x57575757, 0x56565655, 0x54545454, 0x54545456, 0x56595B5E, - 0x6064676A, 0x6F8EDBED, 0xEEEEEBE5, 0xE0CAB4DC, 0xEDEDDA8F, 0x716E6E6C, 0x6A66625D, 0x59534F4B, 0x48454444, - 0x4446484C, 0x4E515355, 0x57565655, 0x53525250, 0x504F4F4E, 0x4E4E4F50, 0x5154565A, 0x5C616469, 0x6B7CC0E7, - 0xEEEEEEEE, 0xEAD2C7E7, 0xEEE6B77A, 0x6E6E6D6B, 0x6964615B, 0x58524F4C, 0x4A484748, 0x494B4D50, 0x53545656, - 0x55555452, 0x504F4E4D, 0x4C4C4B4A, 0x4A4A4B4C, 0x4E505256, 0x5A5F6367, 0x6A708FD0, 0xEAEEEEEE, 0xE8CCD3E9, - 0xEBD18A70, 0x6E6E6D6A, 0x6763605B, 0x5753504D, 0x4C4A4A4B, 0x4C4F5154, 0x55565757, 0x5352504E, 0x4C4A4948, - 0x47464544, 0x44454647, 0x494C4E53, 0x565C6066, 0x696C7396, 0xD1EAEEEE, 0xE6C3E2EC, 0xDAA0766E, 0x6E6D6B68, - 0x66625E5A, 0x5653504F, 0x4E4E4E50, 0x51545557, 0x58585756, 0x51504E4B, 0x49474644, 0x44434241, 0x41424244, - 0x46494C51, 0x555B5F64, 0x676B6C75, 0x96D0E7ED, 0xE7CAE4DA, 0xA57A6F6E, 0x6D6C6A67, 0x64605E59, 0x56545250, - 0x50505153, 0x54565758, 0x58575655, 0x4E4C4A47, 0x4542413F, 0x3F3E3E3D, 0x3D3E3E40, 0x43464A4F, 0x53595D62, - 0x66696B6D, 0x738EBFDD, 0xE8E4D5A3, 0x7A6E6D6D, 0x6C6A6865, 0x625E5C58, 0x56545352, 0x52545456, 0x58595A59, - 0x58565452, 0x4C4A4844, 0x42403E3C, 0x3C3B3B3A, 0x3A3B3C3E, 0x4144484E, 0x52585C61, 0x64686A6C, 0x6C6F7C9F, - 0xD4DEA579, 0x6D6C6D6C, 0x6B696764, 0x615E5B58, 0x56545454, 0x54565758, 0x595A5A59, 0x58555250, 0x4A484441, - 0x3F3C3B39, 0x39383838, 0x38393A3C, 0x3F43464C, 0x50565A60, 0x6366686A, 0x6A6A6B77, 0xA9D0876D, 0x6C6C6B6A, - 0x69666562, 0x5F5C5A57, 0x56545454, 0x5657585A, 0x5A5A5A58, 0x5754514E, 0x4846433F, 0x3D3A3A38, 0x37363636, - 0x3637393B, 0x3E42464C, 0x50565A5F, 0x62666768, 0x6868686E, 0x94C7856C, 0x6A6B6A69, 0x68656360, 0x5E5B5857, - 0x55545455, 0x5658595A, 0x5A5A5A58, 0x56524F4C, 0x4744413D, 0x3A383736, 0x35343434, 0x3536373A, 0x3D42454B, - 0x4F55595E, 0x61646566, 0x6767686D, 0x8BA87A6A, 0x6A696866, 0x6563605D, 0x5B585655, 0x54545454, 0x56585959, - 0x5A595856, 0x54514E4B, 0x4643403C, 0x39373635, 0x34343434, 0x3435373A, 0x3C41444A, 0x4E54585D, 0x60636466, - 0x66676769, 0x6E736C69, 0x69686865, 0x64605E5B, 0x59565553, 0x53535354, 0x55565858, 0x59585756, 0x54504D4A, - 0x44423E3A, 0x38353434, 0x33333333, 0x34343639, 0x3B404449, 0x4E54585C, 0x5F626365, 0x66676768, 0x68696968, - 0x68676563, 0x605D5B58, 0x56535251, 0x50505152, 0x53555657, 0x57565654, 0x524F4C49, 0x44413E39, 0x37353433, - 0x33333333, 0x33343638, 0x3B3F4349, 0x4D53565B, 0x5E616265, 0x65676768, 0x69696968, 0x67656460, 0x5E5B5855, - 0x5351504F, 0x4E4E4F50, 0x52535455, 0x56555553, 0x524E4C49, 0x42403C38, 0x36343333, 0x33333333, 0x33343537, - 0x3A3E4247, 0x4C51555A, 0x5C606264, 0x65676768, 0x69696867, 0x6663615D, 0x5B575451, 0x504E4C4C, 0x4B4B4C4D, - 0x4E505253, 0x53545452, 0x514E4B48, 0x413F3B37, 0x36343333, 0x33333333, 0x33343537, 0x393D4046, 0x4A505458, - 0x5B5F6164, 0x65676868, 0x69686866, 0x64615F5B, 0x5854524F, 0x4D4B4A49, 0x4848494A, 0x4C4E4F51, 0x52535352, - 0x504D4A47, 0x403D3A36, 0x35343333, 0x33333333, 0x33343436, 0x383C3F44, 0x484D5156, 0x5A5E6063, 0x65676868, - 0x68686664, 0x625E5C58, 0x54504E4B, 0x4A474645, 0x45454647, 0x484B4D4F, 0x50525251, 0x504C4845, 0x3E3C3936, - 0x34333333, 0x33333333, 0x33333436, 0x373B3E43, 0x464C4F55, 0x585C6063, 0x64666768, 0x68666562, 0x605C5955, - 0x524E4C49, 0x47454443, 0x43434445, 0x46494B4E, 0x4F515150, 0x4E4B4744, 0x3D3A3735, 0x34333333, 0x33333333, - 0x33333435, 0x36393C40, 0x44494D52, 0x565A5E61, 0x64666666, 0x6664625F, 0x5C585652, 0x4F4B4946, 0x44424040, - 0x40404042, 0x4446494C, 0x4E4F4F4E, 0x4D494542, 0x3B393634, 0x33323333, 0x33333333, 0x33333334, 0x36383A3F, - 0x42474B50, 0x54595C60, 0x62656566, 0x6462605C, 0x5A56534F, 0x4C494744, 0x42403E3E, 0x3D3E3F41, 0x4245484A, - 0x4C4E4E4D, 0x4B474440, 0x39383634, 0x33323333, 0x33333333, 0x33333334, 0x3537393C, 0x4044484E, 0x52575A5E, - 0x61636463, 0x62605D59, 0x5652504C, 0x4A474441, 0x403D3C3B, 0x3B3C3C3E, 0x40434750, 0x585E5E5D, 0x5952483F, - 0x3C373534, 0x33333333, 0x33333333, 0x33333333, 0x3436383B, 0x3E43474D, 0x5056595D, 0x60626261, 0x605D5B57, - 0x54504E4A, 0x48454340, 0x3E3C3B3A, 0x3A3A3B3D, 0x3F4A5E80, 0xA1B2B6B5, 0xAB937350, 0x553D3533, 0x33333333, - 0x33333333, 0x33333333, 0x3335373A, 0x3D42464B, 0x4F54585C, 0x5E5F605F, 0x5D5A5854, 0x524E4C49, 0x4643413F, - 0x3E3B3A39, 0x39393A3E, 0x4F7AA5B9, 0xBEB5C1C4, 0xC0B4AC93, 0x94654033, 0x33333333, 0x33333333, 0x33323233, - 0x3335363A, 0x3C40444A, 0x4E54575B, 0x5D5E5E5D, 0x5C595653, 0x504D4A48, 0x4643413E, 0x3D3B3A38, 0x38383C57, - 0x8EB0BEC2, 0xBB99A5BD, 0xBA9DA0AE, 0xAF9F6B3F, 0x34333333, 0x33333333, 0x33333334, 0x3436373A, 0x3C40444A, - 0x4E53565A, 0x5B5C5C5B, 0x5A575451, 0x4E4B4A47, 0x4542413E, 0x3D3B3A38, 0x38384691, 0xB2B4B5B5, 0xB7AA87A9, - 0xBAAA83A2, 0xAAB2A06A, 0x3D333332, 0x33333333, 0x33343434, 0x3536383B, 0x3D41454A, 0x4E53565A, 0x5B5C5C5A, - 0x58565450, 0x4E4B4946, 0x4542413F, 0x3D3C3A39, 0x38384796, 0xB1958F8C, 0x94A19686, 0xADB39A89, 0x9BB0B19D, - 0x5B373333, 0x34343434, 0x35363637, 0x38393B3D, 0x4044474C, 0x4F545659, 0x5A5B5B59, 0x57555350, 0x4D4A4946, - 0x45434240, 0x3E3C3B3A, 0x39384179, 0xAFB2B1AE, 0xA2947E63, 0x92A9A584, 0x80AAB3AE, 0x8B463434, 0x34353636, - 0x3738393A, 0x3B3C3E40, 0x4346494E, 0x50545659, 0x5A5A5A58, 0x5754524F, 0x4D4A4947, 0x46444341, 0x3F3E3C3B, - 0x3A3A3C59, 0xA4B8B9B8, 0xB3A78F73, 0x8382928E, 0x6FA2B2B3, 0xA6693C36, 0x3738393A, 0x3C3D3E40, 0x40424345, - 0x484A4D50, 0x53565759, 0x5A5A5958, 0x5754524F, 0x4D4B4A48, 0x47464543, 0x42403F3D, 0x3C3B3A46, 0x83B1B7B5, - 0xA58A87A3, 0xABA58E75, 0x6185A7B2, 0xB08F4738, 0x3A3C3D3F, 0x40424445, 0x4648484A, 0x4C4E5052, 0x54575859, - 0x5A5A5958, 0x56545250, 0x4E4C4A49, 0x48474645, 0x44424140, 0x3E3D3B3D, 0x5BA4B6B0, 0x919AA9B3, 0xB4B2A685, - 0x657C88A0, 0xB0A5583D, 0x3C3F4143, 0x4547484A, 0x4B4C4D4E, 0x4F505254, 0x55585859, 0x5A5A5958, 0x56545250, - 0x4E4C4B4A, 0x49484846, 0x45444241, 0x3F3E3C3B, 0x4681AFB4, 0xAEB0B3B3, 0xB3B19A68, -}; - -static Vtx sFrustumVtx[] = { - VTX(88, 121, 0, 1638, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, 176, 1000, 1434, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(143, 46, 0, 1229, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(300, 0, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 150, 0, 2048, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, 285, 1000, 1843, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-88, 121, 0, 2458, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-93, 285, 1000, 2253, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-143, 46, 0, 2867, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-243, 176, 1000, 2662, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-143, -46, 0, 3277, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-300, 0, 1000, 3072, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-88, -121, 0, 3686, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-243, -176, 1000, 3482, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -150, 0, 4096, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(-93, -285, 1000, 3891, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(88, -121, 0, 410, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, -285, 1000, 205, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -150, 0, 0, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, -285, 1000, 4301, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(143, -46, 0, 819, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, -176, 1000, 614, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sTextureDL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 14, 14), - gsDPTileSync(), - gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, 14, G_TX_NOMIRROR | G_TX_WRAP, 6, - 14), - gsDPSetTileSize(1, 0, 0, (63 << 2), (63 << 2)), - gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPEndDisplayList(), -}; - -static Gfx sFrustumDL[] = { - gsSPVertex(sFrustumVtx, 22, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0), - gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0), - gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0), - gsSP2Triangles(10, 11, 8, 0, 11, 9, 8, 0), - gsSP2Triangles(12, 13, 10, 0, 13, 11, 10, 0), - gsSP2Triangles(14, 15, 12, 0, 15, 13, 12, 0), - gsSP2Triangles(16, 17, 18, 0, 19, 15, 14, 0), - gsSP2Triangles(20, 21, 16, 0, 21, 17, 16, 0), - gsSP2Triangles(2, 3, 20, 0, 3, 21, 20, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 7e1b78dbce..c1590b5490 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -28,13 +28,11 @@ const ActorInit Oceff_Wipe4_InitVars = { (ActorFunc)OceffWipe4_Draw, }; -#include "z_oceff_wipe4_gfx.c" - void OceffWipe4_Init(Actor* thisx, GlobalContext* globalCtx) { OceffWipe4* this = THIS; Actor_SetScale(&this->actor, 0.1f); - this->counter = 0; + this->timer = 0; this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; osSyncPrintf(VT_FGCOL(CYAN) " WIPE4 arg_data = %d\n" VT_RST, this->actor.params); } @@ -49,13 +47,15 @@ void OceffWipe4_Update(Actor* thisx, GlobalContext* globalCtx) { OceffWipe4* this = THIS; this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye; - if (this->counter < 50) { - this->counter++; + if (this->timer < 50) { + this->timer++; } else { Actor_Kill(&this->actor); } } +#include "overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.c" + void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->state.frames & 0xFFF; OceffWipe4* this = THIS; @@ -68,15 +68,15 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { eye = GET_ACTIVE_CAM(globalCtx)->eye; Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(globalCtx)); - if (this->counter < 16) { - z = Math_SinS(this->counter << 10) * 1330; + if (this->timer < 16) { + z = Math_SinS(this->timer * 1024) * 1330.0f; } else { - z = 1330; + z = 1330.0f; } vtxPtr = sFrustumVtx; - if (this->counter >= 30) { - alpha = 12 * (50 - this->counter); + if (this->timer >= 30) { + alpha = 12 * (50 - this->timer); } else { alpha = 255; } @@ -98,15 +98,15 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params == OCEFF_WIPE4_UNUSED) { - gSPDisplayList(POLY_XLU_DISP++, sTexture1DL); + gSPDisplayList(POLY_XLU_DISP++, sUnusedMaterialDL); } else { - gSPDisplayList(POLY_XLU_DISP++, sTexture0DL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); } - gSPDisplayList(POLY_XLU_DISP++, sTexture2DL); + gSPDisplayList(POLY_XLU_DISP++, sMaterial2DL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 64, 1, scroll * (-1), scroll, 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); + gSPDisplayList(POLY_XLU_DISP++, &sMaterial2DL[11]); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 344); } diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h index 87af675469..6187289345 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -13,7 +13,7 @@ struct OceffWipe4; typedef struct OceffWipe4 { /* 0x0000 */ Actor actor; - /* 0x014C */ s16 counter; + /* 0x014C */ s16 timer; } OceffWipe4; // size = 0x0150 #endif diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c deleted file mode 100644 index 6b53c8e3ed..0000000000 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "z_oceff_wipe4.h" -#include "objects/gameplay_keep/gameplay_keep.h" - -static u32 sTexture[] = { - 0x00061507, 0x00000000, 0x295a2b08, 0x10030f03, 0x0d070006, 0x00031625, 0x3f230012, 0x79590000, 0x00102c2a, - 0x254a1b0e, 0xaff66600, 0x00467e29, 0x08020000, 0x03383e0b, 0x0501000a, 0x31211c05, 0x00031c27, 0x4ca92f13, - 0xb2ef5500, 0x057ebf37, 0x00000000, 0x0e493f13, 0x00000002, 0x335c3e03, 0x00000e07, 0x3c761200, 0x447e2200, - 0x00426710, 0x00000000, 0x071c2208, 0x00000168, 0xe18f0f00, 0x00060e00, 0x0a100000, 0x0514022d, 0x1b020400, - 0x00000000, 0x093a3f0a, 0x050010ae, 0xda360000, 0x00070500, 0x00000000, 0x00001461, 0x3e050024, 0x24000000, - 0x184e3755, 0x9132043c, 0x2f000000, 0x12020a54, 0x3c000200, 0x00000f3e, 0x2b041159, 0x2c000000, 0x030b22ce, - 0xf9420000, 0x00000301, 0x371160ef, 0xac6d2b00, 0x00000008, 0x05000d27, 0x06000000, 0x00001a91, 0x760b0000, - 0x000b030a, 0x747db0bd, 0xbda31d00, 0x00000000, 0x00000000, 0x00000511, 0x01000209, 0x03020015, 0x583a0010, - 0xc1e0892d, 0x532d0000, 0x03160600, 0x00050001, 0x15142e4e, 0x07000500, 0x100d004c, 0xb65c001b, 0xb2df9417, - 0x00000020, 0x57420400, 0x45882f00, 0x18093b3e, 0x01182f0d, 0x1405003f, 0xb75b001e, 0x5dc2e14f, 0x00000161, - 0xbc4a005a, 0xecf84a00, 0x0011330f, 0x0044591c, 0x01001c7c, 0xb122001f, 0x5de4ff71, 0x00000177, 0xba3218d9, - 0xffc41700, 0x1e7b5a1c, 0x2b769635, 0x0044d5fa, 0x9e000530, 0xc7ffce35, 0x00000035, 0x663441cf, 0xc9380000, - 0x3d733c28, 0x3e709726, 0x0086faf1, 0x9b170d4c, 0xc9812700, 0x000e1a02, 0x4c642544, 0x2b000000, 0x0d0e0508, - 0x0a252f03, 0x00335297, 0xc75b014e, 0x77470600, 0x00160f00, 0x3a350016, 0x29070000, 0x0c3a3911, 0x00000003, - 0x0100004b, 0x8f4b051c, 0x7f6c1c00, 0x00000000, 0x00000437, 0x2e030001, 0x2a6e6b2c, 0x0604000e, 0x0b000004, - 0x19350814, 0x3e63813d, 0x13000000, 0x00000117, 0x06000000, 0x14362911, 0x312e021f, 0x13000000, 0x010c000c, - 0x10b9ef72, 0x2d010000, 0x040c0c10, 0x02000000, 0x33410306, 0x3b30071d, 0x07000000, 0x00000000, 0x1bc2a129, - 0x0d000000, 0x050e1112, 0x0100002e, 0xd2c22e00, 0x21593403, 0x00000000, 0x01010000, 0x0e451b00, 0x00000000, - 0x0000060d, 0x00000061, 0xffea2e00, 0x3da04200, 0x00000000, 0x06140b00, 0x00040200, 0x00000000, 0x00061b0c, - 0x00000037, 0x8d620500, 0x2a8f5801, 0x00000000, 0x082e3404, 0x00000000, 0x00000003, 0x0a201b02, 0x00000000, - 0x06000000, 0x11826503, 0x00060400, 0x07303402, 0x07010007, 0x2f1e0b0a, 0x09080000, 0x03000000, 0x00000000, - 0x07452500, 0x0e361100, 0x000b0a00, 0x06000018, 0x3e170600, 0x00060f0d, 0x3e190000, 0x00000000, 0x00000000, - 0x21360700, 0x00000000, 0x00000007, 0x09000000, 0x0a857124, 0x703c0000, 0x01000000, 0x00000000, 0x08050000, - 0x00000000, 0x00000000, 0x00000000, 0x32d97112, 0x4a1b0001, 0x02050000, 0x00000000, 0x021a0a00, 0x00000613, - 0x07000000, 0x00000000, 0x1e5d1700, 0x04000000, 0x37550400, 0x00000000, 0x14300600, 0x00003e5b, 0x08000000, - 0x00000000, 0x2f2f0000, 0x00000007, 0x90840300, 0x0f070000, 0x06070000, 0x00055a62, 0x00000000, 0x00000020, - 0xa77b0700, 0x0106000f, 0x612d0006, 0x1b030000, 0x00000001, 0x0000211a, 0x00000000, 0x0000002e, 0x944a0103, - 0x3b390200, 0x04000011, 0x14000005, 0x302f0d10, 0x01000000, 0x00000000, 0x00000009, 0x10000015, 0x5d290000, - 0x00000015, 0x09000027, 0x73510f09, 0x37410700, 0x00061408, 0x00000000, 0x25582d09, 0x12020e03, 0x0c070007, - 0x00031627, 0x41240011, 0x795b0000, 0x00102d29, 0x244b1c0d, 0xb0f76600, 0x00467c28, 0x08020000, 0x02383e0b, - 0x0401000a, 0x32231c04, 0x00031b28, 0x4ca83112, 0xb2ef5500, 0x057ebe38, 0x00000000, 0x0d493d13, 0x00000002, - 0x325c3f03, 0x00000e08, 0x3d761200, 0x457f2200, 0x0043660f, 0x00000000, 0x071d2208, 0x00000168, 0xe1901000, - 0x00070e00, 0x09110000, 0x0515022d, 0x1b020400, 0x00000000, 0x093b3e09, 0x050011ae, 0xd9370000, 0x00070500, - 0x00000000, 0x00001462, 0x3e050024, 0x25000000, 0x184e3554, 0x9431043c, 0x2e000000, 0x12010955, 0x3c000300, - 0x0000103e, 0x2b04115a, 0x2d000000, 0x030b22ce, 0xf9420000, 0x00000301, 0x361161ef, 0xac6b2b00, 0x00000008, - 0x05000d27, 0x07000000, 0x00001a8f, 0x760b0000, 0x000b030a, 0x727db1bd, 0xbca21c00, 0x00000000, 0x00000000, - 0x00000610, 0x00000208, 0x03030016, 0x57390010, 0xc1e1892e, 0x522c0000, 0x03160600, 0x00060001, 0x14142f4e, - 0x07000500, 0x100e004b, 0xb55c001b, 0xb0dd9416, 0x0000001f, 0x57430500, 0x468a3000, 0x16093b3e, 0x01192f0d, - 0x1405003e, 0xb65b001d, 0x5cc1e04e, 0x0000005e, 0xbc4b0058, 0xebfa4b00, 0x0011340e, 0x0045591c, 0x02001c7c, - 0xb223001e, 0x5ce5ff71, 0x00000176, 0xb93216d8, 0xffc21700, 0x1d7b5b1c, 0x2b759636, 0x0041d4fc, 0x9d000530, - 0xc7ffce36, 0x00000036, 0x663540ce, 0xc6360000, 0x3c743e29, 0x3e719827, 0x0085faf0, 0x9b160d4e, 0xc9812600, - 0x000f1a03, 0x4b642646, 0x2b000000, 0x0d0e0608, 0x0a253002, 0x00345299, 0xc85b014e, 0x75470600, 0x00160f00, - 0x39350015, 0x29070000, 0x0c3a3911, 0x00000003, 0x0100004b, 0x914b051e, 0x7d6c1c01, 0x00000000, 0x00000437, - 0x2e030001, 0x2a6f6a2a, 0x0604000e, 0x0b000003, 0x1a350814, 0x3e63813e, 0x13000000, 0x00000118, 0x07000000, - 0x13382911, 0x302e0320, 0x14000000, 0x010d000c, 0x0fb9ee73, 0x2f000000, 0x040b0c11, 0x02000000, 0x36440307, - 0x3b30071d, 0x07000000, 0x00000000, 0x1abf9f29, 0x0e000000, 0x050f1112, 0x0100002d, 0xd3c42b00, 0x22593404, - 0x00000000, 0x01010000, 0x0e451b00, 0x00000000, 0x0000070c, 0x00000061, 0xffed2f00, 0x3ea04300, 0x00000000, - 0x05140b00, 0x00030200, 0x00000000, 0x00061c0b, 0x00000037, 0x8f640500, 0x2a8f5901, 0x00000000, 0x082d3504, - 0x00000000, 0x00010003, 0x0a201b02, 0x00000000, 0x07000000, 0x11826503, 0x00050400, 0x072f3503, 0x07010007, - 0x2f1e0c0b, 0x09080000, 0x03000000, 0x00000000, 0x07462500, 0x0e361100, 0x000b0900, 0x04000018, 0x3e160600, - 0x00060f0b, 0x3d190000, 0x00000000, 0x00000000, 0x21370600, 0x00000000, 0x00000007, 0x09000000, 0x0b866f22, - 0x713c0000, 0x02000000, 0x00000000, 0x08060000, 0x00000000, 0x00000000, 0x00000000, 0x30d76f12, 0x4b1a0001, - 0x02050000, 0x00000000, 0x021a0a00, 0x00000714, 0x08000000, 0x00000000, 0x1e5c1700, 0x03000000, 0x36560400, - 0x00000000, 0x15300600, 0x00003f5d, 0x07000000, 0x00000000, 0x2e2f0000, 0x00000008, 0x8f840300, 0x0f060000, - 0x06070000, 0x00065b61, 0x00000000, 0x00000020, 0xa67c0700, 0x0006000e, 0x612d0006, 0x1b030000, 0x00000001, - 0x0001211b, 0x00000000, 0x0000002f, 0x93490103, 0x3b390200, 0x04000011, 0x13000005, 0x2f2e0c11, 0x02000000, - 0x00000000, 0x00000008, 0x14030015, 0x5d2c0000, 0x00000115, 0x08000027, 0x724f0f0a, 0x353d0600, -}; - -static Vtx sFrustumVtx[] = { - VTX(88, 121, 0, 819, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, 176, 1000, 717, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(143, 46, 0, 614, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(300, 0, 1000, 512, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, 150, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, 285, 1000, 922, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-88, 121, 0, 1229, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-93, 285, 1000, 1126, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-143, 46, 0, 1434, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-243, 176, 1000, 1331, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-143, -46, 0, 1638, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-300, 0, 1000, 1536, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(-88, -121, 0, 1843, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-243, -176, 1000, 1741, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -150, 0, 2048, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-93, -285, 1000, 1946, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(88, -121, 0, 205, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, -285, 1000, 102, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(0, -150, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, -285, 1000, 2150, 0, 0xFF, 0xFF, 0xFF, 0xFF), - VTX(143, -46, 0, 410, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, -176, 1000, 307, 0, 0xFF, 0xFF, 0xFF, 0xFF), -}; - -static Gfx sTexture0DL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 15), - gsDPSetPrimColor(0x00, 0x00, 170, 255, 255, 255), - gsDPSetEnvColor(0, 150, 0, 128), - gsSPEndDisplayList(), -}; - -static Gfx sTexture1DL[] = { - gsDPPipeSync(), - gsDPSetTextureLUT(G_TT_NONE), - gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), - gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0), - gsDPSetPrimColor(0x00, 0x00, 255, 170, 255, 255), - gsDPSetEnvColor(120, 0, 100, 128), - gsSPEndDisplayList(), -}; - -static Gfx sTexture2DL[] = { - gsDPPipeSync(), - gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, - G_TX_NOMIRROR | G_TX_WRAP, 5, 6, 14, 1), - gsDPSetCombineLERP(TEXEL0, PRIMITIVE, ENV_ALPHA, TEXEL1, TEXEL0, 0, ENVIRONMENT, TEXEL1, PRIMITIVE, ENVIRONMENT, - COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0), - gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1), - G_RM_AA_XLU_SURF2), - gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - //! @bug : gsSPEndDisplayList() is missing so the next dlist will execute as well -}; - -static Gfx sFrustumDL[] = { - gsSPVertex(sFrustumVtx, 22, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0), - gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0), - gsSP2Triangles(8, 9, 6, 0, 9, 7, 6, 0), - gsSP2Triangles(10, 11, 8, 0, 11, 9, 8, 0), - gsSP2Triangles(12, 13, 10, 0, 13, 11, 10, 0), - gsSP2Triangles(14, 15, 12, 0, 15, 13, 12, 0), - gsSP2Triangles(16, 17, 18, 0, 19, 15, 14, 0), - gsSP2Triangles(20, 21, 16, 0, 21, 17, 16, 0), - gsSP2Triangles(2, 3, 20, 0, 3, 21, 20, 0), - gsSPEndDisplayList(), -}; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 732cba7187..a0d725544d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -25,8 +25,8 @@ EffectSsInit Effect_Ss_Fhg_Flash_InitVars = { EffectSsFhgFlash_Init, }; -UNK_TYPE D_809A5178[]; -Gfx D_809A5100[]; +static UNK_TYPE D_809A5178[258]; +static Gfx D_809A5100[15]; u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsFhgFlashInitParams* initParams = (EffectSsFhgFlashInitParams*)initParamsx; @@ -201,14 +201,14 @@ void EffectSsFhgFlash_UpdateShock(GlobalContext* globalCtx, u32 index, EffectSs* } } -Vtx D_809A50C0[] = { +static Vtx D_809A50C0[4] = { VTX(-10, -10, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF), VTX(10, -10, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0xFF), VTX(10, 10, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(-10, 10, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF), }; -Gfx D_809A5100[] = { +static Gfx D_809A5100[15] = { gsDPPipeSync(), gsDPSetTextureLUT(G_TT_NONE), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), @@ -222,7 +222,7 @@ Gfx D_809A5100[] = { gsSPEndDisplayList(), }; -UNK_TYPE D_809A5178[] = { +static UNK_TYPE D_809A5178[258] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 1c787d3696..8b5808bc4c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -22,8 +22,6 @@ EffectSsInit Effect_Ss_Ice_Piece_InitVars = { EffectSsIcePiece_Init, }; -extern Gfx gEffIceFragment1DL[]; - u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) { EffectSsIcePieceInitParams* initParams = (EffectSsIcePieceInitParams*)initParamsx; diff --git a/tools/vtxdis.c b/tools/vtxdis.c index 8debd89e0c..495d7cea9d 100644 --- a/tools/vtxdis.c +++ b/tools/vtxdis.c @@ -7,7 +7,7 @@ #include #include -#define VTXDIS_VER "0.1" +#define VTXDIS_VER "0.2" #define SWAP16(x) (((x & 0xFF00) >> 8) | ((x & 0x00FF) << 8)) @@ -20,11 +20,11 @@ typedef struct { static char *filename = NULL; static char *data = NULL; -static int offset = 0; -static int data_len = 0; -static int count = 0; +static int32_t offset = 0; +static int32_t data_len = 0; +static int16_t count = 0; -const struct option cmdline_opts[] = { +static const struct option cmdline_opts[] = { { "offset", required_argument, NULL, 'o', }, { "length", required_argument, NULL, 'l', }, { "file" , required_argument, NULL, 'f', }, @@ -35,8 +35,9 @@ const struct option cmdline_opts[] = { }; static uint32_t parse_int(const char *num){ - uint32_t ret = 0; + uint32_t ret; char outnum[21]; + if(strlen(num) > 2 && num[0] == '0' && (num[1] == 'x' || num[1] == 'X')) { strncpy(outnum, &num[2], 20); sscanf(outnum, "%"SCNx32, &ret); @@ -50,7 +51,7 @@ static uint32_t parse_int(const char *num){ } -static void print_usage(void) +static inline void print_usage(void) { puts("vtxdis version " VTXDIS_VER "\n" "Usage:\n" @@ -67,25 +68,25 @@ static void print_usage(void) ); } -static void print_version(void){ +static inline void print_version(void){ puts("Version: " VTXDIS_VER); } static void print_vtx_data(Vtx *vtx, int vtx_cnt) { - printf("{\n"); + puts("{"); for(int i = 0; i < vtx_cnt; i++) { Vtx *v = &vtx[i]; + printf(" VTX(%d, %d, %d, %d, %d, %d, %d, %d, %d),\n", v->pos[0], v->pos[1], v->pos[2], v->tpos[0], v->tpos[1], v->cn[0], v->cn[1], v->cn[2], v->cn[3]); - printf(" VTX(%d, %d, %d, %d, %d, 0x%02X, 0x%02X, 0x%02X, 0x%02X),\n", v->pos[0], v->pos[1], v->pos[2], v->tpos[0], v->tpos[1], v->cn[0], v->cn[1], v->cn[2], v->cn[3]); } - printf("}\n"); + puts("}"); } static void parse_file(void) { - int alloc_size = 0; + unsigned int alloc_size = 0; struct stat sbuffer; stat(filename, &sbuffer); if(errno != 0){ @@ -99,7 +100,7 @@ static void parse_file(void) alloc_size = sizeof(Vtx) * count; if((offset > 0 && (offset + alloc_size) > sbuffer.st_size) || alloc_size > sbuffer.st_size) { - printf("Requested data is beyond file boundaries."); + puts("Requested data is beyond file boundaries."); exit(1); } } @@ -109,7 +110,7 @@ static void parse_file(void) if((offset > 0 && (offset + alloc_size) > sbuffer.st_size) || alloc_size > sbuffer.st_size) { - printf("Requested data is beyond file boundaries."); + puts("Requested data is beyond file boundaries."); exit(1); } } @@ -145,8 +146,7 @@ static void parse_file(void) } } - Vtx *data = NULL; - data = malloc(alloc_size); + Vtx *data = malloc(alloc_size); if(!data){ fclose(file); perror("Could not allocate vtx data"); @@ -162,8 +162,8 @@ static void parse_file(void) fclose(file); - int vtx_cnt = alloc_size / sizeof(Vtx); - for(int i = 0; i < vtx_cnt; i++){ + unsigned int vtx_cnt = alloc_size / sizeof(Vtx); + for(unsigned int i = 0; i < vtx_cnt; i++){ Vtx *v = &data[i]; v->pos[0] = SWAP16(v->pos[0]); @@ -181,9 +181,8 @@ static void parse_file(void) int main(int argc, char **argv) { int opt; - int argv_idx = 0; + while(1){ - argv_idx++; opt = getopt_long(argc, argv, "o:l:f:c:v?", cmdline_opts, NULL); if(opt == -1){ break; @@ -215,35 +214,35 @@ int main(int argc, char **argv) if (filename == NULL && data == NULL) { - printf("Must specify -f or -d\n"); + puts("Must specify -f or -d"); print_usage(); exit(1); } if(data_len < 0) { - printf("Invalid -l/--length parameter passed."); + puts("Invalid -l/--length parameter passed."); print_usage(); exit(1); } if(offset < 0) { - printf("Invalid -o/--offset parameter passed."); + puts("Invalid -o/--offset parameter passed."); print_usage(); exit(1); } if(count < 0) { - printf("Invalid -c/--count parameter passed."); + puts("Invalid -c/--count parameter passed."); print_usage(); exit(1); } if(count > 0 && data_len > 0) { - printf("Cannot specify both -c/--count and -l/--length."); + puts("Cannot specify both -c/--count and -l/--length."); print_usage(); exit(1); }