From 8f734b25598bfc95f39c1106fb64ab3ecfaa37f8 Mon Sep 17 00:00:00 2001 From: Kieron Date: Sat, 18 Nov 2023 16:52:13 +0000 Subject: [PATCH] Inline data for all complete overlays --- build/build.py | 1 + build/linker_command_file.txt | 38 +- src/libgcl/hash.h | 2 + src/overlays/d01a/overlay.c | 121 ------ src/overlays/d01a/overlay1.c | 72 ++++ src/overlays/d01a/overlay2.c | 4 - src/overlays/d03a/Okajima/red_alrt.c | 4 +- src/overlays/d03a/Okajima/uji.c | 10 +- src/overlays/d03a/overlay.c | 11 - src/overlays/d11c/Enemy/demokage.c | 7 +- src/overlays/d11c/Game/lamp.c | 6 +- src/overlays/d11c/overlay.c | 15 - src/overlays/s00a/Anime/animeconv/breath.c | 40 +- src/overlays/s00a/Anime/animeconv/unknown.c | 420 ++++++++++++++++++ src/overlays/s00a/Anime/animeconv/unknown2.c | 30 ++ src/overlays/s00a/Anime/animeconv/unknown3.c | 264 ++++++++++++ src/overlays/s00a/Anime/animeconv/unknown4.c | 71 +++ src/overlays/s00a/Enemy/action.c | 427 ++++++++++++++++++- src/overlays/s00a/Enemy/asiato.c | 8 +- src/overlays/s00a/Enemy/boxkeri.c | 10 +- src/overlays/s00a/Enemy/check.c | 18 +- src/overlays/s00a/Enemy/command.c | 48 ++- src/overlays/s00a/Enemy/enemy.c | 255 +---------- src/overlays/s00a/Enemy/eyeflash.c | 10 +- src/overlays/s00a/Enemy/glight.c | 4 +- src/overlays/s00a/Enemy/grnad_e.c | 8 +- src/overlays/s00a/Enemy/l_sight.c | 4 +- src/overlays/s00a/Enemy/put.c | 383 ----------------- src/overlays/s00a/Enemy/route.c | 361 ---------------- src/overlays/s00a/Enemy/smoke.c | 7 +- src/overlays/s00a/Enemy/think.c | 384 ++++++++++++++++- src/overlays/s00a/Enemy/watcher.c | 13 +- src/overlays/s00a/Game/pad.c | 3 +- src/overlays/s00a/Okajima/pato_lmp.c | 30 +- src/overlays/s00a/Okajima/splash2.c | 2 +- src/overlays/s00a/Takabe/elevator.c | 12 +- src/overlays/s00a/Takabe/wt_area.c | 6 +- src/overlays/s00a/Thing/emitter.c | 11 +- src/overlays/s00a/chara/snake/breath.c | 4 +- src/overlays/s00a/overlay.c | 188 +------- src/overlays/s00a/overlay2.c | 26 -- src/overlays/s00a/overlay3.c | 5 - src/overlays/s00a/overlay4.c | 232 ---------- src/overlays/s00a/overlay5.c | 295 ------------- src/overlays/s00a/overlay6.c | 4 - src/overlays/s00a/overlay7.c | 54 --- src/overlays/s00a/overlay7_2.c | 6 - src/overlays/s00a/overlay8.c | 15 - src/overlays/s01a/Anime/animeconv/rcm.c | 169 ++++++++ src/overlays/s01a/Anime/animeconv/socom.c | 115 ++++- src/overlays/s01a/Enemy/camera.c | 28 +- src/overlays/s01a/Enemy/object.c | 132 +----- src/overlays/s01a/Enemy/searchli.c | 28 +- src/overlays/s01a/Game/cancel.c | 4 +- src/overlays/s01a/Game/tobcnt.c | 53 ++- src/overlays/s01a/Okajima/blink_tx.c | 2 +- src/overlays/s01a/Thing/snow.c | 15 +- src/overlays/s01a/Thing/sphere.c | 4 +- src/overlays/s01a/animal/doll/demodoll.c | 19 +- src/overlays/s01a/animal/doll/doll.c | 2 +- src/overlays/s01a/overlay.c | 294 ------------- src/overlays/s01a/overlay2.c | 12 - src/overlays/s01a/overlay3.c | 13 - src/overlays/s01a/overlay4.c | 7 - src/overlays/s01a/overlay5.c | 229 ---------- src/overlays/s01a/overlay6.c | 273 ------------ src/overlays/s01a/overlay7.c | 6 - src/overlays/s01a/overlay8.c | 267 ------------ src/overlays/s01a/overlay9.c | 24 -- src/overlays/s01a/overlay_bss.c | 72 ++++ src/overlays/s03e/Game/evpanel.c | 35 +- src/overlays/s03e/Okajima/guncame.c | 25 +- src/overlays/s03e/chara/others/intr_cam.c | 3 +- src/overlays/s03e/chara/others/motse.c | 4 +- src/overlays/s03e/overlay.c | 42 -- src/overlays/s03e/overlay2.c | 33 -- src/overlays/s03e/overlay3.c | 117 ----- src/overlays/s03er/overlay.c | 60 --- src/overlays/s03er/overlay2.c | 33 -- src/overlays/s03er/overlay3.c | 117 ----- src/overlays/s16b/Enemy/asioto.c | 8 +- src/overlays/s16b/Enemy/wall.c | 13 +- src/overlays/s16b/overlay.c | 16 +- um/d01a.bin | Bin 7 -> 13 bytes um/d03a.bin | Bin 10 -> 11 bytes um/d11c.bin | Bin 8 -> 10 bytes um/s00a.bin | Bin 1199 -> 1225 bytes um/s01a.bin | Bin 1217 -> 1260 bytes um/s03e.bin | Bin 26 -> 38 bytes um/s03er.bin | Bin 26 -> 38 bytes 90 files changed, 2338 insertions(+), 3885 deletions(-) create mode 100644 src/overlays/d01a/overlay1.c create mode 100644 src/overlays/s00a/Anime/animeconv/unknown.c create mode 100644 src/overlays/s00a/Anime/animeconv/unknown2.c create mode 100644 src/overlays/s00a/Anime/animeconv/unknown3.c create mode 100644 src/overlays/s00a/Anime/animeconv/unknown4.c delete mode 100644 src/overlays/s00a/Enemy/route.c delete mode 100644 src/overlays/s00a/overlay2.c delete mode 100644 src/overlays/s00a/overlay3.c delete mode 100644 src/overlays/s00a/overlay4.c delete mode 100644 src/overlays/s00a/overlay5.c delete mode 100644 src/overlays/s00a/overlay6.c delete mode 100644 src/overlays/s00a/overlay7.c delete mode 100644 src/overlays/s00a/overlay7_2.c delete mode 100644 src/overlays/s00a/overlay8.c create mode 100644 src/overlays/s01a/Anime/animeconv/rcm.c delete mode 100644 src/overlays/s01a/overlay2.c delete mode 100644 src/overlays/s01a/overlay3.c delete mode 100644 src/overlays/s01a/overlay4.c delete mode 100644 src/overlays/s01a/overlay5.c delete mode 100644 src/overlays/s01a/overlay6.c delete mode 100644 src/overlays/s01a/overlay7.c delete mode 100644 src/overlays/s01a/overlay8.c delete mode 100644 src/overlays/s01a/overlay9.c create mode 100644 src/overlays/s01a/overlay_bss.c delete mode 100644 src/overlays/s03e/overlay2.c delete mode 100644 src/overlays/s03e/overlay3.c delete mode 100755 src/overlays/s03er/overlay.c delete mode 100644 src/overlays/s03er/overlay2.c delete mode 100644 src/overlays/s03er/overlay3.c diff --git a/build/build.py b/build/build.py index 72ef6ba62..abf6e1adf 100755 --- a/build/build.py +++ b/build/build.py @@ -86,6 +86,7 @@ def ninja_run(): r'overlay_bss\.c:\d+: warning: `s00a_dword_800E1120\' defined but not used', r'mosaic\.c:\d+: warning: unused variable `unused\'', r'vib_edit.c:\d+: warning: too many arguments for format', + r'action.c:\d+: warning: assignment of read-only location', ] if os.environ.get('APPVEYOR'): diff --git a/build/linker_command_file.txt b/build/linker_command_file.txt index 8817aa65b..0d2489056 100644 --- a/build/linker_command_file.txt +++ b/build/linker_command_file.txt @@ -386,18 +386,15 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\s00a\Thing\emitter.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\watcher.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\check.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay2.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\action.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay3.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\put.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay4.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\enemy.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay5.obj" - include "{{OBJ_DIR}}\overlays\s00a\Enemy\route.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown2.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown3.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown4.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\think.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay6.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\command.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay7.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\eyeflash.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\asiato.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\l_sight.obj" @@ -409,9 +406,7 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\s00a\Enemy\glight.obj" include "{{OBJ_DIR}}\overlays\s00a\Okajima\mouse.obj" include "{{OBJ_DIR}}\overlays\s00a\Okajima\bubble_s.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay7_2.obj" include "{{OBJ_DIR}}\overlays\s00a\Okajima\pato_lmp.obj" - include "{{OBJ_DIR}}\overlays\s00a\overlay8.obj" include "{{OBJ_DIR}}\overlays\s00a\Takabe\ripple.obj" include "{{OBJ_DIR}}\overlays\s00a\Takabe\rsurface.obj" include "{{OBJ_DIR}}\overlays\s00a\Takabe\ripples.obj" @@ -460,9 +455,8 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{PSYQ_SDK}}\psyq_4.4\LIB\libgpu\P22.OBJ", overlay include "{{PSYQ_SDK}}\psyq_4.4\LIB\libgte\MTX_10.OBJ", overlay {% elif OVERLAY == "s03e" or OVERLAY == "s03er" %} - include "{{OBJ_DIR}}\overlays\{{OVERLAY}}\overlay.obj" + include "{{OBJ_DIR}}\overlays\s03e\overlay.obj" include "{{OBJ_DIR}}\overlays\s03e\Game\evpanel.obj" - include "{{OBJ_DIR}}\overlays\{{OVERLAY}}\overlay2.obj" include "{{OBJ_DIR}}\overlays\d11c\Game\lamp.obj" include "{{OBJ_DIR}}\overlays\s03e\chara\others\intr_cam.obj" include "{{OBJ_DIR}}\overlays\s03e\chara\others\motse.obj" @@ -470,7 +464,6 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\s16b\Enemy\asioto.obj" include "{{OBJ_DIR}}\overlays\d03a\Okajima\uji.obj" include "{{OBJ_DIR}}\overlays\s03e\Okajima\guncame.obj" - include "{{OBJ_DIR}}\overlays\{{OVERLAY}}\overlay3.obj" include "{{OBJ_DIR}}\overlays\s01a\Anime\animeconv\socom.obj" include "{{OBJ_DIR}}\overlays\s03e\Anime\animeconv\unknown.obj" include "{{OBJ_DIR}}\overlays\s03e\Takabe\spark2.obj" @@ -506,6 +499,7 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\title\title_800D8690.obj" ; PsyQ {% elif OVERLAY == "s01a" %} include "{{OBJ_DIR}}\overlays\s01a\overlay.obj" + include "{{OBJ_DIR}}\overlays\s01a\overlay_bss.obj" include "{{OBJ_DIR}}\overlays\s01a\Game\cancel.obj" include "{{OBJ_DIR}}\overlays\s01a\Game\tobcnt.obj" @@ -515,20 +509,16 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\s01a\Thing\snow.obj" include "{{OBJ_DIR}}\overlays\s01a\Thing\sphere.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\watcher.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay2.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\check.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay3.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\action.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay4.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\put.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay5.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\enemy.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay6.obj" - include "{{OBJ_DIR}}\overlays\s00a\Enemy\route.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown2.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown3.obj" + include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\unknown4.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\think.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay7.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\command.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay8.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\eyeflash.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\asiato.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\l_sight.obj" @@ -536,8 +526,8 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\s01a\Enemy\camera.obj" include "{{OBJ_DIR}}\overlays\s01a\Anime\animeconv\socom.obj" include "{{OBJ_DIR}}\overlays\s01a\Enemy\searchli.obj" + include "{{OBJ_DIR}}\overlays\s01a\Anime\animeconv\rcm.obj" include "{{OBJ_DIR}}\overlays\s01a\Enemy\object.obj" - include "{{OBJ_DIR}}\overlays\s01a\overlay9.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\boxkeri.obj" include "{{OBJ_DIR}}\overlays\s00a\Enemy\smoke.obj" include "{{OBJ_DIR}}\overlays\s16b\Enemy\wall.obj" @@ -569,11 +559,11 @@ overlay_bss group file("{{OBJ_DIR}}\{{OVERLAY}}_{{OVERLAY_SUFFIX}}_bss.bin") include "{{OBJ_DIR}}\overlays\s00a\Anime\animeconv\breath.obj" include "{{OBJ_DIR}}\overlays\s01a\Thing\snow.obj" - - include "{{OBJ_DIR}}\overlays\d01a\overlay2.obj" - include "{{OBJ_DIR}}\overlays\s00a\Thing\emitter.obj" + include "{{OBJ_DIR}}\overlays\d01a\overlay1.obj" + include "{{OBJ_DIR}}\overlays\d01a\overlay2.obj" + include "{{OBJ_DIR}}\overlays\d01a\d01a_sphere_800C478C.obj" include "{{OBJ_DIR}}\overlays\d01a\d01a_sphere_800C489C.obj" include "{{OBJ_DIR}}\overlays\d01a\d01a_sphere_800C4D04.obj" diff --git a/src/libgcl/hash.h b/src/libgcl/hash.h index 97d8314ea..d60a35e91 100644 --- a/src/libgcl/hash.h +++ b/src/libgcl/hash.h @@ -97,6 +97,8 @@ #define PCX_HOSI 0xcafe // GV_StrCode( "hosi" ) #define PCX_ZZZ 0xf7bb // GV_StrCode( "zzz" ) #define PCX_ASIATO 0xdc55 // GV_StrCode( "asiato" ) +#define PCX_RCM_L 0x479f // GV_StrCode( "rcm_l" ) +#define PCX_W_BONBORI 0xa9cd // GV_StrCode( "w_bonbori" ) //------------------------------------------------------------------------------ // Sight files (.sgt) diff --git a/src/overlays/d01a/overlay.c b/src/overlays/d01a/overlay.c index 3b7308e86..ec9f2e96a 100755 --- a/src/overlays/d01a/overlay.c +++ b/src/overlays/d01a/overlay.c @@ -22,124 +22,3 @@ GCL_ActorTableEntry d01aOverlayCharas[] = { 0x0045, (TGCL_ActorCreateFn)0x800D06F0 }, { 0, 0 } }; - -extern const char d01a_dword_800D0BEC[]; -extern const char d01a_dword_800D0C3C[]; - -ANIMATION anm_breath_800C32E8 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)d01a_dword_800D0BEC }; -ANIMATION anm_unknown_800C3304 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)d01a_dword_800D0C3C }; - -SVECTOR snow_svec_800C3854 = {-5000, 0, -10000, 0}; -SVECTOR snow_svec_800C385C = {5000, 8000, 10000, 0}; -SVECTOR snow_svec_800C3864 = {0, -50, 0, 0}; -RECT snow_rect_800C386C = {0, 0, 2, 2}; - -RECT rect_800C3320 = { 1000, 1000, 2000, 2000 }; - -int d01a_dword_800C32F0 = 0x0001479F; -int d01a_dword_800C32F4 = 0x00010001; -int d01a_dword_800C32F8 = 0x00E60001; -int d01a_dword_800C32FC = 0x012C0001; -int d01a_dword_800C3300 = 0x00FF012C; -int d01a_dword_800C3304 = 0x00000000; -int d01a_dword_800C3308 = 0x800D0D68; -int d01a_dword_800C330C = 0x0001479F; -int d01a_dword_800C3310 = 0x00010001; -int d01a_dword_800C3314 = 0x00E60001; -int d01a_dword_800C3318 = 0x03E80001; -int d01a_dword_800C331C = 0x002003E8; -int d01a_dword_800C3320 = 0x00000000; -int d01a_dword_800C3324 = 0x800D0D94; -int d01a_dword_800C3328 = 0x0001479F; -int d01a_dword_800C332C = 0x00010001; -int d01a_dword_800C3330 = 0x01F40001; -int d01a_dword_800C3334 = 0x00C80001; -int d01a_dword_800C3338 = 0x00FF00C8; -int d01a_dword_800C333C = 0x00000000; -int d01a_dword_800C3340 = 0x800D0DAC; -int d01a_dword_800C3344 = 0x0001479F; -int d01a_dword_800C3348 = 0x00010001; -int d01a_dword_800C334C = 0x01F40001; -int d01a_dword_800C3350 = 0x07D00001; -int d01a_dword_800C3354 = 0x004007D0; -int d01a_dword_800C3358 = 0x00000000; -int d01a_dword_800C335C = 0x800D0DBC; -int d01a_dword_800C3360 = 0x0001479F; -int d01a_dword_800C3364 = 0x00010001; -int d01a_dword_800C3368 = 0x00000001; -int d01a_dword_800C336C = 0x00140000; -int d01a_dword_800C3370 = 0x00FF0014; -int d01a_dword_800C3374 = 0x00000000; -int d01a_dword_800C3378 = 0x800D0DD0; -int d01a_dword_800C337C = 0x0001A9CD; -int d01a_dword_800C3380 = 0x00010001; -int d01a_dword_800C3384 = 0x00E60001; -int d01a_dword_800C3388 = 0x00000001; -int d01a_dword_800C338C = 0x00FF0000; -int d01a_dword_800C3390 = 0x00000000; -int d01a_dword_800C3394 = 0x800D0DDC; -int d01a_dword_800C3398 = 0x03E8012C; -int d01a_dword_800C339C = 0x0000012C; -int d01a_dword_800C33A0 = 0x00000000; -int d01a_dword_800C33A4 = 0x00000000; -int d01a_dword_800C33A8 = 0x01F40320; -int d01a_dword_800C33AC = 0x00000320; -int d01a_dword_800C33B0 = 0x00000064; -int d01a_dword_800C33B4 = 0x00000000; -int d01a_dword_800C33B8 = 0x0320012C; -int d01a_dword_800C33BC = 0x0000012C; -int d01a_dword_800C33C0 = 0x00000000; -int d01a_dword_800C33C4 = 0x00000000; -int d01a_dword_800C33C8 = 0x75307530; -int d01a_dword_800C33CC = 0x00007530; -int d01a_dword_800C33D0 = 0x00000101; -int d01a_dword_800C33D4 = 0x000001FF; -int d01a_dword_800C33D8 = 0x000009C4; -int d01a_dword_800C33DC = 0x00000DAC; -int d01a_dword_800C33E0 = 0x00000FA0; -int d01a_dword_800C33E4 = 0x00001388; -int d01a_dword_800C33E8 = 0x0000157C; -int d01a_dword_800C33EC = 0x000015E0; -int d01a_dword_800C33F0 = 0x00001644; -int d01a_dword_800C33F4 = 0x000016A8; -int d01a_dword_800C33F8 = 0x07D003E8; -int d01a_dword_800C33FC = 0x000005DC; -int d01a_dword_800C3400 = 0x07D005DC; -int d01a_dword_800C3404 = 0x000005DC; -int d01a_dword_800C3408 = 0x03E801F4; -int d01a_dword_800C340C = 0x07D003E8; - -const char d01a_dword_800D0BEC[] = {0x0, 'I', 0x2, 0x0}; -const char d01a_dword_800D0BF0[] = {0x7, 0x0, ')', 0x1}; -const char d01a_dword_800D0BF4[] = {0xfe, 0xc, 0x0, 0x6}; -const char d01a_dword_800D0BF8[] = {0x8, 0x6, 0x6, 0x6}; -const char d01a_dword_800D0BFC[] = {0x1, 0xff, 0x2, 0x0}; -const char d01a_dword_800D0C00[] = {0x1, 0xd, 0xc, 0x0}; -const char d01a_dword_800D0C04[] = {'#', 0x8, 0xff, 0xff}; -const char d01a_dword_800D0C08[] = {0xff, '\n', 0x0, 0x8}; -const char d01a_dword_800D0C0C[] = {0x0, 0x8, 0x1, 0xff}; -const char d01a_dword_800D0C10[] = {0x2, 0x0, 0x1, 0xd}; -const char d01a_dword_800D0C14[] = {0xf, '\n', 0xff, '8'}; -const char d01a_dword_800D0C18[] = {0xff, '8', 0x1, 0xfe}; -const char d01a_dword_800D0C1C[] = {0xc, 0x0, 0x6, 0x8}; -const char d01a_dword_800D0C20[] = {0x6, 0x6, 0x6, 0x1}; -const char d01a_dword_800D0C24[] = {0xff, 0x2, 0x0, 0x1}; -const char d01a_dword_800D0C28[] = {0xd, 0xc, 0x0, '#'}; -const char d01a_dword_800D0C2C[] = {0x8, 0xff, 0xff, 0xff}; -const char d01a_dword_800D0C30[] = {'\n', 0x0, 0x6, 0x0}; -const char d01a_dword_800D0C34[] = {0x6, 0x1, 0xff, 0x2}; -const char d01a_dword_800D0C38[] = {0x0, 0x1, 0xd, 0xf}; - -const char d01a_dword_800D0C3C[] = {0x0, ',', 0x1, 0x0}; -const char d01a_dword_800D0C40[] = {0x5, 0x1, 0xfe, 0xc}; -const char d01a_dword_800D0C44[] = {0x0, 0x3, 0x8, 0x6}; -const char d01a_dword_800D0C48[] = {0x6, 0x6, 0x1, 0xff}; -const char d01a_dword_800D0C4C[] = {0x2, 0x0, 0x1, 0xd}; -const char d01a_dword_800D0C50[] = {0xc, 0x0, 0x10, 0x8}; -const char d01a_dword_800D0C54[] = {0xff, 0xff, 0xff, '\n'}; -const char d01a_dword_800D0C58[] = {0x0, 0x4, 0x0, 0x4}; -const char d01a_dword_800D0C5C[] = {0x1, 0xff, 0x2, 0x0}; -const char d01a_dword_800D0C60[] = {0x1, '\n', 0x0, 0x4}; -const char d01a_dword_800D0C64[] = {0x0, 0x4, 0x1, 0xff}; -const char d01a_dword_800D0C68[] = {0x2, 0x0, 0x1, 0xd}; -const char d01a_dword_800D0C6C[] = {0xf, 0x0, 0x0, 0x0}; diff --git a/src/overlays/d01a/overlay1.c b/src/overlays/d01a/overlay1.c new file mode 100644 index 000000000..7da1a836c --- /dev/null +++ b/src/overlays/d01a/overlay1.c @@ -0,0 +1,72 @@ +int d01a_dword_800C32F0 = 0x0001479F; +int d01a_dword_800C32F4 = 0x00010001; +int d01a_dword_800C32F8 = 0x00E60001; +int d01a_dword_800C32FC = 0x012C0001; +int d01a_dword_800C3300 = 0x00FF012C; +int d01a_dword_800C3304 = 0x00000000; +int d01a_dword_800C3308 = 0x800D0D68; +int d01a_dword_800C330C = 0x0001479F; +int d01a_dword_800C3310 = 0x00010001; +int d01a_dword_800C3314 = 0x00E60001; +int d01a_dword_800C3318 = 0x03E80001; +int d01a_dword_800C331C = 0x002003E8; +int d01a_dword_800C3320 = 0x00000000; +int d01a_dword_800C3324 = 0x800D0D94; +int d01a_dword_800C3328 = 0x0001479F; +int d01a_dword_800C332C = 0x00010001; +int d01a_dword_800C3330 = 0x01F40001; +int d01a_dword_800C3334 = 0x00C80001; +int d01a_dword_800C3338 = 0x00FF00C8; +int d01a_dword_800C333C = 0x00000000; +int d01a_dword_800C3340 = 0x800D0DAC; +int d01a_dword_800C3344 = 0x0001479F; +int d01a_dword_800C3348 = 0x00010001; +int d01a_dword_800C334C = 0x01F40001; +int d01a_dword_800C3350 = 0x07D00001; +int d01a_dword_800C3354 = 0x004007D0; +int d01a_dword_800C3358 = 0x00000000; +int d01a_dword_800C335C = 0x800D0DBC; +int d01a_dword_800C3360 = 0x0001479F; +int d01a_dword_800C3364 = 0x00010001; +int d01a_dword_800C3368 = 0x00000001; +int d01a_dword_800C336C = 0x00140000; +int d01a_dword_800C3370 = 0x00FF0014; +int d01a_dword_800C3374 = 0x00000000; +int d01a_dword_800C3378 = 0x800D0DD0; +int d01a_dword_800C337C = 0x0001A9CD; +int d01a_dword_800C3380 = 0x00010001; +int d01a_dword_800C3384 = 0x00E60001; +int d01a_dword_800C3388 = 0x00000001; +int d01a_dword_800C338C = 0x00FF0000; +int d01a_dword_800C3390 = 0x00000000; +int d01a_dword_800C3394 = 0x800D0DDC; +int d01a_dword_800C3398 = 0x03E8012C; +int d01a_dword_800C339C = 0x0000012C; +int d01a_dword_800C33A0 = 0x00000000; +int d01a_dword_800C33A4 = 0x00000000; +int d01a_dword_800C33A8 = 0x01F40320; +int d01a_dword_800C33AC = 0x00000320; +int d01a_dword_800C33B0 = 0x00000064; +int d01a_dword_800C33B4 = 0x00000000; +int d01a_dword_800C33B8 = 0x0320012C; +int d01a_dword_800C33BC = 0x0000012C; +int d01a_dword_800C33C0 = 0x00000000; +int d01a_dword_800C33C4 = 0x00000000; +int d01a_dword_800C33C8 = 0x75307530; +int d01a_dword_800C33CC = 0x00007530; +int d01a_dword_800C33D0 = 0x00000101; +int d01a_dword_800C33D4 = 0x000001FF; +int d01a_dword_800C33D8 = 0x000009C4; +int d01a_dword_800C33DC = 0x00000DAC; +int d01a_dword_800C33E0 = 0x00000FA0; +int d01a_dword_800C33E4 = 0x00001388; +int d01a_dword_800C33E8 = 0x0000157C; +int d01a_dword_800C33EC = 0x000015E0; +int d01a_dword_800C33F0 = 0x00001644; +int d01a_dword_800C33F4 = 0x000016A8; +int d01a_dword_800C33F8 = 0x07D003E8; +int d01a_dword_800C33FC = 0x000005DC; +int d01a_dword_800C3400 = 0x07D005DC; +int d01a_dword_800C3404 = 0x000005DC; +int d01a_dword_800C3408 = 0x03E801F4; +int d01a_dword_800C340C = 0x07D003E8; diff --git a/src/overlays/d01a/overlay2.c b/src/overlays/d01a/overlay2.c index e0d8703ab..407ba09a9 100644 --- a/src/overlays/d01a/overlay2.c +++ b/src/overlays/d01a/overlay2.c @@ -1,7 +1,3 @@ -const char aYuki[] = {0xc0, 0xe3, 0x0, 0x0}; -const char aSnowC[] = "snow.c"; -const char aSfex_800DFC64[] = "sfex0236"; -const char aEmitterc_800DFC70[] = "emitter.c"; const char d01a_aSpherec_800D0CC4[] = "sphere.c"; const char d01a_dword_800D0CD0[] = {0x0, 0x0, 0x0, 0x0}; const char d01a_dword_800D0CD4[] = {0x0, 0xfe, 0x0, 0x0}; diff --git a/src/overlays/d03a/Okajima/red_alrt.c b/src/overlays/d03a/Okajima/red_alrt.c index 74f9cca8a..19d727c70 100644 --- a/src/overlays/d03a/Okajima/red_alrt.c +++ b/src/overlays/d03a/Okajima/red_alrt.c @@ -4,13 +4,13 @@ #include "red_alrt.h" +RedAlrtWork *d03a_dword_800C3270 = NULL; + extern SVECTOR DG_ZeroVector_800AB39C; extern int GV_Clock_800AB920; extern int GV_PauseLevel_800AB928; extern int GM_CurrentMap_800AB9B0; -extern RedAlrtWork *d03a_dword_800C3270; - #define EXEC_LEVEL 3 // Identical to THING_Msg_CheckMessage minus returning the message value. diff --git a/src/overlays/d03a/Okajima/uji.c b/src/overlays/d03a/Okajima/uji.c index 13cf14963..5f08cab6e 100644 --- a/src/overlays/d03a/Okajima/uji.c +++ b/src/overlays/d03a/Okajima/uji.c @@ -23,14 +23,14 @@ typedef struct _UjiWork char pad3[0x8]; } UjiWork; +RECT uji_rect = {100, 100, 200, 200}; + +const char aUji[] = "uji"; +const char aUjiC[] = "uji.c"; + extern SVECTOR DG_ZeroVector_800AB39C; extern int GM_CurrentMap_800AB9B0; -extern RECT uji_rect; - -extern const char aUji[]; // = "uji"; -extern const char aUjiC[]; // = "uji.c" - #define EXEC_LEVEL 4 int UjiGetSvecs_800C39E8(int opt, SVECTOR *svec) diff --git a/src/overlays/d03a/overlay.c b/src/overlays/d03a/overlay.c index 69e3ab281..1dc79916a 100755 --- a/src/overlays/d03a/overlay.c +++ b/src/overlays/d03a/overlay.c @@ -17,14 +17,3 @@ GCL_ActorTableEntry d03aOverlayCharas[] = { 0x0044, (TGCL_ActorCreateFn)0x800C54D4 }, { 0, 0 } }; - -RECT uji_rect = {100, 100, 200, 200}; - -RedAlrtWork *d03a_dword_800C3270 = NULL; - -// Enemy/demokage.c -const char aShadow[] = "shadow"; -const char aDemokageC[] = "demokage.c"; - -const char aUji[] = "uji"; -const char aUjiC[] = "uji.c"; diff --git a/src/overlays/d11c/Enemy/demokage.c b/src/overlays/d11c/Enemy/demokage.c index 43d129879..c6d205235 100644 --- a/src/overlays/d11c/Enemy/demokage.c +++ b/src/overlays/d11c/Enemy/demokage.c @@ -14,10 +14,11 @@ typedef struct _DemokageWork int *f54; // 54 } DemokageWork; -extern SVECTOR DG_ZeroVector_800AB39C; +// Enemy/demokage.c +const char aShadow[] = "shadow"; +const char aDemokageC[] = "demokage.c"; -extern const char aShadow[]; // = "shadow" -extern const char aDemokageC[]; // = "demokage.c" +extern SVECTOR DG_ZeroVector_800AB39C; #define EXEC_LEVEL 5 diff --git a/src/overlays/d11c/Game/lamp.c b/src/overlays/d11c/Game/lamp.c index a1790d54c..5a657d5db 100644 --- a/src/overlays/d11c/Game/lamp.c +++ b/src/overlays/d11c/Game/lamp.c @@ -21,10 +21,12 @@ typedef struct LampWork SVECTOR field_40_children[0]; } LampWork; +// Game/lamp.c +const char aTexparseerror[] = "TEX:PARSE ERROR\n"; +const char aLampC[] = "lamp.c"; + extern unsigned char *GCL_NextStrPtr_800AB9A0; extern int GM_CurrentMap_800AB9B0; -extern const char aLampC[]; // = "lamp.c"; -extern const char aTexparseerror[]; // = "TEX:PARSE ERROR\n"; void d11c_800C326C(LampWork *work, int textureId) { diff --git a/src/overlays/d11c/overlay.c b/src/overlays/d11c/overlay.c index ef1ec0df2..e057968b3 100755 --- a/src/overlays/d11c/overlay.c +++ b/src/overlays/d11c/overlay.c @@ -18,18 +18,3 @@ GCL_ActorTableEntry d11cOverlayCharas[] = { 0x001B, (TGCL_ActorCreateFn)NewKogaku3_80061708 }, { 0, 0 } }; - -// Game/lamp.c -const char aTexparseerror[] = "TEX:PARSE ERROR\n"; -const char aLampC[] = "lamp.c"; - -// Enemy/wall.c -const char aDestroy[] = "destroy\n"; -const char aBox01[] = "box_01"; -const char aDbx1[] = "dbx1"; -const char aDbx2[] = "dbx2"; -const char aWallC[] = "wall.c"; - -// Enemy/demokage.c -const char aShadow[] = "shadow"; -const char aDemokageC[] = "demokage.c"; diff --git a/src/overlays/s00a/Anime/animeconv/breath.c b/src/overlays/s00a/Anime/animeconv/breath.c index d56ba2094..fa0817c1f 100644 --- a/src/overlays/s00a/Anime/animeconv/breath.c +++ b/src/overlays/s00a/Anime/animeconv/breath.c @@ -1,7 +1,43 @@ +#include "libgcl/hash.h" #include "Anime/animeconv/anime.h" -extern ANIMATION anm_breath_800C32E8; -extern ANIMATION anm_unknown_800C3304; +const char s00a_dword_800DFBE0[] = {0x0, 'I', 0x2, 0x0}; +const char s00a_dword_800DFBE4[] = {0x7, 0x0, ')', 0x1}; +const char s00a_dword_800DFBE8[] = {0xfe, 0xc, 0x0, 0x6}; +const char s00a_dword_800DFBEC[] = {0x8, 0x6, 0x6, 0x6}; +const char s00a_dword_800DFBF0[] = {0x1, 0xff, 0x2, 0x0}; +const char s00a_dword_800DFBF4[] = {0x1, 0xd, 0xc, 0x0}; +const char s00a_dword_800DFBF8[] = {'#', 0x8, 0xff, 0xff}; +const char s00a_dword_800DFBFC[] = {0xff, '\n', 0x0, 0x8}; +const char s00a_dword_800DFC00[] = {0x0, 0x8, 0x1, 0xff}; +const char s00a_dword_800DFC04[] = {0x2, 0x0, 0x1, 0xd}; +const char s00a_dword_800DFC08[] = {0xf, '\n', 0xff, '8'}; +const char s00a_dword_800DFC0C[] = {0xff, '8', 0x1, 0xfe}; +const char s00a_dword_800DFC10[] = {0xc, 0x0, 0x6, 0x8}; +const char s00a_dword_800DFC14[] = {0x6, 0x6, 0x6, 0x1}; +const char s00a_dword_800DFC18[] = {0xff, 0x2, 0x0, 0x1}; +const char s00a_dword_800DFC1C[] = {0xd, 0xc, 0x0, '#'}; +const char s00a_dword_800DFC20[] = {0x8, 0xff, 0xff, 0xff}; +const char s00a_dword_800DFC24[] = {'\n', 0x0, 0x6, 0x0}; +const char s00a_dword_800DFC28[] = {0x6, 0x1, 0xff, 0x2}; +const char s00a_dword_800DFC2C[] = {0x0, 0x1, 0xd, 0xf}; + +const char s00a_dword_800DFC30[] = {0x0, ',', 0x1, 0x0}; +const char s00a_dword_800DFC34[] = {0x5, 0x1, 0xfe, 0xc}; +const char s00a_dword_800DFC38[] = {0x0, 0x3, 0x8, 0x6}; +const char s00a_dword_800DFC3C[] = {0x6, 0x6, 0x1, 0xff}; +const char s00a_dword_800DFC40[] = {0x2, 0x0, 0x1, 0xd}; +const char s00a_dword_800DFC44[] = {0xc, 0x0, 0x10, 0x8}; +const char s00a_dword_800DFC48[] = {0xff, 0xff, 0xff, '\n'}; +const char s00a_dword_800DFC4C[] = {0x0, 0x4, 0x0, 0x4}; +const char s00a_dword_800DFC50[] = {0x1, 0xff, 0x2, 0x0}; +const char s00a_dword_800DFC54[] = {0x1, '\n', 0x0, 0x4}; +const char s00a_dword_800DFC58[] = {0x0, 0x4, 0x1, 0xff}; +const char s00a_dword_800DFC5C[] = {0x2, 0x0, 0x1, 0xd}; +const char s00a_dword_800DFC60[] = {0xf}; + +ANIMATION anm_breath_800C32E8 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)s00a_dword_800DFBE0 }; +ANIMATION anm_unknown_800C3304 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)s00a_dword_800DFC30 }; void AN_Breath_800C3AA8( MATRIX *matrix ) { diff --git a/src/overlays/s00a/Anime/animeconv/unknown.c b/src/overlays/s00a/Anime/animeconv/unknown.c new file mode 100644 index 000000000..f2de80cd5 --- /dev/null +++ b/src/overlays/s00a/Anime/animeconv/unknown.c @@ -0,0 +1,420 @@ +#include "libgcl/hash.h" +#include "Anime/animeconv/anime.h" + +extern SVECTOR DG_ZeroVector_800AB39C; + +const char s00a_dword_800DFEB4[] = { + 0x1, 'V', 0x4, 0x0, + 0xb, 0x0, '^', 0x0, + 0xb1, 0x1, 0x9, 0x1, + 0x0, 0xc, 0x0, 0x4, + '\n', 0x0, 'd', 0x0, + 'd', 0x8, '2', 0x19, + 0x14, 0x2, 0x0, 0x1, + 0xd, '\n', 0x0, 'd', + 0x0, 'd', 0x8, '2', + 0x96, 0xaa, 0x2, 0x0, + 0x3, '\n', 0xff, 0x9c, + 0xff, 0x9c, 0x8, 0xce, + 'j', 'V', 0x2, 0x0, + 0x16, '\n', 0x1, ',', + 0xfe, 0x98, 0x8, 0xce, + 0xe7, 0xec, 0x2, 0x0, + 0x1, '\n', 0x1, ',', + 0xff, 0xe2, 0x8, 0xce, + 0xe7, 0xec, 0x2, 0x0, + 0x1, '\n', 0x1, ',', + 0xff, 0xf4, 0x2, 0x0, + 0x1, '\n', 0xfa, 0xba, + 0x0, 0xf0, 0x2, 0x0, + 0x1, 0xf, 0x1, 0x0, + 0xc, 0x0, 0x4, '\n', + 0x0, '2', 0x0, '2', + 0x8, '2', 0x19, 0x14, + 0x2, 0x0, 0x1, 0xd, + '\n', 0x0, '2', 0x0, + '2', 0x8, '2', 0x96, + 0xaa, 0x2, 0x0, 0x3, + '\n', 0xff, 0xce, 0xff, + 0xce, 0x8, 0xce, 'j', + 'V', 0x2, 0x0, 0x16, + '\n', 0x0, 0x96, 0xff, + 'L', 0x8, 0xce, 0xe7, + 0xec, 0x2, 0x0, 0x1, + '\n', 0x0, 0x96, 0xff, + 0xf1, 0x8, 0xce, 0xe7, + 0xec, 0x2, 0x0, 0x1, + '\n', 0x0, 0x96, 0xff, + 0xfa, 0x2, 0x0, 0x1, + '\n', 0xfd, ']', 0x0, + 'x', 0x2, 0x0, 0x1, + 0xf, '\n', 0xff, 0xd8, + 0xff, 0xd8, 0x1, 0x0, + 0xc, 0x0, 0x4, '\n', + 0x0, 0x19, 0x0, 0x19, + 0x8, '2', 0x19, 0x14, + 0x2, 0x0, 0x1, 0xd, + '\n', 0x0, 0x19, 0x0, + 0x19, 0x8, '2', 0x96, + 0xaa, 0x2, 0x0, 0x3, + '\n', 0xff, 0xe7, 0xff, + 0xe7, 0x8, 0xce, 'j', + 'V', 0x2, 0x0, 0x16, + '\n', 0x0, 'K', 0xff, + 0xa6, 0x8, 0xce, 0xe7, + 0xec, 0x2, 0x0, 0x1, + '\n', 0x0, 'K', 0xff, + 0xf9, 0x8, 0xce, 0xe7, + 0xec, 0x2, 0x0, 0x1, + '\n', 0x0, 'K', 0xff, + 0xf9, 0x2, 0x0, 0x1, + '\n', 0xfe, 0xd4, 0x0, + '<', 0x2, 0x0, 0x1, + 0xf, '\n', 0xff, 0xc4, + 0xff, 0xc4, 0x1, 0x0, + 0xc, 0x0, 0x4, '\n', + 0x0, '\n', 0x0, '\n', + 0x8, '2', 0x19, 0x14, + 0x2, 0x0, 0x1, 0xd, + '\n', 0x0, '\n', 0x0, + '\n', 0x8, '2', 0x96, + 0xaa, 0x2, 0x0, 0x3, + '\n', 0xff, 0xf6, 0xff, + 0xf6, 0x8, 0xce, 'j', + 'V', 0x2, 0x0, 0x16, + '\n', 0x0, 0x1e, 0xff, + 0xdc, 0x8, 0xce, 0xe7, + 0xec, 0x2, 0x0, 0x1, + '\n', 0x0, 0x1e, 0xff, + 0xfe, 0x8, 0xce, 0xe7, + 0xec, 0x2, 0x0, 0x1, + '\n', 0x0, 0x1e, 0xff, + 0xfe, 0x2, 0x0, 0x1, + '\n', 0xff, 0xb0, 0x0, + '\n', 0x2, 0x0, 0x1, + 0xf +}; + +const char s00a_dword_800E0018[] = { + 0x0, 0xf9, 0x3, 0x0, + 0x9, 0x0, '\\', 0x0, + 0xaf, 0x1, 0x0, 0xc, + 0x0, 0x4, '\n', 0x0, + 'd', 0x0, 'd', 0x8, + '-', '#', 0x14, 0x2, + 0x0, 0x1, 0xd, '\n', + 0x0, 'd', 0x0, 'd', + 0x8, 'F', 'n', 0xaa, + 0x2, 0x0, 0x3, '\n', + 0xff, 0x9c, 0xff, 0x9c, + 0x8, 0xba, 0x92, 'V', + 0x2, 0x0, 0x16, '\n', + 0x1, ',', 0xfe, 0x98, + 0x8, 0xd3, 0xdd, 0xec, + 0x2, 0x0, 0x1, '\n', + 0x1, ',', 0xff, 0xe2, + 0x8, 0xd3, 0xdd, 0xec, + 0x2, 0x0, 0x1, '\n', + 0x1, ',', 0xff, 0xf4, + 0x2, 0x0, 0x1, '\n', + 0xfa, 0xba, 0x0, 0xf0, + 0x2, 0x0, 0x1, 0xf, + 0x1, 0x0, 0xc, 0x0, + 0x4, '\n', 0x0, '2', + 0x0, '2', 0x8, '-', + '#', 0x14, 0x2, 0x0, + 0x1, 0xd, '\n', 0x0, + '2', 0x0, '2', 0x8, + 'F', 'n', 0xaa, 0x2, + 0x0, 0x3, '\n', 0xff, + 0xce, 0xff, 0xce, 0x8, + 0xba, 0x92, 'V', 0x2, + 0x0, 0x16, '\n', 0x0, + 0x96, 0xff, 'L', 0x8, + 0xd3, 0xdd, 0xec, 0x2, + 0x0, 0x1, '\n', 0x0, + 0x96, 0xff, 0xf1, 0x8, + 0xd3, 0xdd, 0xec, 0x2, + 0x0, 0x1, '\n', 0x0, + 0x96, 0xff, 0xfa, 0x2, + 0x0, 0x1, '\n', 0xfd, + ']', 0x0, 'x', 0x2, + 0x0, 0x1, 0xf, 0x1, + 0x0, 0xc, 0x0, 0x4, + '\n', 0x0, 0x19, 0x0, + 0x19, 0x8, '2', 0x19, + 0x14, 0x2, 0x0, 0x1, + 0xd, '\n', 0x0, 0x19, + 0x0, 0x19, 0x8, '2', + 0x96, 0xaa, 0x2, 0x0, + 0x3, '\n', 0xff, 0xe7, + 0xff, 0xe7, 0x8, 0xce, + 'j', 'V', 0x2, 0x0, + 0x16, '\n', 0x0, 'K', + 0xff, 0xa6, 0x8, 0xce, + 0xe7, 0xec, 0x2, 0x0, + 0x1, '\n', 0x0, 'K', + 0xff, 0xf9, 0x8, 0xce, + 0xe7, 0xec, 0x2, 0x0, + 0x1, '\n', 0x0, 'K', + 0xff, 0xf9, 0x2, 0x0, + 0x1, '\n', 0xfe, 0xd4, + 0x0, '<', 0x2, 0x0, + 0x1, 0xf +}; + +const char s00a_dword_800E011C[] = { + 0x0, 0xf9, 0x3, 0x0, + 0x9, 0x0, '\\', 0x0, + 0xaf, 0x1, 0x0, 0xc, + 0x0, 0x4, '\n', 0x0, + 'd', 0x0, 'd', 0x8, + 0x19, '&', '-', 0x2, + 0x0, 0x1, 0xd, '\n', + 0x0, 'd', 0x0, 'd', + 0x8, 0x96, 'b', 'F', + 0x2, 0x0, 0x3, '\n', + 0xff, 0x9c, 0xff, 0x9c, + 0x8, 'j', 0x9e, 0xba, + 0x2, 0x0, 0x16, '\n', + 0x1, ',', 0xfe, 0x98, + 0x8, 0xe7, 0xda, 0xd3, + 0x2, 0x0, 0x1, '\n', + 0x1, ',', 0xff, 0xe2, + 0x8, 0xe7, 0xda, 0xd3, + 0x2, 0x0, 0x1, '\n', + 0x1, ',', 0xff, 0xf4, + 0x2, 0x0, 0x1, '\n', + 0xfa, 0xba, 0x0, 0xf0, + 0x2, 0x0, 0x1, 0xf, + 0x1, 0x0, 0xc, 0x0, + 0x4, '\n', 0x0, '2', + 0x0, '2', 0x8, '-', + '#', 0x14, 0x2, 0x0, + 0x1, 0xd, '\n', 0x0, + '2', 0x0, '2', 0x8, + 'F', 'n', 0xaa, 0x2, + 0x0, 0x3, '\n', 0xff, + 0xce, 0xff, 0xce, 0x8, + 0xba, 0x92, 'V', 0x2, + 0x0, 0x16, '\n', 0x0, + 0x96, 0xff, 'L', 0x8, + 0xd3, 0xdd, 0xec, 0x2, + 0x0, 0x1, '\n', 0x0, + 0x96, 0xff, 0xf1, 0x8, + 0xd3, 0xdd, 0xec, 0x2, + 0x0, 0x1, '\n', 0x0, + 0x96, 0xff, 0xfa, 0x2, + 0x0, 0x1, '\n', 0xfd, + ']', 0x0, 'x', 0x2, + 0x0, 0x1, 0xf, 0x1, + 0x0, 0xc, 0x0, 0x4, + '\n', 0x0, 0x19, 0x0, + 0x19, 0x8, '2', 0x19, + 0x14, 0x2, 0x0, 0x1, + 0xd, '\n', 0x0, 0x19, + 0x0, 0x19, 0x8, '2', + 0x96, 0xaa, 0x2, 0x0, + 0x3, '\n', 0xff, 0xe7, + 0xff, 0xe7, 0x8, 0xce, + 'j', 'V', 0x2, 0x0, + 0x16, '\n', 0x0, 'K', + 0xff, 0xa6, 0x8, 0xce, + 0xe7, 0xec, 0x2, 0x0, + 0x1, '\n', 0x0, 'K', + 0xff, 0xf9, 0x8, 0xce, + 0xe7, 0xec, 0x2, 0x0, + 0x1, '\n', 0x0, 'K', + 0xff, 0xf9, 0x2, 0x0, + 0x1, '\n', 0xfe, 0xd4, + 0x0, '<', 0x2, 0x0, + 0x1, 0xf +}; + +const char s00a_dword_800E0220[] = {0x0, 0x4, 0x1, 0x0, 0x5, 0x2, 0x0, 0x1, 0xf}; + +ANIMATION s00a_dword_800C3418 = { PCX_B_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s00a_dword_800DFEB4 }; +ANIMATION s00a_dword_800C3434 = { PCX_Q_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s00a_dword_800E0018 }; +ANIMATION s00a_dword_800C3450 = { PCX_Q_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s00a_dword_800E011C }; +ANIMATION s00a_dword_800C346C = { PCX_HEART, 1, 1, 1, 1, 0, 1, 70, 70, 255, 0, (char *)s00a_dword_800E0220 }; + +short s00a_dword_800C3488 = PCX_B_MARK; +short s00a_dword_800C348A = PCX_Q_MARK; +short s00a_dword_800C348C = PCX_HEART; +short s00a_dword_800C348E = 0x0000; + +void *s00a_command_800CA1EC( MATRIX *mat, int mark ) +{ + SVECTOR *pos; + PRESCRIPT pre; + ANIMATION *anim; + + anim = 0; + pos = &pre.pos; + pos->vx = 0; + pos->vy = 800; + pos->vz = 0; + + pre.speed = DG_ZeroVector_800AB39C; + pre.scr_num = 0; + pre.s_anim = 0; + + switch ( mark ) + { + case 0: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3418; + break; + case 1: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3418; + break; + case 2: + s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3434; + break; + case 3: + s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3434; + break; + case 4: + s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3450; + break; + case 5: + s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3450; + break; + case 6: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348C; + anim = &s00a_dword_800C3418; + pre.scr_num = 1; + break; + } + + anim->field_14_pre_script = ⪯ + return NewAnime_8005FBC8( mat, 0, anim ); +} + +void *s00a_command_800CA320( MATRIX *mat, int mark ) +{ + SVECTOR *pos; + PRESCRIPT pre; + ANIMATION *anim; + + anim = 0; + pos = &pre.pos; + pos->vx = 0; + pos->vy = 600; + pos->vz = 0; + + pre.speed = DG_ZeroVector_800AB39C; + pre.scr_num = 1; + pre.s_anim = 0; + + switch ( mark ) + { + case 0: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3418; + break; + case 1: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3418; + break; + case 2: + s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3434; + break; + case 3: + s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3434; + break; + case 4: + s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3450; + break; + case 5: + s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3450; + break; + case 6: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348C; + anim = &s00a_dword_800C3418; + pre.scr_num = 2; + break; + } + + anim->field_14_pre_script = ⪯ + return NewAnime_8005FBC8( mat, 0, anim ); +} + +void *s00a_command_800CA458( MATRIX *mat, int mark ) +{ + SVECTOR *pos; + PRESCRIPT pre; + ANIMATION *anim; + + anim = 0; + pos = &pre.pos; + pos->vx = 0; + pos->vy = 120; + pos->vz = 0; + + pre.speed = DG_ZeroVector_800AB39C; + pre.scr_num = 2; + pre.s_anim = 0; + + switch ( mark ) + { + case 0: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3418; + pre.scr_num = 3; + break; + case 1: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3418; + break; + case 2: + s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3434; + break; + case 3: + s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3434; + break; + case 4: + s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C3488; + anim = &s00a_dword_800C3450; + break; + case 5: + s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C348A; + anim = &s00a_dword_800C3450; + break; + case 6: + s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348C; + anim = &s00a_dword_800C3418; + pre.scr_num = 3; + break; + } + + anim->field_14_pre_script = ⪯ + return NewAnime_8005FBC8( mat, 0, anim ); +} + +void s00a_command_800CA594( SVECTOR *pos ) +{ + ANIMATION *anm; + PRESCRIPT pre; + + pre.pos = *pos; + pre.speed = DG_ZeroVector_800AB39C; + pre.scr_num = 0; + pre.s_anim = 0; + + anm = &s00a_dword_800C346C; + anm->field_14_pre_script = ⪯ + + NewAnime_8005FBC8( NULL, 0, anm ); +} diff --git a/src/overlays/s00a/Anime/animeconv/unknown2.c b/src/overlays/s00a/Anime/animeconv/unknown2.c new file mode 100644 index 000000000..a385582a1 --- /dev/null +++ b/src/overlays/s00a/Anime/animeconv/unknown2.c @@ -0,0 +1,30 @@ +#include "libgcl/hash.h" +#include "Anime/animeconv/anime.h" + +extern SVECTOR DG_ZeroVector_800AB39C; + +const char s00a_dword_800E0288[] = { + 0x00, 0x1c, 0x01, 0x00, 0x05, 0x01, 0xfe, 0x04, + 0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x0c, 0x00, + 0x09, 0x01, 0xff, 0x0a, 0x00, 0x14, 0x00, 0x14, + 0x08, 0xe7, 0xe7, 0xe7, 0x02, 0x00, 0x01, 0x0d, + 0x0f +}; + +ANIMATION s00a_dword_800C3490 = { PCX_PCH_FOG, 1, 1, 1, 1, 800, 3, 600, 600, 250, 0, (char *)s00a_dword_800E0288 }; + +void s00a_command_800CA618( SVECTOR *pos ) +{ + ANIMATION *anm; + PRESCRIPT pre; + + pre.pos = *pos; + pre.speed = DG_ZeroVector_800AB39C; + pre.s_anim = 0; + + anm = &s00a_dword_800C3490; + anm->field_14_pre_script = ⪯ + pre.scr_num = 0; + + NewAnime_8005FBC8( NULL, 0, anm ); +} diff --git a/src/overlays/s00a/Anime/animeconv/unknown3.c b/src/overlays/s00a/Anime/animeconv/unknown3.c new file mode 100644 index 000000000..aeb92f2c4 --- /dev/null +++ b/src/overlays/s00a/Anime/animeconv/unknown3.c @@ -0,0 +1,264 @@ +#include "libgcl/hash.h" +#include "Anime/animeconv/anime.h" + +extern SVECTOR DG_ZeroVector_800AB39C; + +const char s00a_dword_800E02AC[] = { + 0x2, 0x97, 0x3, 0x0, + 0x9, 0x0, 0xe6, 0x1, + 0xc3, 0x8, 0x0, 0xfc, + 0xde, 0x4, 0x0, 'd', + 0x1, 0xf4, 0xff, 'S', + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, 0xc, + 0x0, 0x3, '\n', 0xfe, + 'p', 0x0, 0x0, 0x4, + 0xff, 0x9c, 0x0, 0x0, + 0xff, 0xe5, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, 0x4, 0xff, 0x9c, + 0x0, 0x0, 0x0, 0x1b, + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, '\n', + 0x1, 0x90, 0x0, 0x0, + 0x4, 0xff, 0xb7, 0x0, + 0x0, 0x0, 'I', 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, 0x4, 0xff, + 0xe5, 0x0, 0x0, 0x0, + 'd', 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + '\n', 0xfe, 'p', 0x0, + 0x0, 0x4, 0x0, 0x1b, + 0x0, 0x0, 0x0, 'd', + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, 0x4, + 0x0, 'I', 0x0, 0x0, + 0x0, 'I', 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, '\n', 0x1, 0x90, + 0x0, 0x0, 0x4, 0x0, + 'd', 0, 0, 0, + 0x1b, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + 0x4, 0x0, 'd', 0x0, + 0x0, 0xff, 0xe5, 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, '\n', 0xfe, + 'p', 0x0, 0x0, 0x4, + 0x0, 'I', 0x0, 0x0, + 0xff, 0xb7, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, 0x4, 0x0, 0x1b, + 0x0, 0x0, 0xff, 0x9c, + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, '\n', + 0x1, 0x90, 0x0, 0x0, + 0x4, 0xff, 0xe5, 0x0, + 0x0, 0xff, 0x9c, 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, 0x4, 0xff, + 0xb7, 0x0, 0x0, 0xff, + 0xb7, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + 0xd, 0xf, 0x8, 0x0, + 0xfc, 0xde, 0x4, 0xff, + '8', 0x1, 0xf4, 0x0, + 0x0, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + 0xc, 0x0, 0x3, '\n', + 0xfe, 'p', 0x0, 0x0, + 0x4, 0x0, 0x1b, 0x0, + 0x0, 0x0, 'd', 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, 0x4, 0x0, + 'I', 0, 0, 0, + 'I', 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + '\n', 0x1, 0x90, 0x0, + 0x0, 0x4, 0x0, 'd', + 0x0, 0x0, 0x0, 0x1b, + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, 0x4, + 0x0, 'd', 0x0, 0x0, + 0xff, 0xe5, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, '\n', 0xfe, 'p', + 0x0, 0x0, 0x4, 0x0, + 'I', 0x0, 0x0, 0xff, + 0xb7, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + 0x4, 0x0, 0x1b, 0x0, + 0x0, 0xff, 0x9c, 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, '\n', 0x1, + 0x90, 0x0, 0x0, 0x4, + 0xff, 0xe5, 0x0, 0x0, + 0xff, 0x9c, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, 0x4, 0xff, 0xb7, + 0x0, 0x0, 0xff, 0xb7, + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, '\n', + 0xfe, 'p', 0x0, 0x0, + 0x4, 0xff, 0x9c, 0x0, + 0x0, 0xff, 0xe5, 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, 0x4, 0xff, + 0x9c, 0x0, 0x0, 0x0, + 0x1b, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + '\n', 0x1, 0x90, 0x0, + 0x0, 0x4, 0xff, 0xb7, + 0x0, 0x0, 0x0, 'I', + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, 0x4, + 0xff, 0xe5, 0x0, 0x0, + 0x0, 'd', 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, 0xd, 0xf, 0x8, + 0x0, 0xfc, 0xde, 0x4, + 0x0, 'd', 0x1, 0xf4, + 0x0, 0xad, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, 0xc, 0x0, 0x3, + '\n', 0xfe, 'p', 0x0, + 0x0, 0x4, 0x0, 'I', + 0x0, 0x0, 0xff, 0xb7, + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, 0x4, + 0x0, 0x1b, 0x0, 0x0, + 0xff, 0x9c, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, '\n', 0x1, 0x90, + 0x0, 0x0, 0x4, 0xff, + 0xe5, 0x0, 0x0, 0xff, + 0x9c, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + 0x4, 0xff, 0xb7, 0x0, + 0x0, 0xff, 0xb7, 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, '\n', 0xfe, + 'p', 0x0, 0x0, 0x4, + 0xff, 0x9c, 0x0, 0x0, + 0xff, 0xe5, 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, 0x4, 0xff, 0x9c, + 0x0, 0x0, 0x0, 0x1b, + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, '\n', + 0x1, 0x90, 0x0, 0x0, + 0x4, 0xff, 0xb7, 0x0, + 0x0, 0x0, 'I', 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, 0x4, 0xff, + 0xe5, 0x0, 0x0, 0x0, + 'd', 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + '\n', 0xfe, 'p', 0x0, + 0x0, 0x4, 0x0, 0x1b, + 0x0, 0x0, 0x0, 'd', + 0xc, 0x0, 0x3, 0x2, + 0x0, 0x1, 0xd, 0x4, + 0x0, 'I', 0x0, 0x0, + 0x0, 'I', 0xc, 0x0, + 0x3, 0x2, 0x0, 0x1, + 0xd, '\n', 0x1, 0x90, + 0x0, 0x0, 0x4, 0x0, + 'd', 0, 0, 0, + 0x1b, 0xc, 0x0, 0x3, + 0x2, 0x0, 0x1, 0xd, + 0x4, 0x0, 'd', 0x0, + 0x0, 0xff, 0xe5, 0xc, + 0x0, 0x3, 0x2, 0x0, + 0x1, 0xd, 0xd, 0xf +}; + +const char s00a_dword_800E054C[] = { + 0x0, 'W', 0x1, 0x0, + 0x5, 0xc, 0x0, 0x1c, + '\n', 0x0, 0x5, 0x0, + 0x5, 0x4, 0x0, 0x0, + 0x0, '\n', 0x0, 0x0, + 0x2, 0x0, 0x1, 0xd, + 0xc, 0x0, 0x4, 0xc, + 0x0, 0x5, '\n', 0xff, + 0xf6, 0xff, 0xf6, 0x4, + 0x0, 0x0, 0x0, '\n', + 0x0, 0x0, 0x2, 0x0, + 0x1, 0xd, 0x2, 0x0, + 0x1, 0xc, 0x0, 0x5, + '\n', 0x0, '\n', 0x0, + '\n', 0x4, 0x0, 0x0, + 0x0, '\n', 0x0, 0x0, + 0x2, 0x0, 0x1, 0xd, + 0x2, 0x0, 0x1, 0xd, + 0xc, 0x0, 0xe, '\n', + 0xff, 0xf6, 0xff, 0xf6, + 0x4, 0x0, 0x0, 0x0, + '\n', 0x0, 0x0, 0x2, + 0x0, 0x1, 0xd, 0xf +}; + +const char s00a_dword_800E05A8[] = { + 0x0, 'A', 0x1, 0x0, + 0x5, 0x1, 0xfe, 0xc, + 0x0, 0x1c, 0x1, 0xff, + '\n', 0x0, 0x2, 0x0, + '\n', 0x4, 0x0, 0x0, + 0x0, '\n', 0x0, 0x0, + 0x2, 0x0, 0x1, 0xd, + 0xc, 0x0, 0x4, 0xc, + 0x0, 0x5, 0x1, 0xff, + 0x4, 0x0, 0x0, 0x0, + '\n', 0x0, 0x0, 0x2, + 0x0, 0x1, 0xd, 0xd, + 0xc, 0x0, 0xe, 0x1, + 0xff, '\n', 0xff, 0xfc, + 0xff, 0xec, 0x4, 0x0, + 0x0, 0x0, '\n', 0x0, + 0x0, 0x2, 0x0, 0x1, + 0xd, 0xf +}; + +ANIMATION s00a_dword_800C34AC = { PCX_HOSI, 1, 1, 1, 1, 0, 1, 200, 200, 128, 0, (char *)s00a_dword_800E02AC }; +ANIMATION s00a_dword_800C34C8 = { 0x4184, 1, 1, 1, 1, 0, 5, 10, 10, 128, 0, (char *)s00a_dword_800E054C }; +ANIMATION s00a_dword_800C34E4 = { PCX_SMOKE, 8, 4, 30, 1, 0, 1, 10, 10, 255, 0, (char *)s00a_dword_800E05A8 }; + +void s00a_command_800CA69C( SVECTOR *pos ) +{ + ANIMATION *anm; + PRESCRIPT pre; + + pre.pos = *pos; + pre.speed = DG_ZeroVector_800AB39C; + pre.s_anim = 0; + + anm = &s00a_dword_800C34AC; + anm->field_14_pre_script = ⪯ + + pre.scr_num = 0; + NewAnime_8005FBC8( NULL, 0, anm ); + + pre.scr_num = 1; + NewAnime_8005FBC8( NULL, 0, anm ); + + pre.scr_num = 2; + NewAnime_8005FBC8( NULL, 0, anm ); +} + +void s00a_command_800CA758( SVECTOR* pos ) +{ + ANIMATION *anm; + PRESCRIPT pre; + + pre.pos = *pos; + pre.speed = DG_ZeroVector_800AB39C; + pre.s_anim = 0; + + anm = &s00a_dword_800C34E4; + anm->field_14_pre_script = ⪯ + pre.scr_num = 0; + + NewAnime_8005FBC8( NULL, 0, anm ); +} diff --git a/src/overlays/s00a/Anime/animeconv/unknown4.c b/src/overlays/s00a/Anime/animeconv/unknown4.c new file mode 100644 index 000000000..26d4e797a --- /dev/null +++ b/src/overlays/s00a/Anime/animeconv/unknown4.c @@ -0,0 +1,71 @@ +#include "libgcl/hash.h" +#include "Anime/animeconv/anime.h" + +extern SVECTOR DG_ZeroVector_800AB39C; + +const char s00a_dword_800E05F0[] = { + 0x0, 0x96, 0x3, 0x0, + 0x9, 0x0, ';', 0x0, + 'm', 0x8, 0x0, 0x2, + 0x1e, 0x2, 0x0, 0x1, + 0xc, 0x0, 0x19, 0x8, + 0x4, 0x6, 0x6, '\n', + 0x0, 0x4, 0x0, 0x4, + 0x4, 0x0, 0x4, 0x0, + 0x14, 0x0, 0x0, 0x2, + 0x0, 0x1, 0xd, 0xc, + 0x0, 0xf, '\n', 0x0, + 0x4, 0x0, 0x4, 0x4, + 0x0, 0x4, 0x0, 0x14, + 0x0, 0x0, 0x2, 0x0, + 0x1, 0xd, 0xf, 0x8, + 0x0, 0x2, 0x1e, 0x2, + 0x0, 0xb, 0xc, 0x0, + 0x19, 0x8, 0x4, 0x6, + 0x6, '\n', 0x0, 0x4, + 0x0, 0x4, 0x4, 0x0, + 0x4, 0x0, 0x14, 0x0, + 0x0, 0x2, 0x0, 0x1, + 0xd, 0xc, 0x0, 0xf, + '\n', 0x0, 0x4, 0x0, + 0x4, 0x4, 0x0, 0x4, + 0x0, 0x14, 0x0, 0x0, + 0x2, 0x0, 0x1, 0xd, + 0xf, 0x8, 0x0, 0x2, + 0x1e, 0x2, 0x0, 0x15, + 0xc, 0x0, 0x19, 0x8, + 0x4, 0x6, 0x6, '\n', + 0x0, 0x4, 0x0, 0x4, + 0x4, 0x0, 0x4, 0x0, + 0x14, 0x0, 0x0, 0x2, + 0x0, 0x1, 0xd, 0xc, + 0x0, 0xf, '\n', 0x0, + 0x4, 0x0, 0x4, 0x4, + 0x0, 0x4, 0x0, 0x14, + 0x0, 0x0, 0x2, 0x0, + 0x1, 0xd, 0xf +}; + +ANIMATION s00a_dword_800C3500 = { PCX_ZZZ, 1, 1, 1, 1, 0, 1, 2, 2, 0, 0, (char *)s00a_dword_800E05F0 }; + +void s00a_command_800CA7DC( SVECTOR *pos ) +{ + ANIMATION *anm; + PRESCRIPT pre; + + pre.pos = *pos; + pre.speed = DG_ZeroVector_800AB39C; + pre.s_anim = 0; + + anm = &s00a_dword_800C3500; + anm->field_14_pre_script = ⪯ + + pre.scr_num = 0; + NewAnime_8005FBC8( NULL, 0, anm ); + + pre.scr_num = 1; + NewAnime_8005FBC8( NULL, 0, anm ); + + pre.scr_num = 2; + NewAnime_8005FBC8( NULL, 0, anm ); +} diff --git a/src/overlays/s00a/Enemy/action.c b/src/overlays/s00a/Enemy/action.c index 65ca3d994..891ac147c 100644 --- a/src/overlays/s00a/Enemy/action.c +++ b/src/overlays/s00a/Enemy/action.c @@ -1,6 +1,19 @@ #include "enemy_externs.h" +#include "Game/item.h" #include "Game/linkvarbuf.h" +short ActTable_800C3358[54] = +{ + 0x13, 0x14, 0x0A, 0x16, 0x09, 0x22, 0x23, 0x24, 0x2D, + 0x0D, 0x0C, 0x1A, 0x0F, 0x0E, 0x10, 0x1B, 0x08, 0x2E, + 0x32, 0x15, 0x1E, 0x1F, 0x20, 0x21, 0x25, 0x34, 0x35, + 0x19, 0x05, 0x02, 0x2A, 0x04, 0x27, 0x28, 0x06, 0x07, + 0x26, 0x03, 0x29, 0x11, 0x12, 0x2B, 0x17, 0x18, 0x1C, + 0x1D, 0x00, 0x01, 0x33, 0x11, 0x12, 0x2B, 0x16, 0x0B +}; + +SVECTOR s00a_dword_800C33C4 = { -150, 0, 300 }; +SVECTOR s00a_dword_800C33CC = { 0, -550, 950 }; extern int GV_NearExp4P_80026554(int from, int to); @@ -9,17 +22,14 @@ extern OBJECT *GM_PlayerBody_800ABA20; extern CONTROL *GM_PlayerControl_800AB9F4; extern SVECTOR GM_PlayerPosition_800ABA10; extern unsigned int GM_PlayerStatus_800ABA50; -extern int GM_PlayerAction_800ABA40; +extern int GM_PlayerAction_800ABA40; +extern int GM_PlayerMap_800ABA0C; -extern const char aComstdanbowl0_800DFDB8[]; // = " ~COM_ST_DANBOWL 0 !! \n "; -extern const char aComstdanbowl1_800DFDD4[]; // = " ~COM_ST_DANBOWL 1 !! \n "; -extern const char aComstdanbowl2_800DFDF0[]; // = " ~COM_ST_DANBOWL 2 !! \n "; +const char aComstdanbowl0_800DFDB8[] = " ~COM_ST_DANBOWL 0 !! \n "; +const char aComstdanbowl1_800DFDD4[] = " ~COM_ST_DANBOWL 1 !! \n "; +const char aComstdanbowl2_800DFDF0[] = " ~COM_ST_DANBOWL 2 !! \n "; -extern SVECTOR s00a_dword_800C33C4; -extern int GM_PlayerMap_800ABA0C; -extern const char aMapchange_800DFE0C[]; // map change \n; - -extern const char aEnemyresetmaxdnumd_800DFE50[]; //"enemy reset max=%d num=%d \n"; +const char aMapchange_800DFE0C[] = " map change \n"; void ActStandStill_800C5C84(WatcherWork* work, int time ) { @@ -1242,7 +1252,7 @@ void s00a_command_800C818C( WatcherWork *work, int time ) if ( EnemyCommand_800E0D98.field_0xC8[ work->field_B78 ].field_04 == 2 ) { s00a_command_800C55B0( work ); - printf(aEnemyresetmaxdnumd_800DFE50, EnemyCommand_800E0D98.reset_enemy_max, EnemyCommand_800E0D98.reset_enemy_num); + printf("enemy reset max=%d num=%d \n", EnemyCommand_800E0D98.reset_enemy_max, EnemyCommand_800E0D98.reset_enemy_num); SetMode( work, ActStandStill_800C5C84) ; } } @@ -1528,7 +1538,6 @@ void s00a_command_800C8A6C( WatcherWork *work, int time ) } } -extern SVECTOR s00a_dword_800C33CC; extern void AN_Unknown_800C3B7C( MATRIX *matrix ); void s00a_command_800C8C58( WatcherWork* work ) @@ -1618,3 +1627,399 @@ void s00a_command_800C8DF8( WatcherWork *work, int time ) UnsetMode2( work ); } } + +extern int GV_Time_800AB330; +extern SVECTOR DG_ZeroVector_800AB39C; +extern int GM_PlayerMap_800ABA0C; +extern SVECTOR GM_PlayerPosition_800ABA10; + +SVECTOR s00a_dword_800C33D4 = { 0, 0, 100 }; +SVECTOR s00a_dword_800C33DC = { -1024, 0, 0 }; +SVECTOR s00a_dword_800C33E4 = { 0, 0, 100 }; +SVECTOR s00a_dword_800C33EC = { -1024, 0, 0 }; + +const char *s00a_off_800C33F4[3] = { + "RATION", + "SOCOM/BULLET * 12", + "FA-MAS/BULLET * 25" +}; + +void ENE_PutSound_800C9414( WatcherWork* work ); +void ENE_PutBreath_800C94B8( WatcherWork *work, int arg1 ); +void ENE_PutLSight_800C9600( WatcherWork* work ); +void ENE_PutBulletEx_800C963C( WatcherWork *work ); + +void *PutFuncList_800C3400[4] = { + ENE_PutSound_800C9414, + ENE_PutBreath_800C94B8, + ENE_PutLSight_800C9600, + ENE_PutBulletEx_800C963C +}; + +SVECTOR s00a_dword_800C3410 = { 5, -500, 80, 0 }; + +extern short s00a_dword_800E0F12; + +extern void anime_create_8005D6BC( MATRIX *, int ); +extern void anime_create_8005D604( MATRIX * ); +extern void *NewBulletEx_80076708( int, MATRIX*, int, int, int, int, int, int, int ); +extern void NewBlood_80072728( MATRIX *, int ); +extern void NewLSight_800D1D2C( SVECTOR *from, SVECTOR *to, int color ) ; +extern void AN_Breath_800C3AA8( MATRIX *, int ); + +void ENE_PutBlood_800C8FF8( WatcherWork* work, int obj_idx, int count ) +{ + MATRIX mat; + DG_SetPos_8001BC44(&work->body.objs->objs[obj_idx].world); + DG_MovePos_8001BD20( &s00a_dword_800C33D4 ); + DG_RotatePos_8001BD64( &s00a_dword_800C33DC ); + ReadRotMatrix( &mat ); + NewBlood_80072728( &mat, count ); +} + +void ENE_PutFog_800C9068( WatcherWork* work ) +{ + MATRIX mat; + SVECTOR svec; + + DG_SetPos_8001BC44( &work->body.objs->objs[1].world ); + DG_MovePos_8001BD20( &s00a_dword_800C33E4 ); + DG_RotatePos_8001BD64( &s00a_dword_800C33EC ); + ReadRotMatrix( &mat ); + + svec.vx = mat.t[ 0 ]; + svec.vy = mat.t[ 1 ]; + svec.vz = mat.t[ 2 ]; + + s00a_command_800CA618( &svec ); +} + +void ENE_PutItem_800C90CC( WatcherWork *work ) +{ + int a1; + int a2; + int rand; + SVECTOR svec; + CONTROL *ctrl; + Item_Info item; + svec = work->field_8D4; + rand = 8; + ctrl = &work->control; + svec.vx += GV_RandU_80017090( rand ); + svec.vy += 100; + rand = GV_RandU_80017090( rand ); + svec.vz += rand; + + switch ( work->local_data ) + { + case 0: + rand = GV_RandU_80017090( 4 ); + break; + case 1: + rand = 3; + break; + case 2: + rand = 0; + break; + case 3: + rand = 1; + break; + case 4: + rand = 2; + break; + } + + a1 = 1; + switch ( rand ) + { + default: + break; + case 3: + return; + case 0: + //ration + item.field_4_type = 4; + item.field_6_id = ITEM_RATION; + item.field_8_amount = 1; + item.field_0_pName = s00a_off_800C33F4[0]; + break; + case 1: + //socom + if ( GM_SocomFlag < 0 ) + { + item.field_4_type = 4; + item.field_6_id = 13; + item.field_8_amount = 1; + item.field_0_pName = s00a_off_800C33F4[0]; + } + else + { + //Socom bullets + item.field_4_type = 2; + item.field_6_id = WEAPON_SOCOM; + if ( work->local_data2 == 0 ) + { + item.field_8_amount = 12; + item.field_0_pName = s00a_off_800C33F4[1]; + } + else + { + a1 = 9; + if ( work-> local_data2 > 99 ) + { + a2 = a1; + } + else + { + a1 = work->local_data2 / 10; + a2 = work->local_data2 % 10; + } + if ( a1 == 0 ) + { + s00a_off_800C33F4[1][15] = 0x20; + } + else + { + s00a_off_800C33F4[1][15] = a1 + 0x30; + } + s00a_off_800C33F4[1][16] = a2 + 0x30; + item.field_0_pName = s00a_off_800C33F4[1]; + item.field_8_amount = work->local_data2; + } + } + break; + case 2: + //famas + if ( GM_FamasFlag < 0 || GM_DifficultyFlag < 0 ) + { + item.field_4_type = 4; + item.field_6_id = 13; + item.field_8_amount = 1; + item.field_0_pName = s00a_off_800C33F4[0]; + } + else + { + item.field_4_type = 2; + item.field_6_id = 1; + item.field_8_amount = 25; + item.field_0_pName = s00a_off_800C33F4[2]; + } + break; + } + item.field_A = 450; + if ( work->param_item == 1 ) + { + item_init_80034758( &ctrl->field_0_mov, &svec, &item ); + } +} + +void ENE_PutMark_800C9378( WatcherWork *work, int mark ) +{ + MATRIX *mat; + if ( !( work->control.field_2C_map->field_0_map_index_bit & GM_PlayerMap_800ABA0C ) ) + { + return; + } + + mat = &work->body.objs->objs[6].world; + if( mark == 0 ) + { + s00a_command_800CEC40( &work->control.field_0_mov , 0x10 ); + } + + if ( work->mark_time ) + { + GV_DestroyOtherActor_800151D8( (GV_ACT*)work->next_node ); + } + + work->next_node = (int)s00a_command_800CA1EC( mat , mark ) ; + work->mark_time = 30; +} + +void ENE_PutSound_800C9414( WatcherWork* work ) +{ + int a1, a3; + int a2; + int v1; + if ( !EnemyCommand_800E0D98.field_0x17A ) return; + + a3 = work->field_8E0; + a2 = work->m_ctrl.field_04_info1.field_2_footstepsFrame; + + v1 = ( ( work->field_B78 % 4 ) * 2 ) + 0xA0; + a1 = ( ( work->field_B78 % 4 ) * 2 ) + 0xA1; + + if( a3 == 1 ) + { + if ( a2 == 22 ) + { + GM_SeSet_80032858( &work->control.field_0_mov, a1 ); + } + else if ( a2 == 11 ) + { + GM_SeSet_80032858( &work->control.field_0_mov, v1 ); + } + } + else if ( a3 == 2 ) + { + if ( a2 == 16 ) + { + GM_SeSet_80032858( &work->control.field_0_mov, a1 ); + } + else if ( a2 == 8 ) + { + GM_SeSet_80032858( &work->control.field_0_mov, v1 ); + } + } +} + +void ENE_PutBreath_800C94B8( WatcherWork *work, int arg1 ) +{ + int frame; + if ( EnemyCommand_800E0D98.mode == TOP_COMM_ALERT ) + { + return; + } + + if ( !( work->control.field_2C_map->field_0_map_index_bit & GM_PlayerMap_800ABA0C ) ) + { + return; + } + + if ( work->field_8E2 == 20 ) + { + frame = work->m_ctrl.field_1C_info2.field_2_footstepsFrame; + if ( frame == 31 ) + { + AN_Breath_800C3AA8( &work->body.objs->objs[6].world , arg1 ); + } + } + else if ( work->field_8E2 == 22 ) + { + frame = work->m_ctrl.field_1C_info2.field_2_footstepsFrame; + if ( ( frame == 15 ) || ( frame == 35 ) || ( frame == 50 ) || ( frame == 60 ) || + ( frame == 70 ) || ( frame == 74 ) || ( frame == 78 ) ) + { + AN_Breath_800C3AA8( &work->body.objs->objs[6].world , arg1 ); + } + } + else if ( work->field_8E2 == 19 ) + { + frame = work->m_ctrl.field_1C_info2.field_2_footstepsFrame; + if ( ( frame == 30 ) || ( frame == 40 ) || ( frame == 50 ) || ( frame == 60 ) || + ( frame == 70 ) || ( frame == 80 ) || ( frame == 90 ) || ( frame == 95 ) || + ( frame == 100 ) || ( frame == 105 ) ) + { + AN_Breath_800C3AA8( &work->body.objs->objs[6].world, arg1 ); + } + } + else + { + if ( ( GV_Time_800AB330 % 64 ) == ( work->field_B78 * 16 ) ) + { + AN_Breath_800C3AA8( &work->body.objs->objs[6].world , GV_Time_800AB330 ); + } + } +} + +void ENE_PutLSight_800C9600( WatcherWork* work ) +{ + if ( work->vision.field_B92 == 2 ) + { + NewLSight_800D1D2C( &GM_PlayerPosition_800ABA10, &work->control.field_0_mov, 0x00008F ); + } +} + +void ENE_PutBulletEx_800C963C( WatcherWork *work ) +{ + int damage; + MATRIX* mat; + SVECTOR svec; + MATRIX local_mat; + + svec = DG_ZeroVector_800AB39C; + svec.vz = GV_RandU_80017090( 128 ); + mat = &work->body.objs->objs[4].world; + + DG_SetPos_8001BC44( mat ); + DG_MovePos_8001BD20( &s00a_dword_800C3410 ); + DG_RotatePos_8001BD64( &svec ); + + svec.vx = GV_RandS_800170BC( 16 ) + 1024; + svec.vz = 0; + + DG_RotatePos_8001BD64( &svec ); + ReadRotMatrix( &local_mat ); + + switch ( GM_DifficultyFlag ) + { + case 1: + damage = 96; + break; + case 2: + case 3: + damage = 128; + break; + default: + damage = 64; + break; + } + + if ( GV_Time_800AB330 & 3 ) + { + NewBulletEx_80076708( 0x100, &local_mat, 2, 1, 0, 0xA, damage, 0x2710, 0x2EE); + } + else + { + NewBulletEx_80076708( 0x1100, &local_mat, 2, 1, 0, 0xA, damage, 0x2710, 0x2EE); + } + + GM_Sound_800329C4( &work->control.field_0_mov, 0x2D, 1 ); + anime_create_8005D6BC( mat, 0 ); + anime_create_8005D604( &local_mat ); + ENE_ClearPutChar_800C97E4( work, ENE_PutBulletEx_800C963C ); +} + +int ENE_SetPutChar_800C979C( WatcherWork *work, int idx ) +{ + int i; + + for ( i = 0 ; i < 8 ; i++ ) + { + if ( work->field_B00[ i ] == NULL ) + { + work->field_B00[ i ] = PutFuncList_800C3400[ idx ]; + return 1; + } + } + return 0; +} + +int ENE_ClearPutChar_800C97E4( WatcherWork *work, void *func ) +{ + int i; + + for ( i = 0 ; i < 8 ; i++ ) + { + if ( work->field_B00[ i ] == func ) + { + work->field_B00[ i ] = 0; + return 1; + } + } + return 0; +} + +void ENE_ExecPutChar_800C9818( WatcherWork* work ) +{ + int i; + + for ( i = 0 ; i < 8 ; i++ ) + { + if ( work->field_B00[i] ) + { + PUTFUNC func = work->field_B00[i]; + func( work ); + } + } +} diff --git a/src/overlays/s00a/Enemy/asiato.c b/src/overlays/s00a/Enemy/asiato.c index 43e6b0fd7..9526c975e 100644 --- a/src/overlays/s00a/Enemy/asiato.c +++ b/src/overlays/s00a/Enemy/asiato.c @@ -2,8 +2,6 @@ #include "libgv/libgv.h" #include "Game/game.h" -extern const char aAsiatoc_800E0998[]; // asiato.c - SVECTOR SECTION("overlay.bss") asiato_svecs[49]; extern int s00a_dword_800E0F90; @@ -188,7 +186,7 @@ GV_ACT *NewAsiatoChar_800D11DC(MATRIX *arg0, int arg1, int arg2, int arg3, int a if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s00a_asiato_800D0E10, - (TActorFunction)s00a_asiato_800D116C, aAsiatoc_800E0998); + (TActorFunction)s00a_asiato_800D116C, "asiato.c"); work->field_4C = arg3; if (s00a_asiato_800D0F90(work, arg0, arg1, arg2) < 0) { @@ -477,7 +475,7 @@ GV_ACT *NewAsiato_800D1A14(int name, int where, int argc, char **argv) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s00a_asiato_800D18C8, - (TActorFunction)AsiatoDie_800D1994, aAsiatoc_800E0998); + (TActorFunction)AsiatoDie_800D1994, "asiato.c"); s00a_asiato_800D199C(work); } @@ -493,7 +491,7 @@ GV_ACT *NewAsiatoKun_800D1A70(int name, int where, int argc, char **argv) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s00a_asiato_800D18C8, - (TActorFunction)AsiatoDie_800D1994, aAsiatoc_800E0998); + (TActorFunction)AsiatoDie_800D1994, "asiato.c"); s00a_asiato_800D199C(work); } diff --git a/src/overlays/s00a/Enemy/boxkeri.c b/src/overlays/s00a/Enemy/boxkeri.c index b01d4d53b..12dce4792 100644 --- a/src/overlays/s00a/Enemy/boxkeri.c +++ b/src/overlays/s00a/Enemy/boxkeri.c @@ -16,16 +16,16 @@ typedef struct BoxKeriWork MATRIX field_7C_mat[2]; } BoxKeriWork; +const char aBoxkeriSnake[] = "スネーク"; +const char sBoxkeriDanbowl[] = "段ボール"; +const char aCbBox[] = "cb_box"; +const char aBoxkeriC[] = "boxkeri.c"; + extern SVECTOR DG_ZeroVector_800AB39C; extern CONTROL *GM_PlayerControl_800AB9F4; extern SVECTOR GM_PlayerPosition_800ABA10; extern int GM_PlayerMap_800ABA0C; -extern const char aBoxkeriSnake[]; // = "スネーク" -extern const char sBoxkeriDanbowl[]; // = "段ボール" -extern const char aCbBox[]; // = "cb_box.c" -extern const char aBoxkeriC[]; // = "boxkeri.c" - void s00a_boxkeri_800D219C(BoxKeriWork *work) { int field_74; diff --git a/src/overlays/s00a/Enemy/check.c b/src/overlays/s00a/Enemy/check.c index 5d8ed2ec0..338043595 100644 --- a/src/overlays/s00a/Enemy/check.c +++ b/src/overlays/s00a/Enemy/check.c @@ -6,14 +6,6 @@ extern void s00a_command_800C6FA8( WatcherWork *work, int time ); extern OBJECT *GM_PlayerBody_800ABA20; extern SVECTOR DG_ZeroVector_800AB39C; -extern const char aPlayxresetdwarpd_800DFD1C[];// " play = %x reset = %d warp = %d \n"; -extern const char aErrnozoneidingcl_800DFD40[];// "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; -extern const char aErrerrenemyresetnumerrcallkorekadoooooooooo_800DFD68[];// " Err Err Enemy Reset Num Err CALL KOREKADOOOOOOOOOO!!\n"; - -extern SVECTOR rp_shift_800DFDA0; -extern SVECTOR force_800DFDA8; -extern SVECTOR size_800DFDB0; - int s00a_command_800C50B0( WatcherWork *work ) { TARGET *target; @@ -113,9 +105,13 @@ int s00a_command_800C5194( WatcherWork *work ) { return 1; } -extern const char aPlayxresetdwarpd_800DFD1C[];// " play = %x reset = %d warp = %d \n"; -extern const char aErrnozoneidingcl_800DFD40[];// "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; -extern const char aErrerrenemyresetnumerrcallkorekadoooooooooo_800DFD68[];// " Err Err Enemy Reset Num Err CALL KOREKADOOOOOOOOOO!!\n"; +const char aPlayxresetdwarpd_800DFD1C[] = " play = %x reset = %d warp = %d \n"; +const char aErrnozoneidingcl_800DFD40[] = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; +const char aErrerrenemyresetnumerrcallkorekadoooooooooo_800DFD68[] = " Err Err Enemy Reset Num Err CALL KOREKADOOOOOOOOOO!!\n"; + +const SVECTOR rp_shift_800DFDA0 = { -200, 100, 600 }; /* 右パンチ */ +const SVECTOR force_800DFDA8 = { 5, 0, 100 }; +const SVECTOR size_800DFDB0 = { 400, 1000, 400 }; int s00a_command_800C5370( WatcherWork * work ) { diff --git a/src/overlays/s00a/Enemy/command.c b/src/overlays/s00a/Enemy/command.c index e090f6be5..05e2e3666 100644 --- a/src/overlays/s00a/Enemy/command.c +++ b/src/overlays/s00a/Enemy/command.c @@ -15,26 +15,34 @@ extern int GM_event_camera_flag_800ABA9C; extern CONTROL *GM_WhereList_800B56D0[94]; extern GM_Camera GM_Camera_800B77E8; +SVECTOR ENEMY_TARGET_SIZE_800C35A4 = { 300, 1000, 300 }; +SVECTOR ENEMY_TARGET_FORCE_800C35AC = { 0, 0, 0 }; +SVECTOR ENEMY_ATTACK_SIZE_800C35B4 = { 800, 500, 800 }; +SVECTOR ENEMY_ATTACK_FORCE_800C35BC = { 100, 0, 0 }; +SVECTOR ENEMY_TOUCH_SIZE_800C35C4 = { 300, 800, 300 }; +SVECTOR ENEMY_TOUCH_FORCE_800C35CC = { 0, 0, 0, 0 }; +SVECTOR COM_NO_POINT_800C35D4 = { 30000, 30000, 30000 }; -unsigned char s00a_dword_800C35DC[4]; -unsigned char s00a_dword_800C35E0[4]; -extern int s00a_dword_800C35E4[8]; +unsigned char s00a_dword_800C35DC[4] = { 1, 1, 0, 0 }; +unsigned char s00a_dword_800C35E0[4] = { 255, 1, 0, 0 }; + +int s00a_dword_800C35E4[] = { + 0x000009C4, + 0x00000DAC, + 0x00000FA0, + 0x00001388, + 0x0000157C, + 0x000015E0, + 0x00001644, + 0x000016A8 +}; extern int COM_NoiseMinDisID_800E0D44; extern int s00a_dword_800E0D30; extern int COM_VibTime_800E0F68; - -extern const char aCresetposd_800E07FC[]; // = " c_reset_pos = %d \n" -extern const char aKottida_800E0810[]; // = "kottida !!\n" -extern const char s00a_aResetmaxdnumd_800E083C[]; // = "reset max=%d num=%d \n" -extern const char aGmenemywatchcountd_800E0854[]; // = "GM_EnemyWatchCount = [%d] \n" -extern const char aNowzonedrzoned_800E0874[]; // = " now zone = %d r_zone=%d\n" -extern const char aNotrestrctedaread_800E0890[]; // = " ? ? ? Not Restrcted Area [%d] !!!!\n" -extern const char aErrerrerrnotlinkroutedtod_800E08B8[]; // = " Err Err Err Not Link Route [%d] to [%d] !!!!\n" -extern const char aCommanderrnozoneidingclzdidd_800E08E8[]; // = "command:!!!Err No Zone ID In Gcl z%d id%d!!!!!!!!\n" -extern const char aCommandcwhereissnake_800E091C[]; // = "command.c: Where Is Snake ????\n" -extern const char aCommandC_800E0970[]; // = "command.c" +const char aCresetposd_800E07FC[] = " c_reset_pos = %d \n"; +const char aKottida_800E0810[] = "kottida !!\n"; void GM_AlertModeSet_8002EA68( int ); void NewPadVibration_8005D58C( unsigned char *ptr, int flags ); @@ -482,6 +490,16 @@ void s00a_command_800CF420( ENEMY_COMMAND* command ) } } +const char s00a_aResetmaxdnumd_800E083C[] = "reset max=%d num=%d \n"; +const char aGmenemywatchcountd_800E0854[] = " GM_EnemyWatchCount = [%d] \n"; +const char aNowzonedrzoned_800E0874[] = " now zone = %d r_zone=%d\n"; +const char aNotrestrctedaread_800E0890[] = " ? ? ? Not Restrcted Area [%d] !!!!\n"; +const char aErrerrerrnotlinkroutedtod_800E08B8[] = " Err Err Err Not Link Route [%d] to [%d] !!!!\n"; +const char aCommanderrnozoneidingclzdidd_800E08E8[] = "command:!!!Err No Zone ID In Gcl z%d id%d!!!!!!!!\n"; +const char aCommandcwhereissnake_800E091C[] = "command.c: Where Is Snake ????\n"; +const char aCom_noisemode_disD_800E0940[] = " COM_NOISEMODE_DIS =%d \n"; +const char aEeeDDDTD_800E095C[] = "eee %d %d %d t %d \n"; + void s00a_command_800CF504( C8_STRUCT* struct_c8 , int i ) { int x = struct_c8->field_08; @@ -1251,7 +1269,7 @@ void *NewCommand_800D0908( int name, int where, int argc, char **argv ) work = (CommanderWork *)GV_NewActor_800150E4( 4, sizeof( CommanderWork ) ) ; if ( work != NULL ) { - GV_SetNamedActor_8001514C( &( work->actor ), ( TActorFunction )CommandAct_800D0258, ( TActorFunction )CommandDie_800D02EC, aCommandC_800E0970 ); + GV_SetNamedActor_8001514C( &( work->actor ), ( TActorFunction )CommandAct_800D0258, ( TActorFunction )CommandDie_800D02EC, "command.c" ); CommandGetResources_800D04F4( work, name, where ); } return (void *)work ; diff --git a/src/overlays/s00a/Enemy/enemy.c b/src/overlays/s00a/Enemy/enemy.c index 59fa41b5b..1a7bfecbb 100644 --- a/src/overlays/s00a/Enemy/enemy.c +++ b/src/overlays/s00a/Enemy/enemy.c @@ -1,6 +1,7 @@ #include "enemy_externs.h" -#include "Game/linkvarbuf.h" +#include "libgcl/hash.h" #include "Anime/animeconv/anime.h" +#include "Game/linkvarbuf.h" extern int GV_Time_800AB330; extern SVECTOR DG_ZeroVector_800AB39C; @@ -423,255 +424,3 @@ void EnemyPushMove_800CA0E8( WatcherWork *work ) ctrl->field_4C_turn.vy = s1; ctrl->field_36 = GV_NearExp2_80026384( ctrl->field_36, work->field_8E4 ); } - -void *s00a_command_800CA1EC( MATRIX *mat, int mark ) -{ - SVECTOR *pos; - PRESCRIPT pre; - ANIMATION *anim; - - anim = 0; - pos = &pre.pos; - pos->vx = 0; - pos->vy = 800; - pos->vz = 0; - - pre.speed = DG_ZeroVector_800AB39C; - pre.scr_num = 0; - pre.s_anim = 0; - - switch ( mark ) - { - case 0: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3418; - break; - case 1: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3418; - break; - case 2: - s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3434; - break; - case 3: - s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3434; - break; - case 4: - s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3450; - break; - case 5: - s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3450; - break; - case 6: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348C; - anim = &s00a_dword_800C3418; - pre.scr_num = 1; - break; - } - - anim->field_14_pre_script = ⪯ - return NewAnime_8005FBC8( mat, 0, anim ); -} - -void *s00a_command_800CA320( MATRIX *mat, int mark ) -{ - SVECTOR *pos; - PRESCRIPT pre; - ANIMATION *anim; - - anim = 0; - pos = &pre.pos; - pos->vx = 0; - pos->vy = 600; - pos->vz = 0; - - pre.speed = DG_ZeroVector_800AB39C; - pre.scr_num = 1; - pre.s_anim = 0; - - switch ( mark ) - { - case 0: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3418; - break; - case 1: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3418; - break; - case 2: - s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3434; - break; - case 3: - s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3434; - break; - case 4: - s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3450; - break; - case 5: - s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3450; - break; - case 6: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348C; - anim = &s00a_dword_800C3418; - pre.scr_num = 2; - break; - } - - anim->field_14_pre_script = ⪯ - return NewAnime_8005FBC8( mat, 0, anim ); -} - -void *s00a_command_800CA458( MATRIX *mat, int mark ) -{ - SVECTOR *pos; - PRESCRIPT pre; - ANIMATION *anim; - - anim = 0; - pos = &pre.pos; - pos->vx = 0; - pos->vy = 120; - pos->vz = 0; - - pre.speed = DG_ZeroVector_800AB39C; - pre.scr_num = 2; - pre.s_anim = 0; - - switch ( mark ) - { - case 0: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3418; - pre.scr_num = 3; - break; - case 1: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3418; - break; - case 2: - s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3434; - break; - case 3: - s00a_dword_800C3434.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3434; - break; - case 4: - s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C3488; - anim = &s00a_dword_800C3450; - break; - case 5: - s00a_dword_800C3450.field_0_texture_hash = s00a_dword_800C348A; - anim = &s00a_dword_800C3450; - break; - case 6: - s00a_dword_800C3418.field_0_texture_hash = s00a_dword_800C348C; - anim = &s00a_dword_800C3418; - pre.scr_num = 3; - break; - } - - anim->field_14_pre_script = ⪯ - return NewAnime_8005FBC8( mat, 0, anim ); -} - -void s00a_command_800CA594( SVECTOR *pos ) -{ - ANIMATION *anm; - PRESCRIPT pre; - - pre.pos = *pos; - pre.speed = DG_ZeroVector_800AB39C; - pre.scr_num = 0; - pre.s_anim = 0; - - anm = &s00a_dword_800C346C; - anm->field_14_pre_script = ⪯ - - NewAnime_8005FBC8( NULL, 0, anm ); -} - -void s00a_command_800CA618( SVECTOR *pos ) -{ - ANIMATION *anm; - PRESCRIPT pre; - - pre.pos = *pos; - pre.speed = DG_ZeroVector_800AB39C; - pre.s_anim = 0; - - anm = &s00a_dword_800C3490; - anm->field_14_pre_script = ⪯ - pre.scr_num = 0; - - NewAnime_8005FBC8( NULL, 0, anm ); -} - -void s00a_command_800CA69C( SVECTOR *pos ) -{ - ANIMATION *anm; - PRESCRIPT pre; - - pre.pos = *pos; - pre.speed = DG_ZeroVector_800AB39C; - pre.s_anim = 0; - - anm = &s00a_dword_800C34AC; - anm->field_14_pre_script = ⪯ - - pre.scr_num = 0; - NewAnime_8005FBC8( NULL, 0, anm ); - - pre.scr_num = 1; - NewAnime_8005FBC8( NULL, 0, anm ); - - pre.scr_num = 2; - NewAnime_8005FBC8( NULL, 0, anm ); -} - -void s00a_command_800CA758( SVECTOR* pos ) -{ - ANIMATION *anm; - PRESCRIPT pre; - - pre.pos = *pos; - pre.speed = DG_ZeroVector_800AB39C; - pre.s_anim = 0; - - anm = &s00a_dword_800C34E4; - anm->field_14_pre_script = ⪯ - pre.scr_num = 0; - - NewAnime_8005FBC8( NULL, 0, anm ); -} - -void s00a_command_800CA7DC( SVECTOR *pos ) -{ - ANIMATION *anm; - PRESCRIPT pre; - - pre.pos = *pos; - pre.speed = DG_ZeroVector_800AB39C; - pre.s_anim = 0; - - anm = &s00a_dword_800C3500; - anm->field_14_pre_script = ⪯ - - pre.scr_num = 0; - NewAnime_8005FBC8( NULL, 0, anm ); - - pre.scr_num = 1; - NewAnime_8005FBC8( NULL, 0, anm ); - - pre.scr_num = 2; - NewAnime_8005FBC8( NULL, 0, anm ); -} diff --git a/src/overlays/s00a/Enemy/eyeflash.c b/src/overlays/s00a/Enemy/eyeflash.c index cbb04b877..175120abe 100644 --- a/src/overlays/s00a/Enemy/eyeflash.c +++ b/src/overlays/s00a/Enemy/eyeflash.c @@ -12,10 +12,8 @@ typedef struct EyeflashWork DG_TEX *field_3C; } EyeflashWork; -extern char s00a_aEyeflashc_800E098C[]; -extern char s00a_aKirari_800E0984[]; -extern SVECTOR eyeflash_svec; -extern RECT eyeflash_rect; +SVECTOR eyeflash_svec = {0, 80, 50, 0}; +const RECT eyeflash_rect = {175, 100, 350, 200}; extern int GV_Clock_800AB920; @@ -122,7 +120,7 @@ int s00a_eyeflash_800D0BE0(EyeflashWork *work, int arg1) if (prim) { prim->field_2E_k500 = 1000; - work->field_3C = tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC(s00a_aKirari_800E0984)); + work->field_3C = tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC("kirari")); if (tex) { s00a_eyeflash_800D0984(&prim->field_40_pBuffers[0]->poly_ft4, tex); @@ -142,7 +140,7 @@ GV_ACT *NewEyeflash_800D0CF4(MATRIX *arg0, SVECTOR *arg1, int arg2, int arg3) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s00a_eyeflash_800D0B18, - (TActorFunction)s00a_eyeflash_800D0BA4, s00a_aEyeflashc_800E098C); + (TActorFunction)s00a_eyeflash_800D0BA4, "eyeflash.c"); work->field_20 = *arg1; work->field_38 = 6; work->field_2C = arg0; diff --git a/src/overlays/s00a/Enemy/glight.c b/src/overlays/s00a/Enemy/glight.c index 73e40c283..5ab387ffe 100644 --- a/src/overlays/s00a/Enemy/glight.c +++ b/src/overlays/s00a/Enemy/glight.c @@ -9,8 +9,8 @@ typedef struct GlightWork int visible; } GlightWork; -extern RECT glight_rect; -extern SVECTOR glight_svec; +RECT glight_rect = {40, 40, 80, 80}; +SVECTOR glight_svec = {0, 65136, 60, 0}; void s00a_glight_800D387C(GlightWork *work) { diff --git a/src/overlays/s00a/Enemy/grnad_e.c b/src/overlays/s00a/Enemy/grnad_e.c index c9b7335c7..a93450ed6 100644 --- a/src/overlays/s00a/Enemy/grnad_e.c +++ b/src/overlays/s00a/Enemy/grnad_e.c @@ -17,12 +17,12 @@ typedef struct _GrenadeEnemyWork int f120; } GrenadeEnemyWork; +const char aGrenadeModelD[] = "grenade model=%d \n"; +const char aGrnadEC[] = "grnad_e.c"; + extern int GM_CurrentMap_800AB9B0; -extern SVECTOR svec_800C360C[2]; - -extern const char aGrenadeModelD[]; // = "grenade model=%d \n" -extern const char aGrnadEC[]; // = "grnad_e.c" +SVECTOR svec_800C360C[2] = {{0, 80, 80, 0}, {0, 20, 500, 0}}; GV_ACT *NewTenage3_8006A128(SVECTOR *vec, SVECTOR *vec2, int param_3, int param_4, int param_5, int param_6, int param_7); GV_ACT *NewBlast_8006DFDC(MATRIX *); diff --git a/src/overlays/s00a/Enemy/l_sight.c b/src/overlays/s00a/Enemy/l_sight.c index 732aa28cf..c9d7941a5 100644 --- a/src/overlays/s00a/Enemy/l_sight.c +++ b/src/overlays/s00a/Enemy/l_sight.c @@ -11,8 +11,6 @@ typedef struct _LSightWork #define EXEC_LEVEL 5 -extern const char aLSightC[]; // = "l_sight.c" - void LSightInitVecs_800D1ACC(SVECTOR *from, SVECTOR *to, SVECTOR *out) { SVECTOR last; @@ -97,7 +95,7 @@ GV_ACT * NewLSight_800D1D2C(SVECTOR *from, SVECTOR *to, int color) work = (LSightWork *)GV_NewActor_800150E4(EXEC_LEVEL, sizeof(LSightWork)); if (work != NULL) { - GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)LSightAct_800D1C20, (TActorFunction)LSightDie_800D1C54, aLSightC); + GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)LSightAct_800D1C20, (TActorFunction)LSightDie_800D1C54, "l_sight.c"); if (LSightGetResources_800D1C90(work, color) < 0) { diff --git a/src/overlays/s00a/Enemy/put.c b/src/overlays/s00a/Enemy/put.c index 5cb030e41..e69de29bb 100644 --- a/src/overlays/s00a/Enemy/put.c +++ b/src/overlays/s00a/Enemy/put.c @@ -1,383 +0,0 @@ -#include "enemy_externs.h" -#include "Game/item.h" -#include "Game/linkvarbuf.h" - -SVECTOR s00a_dword_800C33D4; -SVECTOR s00a_dword_800C33DC; -SVECTOR s00a_dword_800C33E4; -SVECTOR s00a_dword_800C33EC; - -extern int GV_Time_800AB330; -extern SVECTOR DG_ZeroVector_800AB39C; -extern int GM_PlayerMap_800ABA0C; -extern SVECTOR GM_PlayerPosition_800ABA10; - -extern char *s00a_off_800C33F4[]; -extern void *PutFuncList_800C3400[]; -extern SVECTOR s00a_dword_800C3410; - -extern short s00a_dword_800E0F12; - -extern void anime_create_8005D6BC( MATRIX *, int ); -extern void anime_create_8005D604( MATRIX * ); -extern void *NewBulletEx_80076708( int, MATRIX*, int, int, int, int, int, int, int ); -extern void NewBlood_80072728( MATRIX *, int ); -extern void NewLSight_800D1D2C( SVECTOR *from, SVECTOR *to, int color ) ; -extern void AN_Breath_800C3AA8( MATRIX *, int ); - -void ENE_PutBlood_800C8FF8( WatcherWork* work, int obj_idx, int count ) -{ - MATRIX mat; - DG_SetPos_8001BC44(&work->body.objs->objs[obj_idx].world); - DG_MovePos_8001BD20( &s00a_dword_800C33D4 ); - DG_RotatePos_8001BD64( &s00a_dword_800C33DC ); - ReadRotMatrix( &mat ); - NewBlood_80072728( &mat, count ); -} - -void ENE_PutFog_800C9068( WatcherWork* work ) -{ - MATRIX mat; - SVECTOR svec; - - DG_SetPos_8001BC44( &work->body.objs->objs[1].world ); - DG_MovePos_8001BD20( &s00a_dword_800C33E4 ); - DG_RotatePos_8001BD64( &s00a_dword_800C33EC ); - ReadRotMatrix( &mat ); - - svec.vx = mat.t[ 0 ]; - svec.vy = mat.t[ 1 ]; - svec.vz = mat.t[ 2 ]; - - s00a_command_800CA618( &svec ); -} - -void ENE_PutItem_800C90CC( WatcherWork *work ) -{ - int a1; - int a2; - int rand; - SVECTOR svec; - CONTROL *ctrl; - Item_Info item; - svec = work->field_8D4; - rand = 8; - ctrl = &work->control; - svec.vx += GV_RandU_80017090( rand ); - svec.vy += 100; - rand = GV_RandU_80017090( rand ); - svec.vz += rand; - - switch ( work->local_data ) - { - case 0: - rand = GV_RandU_80017090( 4 ); - break; - case 1: - rand = 3; - break; - case 2: - rand = 0; - break; - case 3: - rand = 1; - break; - case 4: - rand = 2; - break; - } - - a1 = 1; - switch ( rand ) - { - default: - break; - case 3: - return; - case 0: - //ration - item.field_4_type = 4; - item.field_6_id = ITEM_RATION; - item.field_8_amount = 1; - item.field_0_pName = s00a_off_800C33F4[0]; - break; - case 1: - //socom - if ( GM_SocomFlag < 0 ) - { - item.field_4_type = 4; - item.field_6_id = 13; - item.field_8_amount = 1; - item.field_0_pName = s00a_off_800C33F4[0]; - } - else - { - //Socom bullets - item.field_4_type = 2; - item.field_6_id = WEAPON_SOCOM; - if ( work->local_data2 == 0 ) - { - item.field_8_amount = 12; - item.field_0_pName = s00a_off_800C33F4[1]; - } - else - { - a1 = 9; - if ( work-> local_data2 > 99 ) - { - a2 = a1; - } - else - { - a1 = work->local_data2 / 10; - a2 = work->local_data2 % 10; - } - if ( a1 == 0 ) - { - s00a_off_800C33F4[1][15] = 0x20; - } - else - { - s00a_off_800C33F4[1][15] = a1 + 0x30; - } - s00a_off_800C33F4[1][16] = a2 + 0x30; - item.field_0_pName = s00a_off_800C33F4[1]; - item.field_8_amount = work->local_data2; - } - } - break; - case 2: - //famas - if ( GM_FamasFlag < 0 || GM_DifficultyFlag < 0 ) - { - item.field_4_type = 4; - item.field_6_id = 13; - item.field_8_amount = 1; - item.field_0_pName = s00a_off_800C33F4[0]; - } - else - { - item.field_4_type = 2; - item.field_6_id = 1; - item.field_8_amount = 25; - item.field_0_pName = s00a_off_800C33F4[2]; - } - break; - } - item.field_A = 450; - if ( work->param_item == 1 ) - { - item_init_80034758( &ctrl->field_0_mov, &svec, &item ); - } -} - -void ENE_PutMark_800C9378( WatcherWork *work, int mark ) -{ - MATRIX *mat; - if ( !( work->control.field_2C_map->field_0_map_index_bit & GM_PlayerMap_800ABA0C ) ) - { - return; - } - - mat = &work->body.objs->objs[6].world; - if( mark == 0 ) - { - s00a_command_800CEC40( &work->control.field_0_mov , 0x10 ); - } - - if ( work->mark_time ) - { - GV_DestroyOtherActor_800151D8( (GV_ACT*)work->next_node ); - } - - work->next_node = (int)s00a_command_800CA1EC( mat , mark ) ; - work->mark_time = 30; -} - -void ENE_PutSound_800C9414( WatcherWork* work ) -{ - int a1, a3; - int a2; - int v1; - if ( !EnemyCommand_800E0D98.field_0x17A ) return; - - a3 = work->field_8E0; - a2 = work->m_ctrl.field_04_info1.field_2_footstepsFrame; - - v1 = ( ( work->field_B78 % 4 ) * 2 ) + 0xA0; - a1 = ( ( work->field_B78 % 4 ) * 2 ) + 0xA1; - - if( a3 == 1 ) - { - if ( a2 == 22 ) - { - GM_SeSet_80032858( &work->control.field_0_mov, a1 ); - } - else if ( a2 == 11 ) - { - GM_SeSet_80032858( &work->control.field_0_mov, v1 ); - } - } - else if ( a3 == 2 ) - { - if ( a2 == 16 ) - { - GM_SeSet_80032858( &work->control.field_0_mov, a1 ); - } - else if ( a2 == 8 ) - { - GM_SeSet_80032858( &work->control.field_0_mov, v1 ); - } - } -} - -void ENE_PutBreath_800C94B8( WatcherWork *work, int arg1 ) -{ - int frame; - if ( EnemyCommand_800E0D98.mode == TOP_COMM_ALERT ) - { - return; - } - - if ( !( work->control.field_2C_map->field_0_map_index_bit & GM_PlayerMap_800ABA0C ) ) - { - return; - } - - if ( work->field_8E2 == 20 ) - { - frame = work->m_ctrl.field_1C_info2.field_2_footstepsFrame; - if ( frame == 31 ) - { - AN_Breath_800C3AA8( &work->body.objs->objs[6].world , arg1 ); - } - } - else if ( work->field_8E2 == 22 ) - { - frame = work->m_ctrl.field_1C_info2.field_2_footstepsFrame; - if ( ( frame == 15 ) || ( frame == 35 ) || ( frame == 50 ) || ( frame == 60 ) || - ( frame == 70 ) || ( frame == 74 ) || ( frame == 78 ) ) - { - AN_Breath_800C3AA8( &work->body.objs->objs[6].world , arg1 ); - } - } - else if ( work->field_8E2 == 19 ) - { - frame = work->m_ctrl.field_1C_info2.field_2_footstepsFrame; - if ( ( frame == 30 ) || ( frame == 40 ) || ( frame == 50 ) || ( frame == 60 ) || - ( frame == 70 ) || ( frame == 80 ) || ( frame == 90 ) || ( frame == 95 ) || - ( frame == 100 ) || ( frame == 105 ) ) - { - AN_Breath_800C3AA8( &work->body.objs->objs[6].world, arg1 ); - } - } - else - { - if ( ( GV_Time_800AB330 % 64 ) == ( work->field_B78 * 16 ) ) - { - AN_Breath_800C3AA8( &work->body.objs->objs[6].world , GV_Time_800AB330 ); - } - } -} - -void ENE_PutLSight_800C9600( WatcherWork* work ) -{ - if ( work->vision.field_B92 == 2 ) - { - NewLSight_800D1D2C( &GM_PlayerPosition_800ABA10, &work->control.field_0_mov, 0x00008F ); - } -} - -void ENE_PutBulletEx_800C963C( WatcherWork *work ) -{ - int damage; - MATRIX* mat; - SVECTOR svec; - MATRIX local_mat; - - svec = DG_ZeroVector_800AB39C; - svec.vz = GV_RandU_80017090( 128 ); - mat = &work->body.objs->objs[4].world; - - DG_SetPos_8001BC44( mat ); - DG_MovePos_8001BD20( &s00a_dword_800C3410 ); - DG_RotatePos_8001BD64( &svec ); - - svec.vx = GV_RandS_800170BC( 16 ) + 1024; - svec.vz = 0; - - DG_RotatePos_8001BD64( &svec ); - ReadRotMatrix( &local_mat ); - - switch ( GM_DifficultyFlag ) - { - case 1: - damage = 96; - break; - case 2: - case 3: - damage = 128; - break; - default: - damage = 64; - break; - } - - if ( GV_Time_800AB330 & 3 ) - { - NewBulletEx_80076708( 0x100, &local_mat, 2, 1, 0, 0xA, damage, 0x2710, 0x2EE); - } - else - { - NewBulletEx_80076708( 0x1100, &local_mat, 2, 1, 0, 0xA, damage, 0x2710, 0x2EE); - } - - GM_Sound_800329C4( &work->control.field_0_mov, 0x2D, 1 ); - anime_create_8005D6BC( mat, 0 ); - anime_create_8005D604( &local_mat ); - ENE_ClearPutChar_800C97E4( work, ENE_PutBulletEx_800C963C ); -} - -int ENE_SetPutChar_800C979C( WatcherWork *work, int idx ) -{ - int i; - - for ( i = 0 ; i < 8 ; i++ ) - { - if ( work->field_B00[ i ] == NULL ) - { - work->field_B00[ i ] = PutFuncList_800C3400[ idx ]; - return 1; - } - } - return 0; -} - -int ENE_ClearPutChar_800C97E4( WatcherWork *work, void *func ) -{ - int i; - - for ( i = 0 ; i < 8 ; i++ ) - { - if ( work->field_B00[ i ] == func ) - { - work->field_B00[ i ] = 0; - return 1; - } - } - return 0; -} - -void ENE_ExecPutChar_800C9818( WatcherWork* work ) -{ - int i; - - for ( i = 0 ; i < 8 ; i++ ) - { - if ( work->field_B00[i] ) - { - PUTFUNC func = work->field_B00[i]; - func( work ); - } - } -} diff --git a/src/overlays/s00a/Enemy/route.c b/src/overlays/s00a/Enemy/route.c deleted file mode 100644 index dbd2ac68b..000000000 --- a/src/overlays/s00a/Enemy/route.c +++ /dev/null @@ -1,361 +0,0 @@ -#include "enemy_externs.h" -#include "libhzd/libhzd.h" -int s00a_command_800CA898( WatcherWork* work, HZD_ZON* zone ) -{ - int i; - for ( i = 0 ; i < work->field_C34 ; i++ ) - { - if ( zone->padding == work->field_C35[i] ) return 1; - } - return 0; -} - -extern const char aErrerrerrnotlinkroutedtod_800E0690[]; - -int s00a_command_800CA8E0( WatcherWork *work, int addr_in ) -{ - int temp, temp2; - int res; - int addr; - HZD_HDL *hzd; - SVECTOR svec; - HZD_ZON *zone; - CONTROL *ctrl; - int local_addr; - - ctrl = &work->control; - hzd = ctrl->field_2C_map->field_8_hzd; - addr = HZD_GetAddress_8005C6C4( hzd, &ctrl->field_0_mov, -1 ) & 0xFF; - zone = &hzd->f00_header->navmeshes[ addr ]; - svec.vx = zone->x; - svec.vy = zone->y; - svec.vz = zone->z; - - temp2 = addr_in & 0xFF; - local_addr = temp2 | (temp2 << 8); - - for ( ;; ) - { - temp = addr & 0xFF; - res = HZD_LinkRoute_8005C974( hzd, temp | ( temp << 8 ), local_addr, &svec ); - if ( res == addr ) - { - printf( aErrerrerrnotlinkroutedtod_800E0690, addr, addr_in ); - return addr; - } - - zone = &hzd->f00_header->navmeshes[ res ]; - if ( s00a_command_800CA898( work, zone ) ) - { - return addr; - } - - svec.vx = zone->x; - svec.vy = zone->y; - svec.vz = zone->z; - addr = res; - } -} - -extern const char aErrnozoneidingcl_800E06C0[]; - -void s00a_command_800CAA2C( WatcherWork *work, int addr ) -{ - MAP *map; - HZD_ZON *zone; - - work->target_addr = (addr | addr << 8); - zone = &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; - - work->target_pos.vx = zone->x; - work->target_pos.vy = zone->y; - work->target_pos.vz = zone->z; - - map = Map_FindByZoneId_80031624( 1 << zone->padding ); - if ( map ) - { - work->target_map = map->field_0_map_index_bit; - } - else - { - printf( aErrnozoneidingcl_800E06C0 ); - } -} - -void s00a_command_800CAACC( WatcherWork* work ) -{ - work->target_addr = work->start_addr; - work->target_pos = work->start_pos; - work->target_map = work->start_map; -} - -void s00a_command_800CAB04( WatcherWork* work ) -{ - work->target_addr = COM_PlayerAddressOne_800E0F40[ work->field_B78 ]; - work->target_pos = COM_PlayerPositionOne_800E0D48[ work->field_B78 ]; - work->target_map = COM_PlayerMapOne_800E0F70[ work->field_B78 ]; -} - -extern CONTROL *GM_WhereList_800B56D0[94]; - -void s00a_command_800CAB74( WatcherWork* work ) -{ - int addr; - MAP *map; - HZD_ZON *zone; - - addr = HZD_GetAddress_8005C6C4( GM_WhereList_800B56D0[0]->field_2C_map->field_8_hzd, &GM_NoisePosition_800AB9F8, -1 ) & 0xFF; - zone = &GM_WhereList_800B56D0[0]->field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; - - if ( work->field_C34 && s00a_command_800CA898( work , zone ) ) - { - s00a_command_800CAA2C( work, s00a_command_800CA8E0( work, addr ) ); - return; - } - - addr &= 0xFF; - work->target_addr = addr | ( addr << 8 ); - work->target_pos.vx = zone->x; - work->target_pos.vy = zone->y; - work->target_pos.vz = zone->z; - - map = Map_FindByZoneId_80031624( 1 << zone->padding ); - if ( map == NULL ) - { - printf( aErrnozoneidingcl_800E06C0 ); - work->target_map = COM_PlayerMapOne_800E0F70[ work->field_B78 ]; - } - else - { - work->target_map = map->field_0_map_index_bit; - } -} - -int s00a_command_800CACA0( WatcherWork *work, int addr, int addr2 ) -{ - SVECTOR svec; - SVECTOR svec2; - HZD_HDL *hzd; - HZD_ZON *zone; - HZD_ZON *zone2; - - if ( work->param_blood != 0x51 ) - { - return 0; - } - - hzd = work->control.field_2C_map->field_8_hzd; - - zone = &hzd->f00_header->navmeshes[ addr ]; - zone2 = &hzd->f00_header->navmeshes[ addr2 ]; - - if ( zone->y || zone2->y ) - { - return 0; - } - - svec.vx = zone->x; - svec.vy = zone->y + 500; - svec.vz = zone->z; - - svec2.vx = zone2->x; - svec2.vy = zone2->y + 500; - svec2.vz = zone2->z; - - return sub_80028454( hzd, &svec, &svec2, 0x8, 0x2 ) != 0; -} - -extern int sub_8005D168(HZD_HDL *pHzd, int a2, int *a3); -int s00a_command_800CEA9C( int addr ); -void s00a_command_800CEA84( int a, int addr ); - -void s00a_command_800CAD84( WatcherWork *work ) -{ - int i; - int vx; - int res; - int addr; - MAP *map; - CONTROL *ctrl; - int addr_copy; - HZD_HDL *hzd; - HZD_ZON *zone; - HZD_ZON *zone2; - HZD_ZON *zone3; - int unk[5]; //? - - ctrl = &work->control; - hzd = work->control.field_2C_map->field_8_hzd; - - addr = HZD_GetAddress_8005C6C4( hzd, &ctrl->field_0_mov, -1 ) & 0xFF; - i = 0; - zone = &hzd->f00_header->navmeshes[ addr ]; - addr_copy = addr; - - res = sub_8005D168( hzd, addr, unk ); - work->field_AEC = 1; - - if ( res > 0 ) - { - vx = work->control.field_0_mov.vx % res; - - if ( vx < 0 ) - { - vx = -vx; - } - - for ( i = 0 ; i < res ; i++ ) - { - addr = unk[vx]; - zone2 = &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; - - if ( !s00a_command_800CA898( work , zone2 ) ) - { - map = Map_FindByZoneId_80031624( 1 << zone2->padding ); - if ( map ) - { - if ( map->field_6_bUsed || zone->padding == zone2->padding ) - { - if ( !s00a_command_800CACA0( work, addr_copy, addr ) ) - { - if ( s00a_command_800CEA9C( addr ) ) - { - goto loop; - } - else - { - goto end; - } - } - } - } - else - { - printf( aErrnozoneidingcl_800E06C0 ); - if ( s00a_command_800CEA9C( addr ) ) - { - goto loop; - } - else - { -end: - work->field_AEC = 0; - s00a_command_800CEA84( work->field_B78, addr ); - break; - } - } - - - } -loop: - vx++; - addr = addr_copy; - if ( vx >= res ) - { - vx = 0; - } - } - - } - else - { - work->field_AEC = 0; - } - - zone3 = &hzd->f00_header->navmeshes[ addr ]; - work->target_addr = addr << 8 | addr; - - work->target_pos.vx = zone3->x; - work->target_pos.vy = zone3->y; - work->target_pos.vz = zone3->z; - work->target_map = COM_PlayerMap_800E0F1C; -} - - -void s00a_command_800CAFD4( WatcherWork* work ) -{ - unsigned char addr; - - if ( !work->field_C34 ) - { - work->target_addr = EnemyCommand_800E0D98.com_addr; - work->target_pos = EnemyCommand_800E0D98.com_pos; - work->target_map = EnemyCommand_800E0D98.com_map; - return; - } - - addr = EnemyCommand_800E0D98.com_addr; - if ( s00a_command_800CA898( work, &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ] ) ) - { - s00a_command_800CAA2C( work, s00a_command_800CA8E0( work, addr ) ); - return; - } - - work->target_addr = EnemyCommand_800E0D98.com_addr; - work->target_pos = EnemyCommand_800E0D98.com_pos; - work->target_map = EnemyCommand_800E0D98.com_map; -} - -void s00a_command_800CB0E0( WatcherWork* work ) -{ - int v0, v1, a2; - HZD_HDL *hzd; - void *a1; - MAP *map; - HZD_HEADER *hdr; - - v0 = work->field_B7C; - do {} while (0); - map = work->control.field_2C_map; - v1 = v0 << 1; - v1 = v1 + v0; - hzd = map->field_8_hzd; - a2 = v0 << 8; - hdr = hzd->f00_header; - v0 = v0 | a2; - a1 = hdr->navmeshes; - v1 = v1 << 3; - work->target_addr = v0; - a1 = a1 + v1; - - work->target_pos.vx = ((HZD_ZON*)a1)->x; - work->target_pos.vy = ((HZD_ZON*)a1)->y; - work->target_pos.vz = ((HZD_ZON*)a1)->z; - work->target_map = work->start_map; - - //should just be this - /* - addr = work->field_B7C; - work->target_addr = addr | (addr << 8); - zone = &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; - - work->target_pos.vx = zone->x; - work->target_pos.vy = zone->y; - work->target_pos.vz = zone->z; - work->target_map = work->start_map; - */ -} - -void s00a_command_800CB13C( WatcherWork* work ) -{ - int x; - - x = work->pad.field_00 + 1; - if ( x >= work->field_9E8 ) - { - x = 0; - } - work->pad.field_00 = x; - work->target_pos = work->nodes[ x ]; - work->target_addr = HZD_GetAddress_8005C6C4( work->control.field_2C_map->field_8_hzd, &work->target_pos, -1 ); - work->target_map = work->start_map; -} - -extern void AsiatoPos_800D129C( signed char, SVECTOR * ); - -void s00a_command_800CB1C4( WatcherWork* work ) -{ - AsiatoPos_800D129C( work->field_BA0, &work->target_pos ); - work->target_addr = HZD_GetAddress_8005C6C4( work->control.field_2C_map->field_8_hzd, &work->target_pos, -1 ); - work->target_map = work->control.field_2C_map->field_0_map_index_bit; -} diff --git a/src/overlays/s00a/Enemy/smoke.c b/src/overlays/s00a/Enemy/smoke.c index 70faf48cd..a5fd36534 100644 --- a/src/overlays/s00a/Enemy/smoke.c +++ b/src/overlays/s00a/Enemy/smoke.c @@ -14,9 +14,10 @@ typedef struct SmokeWork int field_3C; } SmokeWork; -extern char aSmokeC[]; -extern char aSmoke[]; -extern RECT smoke_rect; +const char aSmoke[] = "smoke"; +const char aSmokeC[] = "smoke.c"; + +RECT smoke_rect = {500, 1000, 1000, 2000}; extern int GM_CurrentMap_800AB9B0; extern int GV_Clock_800AB920; diff --git a/src/overlays/s00a/Enemy/think.c b/src/overlays/s00a/Enemy/think.c index a5ab357b9..4aa5d2830 100644 --- a/src/overlays/s00a/Enemy/think.c +++ b/src/overlays/s00a/Enemy/think.c @@ -5,21 +5,389 @@ extern SVECTOR GM_PlayerPosition_800ABA10; extern int GM_AlertLevel_800ABA18; extern int GM_PlayerStatus_800ABA50; -extern const char aRootchange_800E071C[]; // = " Root Change !!\n" -extern const char aErrnozoneidingcl_800E06C0[]; // = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n" -extern const char aBefmapnamed_800E06F4[]; // = "bef map name =%d \n" -extern const char aAftmapnamed_800E0708[]; // = "aft map name =%d \n" -extern const char aKirari_800E06E8[]; // = "kirari01" +const char aErrerrerrnotlinkroutedtod_800E0690[] = " Err Err Err Not Link Route [%d] to [%d] !!!!\n"; +const char aErrnozoneidingcl_800E06C0[] = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; +const char aKirari_800E06E8[] = "kirari01"; +const char aBefmapnamed_800E06F4[] = "bef map name =%d \n"; +const char aAftmapnamed_800E0708[] = "aft map name =%d \n"; +const char aRootchange_800E071C[] = " Root Change !!\n"; +unsigned short s00a_dword_800C351C[4] = { 100, 50, 25, 10 }; -extern unsigned short s00a_dword_800C351C[]; -extern int s00a_dword_800C3524[]; - +int s00a_dword_800C3524[32] = +{ + 0x00000000, 0x00000001, 0x00000002, 0x00000004, + 0x00002000, 0x00000040, 0x00000080, 0x00000200, + 0x00000400, 0x00000800, 0x00000100, 0x00800000, + 0x01000000, 0x04000000, 0x08000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000002, 0x00000004, + 0x00002000, 0x00000040, 0x00000080, 0x00000200, + 0x00000400, 0x00000800, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0000001F +}; extern void NewEyeflash_800D0CF4( MATRIX *, SVECTOR *, const char *, int ); extern char NearAsiato_800D13A0(); extern void CleanAsiato_800D1378(); +int s00a_command_800CA898( WatcherWork* work, HZD_ZON* zone ) +{ + int i; + for ( i = 0 ; i < work->field_C34 ; i++ ) + { + if ( zone->padding == work->field_C35[i] ) return 1; + } + return 0; +} + +int s00a_command_800CA8E0( WatcherWork *work, int addr_in ) +{ + int temp, temp2; + int res; + int addr; + HZD_HDL *hzd; + SVECTOR svec; + HZD_ZON *zone; + CONTROL *ctrl; + int local_addr; + + ctrl = &work->control; + hzd = ctrl->field_2C_map->field_8_hzd; + addr = HZD_GetAddress_8005C6C4( hzd, &ctrl->field_0_mov, -1 ) & 0xFF; + zone = &hzd->f00_header->navmeshes[ addr ]; + svec.vx = zone->x; + svec.vy = zone->y; + svec.vz = zone->z; + + temp2 = addr_in & 0xFF; + local_addr = temp2 | (temp2 << 8); + + for ( ;; ) + { + temp = addr & 0xFF; + res = HZD_LinkRoute_8005C974( hzd, temp | ( temp << 8 ), local_addr, &svec ); + if ( res == addr ) + { + printf( aErrerrerrnotlinkroutedtod_800E0690, addr, addr_in ); + return addr; + } + + zone = &hzd->f00_header->navmeshes[ res ]; + if ( s00a_command_800CA898( work, zone ) ) + { + return addr; + } + + svec.vx = zone->x; + svec.vy = zone->y; + svec.vz = zone->z; + addr = res; + } +} + +extern const char aErrnozoneidingcl_800E06C0[]; + +void s00a_command_800CAA2C( WatcherWork *work, int addr ) +{ + MAP *map; + HZD_ZON *zone; + + work->target_addr = (addr | addr << 8); + zone = &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; + + work->target_pos.vx = zone->x; + work->target_pos.vy = zone->y; + work->target_pos.vz = zone->z; + + map = Map_FindByZoneId_80031624( 1 << zone->padding ); + if ( map ) + { + work->target_map = map->field_0_map_index_bit; + } + else + { + printf( aErrnozoneidingcl_800E06C0 ); + } +} + +void s00a_command_800CAACC( WatcherWork* work ) +{ + work->target_addr = work->start_addr; + work->target_pos = work->start_pos; + work->target_map = work->start_map; +} + +void s00a_command_800CAB04( WatcherWork* work ) +{ + work->target_addr = COM_PlayerAddressOne_800E0F40[ work->field_B78 ]; + work->target_pos = COM_PlayerPositionOne_800E0D48[ work->field_B78 ]; + work->target_map = COM_PlayerMapOne_800E0F70[ work->field_B78 ]; +} + +extern CONTROL *GM_WhereList_800B56D0[94]; + +void s00a_command_800CAB74( WatcherWork* work ) +{ + int addr; + MAP *map; + HZD_ZON *zone; + + addr = HZD_GetAddress_8005C6C4( GM_WhereList_800B56D0[0]->field_2C_map->field_8_hzd, &GM_NoisePosition_800AB9F8, -1 ) & 0xFF; + zone = &GM_WhereList_800B56D0[0]->field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; + + if ( work->field_C34 && s00a_command_800CA898( work , zone ) ) + { + s00a_command_800CAA2C( work, s00a_command_800CA8E0( work, addr ) ); + return; + } + + addr &= 0xFF; + work->target_addr = addr | ( addr << 8 ); + work->target_pos.vx = zone->x; + work->target_pos.vy = zone->y; + work->target_pos.vz = zone->z; + + map = Map_FindByZoneId_80031624( 1 << zone->padding ); + if ( map == NULL ) + { + printf( aErrnozoneidingcl_800E06C0 ); + work->target_map = COM_PlayerMapOne_800E0F70[ work->field_B78 ]; + } + else + { + work->target_map = map->field_0_map_index_bit; + } +} + +int s00a_command_800CACA0( WatcherWork *work, int addr, int addr2 ) +{ + SVECTOR svec; + SVECTOR svec2; + HZD_HDL *hzd; + HZD_ZON *zone; + HZD_ZON *zone2; + + if ( work->param_blood != 0x51 ) + { + return 0; + } + + hzd = work->control.field_2C_map->field_8_hzd; + + zone = &hzd->f00_header->navmeshes[ addr ]; + zone2 = &hzd->f00_header->navmeshes[ addr2 ]; + + if ( zone->y || zone2->y ) + { + return 0; + } + + svec.vx = zone->x; + svec.vy = zone->y + 500; + svec.vz = zone->z; + + svec2.vx = zone2->x; + svec2.vy = zone2->y + 500; + svec2.vz = zone2->z; + + return sub_80028454( hzd, &svec, &svec2, 0x8, 0x2 ) != 0; +} + +extern int sub_8005D168(HZD_HDL *pHzd, int a2, int *a3); +int s00a_command_800CEA9C( int addr ); +void s00a_command_800CEA84( int a, int addr ); + +void s00a_command_800CAD84( WatcherWork *work ) +{ + int i; + int vx; + int res; + int addr; + MAP *map; + CONTROL *ctrl; + int addr_copy; + HZD_HDL *hzd; + HZD_ZON *zone; + HZD_ZON *zone2; + HZD_ZON *zone3; + int unk[5]; //? + + ctrl = &work->control; + hzd = work->control.field_2C_map->field_8_hzd; + + addr = HZD_GetAddress_8005C6C4( hzd, &ctrl->field_0_mov, -1 ) & 0xFF; + i = 0; + zone = &hzd->f00_header->navmeshes[ addr ]; + addr_copy = addr; + + res = sub_8005D168( hzd, addr, unk ); + work->field_AEC = 1; + + if ( res > 0 ) + { + vx = work->control.field_0_mov.vx % res; + + if ( vx < 0 ) + { + vx = -vx; + } + + for ( i = 0 ; i < res ; i++ ) + { + addr = unk[vx]; + zone2 = &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; + + if ( !s00a_command_800CA898( work , zone2 ) ) + { + map = Map_FindByZoneId_80031624( 1 << zone2->padding ); + if ( map ) + { + if ( map->field_6_bUsed || zone->padding == zone2->padding ) + { + if ( !s00a_command_800CACA0( work, addr_copy, addr ) ) + { + if ( s00a_command_800CEA9C( addr ) ) + { + goto loop; + } + else + { + goto end; + } + } + } + } + else + { + printf( aErrnozoneidingcl_800E06C0 ); + if ( s00a_command_800CEA9C( addr ) ) + { + goto loop; + } + else + { +end: + work->field_AEC = 0; + s00a_command_800CEA84( work->field_B78, addr ); + break; + } + } + + + } +loop: + vx++; + addr = addr_copy; + if ( vx >= res ) + { + vx = 0; + } + } + + } + else + { + work->field_AEC = 0; + } + + zone3 = &hzd->f00_header->navmeshes[ addr ]; + work->target_addr = addr << 8 | addr; + + work->target_pos.vx = zone3->x; + work->target_pos.vy = zone3->y; + work->target_pos.vz = zone3->z; + work->target_map = COM_PlayerMap_800E0F1C; +} + + +void s00a_command_800CAFD4( WatcherWork* work ) +{ + unsigned char addr; + + if ( !work->field_C34 ) + { + work->target_addr = EnemyCommand_800E0D98.com_addr; + work->target_pos = EnemyCommand_800E0D98.com_pos; + work->target_map = EnemyCommand_800E0D98.com_map; + return; + } + + addr = EnemyCommand_800E0D98.com_addr; + if ( s00a_command_800CA898( work, &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ] ) ) + { + s00a_command_800CAA2C( work, s00a_command_800CA8E0( work, addr ) ); + return; + } + + work->target_addr = EnemyCommand_800E0D98.com_addr; + work->target_pos = EnemyCommand_800E0D98.com_pos; + work->target_map = EnemyCommand_800E0D98.com_map; +} + +void s00a_command_800CB0E0( WatcherWork* work ) +{ + int v0, v1, a2; + HZD_HDL *hzd; + void *a1; + MAP *map; + HZD_HEADER *hdr; + + v0 = work->field_B7C; + do {} while (0); + map = work->control.field_2C_map; + v1 = v0 << 1; + v1 = v1 + v0; + hzd = map->field_8_hzd; + a2 = v0 << 8; + hdr = hzd->f00_header; + v0 = v0 | a2; + a1 = hdr->navmeshes; + v1 = v1 << 3; + work->target_addr = v0; + a1 = a1 + v1; + + work->target_pos.vx = ((HZD_ZON*)a1)->x; + work->target_pos.vy = ((HZD_ZON*)a1)->y; + work->target_pos.vz = ((HZD_ZON*)a1)->z; + work->target_map = work->start_map; + + //should just be this + /* + addr = work->field_B7C; + work->target_addr = addr | (addr << 8); + zone = &work->control.field_2C_map->field_8_hzd->f00_header->navmeshes[ addr ]; + + work->target_pos.vx = zone->x; + work->target_pos.vy = zone->y; + work->target_pos.vz = zone->z; + work->target_map = work->start_map; + */ +} + +void s00a_command_800CB13C( WatcherWork* work ) +{ + int x; + + x = work->pad.field_00 + 1; + if ( x >= work->field_9E8 ) + { + x = 0; + } + work->pad.field_00 = x; + work->target_pos = work->nodes[ x ]; + work->target_addr = HZD_GetAddress_8005C6C4( work->control.field_2C_map->field_8_hzd, &work->target_pos, -1 ); + work->target_map = work->start_map; +} + +extern void AsiatoPos_800D129C( signed char, SVECTOR * ); + +void s00a_command_800CB1C4( WatcherWork* work ) +{ + AsiatoPos_800D129C( work->field_BA0, &work->target_pos ); + work->target_addr = HZD_GetAddress_8005C6C4( work->control.field_2C_map->field_8_hzd, &work->target_pos, -1 ); + work->target_map = work->control.field_2C_map->field_0_map_index_bit; +} + void EnemyResetThink_800CB224( WatcherWork* work ) { work->think1 = 0; diff --git a/src/overlays/s00a/Enemy/watcher.c b/src/overlays/s00a/Enemy/watcher.c index bbbfde3e3..291753e5c 100644 --- a/src/overlays/s00a/Enemy/watcher.c +++ b/src/overlays/s00a/Enemy/watcher.c @@ -3,13 +3,14 @@ #include "libgcl/hash.h" #include "Game/camera.h" -extern const char aErrerrerrsettimeover_800DFC7C[]; //Err Err Err Set time Over\n -extern const char aErrerrerrsetdirover_800DFC98[]; //Err Err Err Set Dir Over\n -extern const char aErrnotenoughwork_800DFCB4[]; //Err not enough work !!\n -extern const char aWatcharcactionpointerr_800DFCCC[]; //watchar.c : action point Err\n -extern const char aWatcherc_800DFCEC[]; //watcher.c +int s00a_dword_800C3328[8] = { 2500, 3500, 4000, 5000, 5500, 5600, 5700, 5800 }; +unsigned short s00a_dword_800C3348[8] = { 450, 15, 30, 60, 90, 0, 32001, 30000 }; -extern unsigned short s00a_dword_800C3348[8]; +const char aErrerrerrsettimeover_800DFC7C[] = "Err Err Err Set time Over\n"; +const char aErrerrerrsetdirover_800DFC98[] = "Err Err Err Set Dir Over\n"; +const char aErrnotenoughwork_800DFCB4[] = "Err not enough work !!\n"; +const char aWatcharcactionpointerr_800DFCCC[] = "watchar.c : action point Err\n"; +const char aWatcherc_800DFCEC[] = "watcher.c"; extern GM_Camera GM_Camera_800B77E8; extern int GM_PlayerMap_800ABA0C; diff --git a/src/overlays/s00a/Game/pad.c b/src/overlays/s00a/Game/pad.c index 4667a6445..ed91db4a6 100644 --- a/src/overlays/s00a/Game/pad.c +++ b/src/overlays/s00a/Game/pad.c @@ -4,7 +4,6 @@ #include "libgcl/hash.h" #include "libgcl/libgcl.h" -extern const char aPadC_800DFBCC[]; //pad.c extern unsigned short GV_DemoPadStatus_800AB958; #define EXEC_LEVEL 5 @@ -78,7 +77,7 @@ void *NewPad_800C37EC( int name, int where, int argc, char **argv ) if ( work != NULL ) { /* ワークにコールバックを登録する */ - GV_SetNamedActor_8001514C( &( work->actor ), ( TActorFunction )PadAct_800C370C, ( TActorFunction )PadDie_800C37A4, aPadC_800DFBCC ) ; + GV_SetNamedActor_8001514C( &( work->actor ), ( TActorFunction )PadAct_800C370C, ( TActorFunction )PadDie_800C37A4, "pad.c" ) ; ops = GCL_GetOption_80020968( 's' ) ; if ( !ops ) { diff --git a/src/overlays/s00a/Okajima/pato_lmp.c b/src/overlays/s00a/Okajima/pato_lmp.c index 685d4d231..3c3c2b672 100644 --- a/src/overlays/s00a/Okajima/pato_lmp.c +++ b/src/overlays/s00a/Okajima/pato_lmp.c @@ -48,13 +48,12 @@ typedef struct _PatoLmpWork int field_1964; } PatoLmpWork; -extern const char aPatoLmpC[]; // = "pato_lmp.c" -extern const char s00a_aClose_800E0AF4[]; -extern const char s00a_aOpen_800E0AEC[]; -extern const char s00a_aSeoff_800E0B04[]; -extern const char s00a_aSeon_800E0AFC[]; -extern const char s00a_dword_800E0ADC[]; -extern const char s00a_dword_800E0AE4[]; +const char s00a_dword_800E0ADC[] = "開く"; +const char s00a_dword_800E0AE4[] = "閉める"; +const char s00a_aOpen_800E0AEC[] = "open"; +const char s00a_aClose_800E0AF4[] = "close"; +const char s00a_aSeon_800E0AFC[] = "se_on"; +const char s00a_aSeoff_800E0B04[] = "se_off"; extern UnkCameraStruct2 gUnkCameraStruct2_800B7868; extern int GV_Clock_800AB920; @@ -179,10 +178,10 @@ void s00a_pato_lmp_800D617C(PatoLmpWork *work, int field_191C, short vx, short v void s00a_pato_lmp_800D6194(PatoLmpWork *work, int arg1, int arg2, int arg3) { SVECTOR vec; - + SVECTOR *var_a2; - + int temp_a0; int temp_t1; int x, y, z; @@ -210,7 +209,7 @@ void s00a_pato_lmp_800D6194(PatoLmpWork *work, int arg1, int arg2, int arg3) temp_t1 = (temp * 12) + 50; temp_a0 = temp2 + 50; temp_v1 = temp * 4 + 150; - + switch (y) { case 0: @@ -218,7 +217,7 @@ void s00a_pato_lmp_800D6194(PatoLmpWork *work, int arg1, int arg2, int arg3) var_a2->vy = vec.vy + temp_v1; var_a2->vz = vec.vz; var_a2++; - + var_a2->vx = vec.vx + temp_a0; var_a2->vy = vec.vy + temp_v1; var_a2->vz = vec.vz; @@ -270,7 +269,7 @@ void s00a_pato_lmp_800D6194(PatoLmpWork *work, int arg1, int arg2, int arg3) var_a2->vy = vec.vy - temp_v1; var_a2->vz = vec.vz; var_a2++; - + var_a2->vx = vec.vx - temp_a0; var_a2->vy = vec.vy - temp_v1; var_a2->vz = vec.vz; @@ -564,6 +563,11 @@ void s00a_pato_lmp_800D6D40( PatoLmpWork *work, int idx, int idx2, int y ) } +const char aPatlit[] = "patlit"; +const char aPatBody[] = "pat_body"; +const char aPatLamp[] = "pat_lamp"; +const char aPatSpt1[] = "pat_spt1"; + #pragma INCLUDE_ASM("asm/overlays/s00a/s00a_pato_lmp_800D6E28.s") int s00a_pato_lmp_800D6E28(PatoLmpWork *work, int, int); @@ -575,7 +579,7 @@ GV_ACT *s00a_pato_lmp_800D7A2C(int arg0, int arg1) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s00a_pato_lmp_800D6678, - (TActorFunction)s00a_pato_lmp_800D6C44, aPatoLmpC); + (TActorFunction)s00a_pato_lmp_800D6C44, "pato_lmp.c"); if (s00a_pato_lmp_800D6E28(work, arg0, arg1) < 0) { diff --git a/src/overlays/s00a/Okajima/splash2.c b/src/overlays/s00a/Okajima/splash2.c index 9abc9a2df..e97ab3a50 100644 --- a/src/overlays/s00a/Okajima/splash2.c +++ b/src/overlays/s00a/Okajima/splash2.c @@ -23,7 +23,7 @@ extern MATRIX DG_ZeroMatrix_8009D430; extern int GM_CurrentMap_800AB9B0; extern int GV_Clock_800AB920; -extern RECT rect_800C3670; +RECT rect_800C3670 = { 50, 50, 100, 100 }; #define EXEC_LEVEL 5 diff --git a/src/overlays/s00a/Takabe/elevator.c b/src/overlays/s00a/Takabe/elevator.c index 6dbb2c04e..4faaf2d4f 100644 --- a/src/overlays/s00a/Takabe/elevator.c +++ b/src/overlays/s00a/Takabe/elevator.c @@ -70,11 +70,13 @@ extern int tenage_ctrls_count_800BDD70; extern Jirai_unknown stru_800BDD78[16]; extern Jirai_unknown stru_800BDE78[8]; -extern unsigned short elevator_hash_800C3634[4]; -extern char elevator_vib_800C363C[]; -extern char elevator_vib_800C3644[]; -extern char elevator_vib_800C3658[]; -extern char elevator_vib_800C365C[]; +unsigned short elevator_hash_800C3634[4] = {0xACDC, 0x085B, 0x804B, 0xDBC9}; + +char elevator_vib_800C363C[] = {0x00, 0x02, 0x7F, 0x02, 0x00, 0x00, 0x00, 0x00}; +char elevator_vib_800C3644[] = {0x87, 0x04, 0x55, 0x01, 0x69, 0x01, 0x7D, 0x08, 0x5F, 0x08, 0x46, 0x0A, 0x37, 0x0C, 0x2D, 0x0E, 0x00, 0x00, 0x00, 0x00}; +char elevator_vib_800C3658[] = {0x7F, 0x04, 0x00, 0x00}; +char elevator_vib_800C365C[] = {0xA5, 0x06, 0x4B, 0x08, 0x2D, 0x0C, 0x00, 0x00}; + int THING_Gcl_GetInt(int); int THING_Gcl_GetIntDefault(int, int); diff --git a/src/overlays/s00a/Takabe/wt_area.c b/src/overlays/s00a/Takabe/wt_area.c index 368fe7495..dc486a407 100644 --- a/src/overlays/s00a/Takabe/wt_area.c +++ b/src/overlays/s00a/Takabe/wt_area.c @@ -37,8 +37,10 @@ extern CONTROL *tenage_ctrls_800BDD30[16]; extern int tenage_ctrls_count_800BDD70; extern UnkCameraStruct gUnkCameraStruct_800B77B8; -extern short mes_list_800C3664[2]; -extern SVECTOR mouth_offset_800C3668; + +//OPEN_MES, CLOSE_MES +unsigned short mes_list_800C3664[] = { 0x43D3, 0x4235 }; +SVECTOR mouth_offset_800C3668 = { 0, 0, 100 }; int BoundInCheck_800DA5B4( SVECTOR *bound, SVECTOR *check ) { diff --git a/src/overlays/s00a/Thing/emitter.c b/src/overlays/s00a/Thing/emitter.c index ac24110dd..91982c1ba 100644 --- a/src/overlays/s00a/Thing/emitter.c +++ b/src/overlays/s00a/Thing/emitter.c @@ -9,10 +9,9 @@ typedef struct _Work char pad[0x4]; } Work; -extern const char aEmitterc_800DFC70[]; //emitter.c -extern const char aSfex_800DFC64[]; //sfex0236 +RECT rect_800C3320 = { 1000, 1000, 2000, 2000 }; + extern int GM_CurrentMap_800AB9B0; -extern RECT rect_800C3320; #define EXEC_LEVEL 5 @@ -20,7 +19,7 @@ void EmitterShadePacks_800C3C08( POLY_FT4 *packs, int n_packs, DG_TEX *unused, c { DG_TEX *tex; - tex = DG_GetTexture_8001D830( GV_StrCode_80016CCC( aSfex_800DFC64 ) ); + tex = DG_GetTexture_8001D830( GV_StrCode_80016CCC( "sfex0236" ) ); for ( n_packs--; n_packs >= 0; packs++, n_packs-- ) { @@ -83,7 +82,7 @@ int EmitterGetResources_800C3D68( Work *work, int map, int count ) prim->field_2E_k500 = 500; prim->field_2E_k500 *= 2; - tex = DG_GetTexture_8001D830( GV_StrCode_80016CCC( aSfex_800DFC64 ) ); + tex = DG_GetTexture_8001D830( GV_StrCode_80016CCC( "sfex0236" ) ); if ( tex == NULL ) { return -1; @@ -103,7 +102,7 @@ void * NewEmitter_800C3E50( int name, int where ) work = (Work *)GV_NewActor_800150E4( EXEC_LEVEL, sizeof( Work ) ); if (work != NULL) { - GV_SetNamedActor_8001514C( &( work->actor ), NULL, (TActorFunction)EmitterDie_800C3CD8, aEmitterc_800DFC70 ); + GV_SetNamedActor_8001514C( &( work->actor ), NULL, (TActorFunction)EmitterDie_800C3CD8, "emitter.c" ); count = EmitterGetVecs_800C3D14( GCL_GetOption_80020968( 'p' ), work->vecs ); if ( EmitterGetResources_800C3D68( work, where, count ) < 0 ) diff --git a/src/overlays/s00a/chara/snake/breath.c b/src/overlays/s00a/chara/snake/breath.c index c830f6b3c..a92b31baf 100644 --- a/src/overlays/s00a/chara/snake/breath.c +++ b/src/overlays/s00a/chara/snake/breath.c @@ -15,8 +15,6 @@ extern void AN_Breath_800C3AA8( DG_OBJ *obj ); #define EXEC_LEVEL 5 //goes in libgv.h #define DEFAULT_TIME 0x40 -extern const char aBreathC[]; //breath.c - typedef struct _BreathWork { GV_ACT actor; @@ -86,7 +84,7 @@ void *NewBreath_800C3A1C( int name, int where, int argc, char **argv ) work = (BreathWork *)GV_NewActor_800150E4( EXEC_LEVEL, sizeof( BreathWork ) ) ; if ( work != NULL ) { /* ワークにコールバックを登録する */ - GV_SetNamedActor_8001514C( &( work->actor ), ( TActorFunction )BreathAct_800C38A0, ( TActorFunction )BreathDie_800C39AC, aBreathC ) ; + GV_SetNamedActor_8001514C( &( work->actor ), ( TActorFunction )BreathAct_800C38A0, ( TActorFunction )BreathDie_800C39AC, "breath.c" ) ; if ( BreathGetResources_800C39B4( work, name, where ) >= 0 ) { return (void *)work ; } diff --git a/src/overlays/s00a/overlay.c b/src/overlays/s00a/overlay.c index 275ede162..6e48649cb 100755 --- a/src/overlays/s00a/overlay.c +++ b/src/overlays/s00a/overlay.c @@ -1,10 +1,6 @@ +#include "libgcl/hash.h" #include "libgcl/libgcl.h" #include "Anime/animeconv/anime.h" -#include "libgcl/hash.h" - -extern const char aRation_800DFE94[]; -extern const char aSocombullet_800DFE80[]; -extern const char aFamasbullet_800DFE6C[]; GCL_ActorTableEntry s00aOverlayCharas[] = { @@ -37,185 +33,3 @@ GCL_ActorTableEntry s00aOverlayCharas[] = { 0xA12E, (TGCL_ActorCreateFn)0x800DD4A8 }, { 0, 0 } }; - -extern const char s00a_dword_800DFBE0[]; -extern const char s00a_dword_800DFC30[]; - -ANIMATION anm_breath_800C32E8 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)s00a_dword_800DFBE0 }; -ANIMATION anm_unknown_800C3304 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)s00a_dword_800DFC30 }; - -RECT rect_800C3320 = { 1000, 1000, 2000, 2000 }; - -int s00a_dword_800C3328[8] = { 2500, 3500, 4000, 5000, 5500, 5600, 5700, 5800 }; -unsigned short s00a_dword_800C3348[8] = { 450, 15, 30, 60, 90, 0, 32001, 30000 }; - -short ActTable_800C3358[54] = -{ - 0x13, 0x14, 0x0A, 0x16, 0x09, 0x22, 0x23, 0x24, 0x2D, - 0x0D, 0x0C, 0x1A, 0x0F, 0x0E, 0x10, 0x1B, 0x08, 0x2E, - 0x32, 0x15, 0x1E, 0x1F, 0x20, 0x21, 0x25, 0x34, 0x35, - 0x19, 0x05, 0x02, 0x2A, 0x04, 0x27, 0x28, 0x06, 0x07, - 0x26, 0x03, 0x29, 0x11, 0x12, 0x2B, 0x17, 0x18, 0x1C, - 0x1D, 0x00, 0x01, 0x33, 0x11, 0x12, 0x2B, 0x16, 0x0B -}; - -SVECTOR s00a_dword_800C33C4 = { -150, 0, 300 }; -SVECTOR s00a_dword_800C33CC = { 0, -550, 950 }; -SVECTOR s00a_dword_800C33D4 = { 0, 0, 100 }; -SVECTOR s00a_dword_800C33DC = { -1024, 0, 0 }; -SVECTOR s00a_dword_800C33E4 = { 0, 0, 100 }; -SVECTOR s00a_dword_800C33EC = { -1024, 0, 0 }; - -const char *s00a_off_800C33F4[3] = {aRation_800DFE94, aSocombullet_800DFE80, aFamasbullet_800DFE6C}; - -typedef struct WatcherWork WatcherWork; - -void ENE_PutSound_800C9414( WatcherWork* work ); -void ENE_PutBreath_800C94B8( WatcherWork *work, int arg1 ); -void ENE_PutLSight_800C9600( WatcherWork* work ); -void ENE_PutBulletEx_800C963C( WatcherWork *work ); - -void *PutFuncList_800C3400[4] = { - ENE_PutSound_800C9414, - ENE_PutBreath_800C94B8, - ENE_PutLSight_800C9600, - ENE_PutBulletEx_800C963C -}; - -SVECTOR s00a_dword_800C3410 = { 5, -500, 80, 0 }; - -extern const char s00a_dword_800DFEB4[]; -extern const char s00a_dword_800E0018[]; -extern const char s00a_dword_800E011C[]; -extern const char s00a_dword_800E0220[]; - -ANIMATION s00a_dword_800C3418 = { PCX_B_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s00a_dword_800DFEB4 }; -ANIMATION s00a_dword_800C3434 = { PCX_Q_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s00a_dword_800E0018 }; -ANIMATION s00a_dword_800C3450 = { PCX_Q_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s00a_dword_800E011C }; -ANIMATION s00a_dword_800C346C = { PCX_HEART, 1, 1, 1, 1, 0, 1, 70, 70, 255, 0, (char *)s00a_dword_800E0220 }; - -short s00a_dword_800C3488 = PCX_B_MARK; -short s00a_dword_800C348A = PCX_Q_MARK; -short s00a_dword_800C348C = PCX_HEART; -short s00a_dword_800C348E = 0x0000; - -extern const char s00a_dword_800E0288[]; -extern const char s00a_dword_800E02AC[]; -extern const char s00a_dword_800E054C[]; -extern const char s00a_dword_800E05A8[]; -extern const char s00a_dword_800E05F0[]; - -ANIMATION s00a_dword_800C3490 = { PCX_PCH_FOG, 1, 1, 1, 1, 800, 3, 600, 600, 250, 0, (char *)s00a_dword_800E0288 }; -ANIMATION s00a_dword_800C34AC = { PCX_HOSI, 1, 1, 1, 1, 0, 1, 200, 200, 128, 0, (char *)s00a_dword_800E02AC }; -ANIMATION s00a_dword_800C34C8 = { 0x4184, 1, 1, 1, 1, 0, 5, 10, 10, 128, 0, (char *)s00a_dword_800E054C }; -ANIMATION s00a_dword_800C34E4 = { PCX_SMOKE, 8, 4, 30, 1, 0, 1, 10, 10, 255, 0, (char *)s00a_dword_800E05A8 }; -ANIMATION s00a_dword_800C3500 = { PCX_ZZZ, 1, 1, 1, 1, 0, 1, 2, 2, 0, 0, (char *)s00a_dword_800E05F0 }; - -short s00a_dword_800C351C[4] = { 100, 50, 25, 10 }; - -int s00a_dword_800C3524[32] = -{ - 0x00000000, 0x00000001, 0x00000002, 0x00000004, - 0x00002000, 0x00000040, 0x00000080, 0x00000200, - 0x00000400, 0x00000800, 0x00000100, 0x00800000, - 0x01000000, 0x04000000, 0x08000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000002, 0x00000004, - 0x00002000, 0x00000040, 0x00000080, 0x00000200, - 0x00000400, 0x00000800, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0000001F -}; - -SVECTOR ENEMY_TARGET_SIZE_800C35A4 = { 300, 1000, 300 }; -SVECTOR ENEMY_TARGET_FORCE_800C35AC = { 0, 0, 0 }; -SVECTOR ENEMY_ATTACK_SIZE_800C35B4 = { 800, 500, 800 }; -SVECTOR ENEMY_ATTACK_FORCE_800C35BC = { 100, 0, 0 }; -SVECTOR ENEMY_TOUCH_SIZE_800C35C4 = { 300, 800, 300 }; -SVECTOR ENEMY_TOUCH_FORCE_800C35CC = { 0, 0, 0, 0 }; -SVECTOR COM_NO_POINT_800C35D4 = { 30000, 30000, 30000 }; - -unsigned char s00a_dword_800C35DC[4] = { 1, 1, 0, 0 }; -unsigned char s00a_dword_800C35E0[4] = { 255, 1, 0, 0 }; - -int s00a_dword_800C35E4[] = { - 0x000009C4, - 0x00000DAC, - 0x00000FA0, - 0x00001388, - 0x0000157C, - 0x000015E0, - 0x00001644, - 0x000016A8 -}; - -SVECTOR eyeflash_svec = {0, 80, 50, 0}; - -SVECTOR svec_800C360C[2] = {{0, 80, 80, 0}, {0, 20, 500, 0}}; - -RECT smoke_rect = {500, 1000, 1000, 2000}; - -RECT glight_rect = {40, 40, 80, 80}; -SVECTOR glight_svec = {0, 65136, 60, 0}; - -unsigned short elevator_hash_800C3634[4] = {0xACDC, 0x085B, 0x804B, 0xDBC9}; - -char elevator_vib_800C363C[] = {0x00, 0x02, 0x7F, 0x02, 0x00, 0x00, 0x00, 0x00}; -char elevator_vib_800C3644[] = {0x87, 0x04, 0x55, 0x01, 0x69, 0x01, 0x7D, 0x08, - 0x5F, 0x08, 0x46, 0x0A, 0x37, 0x0C, 0x2D, 0x0E, - 0x00, 0x00, 0x00, 0x00}; -char elevator_vib_800C3658[] = {0x7F, 0x04, 0x00, 0x00}; -char elevator_vib_800C365C[] = {0xA5, 0x06, 0x4B, 0x08, 0x2D, 0x0C, 0x00, 0x00}; - - -//OPEN_MES, CLOSE_MES -unsigned short mes_list_800C3664[] = { 0x43D3, 0x4235 }; -SVECTOR mouth_offset_800C3668 = { 0, 0, 100 }; -RECT rect_800C3670 = { 50, 50, 100, 100 }; - -const char aPadC_800DFBCC[] = "pad.c"; -const short s00a_dword_800DFBD2 = 0x4E5F; - -const char aBreathC[] = "breath.c"; - -const char s00a_dword_800DFBDD = 0xC; -const char s00a_dword_800DFBDE = 0xD; -const char s00a_dword_800DFBDF = 0x0; -const char s00a_dword_800DFBE0[] = {0x0, 'I', 0x2, 0x0}; -const char s00a_dword_800DFBE4[] = {0x7, 0x0, ')', 0x1}; -const char s00a_dword_800DFBE8[] = {0xfe, 0xc, 0x0, 0x6}; -const char s00a_dword_800DFBEC[] = {0x8, 0x6, 0x6, 0x6}; -const char s00a_dword_800DFBF0[] = {0x1, 0xff, 0x2, 0x0}; -const char s00a_dword_800DFBF4[] = {0x1, 0xd, 0xc, 0x0}; -const char s00a_dword_800DFBF8[] = {'#', 0x8, 0xff, 0xff}; -const char s00a_dword_800DFBFC[] = {0xff, '\n', 0x0, 0x8}; -const char s00a_dword_800DFC00[] = {0x0, 0x8, 0x1, 0xff}; -const char s00a_dword_800DFC04[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800DFC08[] = {0xf, '\n', 0xff, '8'}; -const char s00a_dword_800DFC0C[] = {0xff, '8', 0x1, 0xfe}; -const char s00a_dword_800DFC10[] = {0xc, 0x0, 0x6, 0x8}; -const char s00a_dword_800DFC14[] = {0x6, 0x6, 0x6, 0x1}; -const char s00a_dword_800DFC18[] = {0xff, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFC1C[] = {0xd, 0xc, 0x0, '#'}; -const char s00a_dword_800DFC20[] = {0x8, 0xff, 0xff, 0xff}; -const char s00a_dword_800DFC24[] = {'\n', 0x0, 0x6, 0x0}; -const char s00a_dword_800DFC28[] = {0x6, 0x1, 0xff, 0x2}; -const char s00a_dword_800DFC2C[] = {0x0, 0x1, 0xd, 0xf}; -const char s00a_dword_800DFC30[] = {0x0, ',', 0x1, 0x0}; -const char s00a_dword_800DFC34[] = {0x5, 0x1, 0xfe, 0xc}; -const char s00a_dword_800DFC38[] = {0x0, 0x3, 0x8, 0x6}; -const char s00a_dword_800DFC3C[] = {0x6, 0x6, 0x1, 0xff}; -const char s00a_dword_800DFC40[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800DFC44[] = {0xc, 0x0, 0x10, 0x8}; -const char s00a_dword_800DFC48[] = {0xff, 0xff, 0xff, '\n'}; -const char s00a_dword_800DFC4C[] = {0x0, 0x4, 0x0, 0x4}; -const char s00a_dword_800DFC50[] = {0x1, 0xff, 0x2, 0x0}; -const char s00a_dword_800DFC54[] = {0x1, '\n', 0x0, 0x4}; -const char s00a_dword_800DFC58[] = {0x0, 0x4, 0x1, 0xff}; -const char s00a_dword_800DFC5C[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800DFC60[] = {0xf, 0x0, 0x0, 0x0}; -const char aSfex_800DFC64[] = "sfex0236"; -const char aEmitterc_800DFC70[] = "emitter.c"; -const char aErrerrerrsettimeover_800DFC7C[] = "Err Err Err Set time Over\n"; -const char aErrerrerrsetdirover_800DFC98[] = "Err Err Err Set Dir Over\n"; -const char aErrnotenoughwork_800DFCB4[] = "Err not enough work !!\n"; -const char aWatcharcactionpointerr_800DFCCC[] = "watchar.c : action point Err\n"; -const char aWatcherc_800DFCEC[] = "watcher.c"; diff --git a/src/overlays/s00a/overlay2.c b/src/overlays/s00a/overlay2.c deleted file mode 100644 index 86d90a5b5..000000000 --- a/src/overlays/s00a/overlay2.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "libgcl/libgcl.h" -#include "Anime/animeconv/anime.h" - -//jpt -/* -const int s00a_dword_800DFCF8 = 0x800C5278; -const int s00a_dword_800DFCFC = 0x800C52D8; -const int s00a_dword_800DFD00 = 0x800C5200; -const int s00a_dword_800DFD04 = 0x800C5260; -const int s00a_dword_800DFD08 = 0x800C5310; -const int s00a_dword_800DFD0C = 0x800C5350; -const int s00a_dword_800DFD10 = 0x800C5350; -const int s00a_dword_800DFD14 = 0x800C5350; -const int s00a_dword_800DFD18 = 0x800C532C; -*/ -const char aPlayxresetdwarpd_800DFD1C[] = " play = %x reset = %d warp = %d \n"; -const char aErrnozoneidingcl_800DFD40[] = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; -const char aErrerrenemyresetnumerrcallkorekadoooooooooo_800DFD68[] = " Err Err Enemy Reset Num Err CALL KOREKADOOOOOOOOOO!!\n"; -const SVECTOR rp_shift_800DFDA0 = { -200, 100, 600 }; /* 右パンチ */ -const SVECTOR force_800DFDA8 = { 5, 0, 100 }; -const SVECTOR size_800DFDB0 = { 400, 1000, 400 }; -const char aComstdanbowl0_800DFDB8[] = " ~COM_ST_DANBOWL 0 !! \n "; -const char aComstdanbowl1_800DFDD4[] = " ~COM_ST_DANBOWL 1 !! \n "; -const char aComstdanbowl2_800DFDF0[] = " ~COM_ST_DANBOWL 2 !! \n "; -const char aMapchange_800DFE0C[] = " map change \n"; -const char s00a_dword_800DFE1C[] = {0x0, 0x0, 0x0, 0x0}; \ No newline at end of file diff --git a/src/overlays/s00a/overlay3.c b/src/overlays/s00a/overlay3.c deleted file mode 100644 index 5585e5a7d..000000000 --- a/src/overlays/s00a/overlay3.c +++ /dev/null @@ -1,5 +0,0 @@ -const char aEnemyresetmaxdnumd_800DFE50[] = "enemy reset max=%d num=%d \n"; -const char aFamasbullet_800DFE6C[] = "FA-MAS/BULLET * 25"; -const char aSocombullet_800DFE80[] = "SOCOM/BULLET * 12"; -const char aRation_800DFE94[] = "RATION"; -const char s00a_dword_800DFE9C[] = {0x0, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s00a/overlay4.c b/src/overlays/s00a/overlay4.c deleted file mode 100644 index 9681e1e69..000000000 --- a/src/overlays/s00a/overlay4.c +++ /dev/null @@ -1,232 +0,0 @@ -//jpt -/* -const int s00a_dword_800DFEA0 = 0x800C916C; -const int s00a_dword_800DFEA4 = 0x800C917C; -const int s00a_dword_800DFEA8 = 0x800C9184; -const int s00a_dword_800DFEAC = 0x800C918C; -const int s00a_dword_800DFEB0 = 0x800C9194; -*/ -const char s00a_dword_800DFEB4[] = {0x1, 'V', 0x4, 0x0}; -const char s00a_dword_800DFEB8[] = {0xb, 0x0, '^', 0x0}; -const char s00a_dword_800DFEBC[] = {0xb1, 0x1, 0x9, 0x1}; -const char s00a_dword_800DFEC0[] = {0x0, 0xc, 0x0, 0x4}; -const char s00a_dword_800DFEC4[] = {'\n', 0x0, 'd', 0x0}; -const char s00a_dword_800DFEC8[] = {'d', 0x8, '2', 0x19}; -const char s00a_dword_800DFECC[] = {0x14, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFED0[] = {0xd, '\n', 0x0, 'd'}; -const char s00a_dword_800DFED4[] = {0x0, 'd', 0x8, '2'}; -const char s00a_dword_800DFED8[] = {0x96, 0xaa, 0x2, 0x0}; -const char s00a_dword_800DFEDC[] = {0x3, '\n', 0xff, 0x9c}; -const char s00a_dword_800DFEE0[] = {0xff, 0x9c, 0x8, 0xce}; -const char s00a_dword_800DFEE4[] = {'j', 'V', 0x2, 0x0}; -const char s00a_dword_800DFEE8[] = {0x16, '\n', 0x1, ','}; -const char s00a_dword_800DFEEC[] = {0xfe, 0x98, 0x8, 0xce}; -const char s00a_dword_800DFEF0[] = {0xe7, 0xec, 0x2, 0x0}; -const char s00a_dword_800DFEF4[] = {0x1, '\n', 0x1, ','}; -const char s00a_dword_800DFEF8[] = {0xff, 0xe2, 0x8, 0xce}; -const char s00a_dword_800DFEFC[] = {0xe7, 0xec, 0x2, 0x0}; -const char s00a_dword_800DFF00[] = {0x1, '\n', 0x1, ','}; -const char s00a_dword_800DFF04[] = {0xff, 0xf4, 0x2, 0x0}; -const char s00a_dword_800DFF08[] = {0x1, '\n', 0xfa, 0xba}; -const char s00a_dword_800DFF0C[] = {0x0, 0xf0, 0x2, 0x0}; -const char s00a_dword_800DFF10[] = {0x1, 0xf, 0x1, 0x0}; -const char s00a_dword_800DFF14[] = {0xc, 0x0, 0x4, '\n'}; -const char s00a_dword_800DFF18[] = {0x0, '2', 0x0, '2'}; -const char s00a_dword_800DFF1C[] = {0x8, '2', 0x19, 0x14}; -const char s00a_dword_800DFF20[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800DFF24[] = {'\n', 0x0, '2', 0x0}; -const char s00a_dword_800DFF28[] = {'2', 0x8, '2', 0x96}; -const char s00a_dword_800DFF2C[] = {0xaa, 0x2, 0x0, 0x3}; -const char s00a_dword_800DFF30[] = {'\n', 0xff, 0xce, 0xff}; -const char s00a_dword_800DFF34[] = {0xce, 0x8, 0xce, 'j'}; -const char s00a_dword_800DFF38[] = {'V', 0x2, 0x0, 0x16}; -const char s00a_dword_800DFF3C[] = {'\n', 0x0, 0x96, 0xff}; -const char s00a_dword_800DFF40[] = {'L', 0x8, 0xce, 0xe7}; -const char s00a_dword_800DFF44[] = {0xec, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFF48[] = {'\n', 0x0, 0x96, 0xff}; -const char s00a_dword_800DFF4C[] = {0xf1, 0x8, 0xce, 0xe7}; -const char s00a_dword_800DFF50[] = {0xec, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFF54[] = {'\n', 0x0, 0x96, 0xff}; -const char s00a_dword_800DFF58[] = {0xfa, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFF5C[] = {'\n', 0xfd, ']', 0x0}; -const char s00a_dword_800DFF60[] = {'x', 0x2, 0x0, 0x1}; -const char s00a_dword_800DFF64[] = {0xf, '\n', 0xff, 0xd8}; -const char s00a_dword_800DFF68[] = {0xff, 0xd8, 0x1, 0x0}; -const char s00a_dword_800DFF6C[] = {0xc, 0x0, 0x4, '\n'}; -const char s00a_dword_800DFF70[] = {0x0, 0x19, 0x0, 0x19}; -const char s00a_dword_800DFF74[] = {0x8, '2', 0x19, 0x14}; -const char s00a_dword_800DFF78[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800DFF7C[] = {'\n', 0x0, 0x19, 0x0}; -const char s00a_dword_800DFF80[] = {0x19, 0x8, '2', 0x96}; -const char s00a_dword_800DFF84[] = {0xaa, 0x2, 0x0, 0x3}; -const char s00a_dword_800DFF88[] = {'\n', 0xff, 0xe7, 0xff}; -const char s00a_dword_800DFF8C[] = {0xe7, 0x8, 0xce, 'j'}; -const char s00a_dword_800DFF90[] = {'V', 0x2, 0x0, 0x16}; -const char s00a_dword_800DFF94[] = {'\n', 0x0, 'K', 0xff}; -const char s00a_dword_800DFF98[] = {0xa6, 0x8, 0xce, 0xe7}; -const char s00a_dword_800DFF9C[] = {0xec, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFFA0[] = {'\n', 0x0, 'K', 0xff}; -const char s00a_dword_800DFFA4[] = {0xf9, 0x8, 0xce, 0xe7}; -const char s00a_dword_800DFFA8[] = {0xec, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFFAC[] = {'\n', 0x0, 'K', 0xff}; -const char s00a_dword_800DFFB0[] = {0xf9, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFFB4[] = {'\n', 0xfe, 0xd4, 0x0}; -const char s00a_dword_800DFFB8[] = {'<', 0x2, 0x0, 0x1}; -const char s00a_dword_800DFFBC[] = {0xf, '\n', 0xff, 0xc4}; -const char s00a_dword_800DFFC0[] = {0xff, 0xc4, 0x1, 0x0}; -const char s00a_dword_800DFFC4[] = {0xc, 0x0, 0x4, '\n'}; -const char s00a_dword_800DFFC8[] = {0x0, '\n', 0x0, '\n'}; -const char s00a_dword_800DFFCC[] = {0x8, '2', 0x19, 0x14}; -const char s00a_dword_800DFFD0[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800DFFD4[] = {'\n', 0x0, '\n', 0x0}; -const char s00a_dword_800DFFD8[] = {'\n', 0x8, '2', 0x96}; -const char s00a_dword_800DFFDC[] = {0xaa, 0x2, 0x0, 0x3}; -const char s00a_dword_800DFFE0[] = {'\n', 0xff, 0xf6, 0xff}; -const char s00a_dword_800DFFE4[] = {0xf6, 0x8, 0xce, 'j'}; -const char s00a_dword_800DFFE8[] = {'V', 0x2, 0x0, 0x16}; -const char s00a_dword_800DFFEC[] = {'\n', 0x0, 0x1e, 0xff}; -const char s00a_dword_800DFFF0[] = {0xdc, 0x8, 0xce, 0xe7}; -const char s00a_dword_800DFFF4[] = {0xec, 0x2, 0x0, 0x1}; -const char s00a_dword_800DFFF8[] = {'\n', 0x0, 0x1e, 0xff}; -const char s00a_dword_800DFFFC[] = {0xfe, 0x8, 0xce, 0xe7}; -const char s00a_dword_800E0000[] = {0xec, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0004[] = {'\n', 0x0, 0x1e, 0xff}; -const char s00a_dword_800E0008[] = {0xfe, 0x2, 0x0, 0x1}; -const char s00a_dword_800E000C[] = {'\n', 0xff, 0xb0, 0x0}; -const char s00a_dword_800E0010[] = {'\n', 0x2, 0x0, 0x1}; -const char s00a_dword_800E0014[] = {0xf, 0x0, 0x0, 0x0}; -const char s00a_dword_800E0018[] = {0x0, 0xf9, 0x3, 0x0}; -const char s00a_dword_800E001C[] = {0x9, 0x0, '\\', 0x0}; -const char s00a_dword_800E0020[] = {0xaf, 0x1, 0x0, 0xc}; -const char s00a_dword_800E0024[] = {0x0, 0x4, '\n', 0x0}; -const char s00a_dword_800E0028[] = {'d', 0x0, 'd', 0x8}; -const char s00a_dword_800E002C[] = {'-', '#', 0x14, 0x2}; -const char s00a_dword_800E0030[] = {0x0, 0x1, 0xd, '\n'}; -const char s00a_dword_800E0034[] = {0x0, 'd', 0x0, 'd'}; -const char s00a_dword_800E0038[] = {0x8, 'F', 'n', 0xaa}; -const char s00a_dword_800E003C[] = {0x2, 0x0, 0x3, '\n'}; -const char s00a_dword_800E0040[] = {0xff, 0x9c, 0xff, 0x9c}; -const char s00a_dword_800E0044[] = {0x8, 0xba, 0x92, 'V'}; -const char s00a_dword_800E0048[] = {0x2, 0x0, 0x16, '\n'}; -const char s00a_dword_800E004C[] = {0x1, ',', 0xfe, 0x98}; -const char s00a_dword_800E0050[] = {0x8, 0xd3, 0xdd, 0xec}; -const char s00a_dword_800E0054[] = {0x2, 0x0, 0x1, '\n'}; -const char s00a_dword_800E0058[] = {0x1, ',', 0xff, 0xe2}; -const char s00a_dword_800E005C[] = {0x8, 0xd3, 0xdd, 0xec}; -const char s00a_dword_800E0060[] = {0x2, 0x0, 0x1, '\n'}; -const char s00a_dword_800E0064[] = {0x1, ',', 0xff, 0xf4}; -const char s00a_dword_800E0068[] = {0x2, 0x0, 0x1, '\n'}; -const char s00a_dword_800E006C[] = {0xfa, 0xba, 0x0, 0xf0}; -const char s00a_dword_800E0070[] = {0x2, 0x0, 0x1, 0xf}; -const char s00a_dword_800E0074[] = {0x1, 0x0, 0xc, 0x0}; -const char s00a_dword_800E0078[] = {0x4, '\n', 0x0, '2'}; -const char s00a_dword_800E007C[] = {0x0, '2', 0x8, '-'}; -const char s00a_dword_800E0080[] = {'#', 0x14, 0x2, 0x0}; -const char s00a_dword_800E0084[] = {0x1, 0xd, '\n', 0x0}; -const char s00a_dword_800E0088[] = {'2', 0x0, '2', 0x8}; -const char s00a_dword_800E008C[] = {'F', 'n', 0xaa, 0x2}; -const char s00a_dword_800E0090[] = {0x0, 0x3, '\n', 0xff}; -const char s00a_dword_800E0094[] = {0xce, 0xff, 0xce, 0x8}; -const char s00a_dword_800E0098[] = {0xba, 0x92, 'V', 0x2}; -const char s00a_dword_800E009C[] = {0x0, 0x16, '\n', 0x0}; -const char s00a_dword_800E00A0[] = {0x96, 0xff, 'L', 0x8}; -const char s00a_dword_800E00A4[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s00a_dword_800E00A8[] = {0x0, 0x1, '\n', 0x0}; -const char s00a_dword_800E00AC[] = {0x96, 0xff, 0xf1, 0x8}; -const char s00a_dword_800E00B0[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s00a_dword_800E00B4[] = {0x0, 0x1, '\n', 0x0}; -const char s00a_dword_800E00B8[] = {0x96, 0xff, 0xfa, 0x2}; -const char s00a_dword_800E00BC[] = {0x0, 0x1, '\n', 0xfd}; -const char s00a_dword_800E00C0[] = {']', 0x0, 'x', 0x2}; -const char s00a_dword_800E00C4[] = {0x0, 0x1, 0xf, 0x1}; -const char s00a_dword_800E00C8[] = {0x0, 0xc, 0x0, 0x4}; -const char s00a_dword_800E00CC[] = {'\n', 0x0, 0x19, 0x0}; -const char s00a_dword_800E00D0[] = {0x19, 0x8, '2', 0x19}; -const char s00a_dword_800E00D4[] = {0x14, 0x2, 0x0, 0x1}; -const char s00a_dword_800E00D8[] = {0xd, '\n', 0x0, 0x19}; -const char s00a_dword_800E00DC[] = {0x0, 0x19, 0x8, '2'}; -const char s00a_dword_800E00E0[] = {0x96, 0xaa, 0x2, 0x0}; -const char s00a_dword_800E00E4[] = {0x3, '\n', 0xff, 0xe7}; -const char s00a_dword_800E00E8[] = {0xff, 0xe7, 0x8, 0xce}; -const char s00a_dword_800E00EC[] = {'j', 'V', 0x2, 0x0}; -const char s00a_dword_800E00F0[] = {0x16, '\n', 0x0, 'K'}; -const char s00a_dword_800E00F4[] = {0xff, 0xa6, 0x8, 0xce}; -const char s00a_dword_800E00F8[] = {0xe7, 0xec, 0x2, 0x0}; -const char s00a_dword_800E00FC[] = {0x1, '\n', 0x0, 'K'}; -const char s00a_dword_800E0100[] = {0xff, 0xf9, 0x8, 0xce}; -const char s00a_dword_800E0104[] = {0xe7, 0xec, 0x2, 0x0}; -const char s00a_dword_800E0108[] = {0x1, '\n', 0x0, 'K'}; -const char s00a_dword_800E010C[] = {0xff, 0xf9, 0x2, 0x0}; -const char s00a_dword_800E0110[] = {0x1, '\n', 0xfe, 0xd4}; -const char s00a_dword_800E0114[] = {0x0, '<', 0x2, 0x0}; -const char s00a_dword_800E0118[] = {0x1, 0xf, 0x0, 0x0}; -const char s00a_dword_800E011C[] = {0x0, 0xf9, 0x3, 0x0}; -const char s00a_dword_800E0120[] = {0x9, 0x0, '\\', 0x0}; -const char s00a_dword_800E0124[] = {0xaf, 0x1, 0x0, 0xc}; -const char s00a_dword_800E0128[] = {0x0, 0x4, '\n', 0x0}; -const char s00a_dword_800E012C[] = {'d', 0x0, 'd', 0x8}; -const char s00a_dword_800E0130[] = {0x19, '&', '-', 0x2}; -const char s00a_dword_800E0134[] = {0x0, 0x1, 0xd, '\n'}; -const char s00a_dword_800E0138[] = {0x0, 'd', 0x0, 'd'}; -const char s00a_dword_800E013C[] = {0x8, 0x96, 'b', 'F'}; -const char s00a_dword_800E0140[] = {0x2, 0x0, 0x3, '\n'}; -const char s00a_dword_800E0144[] = {0xff, 0x9c, 0xff, 0x9c}; -const char s00a_dword_800E0148[] = {0x8, 'j', 0x9e, 0xba}; -const char s00a_dword_800E014C[] = {0x2, 0x0, 0x16, '\n'}; -const char s00a_dword_800E0150[] = {0x1, ',', 0xfe, 0x98}; -const char s00a_dword_800E0154[] = {0x8, 0xe7, 0xda, 0xd3}; -const char s00a_dword_800E0158[] = {0x2, 0x0, 0x1, '\n'}; -const char s00a_dword_800E015C[] = {0x1, ',', 0xff, 0xe2}; -const char s00a_dword_800E0160[] = {0x8, 0xe7, 0xda, 0xd3}; -const char s00a_dword_800E0164[] = {0x2, 0x0, 0x1, '\n'}; -const char s00a_dword_800E0168[] = {0x1, ',', 0xff, 0xf4}; -const char s00a_dword_800E016C[] = {0x2, 0x0, 0x1, '\n'}; -const char s00a_dword_800E0170[] = {0xfa, 0xba, 0x0, 0xf0}; -const char s00a_dword_800E0174[] = {0x2, 0x0, 0x1, 0xf}; -const char s00a_dword_800E0178[] = {0x1, 0x0, 0xc, 0x0}; -const char s00a_dword_800E017C[] = {0x4, '\n', 0x0, '2'}; -const char s00a_dword_800E0180[] = {0x0, '2', 0x8, '-'}; -const char s00a_dword_800E0184[] = {'#', 0x14, 0x2, 0x0}; -const char s00a_dword_800E0188[] = {0x1, 0xd, '\n', 0x0}; -const char s00a_dword_800E018C[] = {'2', 0x0, '2', 0x8}; -const char s00a_dword_800E0190[] = {'F', 'n', 0xaa, 0x2}; -const char s00a_dword_800E0194[] = {0x0, 0x3, '\n', 0xff}; -const char s00a_dword_800E0198[] = {0xce, 0xff, 0xce, 0x8}; -const char s00a_dword_800E019C[] = {0xba, 0x92, 'V', 0x2}; -const char s00a_dword_800E01A0[] = {0x0, 0x16, '\n', 0x0}; -const char s00a_dword_800E01A4[] = {0x96, 0xff, 'L', 0x8}; -const char s00a_dword_800E01A8[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s00a_dword_800E01AC[] = {0x0, 0x1, '\n', 0x0}; -const char s00a_dword_800E01B0[] = {0x96, 0xff, 0xf1, 0x8}; -const char s00a_dword_800E01B4[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s00a_dword_800E01B8[] = {0x0, 0x1, '\n', 0x0}; -const char s00a_dword_800E01BC[] = {0x96, 0xff, 0xfa, 0x2}; -const char s00a_dword_800E01C0[] = {0x0, 0x1, '\n', 0xfd}; -const char s00a_dword_800E01C4[] = {']', 0x0, 'x', 0x2}; -const char s00a_dword_800E01C8[] = {0x0, 0x1, 0xf, 0x1}; -const char s00a_dword_800E01CC[] = {0x0, 0xc, 0x0, 0x4}; -const char s00a_dword_800E01D0[] = {'\n', 0x0, 0x19, 0x0}; -const char s00a_dword_800E01D4[] = {0x19, 0x8, '2', 0x19}; -const char s00a_dword_800E01D8[] = {0x14, 0x2, 0x0, 0x1}; -const char s00a_dword_800E01DC[] = {0xd, '\n', 0x0, 0x19}; -const char s00a_dword_800E01E0[] = {0x0, 0x19, 0x8, '2'}; -const char s00a_dword_800E01E4[] = {0x96, 0xaa, 0x2, 0x0}; -const char s00a_dword_800E01E8[] = {0x3, '\n', 0xff, 0xe7}; -const char s00a_dword_800E01EC[] = {0xff, 0xe7, 0x8, 0xce}; -const char s00a_dword_800E01F0[] = {'j', 'V', 0x2, 0x0}; - -const char s00a_dword_800E01F4[] = {0x16, '\n', 0x0, 'K'}; - -const char s00a_dword_800E01F8[] = {0xff, 0xa6, 0x8, 0xce}; -const char s00a_dword_800E01FC[] = {0xe7, 0xec, 0x2, 0x0}; -const char s00a_dword_800E0200[] = {0x1, '\n', 0x0, 'K'}; -const char s00a_dword_800E0204[] = {0xff, 0xf9, 0x8, 0xce}; -const char s00a_dword_800E0208[] = {0xe7, 0xec, 0x2, 0x0}; -const char s00a_dword_800E020C[] = {0x1, '\n', 0x0, 'K'}; -const char s00a_dword_800E0210[] = {0xff, 0xf9, 0x2, 0x0}; -const char s00a_dword_800E0214[] = {0x1, '\n', 0xfe, 0xd4}; -const char s00a_dword_800E0218[] = {0x0, '<', 0x2, 0x0}; -const char s00a_dword_800E021C[] = {0x1, 0xf, 0x0, 0x0}; -const char s00a_dword_800E0220[] = {0x0, 0x4, 0x1, 0x0}; -const char s00a_dword_800E0224[] = {0x5, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0228[] = {0xf, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s00a/overlay5.c b/src/overlays/s00a/overlay5.c deleted file mode 100644 index e9ff1ceec..000000000 --- a/src/overlays/s00a/overlay5.c +++ /dev/null @@ -1,295 +0,0 @@ -/* -const int s00a_dword_800E022C = 0x800CA268; -const int s00a_dword_800E0230 = 0x800CA278; -const int s00a_dword_800E0234 = 0x800CA290; -const int s00a_dword_800E0238 = 0x800CA2A0; -const int s00a_dword_800E023C = 0x800CA2B8; -const int s00a_dword_800E0240 = 0x800CA2C8; -const int s00a_dword_800E0244 = 0x800CA2E0; -*/ -/* -const char s00a_dword_800E0248[] = {0x0, 0x0, 0x0, 0x0}; -const int s00a_dword_800E024C = 0x800CA3A0; -const int s00a_dword_800E0250 = 0x800CA3B0; -const int s00a_dword_800E0254 = 0x800CA3C8; -const int s00a_dword_800E0258 = 0x800CA3D8; -const int s00a_dword_800E025C = 0x800CA3F0; -const int s00a_dword_800E0260 = 0x800CA400; -const int s00a_dword_800E0264 = 0x800CA418; -*/ -/* -const char s00a_dword_800E0268[] = {0x0, 0x0, 0x0, 0x0}; -const int s00a_dword_800E026C = 0x800CA4D8; -const int s00a_dword_800E0270 = 0x800CA4EC; -const int s00a_dword_800E0274 = 0x800CA504; -const int s00a_dword_800E0278 = 0x800CA514; -const int s00a_dword_800E027C = 0x800CA52C; -const int s00a_dword_800E0280 = 0x800CA53C; -const int s00a_dword_800E0284 = 0x800CA554; -*/ - -//anim script -const char s00a_dword_800E0288[] = {0x0, 0x1c, 0x1, 0x0}; -const char s00a_dword_800E028C[] = {0x5, 0x1, 0xfe, 0x4}; -const char s00a_dword_800E0290[] = {0x0, 0x0, 0x1, 0x90}; -const char s00a_dword_800E0294[] = {0x0, 0x0, 0xc, 0x0}; -const char s00a_dword_800E0298[] = {0x9, 0x1, 0xff, '\n'}; -const char s00a_dword_800E029C[] = {0x0, 0x14, 0x0, 0x14}; -const char s00a_dword_800E02A0[] = {0x8, 0xe7, 0xe7, 0xe7}; -const char s00a_dword_800E02A4[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E02A8[] = {0xf, 0x0, 0x0, 0x0}; -const char s00a_dword_800E02AC[] = {0x2, 0x97, 0x3, 0x0}; -const char s00a_dword_800E02B0[] = {0x9, 0x0, 0xe6, 0x1}; -const char s00a_dword_800E02B4[] = {0xc3, 0x8, 0x0, 0xfc}; -const char s00a_dword_800E02B8[] = {0xde, 0x4, 0x0, 'd'}; -const char s00a_dword_800E02BC[] = {0x1, 0xf4, 0xff, 'S'}; -const char s00a_dword_800E02C0[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E02C4[] = {0x0, 0x1, 0xd, 0xc}; -const char s00a_dword_800E02C8[] = {0x0, 0x3, '\n', 0xfe}; -const char s00a_dword_800E02CC[] = {'p', 0x0, 0x0, 0x4}; -const char s00a_dword_800E02D0[] = {0xff, 0x9c, 0x0, 0x0}; -const char s00a_dword_800E02D4[] = {0xff, 0xe5, 0xc, 0x0}; -const char s00a_dword_800E02D8[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E02DC[] = {0xd, 0x4, 0xff, 0x9c}; -const char s00a_dword_800E02E0[] = {0x0, 0x0, 0x0, 0x1b}; -const char s00a_dword_800E02E4[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E02E8[] = {0x0, 0x1, 0xd, '\n'}; -const char s00a_dword_800E02EC[] = {0x1, 0x90, 0x0, 0x0}; -const char s00a_dword_800E02F0[] = {0x4, 0xff, 0xb7, 0x0}; -const char s00a_dword_800E02F4[] = {0x0, 0x0, 'I', 0xc}; -const char s00a_dword_800E02F8[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E02FC[] = {0x1, 0xd, 0x4, 0xff}; -const char s00a_dword_800E0300[] = {0xe5, 0x0, 0x0, 0x0}; -const char s00a_dword_800E0304[] = {'d', 0xc, 0x0, 0x3}; -const char s00a_dword_800E0308[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E030C[] = {'\n', 0xfe, 'p', 0x0}; -const char s00a_dword_800E0310[] = {0x0, 0x4, 0x0, 0x1b}; -const char s00a_dword_800E0314[] = {0x0, 0x0, 0x0, 'd'}; -const char s00a_dword_800E0318[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E031C[] = {0x0, 0x1, 0xd, 0x4}; -const char s00a_dword_800E0320[] = {0x0, 'I', 0x0, 0x0}; -const char s00a_dword_800E0324[] = {0x0, 'I', 0xc, 0x0}; -const char s00a_dword_800E0328[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E032C[] = {0xd, '\n', 0x1, 0x90}; -const char s00a_dword_800E0330[] = {0x0, 0x0, 0x4, 0x0}; -const char s00a_aD_800E0334[] = "d"; -const char s00a_dword_800E0338[] = {0x1b, 0xc, 0x0, 0x3}; -const char s00a_dword_800E033C[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E0340[] = {0x4, 0x0, 'd', 0x0}; -const char s00a_dword_800E0344[] = {0x0, 0xff, 0xe5, 0xc}; -const char s00a_dword_800E0348[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E034C[] = {0x1, 0xd, '\n', 0xfe}; -const char s00a_dword_800E0350[] = {'p', 0x0, 0x0, 0x4}; -const char s00a_dword_800E0354[] = {0x0, 'I', 0x0, 0x0}; -const char s00a_dword_800E0358[] = {0xff, 0xb7, 0xc, 0x0}; -const char s00a_dword_800E035C[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0360[] = {0xd, 0x4, 0x0, 0x1b}; -const char s00a_dword_800E0364[] = {0x0, 0x0, 0xff, 0x9c}; -const char s00a_dword_800E0368[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E036C[] = {0x0, 0x1, 0xd, '\n'}; -const char s00a_dword_800E0370[] = {0x1, 0x90, 0x0, 0x0}; -const char s00a_dword_800E0374[] = {0x4, 0xff, 0xe5, 0x0}; -const char s00a_dword_800E0378[] = {0x0, 0xff, 0x9c, 0xc}; -const char s00a_dword_800E037C[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E0380[] = {0x1, 0xd, 0x4, 0xff}; -const char s00a_dword_800E0384[] = {0xb7, 0x0, 0x0, 0xff}; -const char s00a_dword_800E0388[] = {0xb7, 0xc, 0x0, 0x3}; -const char s00a_dword_800E038C[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E0390[] = {0xd, 0xf, 0x8, 0x0}; -const char s00a_dword_800E0394[] = {0xfc, 0xde, 0x4, 0xff}; -const char s00a_dword_800E0398[] = {'8', 0x1, 0xf4, 0x0}; -const char s00a_dword_800E039C[] = {0x0, 0xc, 0x0, 0x3}; -const char s00a_dword_800E03A0[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E03A4[] = {0xc, 0x0, 0x3, '\n'}; -const char s00a_dword_800E03A8[] = {0xfe, 'p', 0x0, 0x0}; -const char s00a_dword_800E03AC[] = {0x4, 0x0, 0x1b, 0x0}; -const char s00a_dword_800E03B0[] = {0x0, 0x0, 'd', 0xc}; -const char s00a_dword_800E03B4[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E03B8[] = {0x1, 0xd, 0x4, 0x0}; -const char s00a_aI_800E03BC[] = "I"; -const char s00a_dword_800E03C0[] = {'I', 0xc, 0x0, 0x3}; -const char s00a_dword_800E03C4[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E03C8[] = {'\n', 0x1, 0x90, 0x0}; -const char s00a_dword_800E03CC[] = {0x0, 0x4, 0x0, 'd'}; -const char s00a_dword_800E03D0[] = {0x0, 0x0, 0x0, 0x1b}; -const char s00a_dword_800E03D4[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E03D8[] = {0x0, 0x1, 0xd, 0x4}; -const char s00a_dword_800E03DC[] = {0x0, 'd', 0x0, 0x0}; -const char s00a_dword_800E03E0[] = {0xff, 0xe5, 0xc, 0x0}; -const char s00a_dword_800E03E4[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E03E8[] = {0xd, '\n', 0xfe, 'p'}; -const char s00a_dword_800E03EC[] = {0x0, 0x0, 0x4, 0x0}; -const char s00a_dword_800E03F0[] = {'I', 0x0, 0x0, 0xff}; -const char s00a_dword_800E03F4[] = {0xb7, 0xc, 0x0, 0x3}; -const char s00a_dword_800E03F8[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E03FC[] = {0x4, 0x0, 0x1b, 0x0}; -const char s00a_dword_800E0400[] = {0x0, 0xff, 0x9c, 0xc}; -const char s00a_dword_800E0404[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E0408[] = {0x1, 0xd, '\n', 0x1}; -const char s00a_dword_800E040C[] = {0x90, 0x0, 0x0, 0x4}; -const char s00a_dword_800E0410[] = {0xff, 0xe5, 0x0, 0x0}; -const char s00a_dword_800E0414[] = {0xff, 0x9c, 0xc, 0x0}; -const char s00a_dword_800E0418[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E041C[] = {0xd, 0x4, 0xff, 0xb7}; -const char s00a_dword_800E0420[] = {0x0, 0x0, 0xff, 0xb7}; -const char s00a_dword_800E0424[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E0428[] = {0x0, 0x1, 0xd, '\n'}; -const char s00a_dword_800E042C[] = {0xfe, 'p', 0x0, 0x0}; -const char s00a_dword_800E0430[] = {0x4, 0xff, 0x9c, 0x0}; -const char s00a_dword_800E0434[] = {0x0, 0xff, 0xe5, 0xc}; -const char s00a_dword_800E0438[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E043C[] = {0x1, 0xd, 0x4, 0xff}; -const char s00a_dword_800E0440[] = {0x9c, 0x0, 0x0, 0x0}; -const char s00a_dword_800E0444[] = {0x1b, 0xc, 0x0, 0x3}; -const char s00a_dword_800E0448[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E044C[] = {'\n', 0x1, 0x90, 0x0}; -const char s00a_dword_800E0450[] = {0x0, 0x4, 0xff, 0xb7}; -const char s00a_dword_800E0454[] = {0x0, 0x0, 0x0, 'I'}; -const char s00a_dword_800E0458[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E045C[] = {0x0, 0x1, 0xd, 0x4}; -const char s00a_dword_800E0460[] = {0xff, 0xe5, 0x0, 0x0}; -const char s00a_dword_800E0464[] = {0x0, 'd', 0xc, 0x0}; -const char s00a_dword_800E0468[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E046C[] = {0xd, 0xd, 0xf, 0x8}; -const char s00a_dword_800E0470[] = {0x0, 0xfc, 0xde, 0x4}; -const char s00a_dword_800E0474[] = {0x0, 'd', 0x1, 0xf4}; -const char s00a_dword_800E0478[] = {0x0, 0xad, 0xc, 0x0}; -const char s00a_dword_800E047C[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0480[] = {0xd, 0xc, 0x0, 0x3}; -const char s00a_dword_800E0484[] = {'\n', 0xfe, 'p', 0x0}; -const char s00a_dword_800E0488[] = {0x0, 0x4, 0x0, 'I'}; -const char s00a_dword_800E048C[] = {0x0, 0x0, 0xff, 0xb7}; -const char s00a_dword_800E0490[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E0494[] = {0x0, 0x1, 0xd, 0x4}; -const char s00a_dword_800E0498[] = {0x0, 0x1b, 0x0, 0x0}; -const char s00a_dword_800E049C[] = {0xff, 0x9c, 0xc, 0x0}; -const char s00a_dword_800E04A0[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E04A4[] = {0xd, '\n', 0x1, 0x90}; -const char s00a_dword_800E04A8[] = {0x0, 0x0, 0x4, 0xff}; -const char s00a_dword_800E04AC[] = {0xe5, 0x0, 0x0, 0xff}; -const char s00a_dword_800E04B0[] = {0x9c, 0xc, 0x0, 0x3}; -const char s00a_dword_800E04B4[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E04B8[] = {0x4, 0xff, 0xb7, 0x0}; -const char s00a_dword_800E04BC[] = {0x0, 0xff, 0xb7, 0xc}; -const char s00a_dword_800E04C0[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E04C4[] = {0x1, 0xd, '\n', 0xfe}; -const char s00a_dword_800E04C8[] = {'p', 0x0, 0x0, 0x4}; -const char s00a_dword_800E04CC[] = {0xff, 0x9c, 0x0, 0x0}; -const char s00a_dword_800E04D0[] = {0xff, 0xe5, 0xc, 0x0}; -const char s00a_dword_800E04D4[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E04D8[] = {0xd, 0x4, 0xff, 0x9c}; -const char s00a_dword_800E04DC[] = {0x0, 0x0, 0x0, 0x1b}; -const char s00a_dword_800E04E0[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E04E4[] = {0x0, 0x1, 0xd, '\n'}; -const char s00a_dword_800E04E8[] = {0x1, 0x90, 0x0, 0x0}; -const char s00a_dword_800E04EC[] = {0x4, 0xff, 0xb7, 0x0}; -const char s00a_dword_800E04F0[] = {0x0, 0x0, 'I', 0xc}; -const char s00a_dword_800E04F4[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E04F8[] = {0x1, 0xd, 0x4, 0xff}; -const char s00a_dword_800E04FC[] = {0xe5, 0x0, 0x0, 0x0}; -const char s00a_dword_800E0500[] = {'d', 0xc, 0x0, 0x3}; -const char s00a_dword_800E0504[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E0508[] = {'\n', 0xfe, 'p', 0x0}; -const char s00a_dword_800E050C[] = {0x0, 0x4, 0x0, 0x1b}; -const char s00a_dword_800E0510[] = {0x0, 0x0, 0x0, 'd'}; -const char s00a_dword_800E0514[] = {0xc, 0x0, 0x3, 0x2}; -const char s00a_dword_800E0518[] = {0x0, 0x1, 0xd, 0x4}; -const char s00a_dword_800E051C[] = {0x0, 'I', 0x0, 0x0}; -const char s00a_dword_800E0520[] = {0x0, 'I', 0xc, 0x0}; -const char s00a_dword_800E0524[] = {0x3, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0528[] = {0xd, '\n', 0x1, 0x90}; -const char s00a_dword_800E052C[] = {0x0, 0x0, 0x4, 0x0}; -const char s00a_aD_800E0530[] = "d"; -const char s00a_dword_800E0534[] = {0x1b, 0xc, 0x0, 0x3}; -const char s00a_dword_800E0538[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E053C[] = {0x4, 0x0, 'd', 0x0}; -const char s00a_dword_800E0540[] = {0x0, 0xff, 0xe5, 0xc}; -const char s00a_dword_800E0544[] = {0x0, 0x3, 0x2, 0x0}; -const char s00a_dword_800E0548[] = {0x1, 0xd, 0xd, 0xf}; -const char s00a_dword_800E054C[] = {0x0, 'W', 0x1, 0x0}; -const char s00a_dword_800E0550[] = {0x5, 0xc, 0x0, 0x1c}; -const char s00a_dword_800E0554[] = {'\n', 0x0, 0x5, 0x0}; -const char s00a_dword_800E0558[] = {0x5, 0x4, 0x0, 0x0}; -const char s00a_dword_800E055C[] = {0x0, '\n', 0x0, 0x0}; -const char s00a_dword_800E0560[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E0564[] = {0xc, 0x0, 0x4, 0xc}; -const char s00a_dword_800E0568[] = {0x0, 0x5, '\n', 0xff}; -const char s00a_dword_800E056C[] = {0xf6, 0xff, 0xf6, 0x4}; -const char s00a_dword_800E0570[] = {0x0, 0x0, 0x0, '\n'}; -const char s00a_dword_800E0574[] = {0x0, 0x0, 0x2, 0x0}; -const char s00a_dword_800E0578[] = {0x1, 0xd, 0x2, 0x0}; -const char s00a_dword_800E057C[] = {0x1, 0xc, 0x0, 0x5}; -const char s00a_dword_800E0580[] = {'\n', 0x0, '\n', 0x0}; -const char s00a_dword_800E0584[] = {'\n', 0x4, 0x0, 0x0}; -const char s00a_dword_800E0588[] = {0x0, '\n', 0x0, 0x0}; -const char s00a_dword_800E058C[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E0590[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E0594[] = {0xc, 0x0, 0xe, '\n'}; -const char s00a_dword_800E0598[] = {0xff, 0xf6, 0xff, 0xf6}; -const char s00a_dword_800E059C[] = {0x4, 0x0, 0x0, 0x0}; -const char s00a_dword_800E05A0[] = {'\n', 0x0, 0x0, 0x2}; -const char s00a_dword_800E05A4[] = {0x0, 0x1, 0xd, 0xf}; -const char s00a_dword_800E05A8[] = {0x0, 'A', 0x1, 0x0}; -const char s00a_dword_800E05AC[] = {0x5, 0x1, 0xfe, 0xc}; -const char s00a_dword_800E05B0[] = {0x0, 0x1c, 0x1, 0xff}; -const char s00a_dword_800E05B4[] = {'\n', 0x0, 0x2, 0x0}; -const char s00a_dword_800E05B8[] = {'\n', 0x4, 0x0, 0x0}; -const char s00a_dword_800E05BC[] = {0x0, '\n', 0x0, 0x0}; -const char s00a_dword_800E05C0[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E05C4[] = {0xc, 0x0, 0x4, 0xc}; -const char s00a_dword_800E05C8[] = {0x0, 0x5, 0x1, 0xff}; -const char s00a_dword_800E05CC[] = {0x4, 0x0, 0x0, 0x0}; -const char s00a_dword_800E05D0[] = {'\n', 0x0, 0x0, 0x2}; -const char s00a_dword_800E05D4[] = {0x0, 0x1, 0xd, 0xd}; -const char s00a_dword_800E05D8[] = {0xc, 0x0, 0xe, 0x1}; -const char s00a_dword_800E05DC[] = {0xff, '\n', 0xff, 0xfc}; -const char s00a_dword_800E05E0[] = {0xff, 0xec, 0x4, 0x0}; -const char s00a_dword_800E05E4[] = {0x0, 0x0, '\n', 0x0}; -const char s00a_dword_800E05E8[] = {0x0, 0x2, 0x0, 0x1}; -const char s00a_dword_800E05EC[] = {0xd, 0xf, 0x0, 0x0}; -const char s00a_dword_800E05F0[] = {0x0, 0x96, 0x3, 0x0}; -const char s00a_dword_800E05F4[] = {0x9, 0x0, ';', 0x0}; -const char s00a_dword_800E05F8[] = {'m', 0x8, 0x0, 0x2}; -const char s00a_dword_800E05FC[] = {0x1e, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0600[] = {0xc, 0x0, 0x19, 0x8}; -const char s00a_dword_800E0604[] = {0x4, 0x6, 0x6, '\n'}; -const char s00a_dword_800E0608[] = {0x0, 0x4, 0x0, 0x4}; -const char s00a_dword_800E060C[] = {0x4, 0x0, 0x4, 0x0}; -const char s00a_dword_800E0610[] = {0x14, 0x0, 0x0, 0x2}; -const char s00a_dword_800E0614[] = {0x0, 0x1, 0xd, 0xc}; -const char s00a_dword_800E0618[] = {0x0, 0xf, '\n', 0x0}; -const char s00a_dword_800E061C[] = {0x4, 0x0, 0x4, 0x4}; -const char s00a_dword_800E0620[] = {0x0, 0x4, 0x0, 0x14}; -const char s00a_dword_800E0624[] = {0x0, 0x0, 0x2, 0x0}; -const char s00a_dword_800E0628[] = {0x1, 0xd, 0xf, 0x8}; -const char s00a_dword_800E062C[] = {0x0, 0x2, 0x1e, 0x2}; -const char s00a_dword_800E0630[] = {0x0, 0xb, 0xc, 0x0}; -const char s00a_dword_800E0634[] = {0x19, 0x8, 0x4, 0x6}; -const char s00a_dword_800E0638[] = {0x6, '\n', 0x0, 0x4}; -const char s00a_dword_800E063C[] = {0x0, 0x4, 0x4, 0x0}; -const char s00a_dword_800E0640[] = {0x4, 0x0, 0x14, 0x0}; -const char s00a_dword_800E0644[] = {0x0, 0x2, 0x0, 0x1}; -const char s00a_dword_800E0648[] = {0xd, 0xc, 0x0, 0xf}; -const char s00a_dword_800E064C[] = {'\n', 0x0, 0x4, 0x0}; -const char s00a_dword_800E0650[] = {0x4, 0x4, 0x0, 0x4}; -const char s00a_dword_800E0654[] = {0x0, 0x14, 0x0, 0x0}; -const char s00a_dword_800E0658[] = {0x2, 0x0, 0x1, 0xd}; -const char s00a_dword_800E065C[] = {0xf, 0x8, 0x0, 0x2}; -const char s00a_dword_800E0660[] = {0x1e, 0x2, 0x0, 0x15}; -const char s00a_dword_800E0664[] = {0xc, 0x0, 0x19, 0x8}; -const char s00a_dword_800E0668[] = {0x4, 0x6, 0x6, '\n'}; -const char s00a_dword_800E066C[] = {0x0, 0x4, 0x0, 0x4}; -const char s00a_dword_800E0670[] = {0x4, 0x0, 0x4, 0x0}; -const char s00a_dword_800E0674[] = {0x14, 0x0, 0x0, 0x2}; -const char s00a_dword_800E0678[] = {0x0, 0x1, 0xd, 0xc}; -const char s00a_dword_800E067C[] = {0x0, 0xf, '\n', 0x0}; -const char s00a_dword_800E0680[] = {0x4, 0x0, 0x4, 0x4}; -const char s00a_dword_800E0684[] = {0x0, 0x4, 0x0, 0x14}; -const char s00a_dword_800E0688[] = {0x0, 0x0, 0x2, 0x0}; -const char s00a_dword_800E068C[] = {0x1, 0xd, 0xf, 0x0}; -const char aErrerrerrnotlinkroutedtod_800E0690[] = " Err Err Err Not Link Route [%d] to [%d] !!!!\n"; -const char aErrnozoneidingcl_800E06C0[] = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; -const char aKirari_800E06E8[] = "kirari01"; -const char aBefmapnamed_800E06F4[] = "bef map name =%d \n"; -const char aAftmapnamed_800E0708[] = "aft map name =%d \n"; -const char aRootchange_800E071C[] = " Root Change !!\n"; diff --git a/src/overlays/s00a/overlay6.c b/src/overlays/s00a/overlay6.c deleted file mode 100644 index abfd3555e..000000000 --- a/src/overlays/s00a/overlay6.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "libdg/libdg.h" - -const char aCresetposd_800E07FC[] = " c_reset_pos = %d \n"; -const char aKottida_800E0810[] = "kottida !!\n"; \ No newline at end of file diff --git a/src/overlays/s00a/overlay7.c b/src/overlays/s00a/overlay7.c deleted file mode 100644 index 7333bee34..000000000 --- a/src/overlays/s00a/overlay7.c +++ /dev/null @@ -1,54 +0,0 @@ -#include "libdg/libdg.h" -/* -const int s00a_dword_800E081C = 0x800CF174; -const int s00a_dword_800E0820 = 0x800CF184; -const int s00a_dword_800E0824 = 0x800CF194; -const int s00a_dword_800E0828 = 0x800CF1A4; -const int s00a_dword_800E082C = 0x800CF1B4; -const int s00a_dword_800E0830 = 0x800CF1C4; -const int s00a_dword_800E0834 = 0x800CF1D4; -const int s00a_dword_800E0838 = 0x800CF1E4; -*/ -const char s00a_aResetmaxdnumd_800E083C[] = "reset max=%d num=%d \n"; -const char aGmenemywatchcountd_800E0854[] = " GM_EnemyWatchCount = [%d] \n"; -const char aNowzonedrzoned_800E0874[] = " now zone = %d r_zone=%d\n"; -const char aNotrestrctedaread_800E0890[] = " ? ? ? Not Restrcted Area [%d] !!!!\n"; -const char aErrerrerrnotlinkroutedtod_800E08B8[] = " Err Err Err Not Link Route [%d] to [%d] !!!!\n"; - -const char aCommanderrnozoneidingclzdidd_800E08E8[] = "command:!!!Err No Zone ID In Gcl z%d id%d!!!!!!!!\n"; -const char aCommandcwhereissnake_800E091C[] = "command.c: Where Is Snake ????\n"; -const char aCom_noisemode_disD_800E0940[] = " COM_NOISEMODE_DIS =%d \n"; -const char aEeeDDDTD_800E095C[] = "eee %d %d %d t %d \n"; -const char aCommandC_800E0970[] = "command.c"; -const RECT eyeflash_rect = {175, 100, 350, 200}; -const char s00a_aKirari_800E0984[] = "kirari"; -const char s00a_aEyeflashc_800E098C[] = "eyeflash.c"; -const char aAsiatoc_800E0998[] = "asiato.c"; - -const char aLSightC[] = "l_sight.c"; - -const char aGrenadeModelD[] = "grenade model=%d \n"; -const char aGrnadEC[] = "grnad_e.c"; - -// Enemy/boxkeri.c -const char aBoxkeriSnake[] = "スネーク"; -const char sBoxkeriDanbowl[] = "段ボール"; -const char aCbBox[] = "cb_box"; -const char aBoxkeriC[] = "boxkeri.c"; - -// Enemy/smoke.c -const char aSmoke[] = "smoke"; -const char aSmokeC[] = "smoke.c"; - -// Enemy/wall.c -const char aDestroy[] = "destroy\n"; -const char aBox01[] = "box_01"; -const char aDbx1[] = "dbx1"; -const char aDbx2[] = "dbx2"; -const char aWallC[] = "wall.c"; - -// Enemy/asioto.c -const char aAsiotoSeSetErr[] = " asioto se set err \n"; -const char aAsiotoSeNoiseSetErr[] = " asioto se noise set err \n"; -const char aMigiSodesuri[] = " migi sodesuri %d \n"; -const char aAsiotoC[] = "asioto.c"; diff --git a/src/overlays/s00a/overlay7_2.c b/src/overlays/s00a/overlay7_2.c deleted file mode 100644 index 5f3b720e7..000000000 --- a/src/overlays/s00a/overlay7_2.c +++ /dev/null @@ -1,6 +0,0 @@ -const char s00a_dword_800E0ADC[] = {0xb3, 0xab, 0xa4, 0xaf, 0x0, 0x0, 0x0, 0x0}; -const char s00a_dword_800E0AE4[] = {0xca, 0xc4, 0xa4, 0xe1, 0xa4, 0xeb, 0x0, 0x0}; -const char s00a_aOpen_800E0AEC[] = "open"; -const char s00a_aClose_800E0AF4[] = "close"; -const char s00a_aSeon_800E0AFC[] = "se_on"; -const char s00a_aSeoff_800E0B04[] = "se_off"; diff --git a/src/overlays/s00a/overlay8.c b/src/overlays/s00a/overlay8.c deleted file mode 100644 index a64ed60ea..000000000 --- a/src/overlays/s00a/overlay8.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -const int s00a_dword_800E0B0C = 0x800D6750; -const int s00a_dword_800E0B10 = 0x800D676C; -const int s00a_dword_800E0B14 = 0x800D6750; -const int s00a_dword_800E0B18 = 0x800D676C; -const int s00a_dword_800E0B1C = 0x800D6780; -const int s00a_dword_800E0B20 = 0x800D678C; -*/ - -const char aPatlit[] = "patlit"; -const char aPatBody[] = "pat_body"; -const char aPatLamp[] = "pat_lamp"; -const char aPatSpt1[] = "pat_spt1"; -const char aPatoLmpC[] = "pato_lmp.c"; -const char s00a_dword_800E0B5B = 0xFF; diff --git a/src/overlays/s01a/Anime/animeconv/rcm.c b/src/overlays/s01a/Anime/animeconv/rcm.c new file mode 100644 index 000000000..5b27f86d4 --- /dev/null +++ b/src/overlays/s01a/Anime/animeconv/rcm.c @@ -0,0 +1,169 @@ +#include "libgcl/hash.h" +#include "Anime/animeconv/anime.h" + +extern SVECTOR DG_ZeroVector_800AB39C; + +const char anim_data_800E46F8[] = { + 0x00, 0x1f, 0x04, 0x00, 0x0b, 0x00, 0x0f, 0x00, + 0x18, 0x00, 0x21, 0x02, 0x00, 0x01, 0x0f, 0x0a, + 0xff, 0xce, 0xff, 0xce, 0x02, 0x00, 0x01, 0x0f, + 0x0a, 0xff, 0x9c, 0xff, 0x9c, 0x02, 0x00, 0x01, + 0x0f, 0x0a, 0xff, 0x6a, 0xff, 0x6a, 0x02, 0x00, + 0x01, 0x0f, 0x00, 0x00, +}; + +const char anim_data_800E4724[] = { + 0x00, 0x10, 0x01, 0x00, 0x05, 0x02, 0x00, 0x01, + 0x08, 0xf0, 0xf0, 0xf0, 0x0a, 0x03, 0xe8, 0x03, + 0xe8, 0x02, 0x00, 0x01, 0x0f, 0x00, 0x00, 0x00, +}; + +const char anim_data_800E473C[] = { + 0x00, 0x08, 0x01, 0x00, 0x05, 0x0c, 0x00, 0x3c, + 0x02, 0x00, 0x01, 0x0d, 0x0f, 0x00, 0x00, 0x00, +}; + +const char anim_data_800E474C[] = { + 0x00, 0x0d, 0x02, 0x00, 0x07, 0x00, 0x0b, 0x02, + 0x00, 0x01, 0x0f, 0x0a, 0xfe, 0x70, 0xfe, 0x70, + 0x02, 0x00, 0x01, 0x0f, +}; + +const char anim_data_800E4760[] = { + 0x00, 0x04, 0x01, 0x00, 0x05, 0x02, 0x00, 0x01, + 0x0f, 0x00, 0x00, 0x00, +}; + +const char anim_data_800E476C[] = { + 0x00, 0x13, 0x01, 0x00, 0x05, 0x08, 0xc8, 0xc8, + 0xff, 0x02, 0x00, 0x01, 0x0c, 0x00, 0x1f, 0x08, + 0xfa, 0xfa, 0xf8, 0x02, 0x00, 0x01, 0x0d, 0x0f, +}; + +ANIMATION anm_800C3C04 = {PCX_RCM_L, 1, 1, 1, 1, 230, 1, 300, 300, 255, NULL, (char *)anim_data_800E46F8}; +ANIMATION anm_800C3C20 = {PCX_RCM_L, 1, 1, 1, 1, 230, 1, 1000, 1000, 32, NULL, (char *)anim_data_800E4724}; +ANIMATION anm_800C3C3C = {PCX_RCM_L, 1, 1, 1, 1, 500, 1, 200, 200, 255, NULL, (char *)anim_data_800E473C}; +ANIMATION anm_800C3C58 = {PCX_RCM_L, 1, 1, 1, 1, 500, 1, 2000, 2000, 64, NULL, (char *)anim_data_800E474C}; +ANIMATION anm_800C3C74 = {PCX_RCM_L, 1, 1, 1, 1, 0, 0, 20, 20, 255, NULL, (char *)anim_data_800E4760}; +ANIMATION anm_800C3C90 = {PCX_W_BONBORI, 1, 1, 1, 1, 230, 1, 0, 0, 255, NULL, (char *)anim_data_800E476C}; + + +void s01a_object_800D93BC(short *arg0) +{ + PRESCRIPT prescript; + SVECTOR *pos, *speed; + + pos = &prescript.pos; + + pos->vx = arg0[10]; + pos->vy = arg0[12]; + pos->vz = arg0[14]; + + speed = &prescript.speed; + + speed->vx = 0; + speed->vy = 0; + speed->vz = 0; + + prescript.scr_num = 1; + prescript.s_anim = 0; + + anm_800C3C04.field_14_pre_script = &prescript; + NewAnime_8005FBC8(NULL, NULL, &anm_800C3C04); +} + +void s01a_object_800D9424(SVECTOR *pos, short scr_num) +{ + PRESCRIPT prescript; + + prescript.pos = *pos; + prescript.speed = DG_ZeroVector_800AB39C; + prescript.scr_num = scr_num; + prescript.s_anim = 0; + + anm_800C3C04.field_14_pre_script = &prescript; + NewAnime_8005FBC8(NULL, NULL, &anm_800C3C04); +} + +void s01a_object_800D94A8(SVECTOR *pos) +{ + PRESCRIPT prescript; + + prescript.pos = *pos; + prescript.speed = DG_ZeroVector_800AB39C; + prescript.scr_num = 0; + prescript.s_anim = 0; + + anm_800C3C3C.field_14_pre_script = &prescript; + NewAnime_8005FBC8(NULL, NULL, &anm_800C3C3C); +} + +void s01a_object_800D952C(SVECTOR *pos, short scr_num) +{ + PRESCRIPT prescript; + + prescript.pos = *pos; + prescript.speed = DG_ZeroVector_800AB39C; + prescript.scr_num = scr_num; + prescript.s_anim = 0; + + anm_800C3C58.field_14_pre_script = &prescript; + NewAnime_8005FBC8(NULL, NULL, &anm_800C3C58); +} + +void s01a_object_800D95B0(SVECTOR *pos) +{ + PRESCRIPT prescript; + + prescript.pos = *pos; + prescript.speed = DG_ZeroVector_800AB39C; + prescript.scr_num = 0; + prescript.s_anim = 0; + + anm_800C3C74.field_14_pre_script = &prescript; + NewAnime_8005FBC8(NULL, NULL, &anm_800C3C74); +} + +void s01a_object_800D9634(SVECTOR *pos) +{ + PRESCRIPT prescript; + + prescript.pos = *pos; + prescript.speed = DG_ZeroVector_800AB39C; + prescript.scr_num = 0; + prescript.s_anim = 0; + + anm_800C3C20.field_14_pre_script = &prescript; + NewAnime_8005FBC8(NULL, NULL, &anm_800C3C20); +} + +void s01a_object_800D96B8(MATRIX *world, int arg1, char arg2, char arg3, char arg4, char arg5, char arg6, char arg7, char arg8, char *ptr) +{ + ANIMATION anm; + PRESCRIPT pre; + + memset(&pre, 0, sizeof(PRESCRIPT)); + + pre.pos.vx = world->t[0]; + pre.pos.vy = world->t[1]; + pre.pos.vz = world->t[2]; + + anm = anm_800C3C90; + + memcpy(ptr, anm.field_18_ptr, 32); + + anm.field_18_ptr = ptr; + anm.field_14_pre_script = ⪯ + anm.field_E_xw = arg1; + anm.field_10_yh = arg1; + + anm.field_18_ptr[6] = arg2; + anm.field_18_ptr[7] = arg3; + anm.field_18_ptr[8] = arg4; + anm.field_18_ptr[14] = arg5; + anm.field_18_ptr[16] = arg6; + anm.field_18_ptr[17] = arg7; + anm.field_18_ptr[18] = arg8; + + NewAnime_8005FBC8(NULL, 0, &anm); +} diff --git a/src/overlays/s01a/Anime/animeconv/socom.c b/src/overlays/s01a/Anime/animeconv/socom.c index 212e4fe11..71b95030f 100644 --- a/src/overlays/s01a/Anime/animeconv/socom.c +++ b/src/overlays/s01a/Anime/animeconv/socom.c @@ -1,13 +1,118 @@ +#include "libgcl/hash.h" #include "Anime/animeconv/anime.h" +const char anim_data_800CC124[] = {0x0, 0x1d, 0x3, 0x0}; +const char s03e_dword_800CC128[] = {0x9, 0x0, 0x10, 0x0}; +const char s03e_dword_800CC12C[] = {0x1b, 0x9, 0xb, 0xb8}; +const char s03e_dword_800CC130[] = {0x2, 0x0, 0x1, 0xf}; +const char s03e_dword_800CC134[] = {0x7, 0x3, '\n', 0xff}; +const char s03e_dword_800CC138[] = {'8', 0xff, '8', 0x2}; +const char s03e_dword_800CC13C[] = {0x0, 0x1, 0xf, 0x7}; +const char s03e_dword_800CC140[] = {0x3, '\n', 0xfe, 0x98}; +const char s03e_dword_800CC144[] = {0xfe, 0xfc, 0x2, 0x0}; +const char s03e_dword_800CC148[] = {0x1, 0xf, 0x0, 0x0}; + +const char anim_data_800CC14C[] = {0x0, 0x13, 0x1, 0x0}; +const char s03e_dword_800CC150[] = {0x5, 0xc, 0x0, 0x7}; +const char s03e_dword_800CC154[] = {0x1, 0xff, '\n', 0x0}; +const char s03e_dword_800CC158[] = {'F', 0x0, 'F', 0x8}; +const char s03e_dword_800CC15C[] = {0xf0, 0xf0, 0xf0, 0x2}; +const char s03e_dword_800CC160[] = {0x0, 0x1, 0xd, 0xf}; + +const char anim_data_800CC164[] = {0x0, '[', 0x4, 0x0}; +const char s03e_dword_800CC168[] = {0xb, 0x0, 0x1e, 0x0}; +const char s03e_dword_800CC16C[] = {'6', 0x0, 'N', 0xc}; +const char s03e_dword_800CC170[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC174[] = {'\n', 0x0, 0xc8, 0x0}; +const char s03e_dword_800CC178[] = {0xc8, 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC17C[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC180[] = {0xd, 0xf, '\n', 0x1}; +const char s03e_dword_800CC184[] = {0x90, 0x1, 0x90, 0xc}; +const char s03e_dword_800CC188[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC18C[] = {'\n', 0x1, ',', 0x1}; +const char s03e_dword_800CC190[] = {',', 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC194[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC198[] = {0xd, 0xf, '\n', 0x3}; +const char s03e_dword_800CC19C[] = {' ', 0x3, ' ', 0xc}; +const char s03e_dword_800CC1A0[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC1A4[] = {'\n', 0x1, 0x90, 0x1}; +const char s03e_dword_800CC1A8[] = {0x90, 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC1AC[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC1B0[] = {0xd, 0xf, '\n', 0x4}; +const char s03e_dword_800CC1B4[] = {0xb0, 0x4, 0xb0, 0xc}; +const char s03e_dword_800CC1B8[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC1BC[] = {'\n', 0x1, 0xf4, 0x1}; +const char s03e_dword_800CC1C0[] = {0xf4, 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC1C4[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC1C8[] = {0xd, 0xf, 0x0, 0x0}; + +const char anim_data_800CC1CC[] = {0x0, 'k', 0x4, 0x0}; +const char s03e_dword_800CC1D0[] = {0xb, 0x0, '"', 0x0}; +const char s03e_dword_800CC1D4[] = {'>', 0x0, 'Z', 0x8}; +const char s03e_dword_800CC1D8[] = {0xff, 0xff, 0xff, 0xc}; +const char s03e_dword_800CC1DC[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC1E0[] = {'\n', 0x0, 0xc8, 0x0}; +const char s03e_dword_800CC1E4[] = {0xc8, 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC1E8[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC1EC[] = {0xd, 0xf, 0x8, 0xff}; +const char s03e_dword_800CC1F0[] = {0xff, 0xff, '\n', 0x1}; +const char s03e_dword_800CC1F4[] = {0x90, 0x1, 0x90, 0xc}; +const char s03e_dword_800CC1F8[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC1FC[] = {'\n', 0x1, ',', 0x1}; +const char s03e_dword_800CC200[] = {',', 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC204[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC208[] = {0xd, 0xf, 0x8, 0xff}; +const char s03e_dword_800CC20C[] = {0xff, 0xff, '\n', 0x3}; +const char s03e_dword_800CC210[] = {' ', 0x3, ' ', 0xc}; +const char s03e_dword_800CC214[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC218[] = {'\n', 0x1, 0x90, 0x1}; +const char s03e_dword_800CC21C[] = {0x90, 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC220[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC224[] = {0xd, 0xf, 0x8, 0xff}; +const char s03e_dword_800CC228[] = {0xff, 0xff, '\n', 0x4}; +const char s03e_dword_800CC22C[] = {0xb0, 0x4, 0xb0, 0xc}; +const char s03e_dword_800CC230[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC234[] = {'\n', 0x1, 0xf4, 0x1}; +const char s03e_dword_800CC238[] = {0xf4, 0x8, 0xf0, 0xf0}; +const char s03e_dword_800CC23C[] = {0xf0, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC240[] = {0xd, 0xf, 0x0, 0x0}; + +const char anim_data_800CC244[] = {0x0, '[', 0x4, 0x0}; +const char s03e_dword_800CC248[] = {0xb, 0x0, 0x1e, 0x0}; +const char s03e_dword_800CC24C[] = {'6', 0x0, 'N', 0xc}; +const char s03e_dword_800CC250[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC254[] = {'\n', 0x0, 0xc8, 0x0}; +const char s03e_dword_800CC258[] = {0xc8, 0x8, 0xfc, 0xfc}; +const char s03e_dword_800CC25C[] = {0xfc, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC260[] = {0xd, 0xf, '\n', 0x1}; +const char s03e_dword_800CC264[] = {0x90, 0x1, 0x90, 0xc}; +const char s03e_dword_800CC268[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC26C[] = {'\n', 0x1, ',', 0x1}; +const char s03e_dword_800CC270[] = {',', 0x8, 0xfc, 0xfc}; +const char s03e_dword_800CC274[] = {0xfc, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC278[] = {0xd, 0xf, '\n', 0x3}; +const char s03e_dword_800CC27C[] = {' ', 0x3, ' ', 0xc}; +const char s03e_dword_800CC280[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC284[] = {'\n', 0x1, 0x90, 0x1}; +const char s03e_dword_800CC288[] = {0x90, 0x8, 0xfc, 0xfc}; +const char s03e_dword_800CC28C[] = {0xfc, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC290[] = {0xd, 0xf, '\n', 0x4}; +const char s03e_dword_800CC294[] = {0xb0, 0x4, 0xb0, 0xc}; +const char s03e_dword_800CC298[] = {0x0, 0x7, 0x1, 0xff}; +const char s03e_dword_800CC29C[] = {'\n', 0x1, 0xf4, 0x1}; +const char s03e_dword_800CC2A0[] = {0xf4, 0x8, 0xfc, 0xfc}; +const char s03e_dword_800CC2A4[] = {0xfc, 0x2, 0x0, 0x1}; +const char s03e_dword_800CC2A8[] = {0xd, 0xf}; + +ANIMATION anm_800C3B78 = {PCX_SOCOM_F, 2, 2, 4, 1, 300, 1, 800, 800, 128, NULL, (char *)anim_data_800CC124}; +ANIMATION anm_800C3B94 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800CC14C}; +ANIMATION anm_800C3BB0 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800CC164}; +ANIMATION anm_800C3BCC = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 0, NULL, (char *)anim_data_800CC1CC}; +ANIMATION anm_800C3BE8 = {PCX_SMOKE, 8, 4, 30, 1, 500, 2, 400, 400, 32, NULL, (char *)anim_data_800CC244}; + extern SVECTOR DG_ZeroVector_800AB39C; extern ANIMATION stru_8009F0D4; extern ANIMATION stru_8009F0F0; -extern ANIMATION anm_800C3B78; -extern ANIMATION anm_800C3B94; -extern ANIMATION anm_800C3BB0; -extern ANIMATION anm_800C3BCC; -extern ANIMATION anm_800C3BE8; void AN_Unknown_800D6898(MATRIX *pos) { diff --git a/src/overlays/s01a/Enemy/camera.c b/src/overlays/s01a/Enemy/camera.c index 674757f48..4c50d44a7 100644 --- a/src/overlays/s01a/Enemy/camera.c +++ b/src/overlays/s01a/Enemy/camera.c @@ -106,12 +106,10 @@ typedef struct CameraWork int field_28C; } CameraWork; -extern char s01a_dword_800E44CC[]; -extern char s01a_aScamera_800E44C0[]; -extern char s01a_aCamarm_800E44AC[]; -extern char s01a_aCameral_800E44B4[]; -extern SVECTOR camera_svec1_800C3B70; -extern RECT camera_rect_800C3B68; +RECT camera_rect_800C3B68 = {120, 120, 240, 240}; +SVECTOR camera_svec1_800C3B70 = {300, 300, 300, 0}; + +extern char s01a_dword_800E44CC[]; extern TOPCOMMAND_STRUCT TOPCOMMAND_800E0F20; extern SVECTOR DG_ZeroVector_800AB39C; @@ -546,6 +544,14 @@ int s01a_camera_800D5EC0(CameraWork *work) #pragma INCLUDE_ASM("asm/overlays/s01a/s01a_camera_800D5F64.s") void s01a_camera_800D5F64(CameraWork *work); +const int s01a_dword_800E4490 = 0x800D5810; +const int s01a_dword_800E4494 = 0x800D5840; +const int s01a_dword_800E4498 = 0x800D5870; +const int s01a_dword_800E449C = 0x800D58E8; +const int s01a_dword_800E44A0 = 0x800D5880; +const int s01a_dword_800E44A4 = 0x800D58E8; +const int s01a_dword_800E44A8 = 0x800D58A4; + void s01a_camera_800D6174(CameraWork *work) { CONTROL *ctrl; @@ -677,7 +683,7 @@ int s01a_camera_800D640C(CameraWork *work) OBJECT_NO_ROTS *obj; obj = &work->field_C0; - GM_InitObjectNoRots_800349B0(obj, GV_StrCode_80016CCC(s01a_aCamarm_800E44AC), 0x36D, 0); + GM_InitObjectNoRots_800349B0(obj, GV_StrCode_80016CCC("cam_arm"), 0x36D, 0); GM_ConfigObjectLight_80034C44((OBJECT *)obj, &work->field_F4); DG_GetLightMatrix2_8001A5D8(&work->field_20.field_0_mov, &work->field_F4); work->field_E4.vy = -25; @@ -731,7 +737,7 @@ int s01a_camera_800D6504(CameraWork *work) if (prim != NULL) { prim->field_2E_k500 = 500; - work->field_198 = tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC(s01a_aCameral_800E44B4)); + work->field_198 = tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC("camera_l")); if (tex != NULL) { s01a_camera_800D648C(&prim->field_40_pBuffers[0]->poly_ft4, tex, 0x80); @@ -774,11 +780,11 @@ int s01a_camera_800D65EC(CameraWork *work, int arg1, int arg2) // Dead code (if with identical cases): if (type == 0x41) { - opt = s01a_aScamera_800E44C0; + opt = "s_camera"; } else { - opt = s01a_aScamera_800E44C0; + opt = "s_camera"; } GM_InitObjectNoRots_800349B0(obj, GV_StrCode_80016CCC(opt), 0x32D, 0); @@ -834,7 +840,7 @@ GV_ACT *s01a_camera_800D67F8(int arg0, int arg1) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s01a_camera_800D5F64, - (TActorFunction)s01a_camera_800D678C, s01a_dword_800E44CC); + (TActorFunction)s01a_camera_800D678C, "camera.c"); if (s01a_camera_800D65EC(work, arg0, arg1) < 0) { GV_DestroyActor_800151C8(&work->actor); diff --git a/src/overlays/s01a/Enemy/object.c b/src/overlays/s01a/Enemy/object.c index e51e5578a..6f6b45028 100644 --- a/src/overlays/s01a/Enemy/object.c +++ b/src/overlays/s01a/Enemy/object.c @@ -58,138 +58,12 @@ typedef struct ObjectWork int field_28C; } ObjectWork; -extern int GM_GameFlag_800E0F64; -extern SVECTOR object_svec1_800C3CAC; -extern SVECTOR object_svec2_800C3CB4; -extern ANIMATION anm_800C3C04; -extern ANIMATION anm_800C3C20; -extern ANIMATION anm_800C3C3C; -extern ANIMATION anm_800C3C58; -extern ANIMATION anm_800C3C74; -extern ANIMATION anm_800C3C90; +SVECTOR object_svec1_800C3CAC = {1000, 2000, 1500, 0}; +SVECTOR object_svec2_800C3CB4 = {1500, 2000, 1500, 0}; +extern int GM_GameFlag_800E0F64; extern SVECTOR DG_ZeroVector_800AB39C; -void s01a_object_800D93BC(short *arg0) -{ - PRESCRIPT prescript; - SVECTOR *pos, *speed; - - pos = &prescript.pos; - - pos->vx = arg0[10]; - pos->vy = arg0[12]; - pos->vz = arg0[14]; - - speed = &prescript.speed; - - speed->vx = 0; - speed->vy = 0; - speed->vz = 0; - - prescript.scr_num = 1; - prescript.s_anim = 0; - - anm_800C3C04.field_14_pre_script = &prescript; - NewAnime_8005FBC8(NULL, NULL, &anm_800C3C04); -} - -void s01a_object_800D9424(SVECTOR *pos, short scr_num) -{ - PRESCRIPT prescript; - - prescript.pos = *pos; - prescript.speed = DG_ZeroVector_800AB39C; - prescript.scr_num = scr_num; - prescript.s_anim = 0; - - anm_800C3C04.field_14_pre_script = &prescript; - NewAnime_8005FBC8(NULL, NULL, &anm_800C3C04); -} - -void s01a_object_800D94A8(SVECTOR *pos) -{ - PRESCRIPT prescript; - - prescript.pos = *pos; - prescript.speed = DG_ZeroVector_800AB39C; - prescript.scr_num = 0; - prescript.s_anim = 0; - - anm_800C3C3C.field_14_pre_script = &prescript; - NewAnime_8005FBC8(NULL, NULL, &anm_800C3C3C); -} - -void s01a_object_800D952C(SVECTOR *pos, short scr_num) -{ - PRESCRIPT prescript; - - prescript.pos = *pos; - prescript.speed = DG_ZeroVector_800AB39C; - prescript.scr_num = scr_num; - prescript.s_anim = 0; - - anm_800C3C58.field_14_pre_script = &prescript; - NewAnime_8005FBC8(NULL, NULL, &anm_800C3C58); -} - -void s01a_object_800D95B0(SVECTOR *pos) -{ - PRESCRIPT prescript; - - prescript.pos = *pos; - prescript.speed = DG_ZeroVector_800AB39C; - prescript.scr_num = 0; - prescript.s_anim = 0; - - anm_800C3C74.field_14_pre_script = &prescript; - NewAnime_8005FBC8(NULL, NULL, &anm_800C3C74); -} - -void s01a_object_800D9634(SVECTOR *pos) -{ - PRESCRIPT prescript; - - prescript.pos = *pos; - prescript.speed = DG_ZeroVector_800AB39C; - prescript.scr_num = 0; - prescript.s_anim = 0; - - anm_800C3C20.field_14_pre_script = &prescript; - NewAnime_8005FBC8(NULL, NULL, &anm_800C3C20); -} - -void s01a_object_800D96B8(MATRIX *world, int arg1, char arg2, char arg3, char arg4, char arg5, char arg6, char arg7, char arg8, char *ptr) -{ - ANIMATION anm; - PRESCRIPT pre; - - memset(&pre, 0, sizeof(PRESCRIPT)); - - pre.pos.vx = world->t[0]; - pre.pos.vy = world->t[1]; - pre.pos.vz = world->t[2]; - - anm = anm_800C3C90; - - memcpy(ptr, anm.field_18_ptr, 32); - - anm.field_18_ptr = ptr; - anm.field_14_pre_script = ⪯ - anm.field_E_xw = arg1; - anm.field_10_yh = arg1; - - anm.field_18_ptr[6] = arg2; - anm.field_18_ptr[7] = arg3; - anm.field_18_ptr[8] = arg4; - anm.field_18_ptr[14] = arg5; - anm.field_18_ptr[16] = arg6; - anm.field_18_ptr[17] = arg7; - anm.field_18_ptr[18] = arg8; - - NewAnime_8005FBC8(NULL, 0, &anm); -} - int s01a_object_800D98B0(ObjectWork *work, int threshold) { SVECTOR svec; diff --git a/src/overlays/s01a/Enemy/searchli.c b/src/overlays/s01a/Enemy/searchli.c index 704449c85..25e783c11 100644 --- a/src/overlays/s01a/Enemy/searchli.c +++ b/src/overlays/s01a/Enemy/searchli.c @@ -71,23 +71,25 @@ extern CONTROL *GM_WhereList_800B56D0[96]; extern OBJECT *GM_PlayerBody_800ABA20; extern int dword_800ABA1C; extern CONTROL *GM_PlayerControl_800AB9F4; - -extern SVECTOR SearchliCenter_800E46D8; -extern SVECTOR s01a_svec_800E4660; extern int COM_VibTime_800E0F68; extern ENEMY_COMMAND EnemyCommand_800E0D98; extern TOPCOMMAND_STRUCT TOPCOMMAND_800E0F20; -extern const char aSearchliUDRotXLRRotY[]; // = "UD:ROT.X LR:ROT.Y\n" -extern const char aSearchliUDPosXLRPosZ[]; // = "UD:POS.X LR:POS.Z\n" -extern const char aSearchliUDPosYLRAngle[]; // = "UD:POS.Y LR:ANGLE\n" -extern const char aSearchliRot7D7D7D[]; // = "ROT:%7d %7d %7d\n" -extern const char aSearchliPos7D7D7D[]; // = "POS:%7d %7d %7d\n" -extern const char aSearchliAngle4D[]; // = "ANGLE:%4d \n" -extern const char aSearchli0[]; // = "0" -extern const char aSearchliShadow[]; // = "shadow" -extern const char aSearchliC[]; // = "searchli.c" +const SVECTOR s01a_svec_800E4660 = {0, 0, 65024}; + +const char aSearchliUDRotXLRRotY[] = "UD:ROT.X LR:ROT.Y\n"; +const char aSearchliUDPosXLRPosZ[] = "UD:POS.X LR:POS.Z\n"; +const char aSearchliUDPosYLRAngle[] = "UD:POS.Y LR:ANGLE\n"; +const char aSearchliRot7D7D7D[] = "ROT:%7d %7d %7d\n"; +const char aSearchliPos7D7D7D[] = "POS:%7d %7d %7d\n"; +const char aSearchliAngle4D[] = "ANGLE:%4d \n"; + +const SVECTOR SearchliCenter_800E46D8 = {0, 0, 3000, 0}; + +const char aSearchli0[] = "0"; +const char aSearchliShadow[] = "shadow"; + void ENE_SetTopCommAL_800CEAE8(int); void ENE_SetGopointLast_800CEB00(void); @@ -1151,7 +1153,7 @@ GV_ACT *NewSearchlight_800D92BC(int name, int where) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)SearchlightAct_800D86F0, - (TActorFunction)SearchlightDie_800D9274, aSearchliC); + (TActorFunction)SearchlightDie_800D9274, "searchli.c"); if (SearchlightGetResources_800D91B0(work, name, where) < 0) { diff --git a/src/overlays/s01a/Game/cancel.c b/src/overlays/s01a/Game/cancel.c index 983859b44..6310d2449 100644 --- a/src/overlays/s01a/Game/cancel.c +++ b/src/overlays/s01a/Game/cancel.c @@ -16,8 +16,6 @@ typedef struct _CancelWork extern int DG_UnDrawFrameCount_800AB380; extern int GV_PauseLevel_800AB928; -extern const char aCancelC[]; // = "cancel.c" - #define EXEC_LEVEL 3 void Cancel_800C3E24(CancelWork *work) @@ -103,7 +101,7 @@ GV_ACT * NewCancel_800C3FFC(void) work = (CancelWork *)GV_NewActor_800150E4(EXEC_LEVEL, sizeof(CancelWork)); if (work != NULL) { - GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)CancelAct_800C3EA0, (TActorFunction)CancelDie_800C3F18, aCancelC); + GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)CancelAct_800C3EA0, (TActorFunction)CancelDie_800C3F18, "cancel.c"); if (CancelGetResources_800C3F54(work) < 0) { diff --git a/src/overlays/s01a/Game/tobcnt.c b/src/overlays/s01a/Game/tobcnt.c index c1ae65d7d..2fb21539f 100644 --- a/src/overlays/s01a/Game/tobcnt.c +++ b/src/overlays/s01a/Game/tobcnt.c @@ -28,10 +28,53 @@ extern int GV_Clock_800AB920; extern int GV_PauseLevel_800AB928; extern GV_PAD GV_PadData_800B05C0[4]; -extern short tobcnt_lines[]; +short tobcnt_lines[] = { + 166, // table length + 19, 93, 39, 93, 19, 93, 18, 98, 39, 93, 38, 98, 31, 98, 38, 98, + 31, 98, 25, 129, 25, 129, 19, 129, 42, 93, 60, 93, 42, 93, 41, 98, + 60, 93, 59, 98, 41, 98, 59, 98, 40, 102, 37, 117, 37, 117, 55, 117, + 55, 117, 58, 102, 40, 102, 46, 102, 52, 102, 58, 102, 44, 112, 46, 102, + 44, 112, 50, 112, 52, 102, 50, 112, 18, 98, 25, 98, 25, 98, 19, 129, + 68, 98, 69, 93, 69, 93, 85, 93, 68, 98, 80, 98, 77, 102, 67, 102, + 67, 102, 64, 117, 64, 117, 79, 117, 79, 117, 84, 113, 85, 109, 82, 105, + 87, 98, 85, 93, 87, 98, 82, 105, 80, 98, 77, 102, 71, 112, 76, 112, + 76, 112, 79, 110, 71, 112, 72, 107, 72, 107, 77, 107, 79, 110, 77, 107, + 85, 109, 84, 113, 86, 117, 102, 117, 91, 93, 107, 93, 90, 98, 106, 98, + 89, 102, 105, 102, 89, 102, 86, 117, 91, 93, 90, 98, 107, 93, 106, 98, + 104, 107, 94, 107, 105, 102, 104, 107, 93, 112, 103, 112, 103, 112, 102, 117, + 93, 112, 94, 107, 122, 93, 135, 93, 122, 93, 112, 105, 130, 117, 116, 117, + 125, 98, 134, 98, 135, 93, 134, 98, 125, 98, 119, 105, 119, 105, 121, 112, + 121, 112, 131, 112, 131, 112, 130, 117, 112, 105, 116, 117, 157, 93, 139, 93, + 134, 117, 152, 117, 138, 98, 156, 98, 143, 102, 141, 112, 141, 112, 147, 112, + 149, 102, 147, 112, 137, 102, 143, 102, 149, 102, 155, 102, 139, 93, 138, 98, + 137, 102, 134, 117, 155, 102, 152, 117, 157, 93, 156, 98, 161, 93, 160, 98, + 161, 93, 167, 93, 170, 102, 172, 106, 174, 98, 175, 93, 175, 93, 181, 93, + 179, 102, 176, 117, 156, 117, 162, 117, 162, 117, 165, 103, 165, 103, 171, 117, + 171, 117, 176, 117, 160, 98, 169, 98, 167, 93, 169, 98, 159, 102, 170, 102, + 159, 102, 156, 117, 174, 98, 180, 98, 173, 102, 172, 106, 173, 102, 179, 102, + 180, 98, 181, 93, 184, 93, 183, 98, 204, 93, 184, 93, 204, 93, 203, 98, + 203, 98, 183, 98, 189, 102, 186, 117, 195, 102, 192, 117, 186, 117, 192, 117, + 189, 102, 195, 102, 205, 102, 202, 117, 207, 93, 213, 93, 211, 102, 208, 117, + 202, 117, 208, 117, 206, 98, 212, 98, 205, 102, 211, 102, 207, 93, 206, 98, + 213, 93, 212, 98, 215, 102, 212, 117, 212, 117, 218, 117, 218, 117, 221, 103, + 217, 93, 223, 93, 223, 93, 225, 98, 225, 98, 216, 98, 215, 102, 226, 102, + 226, 102, 228, 106, 221, 103, 227, 117, 227, 117, 232, 117, 228, 106, 229, 102, + 229, 102, 235, 102, 235, 102, 232, 117, 217, 93, 216, 98, 230, 98, 236, 98, + 230, 98, 231, 93, 236, 98, 237, 93, 231, 93, 237, 93, 239, 102, 236, 117, + 241, 93, 247, 93, 236, 117, 254, 117, 254, 117, 257, 102, 243, 112, 249, 112, + 243, 112, 245, 102, 249, 112, 251, 102, 240, 98, 246, 98, 252, 98, 258, 98, + 239, 102, 245, 102, 251, 102, 257, 102, 253, 93, 259, 93, 241, 93, 240, 98, + 247, 93, 246, 98, 253, 93, 252, 98, 259, 93, 258, 98, 258, 117, 274, 117, + 258, 117, 261, 102, 263, 93, 279, 93, 277, 102, 276, 107, 262, 98, 278, 98, + 261, 102, 277, 102, 263, 93, 262, 98, 279, 93, 278, 98, 266, 107, 276, 107, + 275, 112, 265, 112, 266, 107, 265, 112, 275, 112, 274, 117, 281, 102, 278, 117, + 283, 93, 298, 93, 298, 93, 302, 104, 302, 104, 293, 117, 293, 117, 278, 117, + 282, 98, 293, 98, 293, 98, 295, 104, 295, 104, 289, 112, 289, 112, 285, 112, + 285, 112, 287, 102, 281, 102, 287, 102, 283, 93, 282, 98, 30, 120, 28, 129, + 30, 120, 291, 120, 28, 129, 285, 129 +}; -extern const char aTobcntTitle[]; // = "title" -extern const char aTobcntC[]; // = "tobcnt.c" +short s01a_dword_800C381A = 0x800C; #define EXEC_LEVEL 0 @@ -370,7 +413,7 @@ void TobcntDie_800C4A64(TobcntWork *work) { char *stage_name; - stage_name = (char *)aTobcntTitle; + stage_name = "title"; GV_PauseLevel_800AB928 &= ~0x1; DG_ResetObjectQueue_8001844C(); @@ -420,7 +463,7 @@ GV_ACT * NewTobcnt_800C4BC8(void) work = (TobcntWork *)GV_NewActor_800150E4(EXEC_LEVEL, sizeof(TobcntWork)); if (work != NULL) { - GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)TobcntAct_800C482C, (TActorFunction)TobcntDie_800C4A64, aTobcntC); + GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)TobcntAct_800C482C, (TActorFunction)TobcntDie_800C4A64, "tobcnt.c"); work->state = 1; work->time = 0; diff --git a/src/overlays/s01a/Okajima/blink_tx.c b/src/overlays/s01a/Okajima/blink_tx.c index 95c90b70a..317bbbf5b 100644 --- a/src/overlays/s01a/Okajima/blink_tx.c +++ b/src/overlays/s01a/Okajima/blink_tx.c @@ -12,7 +12,7 @@ typedef struct _BlinkTxWork extern int GM_CurrentMap_800AB9B0; -extern RECT blink_tx_rect; +RECT blink_tx_rect = {1000, 1000, 2000, 2000}; #define EXEC_LEVEL 5 diff --git a/src/overlays/s01a/Thing/snow.c b/src/overlays/s01a/Thing/snow.c index cf08c2aeb..2dcc14c7c 100644 --- a/src/overlays/s01a/Thing/snow.c +++ b/src/overlays/s01a/Thing/snow.c @@ -40,13 +40,10 @@ extern int GM_CurrentMap_800AB9B0; extern CONTROL *GM_WhereList_800B56D0[96]; extern UnkCameraStruct2 gUnkCameraStruct2_800B7868; -extern SVECTOR snow_svec_800C3854; -extern SVECTOR snow_svec_800C385C; -extern SVECTOR snow_svec_800C3864; -extern RECT snow_rect_800C386C; - -extern const char aYuki[]; // = "雪" (snow) -extern const char aSnowC[]; // = "snow.c" +SVECTOR snow_svec_800C3854 = {-5000, 0, -10000, 0}; +SVECTOR snow_svec_800C385C = {5000, 8000, 10000, 0}; +SVECTOR snow_svec_800C3864 = {0, -50, 0, 0}; +RECT snow_rect_800C386C = {0, 0, 2, 2}; #define EXEC_LEVEL 5 @@ -243,7 +240,7 @@ void Snow_800C592C(SnowWork *work) int n_msgs; GV_MSG *msg; - n_msgs = GV_ReceiveMessage_80016620(GV_StrCode_80016CCC(aYuki), &work->msgs); + n_msgs = GV_ReceiveMessage_80016620(GV_StrCode_80016CCC("雪"), &work->msgs); if (n_msgs <= 0) { return; @@ -521,7 +518,7 @@ GV_ACT * NewSnow_800C6058(int arg0, int arg1) { SnowGetOptions_800C5CD4(work); - GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)SnowAct_800C5B2C, (TActorFunction)SnowDie_800C5C6C, aSnowC); + GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)SnowAct_800C5B2C, (TActorFunction)SnowDie_800C5C6C, "snow.c"); if (SnowGetResources_800C5F40(work, arg1) < 0) { diff --git a/src/overlays/s01a/Thing/sphere.c b/src/overlays/s01a/Thing/sphere.c index 86bfab68b..bf1b0b1d9 100644 --- a/src/overlays/s01a/Thing/sphere.c +++ b/src/overlays/s01a/Thing/sphere.c @@ -26,8 +26,6 @@ extern short sphere_tile_height_800E4B36; extern short sphere_elevation_800E4B38; extern short sphere_word_800E4B3A; -extern const char aSphereC[]; // = "sphere.c" - #define EXEC_LEVEL 7 void Sphere_800C60E0(MATRIX *eye, SVECTOR *out) @@ -149,7 +147,7 @@ GV_ACT * NewSphere_800C69C0(int name, int where) work = (SphereWork *)GV_NewActor_800150E4(EXEC_LEVEL, sizeof(SphereWork)); if (work != NULL) { - GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)SphereAct_800C61F0, (TActorFunction)SphereDie_800C6658, aSphereC); + GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)SphereAct_800C61F0, (TActorFunction)SphereDie_800C6658, "sphere.c"); if (SphereGetResources_800C6694(work, where) < 0) { diff --git a/src/overlays/s01a/animal/doll/demodoll.c b/src/overlays/s01a/animal/doll/demodoll.c index 5351b8304..f1f34d28f 100644 --- a/src/overlays/s01a/animal/doll/demodoll.c +++ b/src/overlays/s01a/animal/doll/demodoll.c @@ -7,8 +7,23 @@ extern SVECTOR DG_ZeroVector_800AB39C; extern SVECTOR GM_PlayerPosition_800ABA10; extern OBJECT *GM_PlayerBody_800ABA20; -extern short s01a_dword_800C3CE4[]; -extern int s01a_dword_800C3D04[]; +short s01a_dword_800C3CE4[] = { + 0x0000, 0x0001, 0x0002, 0x0003, + 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, + 0x000C, 0x000D, 0x000E, 0xB300, +}; + +int s01a_dword_800C3D04[] = { + 0x00000000, 0x00000001, 0x00000002, 0x00000004, + 0x00000008, 0x00000010, 0x00000020, 0x00000040, + 0x00000080, 0x00000100, 0x00000200, 0x00000400, + 0x00000800, 0x00001000, 0x00000000, 0x0000000F, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0000001D, 0x0000001E, 0x0000001F, +}; void AN_Breath_800C3AA8(MATRIX *world); diff --git a/src/overlays/s01a/animal/doll/doll.c b/src/overlays/s01a/animal/doll/doll.c index ec307d51b..d26ecb96b 100644 --- a/src/overlays/s01a/animal/doll/doll.c +++ b/src/overlays/s01a/animal/doll/doll.c @@ -3,7 +3,7 @@ extern int GM_CurrentMap_800AB9B0; -extern short s01a_word_800C3CD4[]; +short s01a_word_800C3CD4[8] = {31000, 15, 30, 60, 90, 32000, 32001, 30000}; GV_ACT * s00a_glight_800D3AD4(MATRIX *world, int **enable); GV_ACT * s01a_blink_tx_800DD60C(CONTROL *, OBJECT *, int, int *); diff --git a/src/overlays/s01a/overlay.c b/src/overlays/s01a/overlay.c index 469955b2a..c5449c01a 100755 --- a/src/overlays/s01a/overlay.c +++ b/src/overlays/s01a/overlay.c @@ -33,297 +33,3 @@ GCL_ActorTableEntry s01aOverlayCharas[] = { 0xA12E, (TGCL_ActorCreateFn)0x800E0FF4 }, { 0, 0 } }; - -short tobcnt_lines[] = { - 166, // table length - 19, 93, 39, 93, 19, 93, 18, 98, 39, 93, 38, 98, 31, 98, 38, 98, - 31, 98, 25, 129, 25, 129, 19, 129, 42, 93, 60, 93, 42, 93, 41, 98, - 60, 93, 59, 98, 41, 98, 59, 98, 40, 102, 37, 117, 37, 117, 55, 117, - 55, 117, 58, 102, 40, 102, 46, 102, 52, 102, 58, 102, 44, 112, 46, 102, - 44, 112, 50, 112, 52, 102, 50, 112, 18, 98, 25, 98, 25, 98, 19, 129, - 68, 98, 69, 93, 69, 93, 85, 93, 68, 98, 80, 98, 77, 102, 67, 102, - 67, 102, 64, 117, 64, 117, 79, 117, 79, 117, 84, 113, 85, 109, 82, 105, - 87, 98, 85, 93, 87, 98, 82, 105, 80, 98, 77, 102, 71, 112, 76, 112, - 76, 112, 79, 110, 71, 112, 72, 107, 72, 107, 77, 107, 79, 110, 77, 107, - 85, 109, 84, 113, 86, 117, 102, 117, 91, 93, 107, 93, 90, 98, 106, 98, - 89, 102, 105, 102, 89, 102, 86, 117, 91, 93, 90, 98, 107, 93, 106, 98, - 104, 107, 94, 107, 105, 102, 104, 107, 93, 112, 103, 112, 103, 112, 102, 117, - 93, 112, 94, 107, 122, 93, 135, 93, 122, 93, 112, 105, 130, 117, 116, 117, - 125, 98, 134, 98, 135, 93, 134, 98, 125, 98, 119, 105, 119, 105, 121, 112, - 121, 112, 131, 112, 131, 112, 130, 117, 112, 105, 116, 117, 157, 93, 139, 93, - 134, 117, 152, 117, 138, 98, 156, 98, 143, 102, 141, 112, 141, 112, 147, 112, - 149, 102, 147, 112, 137, 102, 143, 102, 149, 102, 155, 102, 139, 93, 138, 98, - 137, 102, 134, 117, 155, 102, 152, 117, 157, 93, 156, 98, 161, 93, 160, 98, - 161, 93, 167, 93, 170, 102, 172, 106, 174, 98, 175, 93, 175, 93, 181, 93, - 179, 102, 176, 117, 156, 117, 162, 117, 162, 117, 165, 103, 165, 103, 171, 117, - 171, 117, 176, 117, 160, 98, 169, 98, 167, 93, 169, 98, 159, 102, 170, 102, - 159, 102, 156, 117, 174, 98, 180, 98, 173, 102, 172, 106, 173, 102, 179, 102, - 180, 98, 181, 93, 184, 93, 183, 98, 204, 93, 184, 93, 204, 93, 203, 98, - 203, 98, 183, 98, 189, 102, 186, 117, 195, 102, 192, 117, 186, 117, 192, 117, - 189, 102, 195, 102, 205, 102, 202, 117, 207, 93, 213, 93, 211, 102, 208, 117, - 202, 117, 208, 117, 206, 98, 212, 98, 205, 102, 211, 102, 207, 93, 206, 98, - 213, 93, 212, 98, 215, 102, 212, 117, 212, 117, 218, 117, 218, 117, 221, 103, - 217, 93, 223, 93, 223, 93, 225, 98, 225, 98, 216, 98, 215, 102, 226, 102, - 226, 102, 228, 106, 221, 103, 227, 117, 227, 117, 232, 117, 228, 106, 229, 102, - 229, 102, 235, 102, 235, 102, 232, 117, 217, 93, 216, 98, 230, 98, 236, 98, - 230, 98, 231, 93, 236, 98, 237, 93, 231, 93, 237, 93, 239, 102, 236, 117, - 241, 93, 247, 93, 236, 117, 254, 117, 254, 117, 257, 102, 243, 112, 249, 112, - 243, 112, 245, 102, 249, 112, 251, 102, 240, 98, 246, 98, 252, 98, 258, 98, - 239, 102, 245, 102, 251, 102, 257, 102, 253, 93, 259, 93, 241, 93, 240, 98, - 247, 93, 246, 98, 253, 93, 252, 98, 259, 93, 258, 98, 258, 117, 274, 117, - 258, 117, 261, 102, 263, 93, 279, 93, 277, 102, 276, 107, 262, 98, 278, 98, - 261, 102, 277, 102, 263, 93, 262, 98, 279, 93, 278, 98, 266, 107, 276, 107, - 275, 112, 265, 112, 266, 107, 265, 112, 275, 112, 274, 117, 281, 102, 278, 117, - 283, 93, 298, 93, 298, 93, 302, 104, 302, 104, 293, 117, 293, 117, 278, 117, - 282, 98, 293, 98, 293, 98, 295, 104, 295, 104, 289, 112, 289, 112, 285, 112, - 285, 112, 287, 102, 281, 102, 287, 102, 283, 93, 282, 98, 30, 120, 28, 129, - 30, 120, 291, 120, 28, 129, 285, 129 -}; - -short s01a_dword_800C381A = 0x800C; - -extern const char s01a_dword_800E3668[]; -extern const char s01a_dword_800E36B8[]; - -ANIMATION anm_breath_800C32E8 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)s01a_dword_800E3668 }; -ANIMATION anm_unknown_800C3304 = { PCX_SMOKE, 8, 4, 30, 1, 300, 1, 500, 500, 0, 0, (char *)s01a_dword_800E36B8 }; - -SVECTOR snow_svec_800C3854 = {-5000, 0, -10000, 0}; -SVECTOR snow_svec_800C385C = {5000, 8000, 10000, 0}; -SVECTOR snow_svec_800C3864 = {0, -50, 0, 0}; -RECT snow_rect_800C386C = {0, 0, 2, 2}; - -int s00a_dword_800C3328[8] = { 2500, 3500, 4000, 5000, 5500, 5600, 5700, 5800 }; -unsigned short s00a_dword_800C3348[8] = { 450, 15, 30, 60, 90, 0, 32001, 30000 }; - -short ActTable_800C3358[54] = -{ - 0x13, 0x14, 0x0A, 0x16, 0x09, 0x22, 0x23, 0x24, 0x2D, - 0x0D, 0x0C, 0x1A, 0x0F, 0x0E, 0x10, 0x1B, 0x08, 0x2E, - 0x32, 0x15, 0x1E, 0x1F, 0x20, 0x21, 0x25, 0x34, 0x35, - 0x19, 0x05, 0x02, 0x2A, 0x04, 0x27, 0x28, 0x06, 0x07, - 0x26, 0x03, 0x29, 0x11, 0x12, 0x2B, 0x17, 0x18, 0x1C, - 0x1D, 0x00, 0x01, 0x33, 0x11, 0x12, 0x2B, 0x16, 0x0B -}; - -SVECTOR s00a_dword_800C33C4 = { -150, 0, 300 }; -SVECTOR s00a_dword_800C33CC = { 0, -550, 950 }; -SVECTOR s00a_dword_800C33D4 = { 0, 0, 100 }; -SVECTOR s00a_dword_800C33DC = { -1024, 0, 0 }; -SVECTOR s00a_dword_800C33E4 = { 0, 0, 100 }; -SVECTOR s00a_dword_800C33EC = { -1024, 0, 0 }; - -extern const char aRation_800DFE94[]; -extern const char aSocombullet_800DFE80[]; -extern const char aFamasbullet_800DFE6C[]; - -const char *s00a_off_800C33F4[3] = {aRation_800DFE94, aSocombullet_800DFE80, aFamasbullet_800DFE6C}; - -int PutFuncList_800C3400[4] = { 0x800CBF74, 0x800CC018, 0x800CC160, 0x800CC19C }; - -SVECTOR s00a_dword_800C3410 = { 5, -500, 80 }; - -extern const char s01a_dword_800E3974[]; -extern const char s01a_dword_800E3AD8[]; -extern const char s01a_dword_800E3BDC[]; -extern const char s01a_dword_800E3CE0[]; - -ANIMATION s00a_dword_800C3418 = { PCX_B_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s01a_dword_800E3974 }; -ANIMATION s00a_dword_800C3434 = { PCX_Q_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s01a_dword_800E3AD8 }; -ANIMATION s00a_dword_800C3450 = { PCX_Q_MARK, 1, 1, 1, 1, 500, 1, 80, 80, 0, 0, (char *)s01a_dword_800E3BDC }; -ANIMATION s00a_dword_800C346C = { PCX_HEART, 1, 1, 1, 1, 0, 1, 70, 70, 255, 0, (char *)s01a_dword_800E3CE0 }; - -short s00a_dword_800C3488 = PCX_B_MARK; -short s00a_dword_800C348A = PCX_Q_MARK; -short s00a_dword_800C348C = PCX_HEART; -short s00a_dword_800C348E = 0x0000; - -extern const char s01a_dword_800E3D48[]; -extern const char s01a_dword_800E3D6C[]; -extern const char s01a_dword_800E400C[]; -extern const char s01a_dword_800E4068[]; -extern const char s01a_dword_800E40B0[]; - -ANIMATION s00a_dword_800C3490 = { PCX_PCH_FOG, 1, 1, 1, 1, 800, 3, 600, 600, 250, 0, (char *)s01a_dword_800E3D48 }; -ANIMATION s00a_dword_800C34AC = { PCX_HOSI, 1, 1, 1, 1, 0, 1, 200, 200, 128, 0, (char *)s01a_dword_800E3D6C }; -ANIMATION s00a_dword_800C34C8 = { 0x4184, 1, 1, 1, 1, 0, 5, 10, 10, 128, 0, (char *)s01a_dword_800E400C }; -ANIMATION s00a_dword_800C34E4 = { PCX_SMOKE, 8, 4, 30, 1, 0, 1, 10, 10, 255, 0, (char *)s01a_dword_800E4068 }; -ANIMATION s00a_dword_800C3500 = { PCX_ZZZ, 1, 1, 1, 1, 0, 1, 2, 2, 0, 0, (char *)s01a_dword_800E40B0 }; - -short s00a_dword_800C351C[4] = { 100, 50, 25, 10 }; - -int s00a_dword_800C3524[32] = -{ - 0x00000000, 0x00000001, 0x00000002, 0x00000004, - 0x00002000, 0x00000040, 0x00000080, 0x00000200, - 0x00000400, 0x00000800, 0x00000100, 0x00800000, - 0x01000000, 0x04000000, 0x08000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000002, 0x00000004, - 0x00002000, 0x00000040, 0x00000080, 0x00000200, - 0x00000400, 0x00000800, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0000001F -}; - -SVECTOR ENEMY_TARGET_SIZE_800C35A4 = { 300, 1000, 300 }; -SVECTOR ENEMY_TARGET_FORCE_800C35AC = { 0, 0, 0 }; -SVECTOR ENEMY_ATTACK_SIZE_800C35B4 = { 800, 500, 800 }; -SVECTOR ENEMY_ATTACK_FORCE_800C35BC = { 100, 0, 0 }; -SVECTOR ENEMY_TOUCH_SIZE_800C35C4 = { 300, 800, 300 }; -SVECTOR ENEMY_TOUCH_FORCE_800C35CC = { 0, 0, 0, 0 }; -SVECTOR COM_NO_POINT_800C35D4 = { 30000, 30000, 30000 }; - -unsigned char s00a_dword_800C35DC[4] = { 1, 1, 0, 0 }; -unsigned char s00a_dword_800C35E0[4] = { 255, 1, 0, 0 }; - -int s00a_dword_800C35E4[] = { - 0x000009C4, - 0x00000DAC, - 0x00000FA0, - 0x00001388, - 0x0000157C, - 0x000015E0, - 0x00001644, - 0x000016A8 -}; - -// Enemy/eyeflash.c -SVECTOR eyeflash_svec = {0, 80, 50, 0}; - -// Enemy/grnad_e.c -SVECTOR svec_800C360C[2] = {{0, 80, 80, 0}, {0, 20, 500, 0}}; - -// Enemy/camera.c -RECT camera_rect_800C3B68 = {120, 120, 240, 240}; -SVECTOR camera_svec1_800C3B70 = {300, 300, 300, 0}; - -extern const char anim_data_800E44D8[]; -ANIMATION anm_800C3B78 = {PCX_SOCOM_F, 2, 2, 4, 1, 300, 1, 800, 800, 128, NULL, (char *)anim_data_800E44D8}; - -extern const char anim_data_800E4500[]; -ANIMATION anm_800C3B94 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800E4500}; - -extern const char anim_data_800E4518[]; -ANIMATION anm_800C3BB0 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800E4518}; - -extern const char anim_data_800E4580[]; -ANIMATION anm_800C3BCC = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 0, NULL, (char *)anim_data_800E4580}; - -extern const char anim_data_800E45F8[]; -ANIMATION anm_800C3BE8 = {PCX_SMOKE, 8, 4, 30, 1, 500, 2, 400, 400, 32, NULL, (char *)anim_data_800E45F8}; - -extern const char anim_data_800E46F8[]; -ANIMATION anm_800C3C04 = {0x479F, 1, 1, 1, 1, 230, 1, 300, 300, 255, NULL, (char *)anim_data_800E46F8}; - -extern const char anim_data_800E4724[]; -ANIMATION anm_800C3C20 = {0x479F, 1, 1, 1, 1, 230, 1, 1000, 1000, 32, NULL, (char *)anim_data_800E4724}; - -extern const char anim_data_800E473C[]; -ANIMATION anm_800C3C3C = {0x479F, 1, 1, 1, 1, 500, 1, 200, 200, 255, NULL, (char *)anim_data_800E473C}; - -extern const char anim_data_800E474C[]; -ANIMATION anm_800C3C58 = {0x479F, 1, 1, 1, 1, 500, 1, 2000, 2000, 64, NULL, (char *)anim_data_800E474C}; - -extern const char anim_data_800E4760[]; -ANIMATION anm_800C3C74 = {0x479F, 1, 1, 1, 1, 0, 0, 20, 20, 255, NULL, (char *)anim_data_800E4760}; - -extern const char anim_data_800E476C[]; -ANIMATION anm_800C3C90 = {0xA9CD, 1, 1, 1, 1, 230, 1, 0, 0, 255, NULL, (char *)anim_data_800E476C}; - -SVECTOR object_svec1_800C3CAC = {1000, 2000, 1500, 0}; -SVECTOR object_svec2_800C3CB4 = {1500, 2000, 1500, 0}; - -RECT smoke_rect = {500, 1000, 1000, 2000}; - -RECT glight_rect = {40, 40, 80, 80}; -SVECTOR glight_svec = {0, 65136, 60, 0}; - -short s01a_word_800C3CD4[8] = {31000, 15, 30, 60, 90, 32000, 32001, 30000}; - -int s01a_dword_800C3CE4 = 0x00010000; -int s01a_dword_800C3CE8 = 0x00030002; -int s01a_dword_800C3CEC = 0x00050004; -int s01a_dword_800C3CF0 = 0x00070006; -int s01a_dword_800C3CF4 = 0x00090008; -int s01a_dword_800C3CF8 = 0x000B000A; -int s01a_dword_800C3CFC = 0x000D000C; -int s01a_dword_800C3D00 = 0xB300000E; - -int s01a_dword_800C3D04 = 0x00000000; -int s01a_dword_800C3D08 = 0x00000001; -int s01a_dword_800C3D0C = 0x00000002; -int s01a_dword_800C3D10 = 0x00000004; -int s01a_dword_800C3D14 = 0x00000008; -int s01a_dword_800C3D18 = 0x00000010; -int s01a_dword_800C3D1C = 0x00000020; -int s01a_dword_800C3D20 = 0x00000040; -int s01a_dword_800C3D24 = 0x00000080; -int s01a_dword_800C3D28 = 0x00000100; -int s01a_dword_800C3D2C = 0x00000200; -int s01a_dword_800C3D30 = 0x00000400; -int s01a_dword_800C3D34 = 0x00000800; -int s01a_dword_800C3D38 = 0x00001000; - -int s01a_dword_800C3D3C = 0x00000000; -int s01a_dword_800C3D40 = 0x0000000F; -int s01a_dword_800C3D44 = 0x00000000; -int s01a_dword_800C3D48 = 0x00000000; -int s01a_dword_800C3D4C = 0x00000000; -int s01a_dword_800C3D50 = 0x00000000; -int s01a_dword_800C3D54 = 0x00000000; -int s01a_dword_800C3D58 = 0x00000000; -int s01a_dword_800C3D5C = 0x00000000; -int s01a_dword_800C3D60 = 0x00000000; -int s01a_dword_800C3D64 = 0x00000000; -int s01a_dword_800C3D68 = 0x00000000; -int s01a_dword_800C3D6C = 0x00000000; -int s01a_dword_800C3D70 = 0x00000000; -int s01a_dword_800C3D74 = 0x00000000; -int s01a_dword_800C3D78 = 0x0000001D; -int s01a_dword_800C3D7C = 0x0000001E; -int s01a_dword_800C3D80 = 0x0000001F; - -RECT blink_tx_rect = {1000, 1000, 2000, 2000}; - -const char aCancelC[] = {'c', 'a', 'n', 'c', 'e', 'l', '.', 'c', 0x0, 'D', 'G', '_'}; - -const char aTobcntTitle[] = "title"; -const char aTobcntC[] = {'t', 'o', 'b', 'c', 'n', 't', '.', 'c', 0x0, 0x11, 'R', 'e'}; - -const char aBreathC[] = {'b', 'r', 'e', 'a', 't', 'h', '.', 'c', 0x0, 'v', 'i', 's'}; - -const char s01a_dword_800E3668[] = {0x0, 'I', 0x2, 0x0}; -const char s01a_dword_800E366C[] = {0x7, 0x0, ')', 0x1}; -const char s01a_dword_800E3670[] = {0xfe, 0xc, 0x0, 0x6}; -const char s01a_dword_800E3674[] = {0x8, 0x6, 0x6, 0x6}; -const char s01a_dword_800E3678[] = {0x1, 0xff, 0x2, 0x0}; -const char s01a_dword_800E367C[] = {0x1, 0xd, 0xc, 0x0}; -const char s01a_dword_800E3680[] = {'#', 0x8, 0xff, 0xff}; -const char s01a_dword_800E3684[] = {0xff, '\n', 0x0, 0x8}; -const char s01a_dword_800E3688[] = {0x0, 0x8, 0x1, 0xff}; -const char s01a_dword_800E368C[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3690[] = {0xf, '\n', 0xff, '8'}; -const char s01a_dword_800E3694[] = {0xff, '8', 0x1, 0xfe}; -const char s01a_dword_800E3698[] = {0xc, 0x0, 0x6, 0x8}; -const char s01a_dword_800E369C[] = {0x6, 0x6, 0x6, 0x1}; -const char s01a_dword_800E36A0[] = {0xff, 0x2, 0x0, 0x1}; -const char s01a_dword_800E36A4[] = {0xd, 0xc, 0x0, '#'}; -const char s01a_dword_800E36A8[] = {0x8, 0xff, 0xff, 0xff}; -const char s01a_dword_800E36AC[] = {'\n', 0x0, 0x6, 0x0}; -const char s01a_dword_800E36B0[] = {0x6, 0x1, 0xff, 0x2}; -const char s01a_dword_800E36B4[] = {0x0, 0x1, 0xd, 0xf}; - -const char s01a_dword_800E36B8[] = {0x0, ',', 0x1, 0x0}; -const char s01a_dword_800E36BC[] = {0x5, 0x1, 0xfe, 0xc}; -const char s01a_dword_800E36C0[] = {0x0, 0x3, 0x8, 0x6}; -const char s01a_dword_800E36C4[] = {0x6, 0x6, 0x1, 0xff}; -const char s01a_dword_800E36C8[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E36CC[] = {0xc, 0x0, 0x10, 0x8}; -const char s01a_dword_800E36D0[] = {0xff, 0xff, 0xff, '\n'}; -const char s01a_dword_800E36D4[] = {0x0, 0x4, 0x0, 0x4}; -const char s01a_dword_800E36D8[] = {0x1, 0xff, 0x2, 0x0}; -const char s01a_dword_800E36DC[] = {0x1, '\n', 0x0, 0x4}; -const char s01a_dword_800E36E0[] = {0x0, 0x4, 0x1, 0xff}; -const char s01a_dword_800E36E4[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E36E8[] = {0xf, 'k', 's', 'R'}; - -const char aMotseC[] = "motse.c"; diff --git a/src/overlays/s01a/overlay2.c b/src/overlays/s01a/overlay2.c deleted file mode 100644 index 01c86e830..000000000 --- a/src/overlays/s01a/overlay2.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "psyq.h" - -const char aYuki[] = "雪"; // snow -const char aSnowC[] = {'s', 'n', 'o', 'w', '.', 'c', 0x0, 'r'}; - -const char aSphereC[] = {'s', 'p', 'h', 'e', 'r', 'e', '.', 'c', 0x0, '\n', 'R', 'e'}; - -const char aErrerrerrsettimeover_800DFC7C[] = "Err Err Err Set time Over\n"; -const char aErrerrerrsetdirover_800DFC98[] = "Err Err Err Set Dir Over\n"; -const char aErrnotenoughwork_800DFCB4[] = "Err not enough work !!\n"; -const char aWatcharcactionpointerr_800DFCCC[] = "watchar.c : action point Err\n"; -const char aWatcherc_800DFCEC[] = {'w', 'a', 't', 'c', 'h', 'e', 'r', '.', 'c', 0x0, 's', '`'}; diff --git a/src/overlays/s01a/overlay3.c b/src/overlays/s01a/overlay3.c deleted file mode 100644 index 1b7cae767..000000000 --- a/src/overlays/s01a/overlay3.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "psyq.h" - -const char aPlayxresetdwarpd_800DFD1C[] = " play = %x reset = %d warp = %d \n"; -const char aErrnozoneidingcl_800DFD40[] = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; -const char aErrerrenemyresetnumerrcallkorekadoooooooooo_800DFD68[] = " Err Err Enemy Reset Num Err CALL KOREKADOOOOOOOOOO!!\n"; -const SVECTOR rp_shift_800DFDA0 = { -200, 100, 600 }; /* 右パンチ */ -const SVECTOR force_800DFDA8 = { 5, 0, 100 }; -const SVECTOR size_800DFDB0 = { 400, 1000, 400 }; -const char aComstdanbowl0_800DFDB8[] = " ~COM_ST_DANBOWL 0 !! \n "; -const char aComstdanbowl1_800DFDD4[] = " ~COM_ST_DANBOWL 1 !! \n "; -const char aComstdanbowl2_800DFDF0[] = " ~COM_ST_DANBOWL 2 !! \n "; -const char aMapchange_800DFE0C[] = " map change \n"; -const char s00a_dword_800DFE1C[] = {0x0, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s01a/overlay4.c b/src/overlays/s01a/overlay4.c deleted file mode 100644 index dec9e4c3b..000000000 --- a/src/overlays/s01a/overlay4.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "psyq.h" - -const char aEnemyresetmaxdnumd_800DFE50[] = "enemy reset max=%d num=%d \n"; -const char aFamasbullet_800DFE6C[] = "FA-MAS/BULLET * 25"; -const char aSocombullet_800DFE80[] = "SOCOM/BULLET * 12"; -const char aRation_800DFE94[] = "RATION"; -const char s01a_dword_800E395C[] = {0x0, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s01a/overlay5.c b/src/overlays/s01a/overlay5.c deleted file mode 100644 index 835886e9f..000000000 --- a/src/overlays/s01a/overlay5.c +++ /dev/null @@ -1,229 +0,0 @@ -#include "psyq.h" -#include "libdg/libdg.h" -#include "overlays/s00a/Enemy/enemy.h" - -const char s01a_dword_800E3974[] = {0x1, 'V', 0x4, 0x0}; -const char s01a_dword_800E3978[] = {0xb, 0x0, '^', 0x0}; -const char s01a_dword_800E397C[] = {0xb1, 0x1, 0x9, 0x1}; -const char s01a_dword_800E3980[] = {0x0, 0xc, 0x0, 0x4}; -const char s01a_dword_800E3984[] = {'\n', 0x0, 'd', 0x0}; -const char s01a_dword_800E3988[] = {'d', 0x8, '2', 0x19}; -const char s01a_dword_800E398C[] = {0x14, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3990[] = {0xd, '\n', 0x0, 'd'}; -const char s01a_dword_800E3994[] = {0x0, 'd', 0x8, '2'}; -const char s01a_dword_800E3998[] = {0x96, 0xaa, 0x2, 0x0}; -const char s01a_dword_800E399C[] = {0x3, '\n', 0xff, 0x9c}; -const char s01a_dword_800E39A0[] = {0xff, 0x9c, 0x8, 0xce}; -const char s01a_dword_800E39A4[] = {'j', 'V', 0x2, 0x0}; -const char s01a_dword_800E39A8[] = {0x16, '\n', 0x1, ','}; -const char s01a_dword_800E39AC[] = {0xfe, 0x98, 0x8, 0xce}; -const char s01a_dword_800E39B0[] = {0xe7, 0xec, 0x2, 0x0}; -const char s01a_dword_800E39B4[] = {0x1, '\n', 0x1, ','}; -const char s01a_dword_800E39B8[] = {0xff, 0xe2, 0x8, 0xce}; -const char s01a_dword_800E39BC[] = {0xe7, 0xec, 0x2, 0x0}; -const char s01a_dword_800E39C0[] = {0x1, '\n', 0x1, ','}; -const char s01a_dword_800E39C4[] = {0xff, 0xf4, 0x2, 0x0}; -const char s01a_dword_800E39C8[] = {0x1, '\n', 0xfa, 0xba}; -const char s01a_dword_800E39CC[] = {0x0, 0xf0, 0x2, 0x0}; -const char s01a_dword_800E39D0[] = {0x1, 0xf, 0x1, 0x0}; -const char s01a_dword_800E39D4[] = {0xc, 0x0, 0x4, '\n'}; -const char s01a_dword_800E39D8[] = {0x0, '2', 0x0, '2'}; -const char s01a_dword_800E39DC[] = {0x8, '2', 0x19, 0x14}; -const char s01a_dword_800E39E0[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E39E4[] = {'\n', 0x0, '2', 0x0}; -const char s01a_dword_800E39E8[] = {'2', 0x8, '2', 0x96}; -const char s01a_dword_800E39EC[] = {0xaa, 0x2, 0x0, 0x3}; -const char s01a_dword_800E39F0[] = {'\n', 0xff, 0xce, 0xff}; -const char s01a_dword_800E39F4[] = {0xce, 0x8, 0xce, 'j'}; -const char s01a_dword_800E39F8[] = {'V', 0x2, 0x0, 0x16}; -const char s01a_dword_800E39FC[] = {'\n', 0x0, 0x96, 0xff}; -const char s01a_dword_800E3A00[] = {'L', 0x8, 0xce, 0xe7}; -const char s01a_dword_800E3A04[] = {0xec, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A08[] = {'\n', 0x0, 0x96, 0xff}; -const char s01a_dword_800E3A0C[] = {0xf1, 0x8, 0xce, 0xe7}; -const char s01a_dword_800E3A10[] = {0xec, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A14[] = {'\n', 0x0, 0x96, 0xff}; -const char s01a_dword_800E3A18[] = {0xfa, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A1C[] = {'\n', 0xfd, ']', 0x0}; -const char s01a_dword_800E3A20[] = {'x', 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A24[] = {0xf, '\n', 0xff, 0xd8}; -const char s01a_dword_800E3A28[] = {0xff, 0xd8, 0x1, 0x0}; -const char s01a_dword_800E3A2C[] = {0xc, 0x0, 0x4, '\n'}; -const char s01a_dword_800E3A30[] = {0x0, 0x19, 0x0, 0x19}; -const char s01a_dword_800E3A34[] = {0x8, '2', 0x19, 0x14}; -const char s01a_dword_800E3A38[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3A3C[] = {'\n', 0x0, 0x19, 0x0}; -const char s01a_dword_800E3A40[] = {0x19, 0x8, '2', 0x96}; -const char s01a_dword_800E3A44[] = {0xaa, 0x2, 0x0, 0x3}; -const char s01a_dword_800E3A48[] = {'\n', 0xff, 0xe7, 0xff}; -const char s01a_dword_800E3A4C[] = {0xe7, 0x8, 0xce, 'j'}; -const char s01a_dword_800E3A50[] = {'V', 0x2, 0x0, 0x16}; -const char s01a_dword_800E3A54[] = {'\n', 0x0, 'K', 0xff}; -const char s01a_dword_800E3A58[] = {0xa6, 0x8, 0xce, 0xe7}; -const char s01a_dword_800E3A5C[] = {0xec, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A60[] = {'\n', 0x0, 'K', 0xff}; -const char s01a_dword_800E3A64[] = {0xf9, 0x8, 0xce, 0xe7}; -const char s01a_dword_800E3A68[] = {0xec, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A6C[] = {'\n', 0x0, 'K', 0xff}; -const char s01a_dword_800E3A70[] = {0xf9, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A74[] = {'\n', 0xfe, 0xd4, 0x0}; -const char s01a_dword_800E3A78[] = {'<', 0x2, 0x0, 0x1}; -const char s01a_dword_800E3A7C[] = {0xf, '\n', 0xff, 0xc4}; -const char s01a_dword_800E3A80[] = {0xff, 0xc4, 0x1, 0x0}; -const char s01a_dword_800E3A84[] = {0xc, 0x0, 0x4, '\n'}; -const char s01a_dword_800E3A88[] = {0x0, '\n', 0x0, '\n'}; -const char s01a_dword_800E3A8C[] = {0x8, '2', 0x19, 0x14}; -const char s01a_dword_800E3A90[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3A94[] = {'\n', 0x0, '\n', 0x0}; -const char s01a_dword_800E3A98[] = {'\n', 0x8, '2', 0x96}; -const char s01a_dword_800E3A9C[] = {0xaa, 0x2, 0x0, 0x3}; -const char s01a_dword_800E3AA0[] = {'\n', 0xff, 0xf6, 0xff}; -const char s01a_dword_800E3AA4[] = {0xf6, 0x8, 0xce, 'j'}; -const char s01a_dword_800E3AA8[] = {'V', 0x2, 0x0, 0x16}; -const char s01a_dword_800E3AAC[] = {'\n', 0x0, 0x1e, 0xff}; -const char s01a_dword_800E3AB0[] = {0xdc, 0x8, 0xce, 0xe7}; -const char s01a_dword_800E3AB4[] = {0xec, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3AB8[] = {'\n', 0x0, 0x1e, 0xff}; -const char s01a_dword_800E3ABC[] = {0xfe, 0x8, 0xce, 0xe7}; -const char s01a_dword_800E3AC0[] = {0xec, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3AC4[] = {'\n', 0x0, 0x1e, 0xff}; -const char s01a_dword_800E3AC8[] = {0xfe, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3ACC[] = {'\n', 0xff, 0xb0, 0x0}; -const char s01a_dword_800E3AD0[] = {'\n', 0x2, 0x0, 0x1}; -const char s01a_dword_800E3AD4[] = {0xf, 0x0, 0x0, 0x0}; - -const char s01a_dword_800E3AD8[] = {0x0, 0xf9, 0x3, 0x0}; -const char s01a_dword_800E3ADC[] = {0x9, 0x0, '\\', 0x0}; -const char s01a_dword_800E3AE0[] = {0xaf, 0x1, 0x0, 0xc}; -const char s01a_dword_800E3AE4[] = {0x0, 0x4, '\n', 0x0}; -const char s01a_dword_800E3AE8[] = {'d', 0x0, 'd', 0x8}; -const char s01a_dword_800E3AEC[] = {'-', '#', 0x14, 0x2}; -const char s01a_dword_800E3AF0[] = {0x0, 0x1, 0xd, '\n'}; -const char s01a_dword_800E3AF4[] = {0x0, 'd', 0x0, 'd'}; -const char s01a_dword_800E3AF8[] = {0x8, 'F', 'n', 0xaa}; -const char s01a_dword_800E3AFC[] = {0x2, 0x0, 0x3, '\n'}; -const char s01a_dword_800E3B00[] = {0xff, 0x9c, 0xff, 0x9c}; -const char s01a_dword_800E3B04[] = {0x8, 0xba, 0x92, 'V'}; -const char s01a_dword_800E3B08[] = {0x2, 0x0, 0x16, '\n'}; -const char s01a_dword_800E3B0C[] = {0x1, ',', 0xfe, 0x98}; -const char s01a_dword_800E3B10[] = {0x8, 0xd3, 0xdd, 0xec}; -const char s01a_dword_800E3B14[] = {0x2, 0x0, 0x1, '\n'}; -const char s01a_dword_800E3B18[] = {0x1, ',', 0xff, 0xe2}; -const char s01a_dword_800E3B1C[] = {0x8, 0xd3, 0xdd, 0xec}; -const char s01a_dword_800E3B20[] = {0x2, 0x0, 0x1, '\n'}; -const char s01a_dword_800E3B24[] = {0x1, ',', 0xff, 0xf4}; -const char s01a_dword_800E3B28[] = {0x2, 0x0, 0x1, '\n'}; -const char s01a_dword_800E3B2C[] = {0xfa, 0xba, 0x0, 0xf0}; -const char s01a_dword_800E3B30[] = {0x2, 0x0, 0x1, 0xf}; -const char s01a_dword_800E3B34[] = {0x1, 0x0, 0xc, 0x0}; -const char s01a_dword_800E3B38[] = {0x4, '\n', 0x0, '2'}; -const char s01a_dword_800E3B3C[] = {0x0, '2', 0x8, '-'}; -const char s01a_dword_800E3B40[] = {'#', 0x14, 0x2, 0x0}; -const char s01a_dword_800E3B44[] = {0x1, 0xd, '\n', 0x0}; -const char s01a_dword_800E3B48[] = {'2', 0x0, '2', 0x8}; -const char s01a_dword_800E3B4C[] = {'F', 'n', 0xaa, 0x2}; -const char s01a_dword_800E3B50[] = {0x0, 0x3, '\n', 0xff}; -const char s01a_dword_800E3B54[] = {0xce, 0xff, 0xce, 0x8}; -const char s01a_dword_800E3B58[] = {0xba, 0x92, 'V', 0x2}; -const char s01a_dword_800E3B5C[] = {0x0, 0x16, '\n', 0x0}; -const char s01a_dword_800E3B60[] = {0x96, 0xff, 'L', 0x8}; -const char s01a_dword_800E3B64[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s01a_dword_800E3B68[] = {0x0, 0x1, '\n', 0x0}; -const char s01a_dword_800E3B6C[] = {0x96, 0xff, 0xf1, 0x8}; -const char s01a_dword_800E3B70[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s01a_dword_800E3B74[] = {0x0, 0x1, '\n', 0x0}; -const char s01a_dword_800E3B78[] = {0x96, 0xff, 0xfa, 0x2}; -const char s01a_dword_800E3B7C[] = {0x0, 0x1, '\n', 0xfd}; -const char s01a_dword_800E3B80[] = {']', 0x0, 'x', 0x2}; -const char s01a_dword_800E3B84[] = {0x0, 0x1, 0xf, 0x1}; -const char s01a_dword_800E3B88[] = {0x0, 0xc, 0x0, 0x4}; -const char s01a_dword_800E3B8C[] = {'\n', 0x0, 0x19, 0x0}; -const char s01a_dword_800E3B90[] = {0x19, 0x8, '2', 0x19}; -const char s01a_dword_800E3B94[] = {0x14, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3B98[] = {0xd, '\n', 0x0, 0x19}; -const char s01a_dword_800E3B9C[] = {0x0, 0x19, 0x8, '2'}; -const char s01a_dword_800E3BA0[] = {0x96, 0xaa, 0x2, 0x0}; -const char s01a_dword_800E3BA4[] = {0x3, '\n', 0xff, 0xe7}; -const char s01a_dword_800E3BA8[] = {0xff, 0xe7, 0x8, 0xce}; -const char s01a_dword_800E3BAC[] = {'j', 'V', 0x2, 0x0}; -const char s01a_dword_800E3BB0[] = {0x16, '\n', 0x0, 'K'}; -const char s01a_dword_800E3BB4[] = {0xff, 0xa6, 0x8, 0xce}; -const char s01a_dword_800E3BB8[] = {0xe7, 0xec, 0x2, 0x0}; -const char s01a_dword_800E3BBC[] = {0x1, '\n', 0x0, 'K'}; -const char s01a_dword_800E3BC0[] = {0xff, 0xf9, 0x8, 0xce}; -const char s01a_dword_800E3BC4[] = {0xe7, 0xec, 0x2, 0x0}; -const char s01a_dword_800E3BC8[] = {0x1, '\n', 0x0, 'K'}; -const char s01a_dword_800E3BCC[] = {0xff, 0xf9, 0x2, 0x0}; -const char s01a_dword_800E3BD0[] = {0x1, '\n', 0xfe, 0xd4}; -const char s01a_dword_800E3BD4[] = {0x0, '<', 0x2, 0x0}; -const char s01a_dword_800E3BD8[] = {0x1, 0xf, 0x0, 0x0}; - -const char s01a_dword_800E3BDC[] = {0x0, 0xf9, 0x3, 0x0}; -const char s01a_dword_800E3BE0[] = {0x9, 0x0, '\\', 0x0}; -const char s01a_dword_800E3BE4[] = {0xaf, 0x1, 0x0, 0xc}; -const char s01a_dword_800E3BE8[] = {0x0, 0x4, '\n', 0x0}; -const char s01a_dword_800E3BEC[] = {'d', 0x0, 'd', 0x8}; -const char s01a_dword_800E3BF0[] = {0x19, '&', '-', 0x2}; -const char s01a_dword_800E3BF4[] = {0x0, 0x1, 0xd, '\n'}; -const char s01a_dword_800E3BF8[] = {0x0, 'd', 0x0, 'd'}; -const char s01a_dword_800E3BFC[] = {0x8, 0x96, 'b', 'F'}; -const char s01a_dword_800E3C00[] = {0x2, 0x0, 0x3, '\n'}; -const char s01a_dword_800E3C04[] = {0xff, 0x9c, 0xff, 0x9c}; -const char s01a_dword_800E3C08[] = {0x8, 'j', 0x9e, 0xba}; -const char s01a_dword_800E3C0C[] = {0x2, 0x0, 0x16, '\n'}; -const char s01a_dword_800E3C10[] = {0x1, ',', 0xfe, 0x98}; -const char s01a_dword_800E3C14[] = {0x8, 0xe7, 0xda, 0xd3}; -const char s01a_dword_800E3C18[] = {0x2, 0x0, 0x1, '\n'}; -const char s01a_dword_800E3C1C[] = {0x1, ',', 0xff, 0xe2}; -const char s01a_dword_800E3C20[] = {0x8, 0xe7, 0xda, 0xd3}; -const char s01a_dword_800E3C24[] = {0x2, 0x0, 0x1, '\n'}; -const char s01a_dword_800E3C28[] = {0x1, ',', 0xff, 0xf4}; -const char s01a_dword_800E3C2C[] = {0x2, 0x0, 0x1, '\n'}; -const char s01a_dword_800E3C30[] = {0xfa, 0xba, 0x0, 0xf0}; -const char s01a_dword_800E3C34[] = {0x2, 0x0, 0x1, 0xf}; -const char s01a_dword_800E3C38[] = {0x1, 0x0, 0xc, 0x0}; -const char s01a_dword_800E3C3C[] = {0x4, '\n', 0x0, '2'}; -const char s01a_dword_800E3C40[] = {0x0, '2', 0x8, '-'}; -const char s01a_dword_800E3C44[] = {'#', 0x14, 0x2, 0x0}; -const char s01a_dword_800E3C48[] = {0x1, 0xd, '\n', 0x0}; -const char s01a_dword_800E3C4C[] = {'2', 0x0, '2', 0x8}; -const char s01a_dword_800E3C50[] = {'F', 'n', 0xaa, 0x2}; -const char s01a_dword_800E3C54[] = {0x0, 0x3, '\n', 0xff}; -const char s01a_dword_800E3C58[] = {0xce, 0xff, 0xce, 0x8}; -const char s01a_dword_800E3C5C[] = {0xba, 0x92, 'V', 0x2}; -const char s01a_dword_800E3C60[] = {0x0, 0x16, '\n', 0x0}; -const char s01a_dword_800E3C64[] = {0x96, 0xff, 'L', 0x8}; -const char s01a_dword_800E3C68[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s01a_dword_800E3C6C[] = {0x0, 0x1, '\n', 0x0}; -const char s01a_dword_800E3C70[] = {0x96, 0xff, 0xf1, 0x8}; -const char s01a_dword_800E3C74[] = {0xd3, 0xdd, 0xec, 0x2}; -const char s01a_dword_800E3C78[] = {0x0, 0x1, '\n', 0x0}; -const char s01a_dword_800E3C7C[] = {0x96, 0xff, 0xfa, 0x2}; -const char s01a_dword_800E3C80[] = {0x0, 0x1, '\n', 0xfd}; -const char s01a_dword_800E3C84[] = {']', 0x0, 'x', 0x2}; -const char s01a_dword_800E3C88[] = {0x0, 0x1, 0xf, 0x1}; -const char s01a_dword_800E3C8C[] = {0x0, 0xc, 0x0, 0x4}; -const char s01a_dword_800E3C90[] = {'\n', 0x0, 0x19, 0x0}; -const char s01a_dword_800E3C94[] = {0x19, 0x8, '2', 0x19}; -const char s01a_dword_800E3C98[] = {0x14, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3C9C[] = {0xd, '\n', 0x0, 0x19}; -const char s01a_dword_800E3CA0[] = {0x0, 0x19, 0x8, '2'}; -const char s01a_dword_800E3CA4[] = {0x96, 0xaa, 0x2, 0x0}; -const char s01a_dword_800E3CA8[] = {0x3, '\n', 0xff, 0xe7}; -const char s01a_dword_800E3CAC[] = {0xff, 0xe7, 0x8, 0xce}; -const char s01a_dword_800E3CB0[] = {'j', 'V', 0x2, 0x0}; -const char s01a_dword_800E3CB4[] = {0x16, '\n', 0x0, 'K'}; -const char s01a_dword_800E3CB8[] = {0xff, 0xa6, 0x8, 0xce}; -const char s01a_dword_800E3CBC[] = {0xe7, 0xec, 0x2, 0x0}; -const char s01a_dword_800E3CC0[] = {0x1, '\n', 0x0, 'K'}; -const char s01a_dword_800E3CC4[] = {0xff, 0xf9, 0x8, 0xce}; -const char s01a_dword_800E3CC8[] = {0xe7, 0xec, 0x2, 0x0}; -const char s01a_dword_800E3CCC[] = {0x1, '\n', 0x0, 'K'}; -const char s01a_dword_800E3CD0[] = {0xff, 0xf9, 0x2, 0x0}; -const char s01a_dword_800E3CD4[] = {0x1, '\n', 0xfe, 0xd4}; -const char s01a_dword_800E3CD8[] = {0x0, '<', 0x2, 0x0}; -const char s01a_dword_800E3CDC[] = {0x1, 0xf, 0x0, 0x0}; - -const char s01a_dword_800E3CE0[] = {0x0, 0x4, 0x1, 0x0}; -const char s01a_dword_800E3CE4[] = {0x5, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3CE8[] = {0xf, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s01a/overlay6.c b/src/overlays/s01a/overlay6.c deleted file mode 100644 index eaa49dac1..000000000 --- a/src/overlays/s01a/overlay6.c +++ /dev/null @@ -1,273 +0,0 @@ -#include "linker.h" -#include "psyq.h" -#include "overlays/s00a/Enemy/enemy.h" - -const char s01a_dword_800E3D48[] = {0x0, 0x1c, 0x1, 0x0}; -const char s01a_dword_800E3D4C[] = {0x5, 0x1, 0xfe, 0x4}; -const char s01a_dword_800E3D50[] = {0x0, 0x0, 0x1, 0x90}; -const char s01a_dword_800E3D54[] = {0x0, 0x0, 0xc, 0x0}; -const char s01a_dword_800E3D58[] = {0x9, 0x1, 0xff, '\n'}; -const char s01a_dword_800E3D5C[] = {0x0, 0x14, 0x0, 0x14}; -const char s01a_dword_800E3D60[] = {0x8, 0xe7, 0xe7, 0xe7}; -const char s01a_dword_800E3D64[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3D68[] = {0xf, 'v', '2', 0xd0}; - -const char s01a_dword_800E3D6C[] = {0x2, 0x97, 0x3, 0x0}; -const char s01a_dword_800E3D70[] = {0x9, 0x0, 0xe6, 0x1}; -const char s01a_dword_800E3D74[] = {0xc3, 0x8, 0x0, 0xfc}; -const char s01a_dword_800E3D78[] = {0xde, 0x4, 0x0, 'd'}; -const char s01a_dword_800E3D7C[] = {0x1, 0xf4, 0xff, 'S'}; -const char s01a_dword_800E3D80[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3D84[] = {0x0, 0x1, 0xd, 0xc}; -const char s01a_dword_800E3D88[] = {0x0, 0x3, '\n', 0xfe}; -const char s01a_dword_800E3D8C[] = {'p', 0x0, 0x0, 0x4}; -const char s01a_dword_800E3D90[] = {0xff, 0x9c, 0x0, 0x0}; -const char s01a_dword_800E3D94[] = {0xff, 0xe5, 0xc, 0x0}; -const char s01a_dword_800E3D98[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3D9C[] = {0xd, 0x4, 0xff, 0x9c}; -const char s01a_dword_800E3DA0[] = {0x0, 0x0, 0x0, 0x1b}; -const char s01a_dword_800E3DA4[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3DA8[] = {0x0, 0x1, 0xd, '\n'}; -const char s01a_dword_800E3DAC[] = {0x1, 0x90, 0x0, 0x0}; -const char s01a_dword_800E3DB0[] = {0x4, 0xff, 0xb7, 0x0}; -const char s01a_dword_800E3DB4[] = {0x0, 0x0, 'I', 0xc}; -const char s01a_dword_800E3DB8[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3DBC[] = {0x1, 0xd, 0x4, 0xff}; -const char s01a_dword_800E3DC0[] = {0xe5, 0x0, 0x0, 0x0}; -const char s01a_dword_800E3DC4[] = {'d', 0xc, 0x0, 0x3}; -const char s01a_dword_800E3DC8[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3DCC[] = {'\n', 0xfe, 'p', 0x0}; -const char s01a_dword_800E3DD0[] = {0x0, 0x4, 0x0, 0x1b}; -const char s01a_dword_800E3DD4[] = {0x0, 0x0, 0x0, 'd'}; -const char s01a_dword_800E3DD8[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3DDC[] = {0x0, 0x1, 0xd, 0x4}; -const char s01a_dword_800E3DE0[] = {0x0, 'I', 0x0, 0x0}; -const char s01a_dword_800E3DE4[] = {0x0, 'I', 0xc, 0x0}; -const char s01a_dword_800E3DE8[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3DEC[] = {0xd, '\n', 0x1, 0x90}; -const char s01a_dword_800E3DF0[] = {0x0, 0x0, 0x4, 0x0}; -const char s01a_aD_800E3DF4[] = "d"; -const char s01a_dword_800E3DF8[] = {0x1b, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3DFC[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3E00[] = {0x4, 0x0, 'd', 0x0}; -const char s01a_dword_800E3E04[] = {0x0, 0xff, 0xe5, 0xc}; -const char s01a_dword_800E3E08[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3E0C[] = {0x1, 0xd, '\n', 0xfe}; -const char s01a_dword_800E3E10[] = {'p', 0x0, 0x0, 0x4}; -const char s01a_dword_800E3E14[] = {0x0, 'I', 0x0, 0x0}; -const char s01a_dword_800E3E18[] = {0xff, 0xb7, 0xc, 0x0}; -const char s01a_dword_800E3E1C[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3E20[] = {0xd, 0x4, 0x0, 0x1b}; -const char s01a_dword_800E3E24[] = {0x0, 0x0, 0xff, 0x9c}; -const char s01a_dword_800E3E28[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3E2C[] = {0x0, 0x1, 0xd, '\n'}; -const char s01a_dword_800E3E30[] = {0x1, 0x90, 0x0, 0x0}; -const char s01a_dword_800E3E34[] = {0x4, 0xff, 0xe5, 0x0}; -const char s01a_dword_800E3E38[] = {0x0, 0xff, 0x9c, 0xc}; -const char s01a_dword_800E3E3C[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3E40[] = {0x1, 0xd, 0x4, 0xff}; -const char s01a_dword_800E3E44[] = {0xb7, 0x0, 0x0, 0xff}; -const char s01a_dword_800E3E48[] = {0xb7, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3E4C[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3E50[] = {0xd, 0xf, 0x8, 0x0}; -const char s01a_dword_800E3E54[] = {0xfc, 0xde, 0x4, 0xff}; -const char s01a_dword_800E3E58[] = {'8', 0x1, 0xf4, 0x0}; -const char s01a_dword_800E3E5C[] = {0x0, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3E60[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3E64[] = {0xc, 0x0, 0x3, '\n'}; -const char s01a_dword_800E3E68[] = {0xfe, 'p', 0x0, 0x0}; -const char s01a_dword_800E3E6C[] = {0x4, 0x0, 0x1b, 0x0}; -const char s01a_dword_800E3E70[] = {0x0, 0x0, 'd', 0xc}; -const char s01a_dword_800E3E74[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3E78[] = {0x1, 0xd, 0x4, 0x0}; -const char s01a_aI_800E3E7C[] = "I"; -const char s01a_dword_800E3E80[] = {'I', 0xc, 0x0, 0x3}; -const char s01a_dword_800E3E84[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3E88[] = {'\n', 0x1, 0x90, 0x0}; -const char s01a_dword_800E3E8C[] = {0x0, 0x4, 0x0, 'd'}; -const char s01a_dword_800E3E90[] = {0x0, 0x0, 0x0, 0x1b}; -const char s01a_dword_800E3E94[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3E98[] = {0x0, 0x1, 0xd, 0x4}; -const char s01a_dword_800E3E9C[] = {0x0, 'd', 0x0, 0x0}; -const char s01a_dword_800E3EA0[] = {0xff, 0xe5, 0xc, 0x0}; -const char s01a_dword_800E3EA4[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3EA8[] = {0xd, '\n', 0xfe, 'p'}; -const char s01a_dword_800E3EAC[] = {0x0, 0x0, 0x4, 0x0}; -const char s01a_dword_800E3EB0[] = {'I', 0x0, 0x0, 0xff}; -const char s01a_dword_800E3EB4[] = {0xb7, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3EB8[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3EBC[] = {0x4, 0x0, 0x1b, 0x0}; -const char s01a_dword_800E3EC0[] = {0x0, 0xff, 0x9c, 0xc}; -const char s01a_dword_800E3EC4[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3EC8[] = {0x1, 0xd, '\n', 0x1}; -const char s01a_dword_800E3ECC[] = {0x90, 0x0, 0x0, 0x4}; -const char s01a_dword_800E3ED0[] = {0xff, 0xe5, 0x0, 0x0}; -const char s01a_dword_800E3ED4[] = {0xff, 0x9c, 0xc, 0x0}; -const char s01a_dword_800E3ED8[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3EDC[] = {0xd, 0x4, 0xff, 0xb7}; -const char s01a_dword_800E3EE0[] = {0x0, 0x0, 0xff, 0xb7}; -const char s01a_dword_800E3EE4[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3EE8[] = {0x0, 0x1, 0xd, '\n'}; -const char s01a_dword_800E3EEC[] = {0xfe, 'p', 0x0, 0x0}; -const char s01a_dword_800E3EF0[] = {0x4, 0xff, 0x9c, 0x0}; -const char s01a_dword_800E3EF4[] = {0x0, 0xff, 0xe5, 0xc}; -const char s01a_dword_800E3EF8[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3EFC[] = {0x1, 0xd, 0x4, 0xff}; -const char s01a_dword_800E3F00[] = {0x9c, 0x0, 0x0, 0x0}; -const char s01a_dword_800E3F04[] = {0x1b, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3F08[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3F0C[] = {'\n', 0x1, 0x90, 0x0}; -const char s01a_dword_800E3F10[] = {0x0, 0x4, 0xff, 0xb7}; -const char s01a_dword_800E3F14[] = {0x0, 0x0, 0x0, 'I'}; -const char s01a_dword_800E3F18[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3F1C[] = {0x0, 0x1, 0xd, 0x4}; -const char s01a_dword_800E3F20[] = {0xff, 0xe5, 0x0, 0x0}; -const char s01a_dword_800E3F24[] = {0x0, 'd', 0xc, 0x0}; -const char s01a_dword_800E3F28[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3F2C[] = {0xd, 0xd, 0xf, 0x8}; -const char s01a_dword_800E3F30[] = {0x0, 0xfc, 0xde, 0x4}; -const char s01a_dword_800E3F34[] = {0x0, 'd', 0x1, 0xf4}; -const char s01a_dword_800E3F38[] = {0x0, 0xad, 0xc, 0x0}; -const char s01a_dword_800E3F3C[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3F40[] = {0xd, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3F44[] = {'\n', 0xfe, 'p', 0x0}; -const char s01a_dword_800E3F48[] = {0x0, 0x4, 0x0, 'I'}; -const char s01a_dword_800E3F4C[] = {0x0, 0x0, 0xff, 0xb7}; -const char s01a_dword_800E3F50[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3F54[] = {0x0, 0x1, 0xd, 0x4}; -const char s01a_dword_800E3F58[] = {0x0, 0x1b, 0x0, 0x0}; -const char s01a_dword_800E3F5C[] = {0xff, 0x9c, 0xc, 0x0}; -const char s01a_dword_800E3F60[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3F64[] = {0xd, '\n', 0x1, 0x90}; -const char s01a_dword_800E3F68[] = {0x0, 0x0, 0x4, 0xff}; -const char s01a_dword_800E3F6C[] = {0xe5, 0x0, 0x0, 0xff}; -const char s01a_dword_800E3F70[] = {0x9c, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3F74[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3F78[] = {0x4, 0xff, 0xb7, 0x0}; -const char s01a_dword_800E3F7C[] = {0x0, 0xff, 0xb7, 0xc}; -const char s01a_dword_800E3F80[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3F84[] = {0x1, 0xd, '\n', 0xfe}; -const char s01a_dword_800E3F88[] = {'p', 0x0, 0x0, 0x4}; -const char s01a_dword_800E3F8C[] = {0xff, 0x9c, 0x0, 0x0}; -const char s01a_dword_800E3F90[] = {0xff, 0xe5, 0xc, 0x0}; -const char s01a_dword_800E3F94[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3F98[] = {0xd, 0x4, 0xff, 0x9c}; -const char s01a_dword_800E3F9C[] = {0x0, 0x0, 0x0, 0x1b}; -const char s01a_dword_800E3FA0[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3FA4[] = {0x0, 0x1, 0xd, '\n'}; -const char s01a_dword_800E3FA8[] = {0x1, 0x90, 0x0, 0x0}; -const char s01a_dword_800E3FAC[] = {0x4, 0xff, 0xb7, 0x0}; -const char s01a_dword_800E3FB0[] = {0x0, 0x0, 'I', 0xc}; -const char s01a_dword_800E3FB4[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E3FB8[] = {0x1, 0xd, 0x4, 0xff}; -const char s01a_dword_800E3FBC[] = {0xe5, 0x0, 0x0, 0x0}; -const char s01a_dword_800E3FC0[] = {'d', 0xc, 0x0, 0x3}; -const char s01a_dword_800E3FC4[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3FC8[] = {'\n', 0xfe, 'p', 0x0}; -const char s01a_dword_800E3FCC[] = {0x0, 0x4, 0x0, 0x1b}; -const char s01a_dword_800E3FD0[] = {0x0, 0x0, 0x0, 'd'}; -const char s01a_dword_800E3FD4[] = {0xc, 0x0, 0x3, 0x2}; -const char s01a_dword_800E3FD8[] = {0x0, 0x1, 0xd, 0x4}; -const char s01a_dword_800E3FDC[] = {0x0, 'I', 0x0, 0x0}; -const char s01a_dword_800E3FE0[] = {0x0, 'I', 0xc, 0x0}; -const char s01a_dword_800E3FE4[] = {0x3, 0x2, 0x0, 0x1}; -const char s01a_dword_800E3FE8[] = {0xd, '\n', 0x1, 0x90}; -const char s01a_dword_800E3FEC[] = {0x0, 0x0, 0x4, 0x0}; -const char s01a_aD_800E3FF0[] = "d"; -const char s01a_dword_800E3FF4[] = {0x1b, 0xc, 0x0, 0x3}; -const char s01a_dword_800E3FF8[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E3FFC[] = {0x4, 0x0, 'd', 0x0}; -const char s01a_dword_800E4000[] = {0x0, 0xff, 0xe5, 0xc}; -const char s01a_dword_800E4004[] = {0x0, 0x3, 0x2, 0x0}; -const char s01a_dword_800E4008[] = {0x1, 0xd, 0xd, 0xf}; - -const char s01a_dword_800E400C[] = {0x0, 'W', 0x1, 0x0}; -const char s01a_dword_800E4010[] = {0x5, 0xc, 0x0, 0x1c}; -const char s01a_dword_800E4014[] = {'\n', 0x0, 0x5, 0x0}; -const char s01a_dword_800E4018[] = {0x5, 0x4, 0x0, 0x0}; -const char s01a_dword_800E401C[] = {0x0, '\n', 0x0, 0x0}; -const char s01a_dword_800E4020[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E4024[] = {0xc, 0x0, 0x4, 0xc}; -const char s01a_dword_800E4028[] = {0x0, 0x5, '\n', 0xff}; -const char s01a_dword_800E402C[] = {0xf6, 0xff, 0xf6, 0x4}; -const char s01a_dword_800E4030[] = {0x0, 0x0, 0x0, '\n'}; -const char s01a_dword_800E4034[] = {0x0, 0x0, 0x2, 0x0}; -const char s01a_dword_800E4038[] = {0x1, 0xd, 0x2, 0x0}; -const char s01a_dword_800E403C[] = {0x1, 0xc, 0x0, 0x5}; -const char s01a_dword_800E4040[] = {'\n', 0x0, '\n', 0x0}; -const char s01a_dword_800E4044[] = {'\n', 0x4, 0x0, 0x0}; -const char s01a_dword_800E4048[] = {0x0, '\n', 0x0, 0x0}; -const char s01a_dword_800E404C[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E4050[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E4054[] = {0xc, 0x0, 0xe, '\n'}; -const char s01a_dword_800E4058[] = {0xff, 0xf6, 0xff, 0xf6}; -const char s01a_dword_800E405C[] = {0x4, 0x0, 0x0, 0x0}; -const char s01a_dword_800E4060[] = {'\n', 0x0, 0x0, 0x2}; -const char s01a_dword_800E4064[] = {0x0, 0x1, 0xd, 0xf}; - -const char s01a_dword_800E4068[] = {0x0, 'A', 0x1, 0x0}; -const char s01a_dword_800E406C[] = {0x5, 0x1, 0xfe, 0xc}; -const char s01a_dword_800E4070[] = {0x0, 0x1c, 0x1, 0xff}; -const char s01a_dword_800E4074[] = {'\n', 0x0, 0x2, 0x0}; -const char s01a_dword_800E4078[] = {'\n', 0x4, 0x0, 0x0}; -const char s01a_dword_800E407C[] = {0x0, '\n', 0x0, 0x0}; -const char s01a_dword_800E4080[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E4084[] = {0xc, 0x0, 0x4, 0xc}; -const char s01a_dword_800E4088[] = {0x0, 0x5, 0x1, 0xff}; -const char s01a_dword_800E408C[] = {0x4, 0x0, 0x0, 0x0}; -const char s01a_dword_800E4090[] = {'\n', 0x0, 0x0, 0x2}; -const char s01a_dword_800E4094[] = {0x0, 0x1, 0xd, 0xd}; -const char s01a_dword_800E4098[] = {0xc, 0x0, 0xe, 0x1}; -const char s01a_dword_800E409C[] = {0xff, '\n', 0xff, 0xfc}; -const char s01a_dword_800E40A0[] = {0xff, 0xec, 0x4, 0x0}; -const char s01a_dword_800E40A4[] = {0x0, 0x0, '\n', 0x0}; -const char s01a_dword_800E40A8[] = {0x0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E40AC[] = {0xd, 0xf, 'k', 'N'}; - -const char s01a_dword_800E40B0[] = {0x0, 0x96, 0x3, 0x0}; -const char s01a_dword_800E40B4[] = {0x9, 0x0, ';', 0x0}; -const char s01a_dword_800E40B8[] = {'m', 0x8, 0x0, 0x2}; -const char s01a_dword_800E40BC[] = {0x1e, 0x2, 0x0, 0x1}; -const char s01a_dword_800E40C0[] = {0xc, 0x0, 0x19, 0x8}; -const char s01a_dword_800E40C4[] = {0x4, 0x6, 0x6, '\n'}; -const char s01a_dword_800E40C8[] = {0x0, 0x4, 0x0, 0x4}; -const char s01a_dword_800E40CC[] = {0x4, 0x0, 0x4, 0x0}; -const char s01a_dword_800E40D0[] = {0x14, 0x0, 0x0, 0x2}; -const char s01a_dword_800E40D4[] = {0x0, 0x1, 0xd, 0xc}; -const char s01a_dword_800E40D8[] = {0x0, 0xf, '\n', 0x0}; -const char s01a_dword_800E40DC[] = {0x4, 0x0, 0x4, 0x4}; -const char s01a_dword_800E40E0[] = {0x0, 0x4, 0x0, 0x14}; -const char s01a_dword_800E40E4[] = {0x0, 0x0, 0x2, 0x0}; -const char s01a_dword_800E40E8[] = {0x1, 0xd, 0xf, 0x8}; -const char s01a_dword_800E40EC[] = {0x0, 0x2, 0x1e, 0x2}; -const char s01a_dword_800E40F0[] = {0x0, 0xb, 0xc, 0x0}; -const char s01a_dword_800E40F4[] = {0x19, 0x8, 0x4, 0x6}; -const char s01a_dword_800E40F8[] = {0x6, '\n', 0x0, 0x4}; -const char s01a_dword_800E40FC[] = {0x0, 0x4, 0x4, 0x0}; -const char s01a_dword_800E4100[] = {0x4, 0x0, 0x14, 0x0}; -const char s01a_dword_800E4104[] = {0x0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4108[] = {0xd, 0xc, 0x0, 0xf}; -const char s01a_dword_800E410C[] = {'\n', 0x0, 0x4, 0x0}; -const char s01a_dword_800E4110[] = {0x4, 0x4, 0x0, 0x4}; -const char s01a_dword_800E4114[] = {0x0, 0x14, 0x0, 0x0}; -const char s01a_dword_800E4118[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E411C[] = {0xf, 0x8, 0x0, 0x2}; -const char s01a_dword_800E4120[] = {0x1e, 0x2, 0x0, 0x15}; -const char s01a_dword_800E4124[] = {0xc, 0x0, 0x19, 0x8}; -const char s01a_dword_800E4128[] = {0x4, 0x6, 0x6, '\n'}; -const char s01a_dword_800E412C[] = {0x0, 0x4, 0x0, 0x4}; -const char s01a_dword_800E4130[] = {0x4, 0x0, 0x4, 0x0}; -const char s01a_dword_800E4134[] = {0x14, 0x0, 0x0, 0x2}; -const char s01a_dword_800E4138[] = {0x0, 0x1, 0xd, 0xc}; -const char s01a_dword_800E413C[] = {0x0, 0xf, '\n', 0x0}; -const char s01a_dword_800E4140[] = {0x4, 0x0, 0x4, 0x4}; -const char s01a_dword_800E4144[] = {0x0, 0x4, 0x0, 0x14}; -const char s01a_dword_800E4148[] = {0x0, 0x0, 0x2, 0x0}; -const char s01a_dword_800E414C[] = {0x1, 0xd, 0xf, 'M'}; - -const char aErrerrerrnotlinkroutedtod_800E0690[] = " Err Err Err Not Link Route [%d] to [%d] !!!!\n"; -const char aErrnozoneidingcl_800E06C0[] = "!!!!!!Err No Zone ID In Gcl !!!!!!!!\n"; -const char aKirari_800E06E8[] = "kirari01"; -const char aBefmapnamed_800E06F4[] = "bef map name =%d \n"; -const char aAftmapnamed_800E0708[] = "aft map name =%d \n"; -const char aRootchange_800E071C[] = " Root Change !!\n"; diff --git a/src/overlays/s01a/overlay7.c b/src/overlays/s01a/overlay7.c deleted file mode 100644 index e8e5e3493..000000000 --- a/src/overlays/s01a/overlay7.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "linker.h" -#include "psyq.h" -#include "overlays/s00a/Enemy/enemy.h" - -const char aCresetposd_800E07FC[] = " c_reset_pos = %d \n"; -const char aKottida_800E0810[] = "kottida !!\n"; diff --git a/src/overlays/s01a/overlay8.c b/src/overlays/s01a/overlay8.c deleted file mode 100644 index 23e6fdf59..000000000 --- a/src/overlays/s01a/overlay8.c +++ /dev/null @@ -1,267 +0,0 @@ -#include "linker.h" -#include "psyq.h" -#include "overlays/s00a/Enemy/enemy.h" - -const char s00a_aResetmaxdnumd_800E083C[] = "reset max=%d num=%d \n"; -const char aGmenemywatchcountd_800E0854[] = " GM_EnemyWatchCount = [%d] \n"; -const char aNowzonedrzoned_800E0874[] = " now zone = %d r_zone=%d\n"; -const char aNotrestrctedaread_800E0890[] = " ? ? ? Not Restrcted Area [%d] !!!!\n"; -const char aErrerrerrnotlinkroutedtod_800E08B8[] = " Err Err Err Not Link Route [%d] to [%d] !!!!\n"; -const char aCommanderrnozoneidingclzdidd_800E08E8[] = "command:!!!Err No Zone ID In Gcl z%d id%d!!!!!!!!\n"; -const char aCommandcwhereissnake_800E091C[] = "command.c: Where Is Snake ????\n"; -const char aCom_noisemode_disD_800E0940[] = " COM_NOISEMODE_DIS =%d \n"; -const char aEeeDDDTD_800E095C[] = "eee %d %d %d t %d \n"; -const char aCommandC_800E0970[] = {'c', 'o', 'm', 'm', 'a', 'n', 'd', '.', 'c', 0x0, 'W', 'h'}; - -// Enemy/eyeflash.c -const RECT eyeflash_rect = {175, 100, 350, 200}; -const char s00a_aKirari_800E0984[] = "kirari"; -const char s00a_aEyeflashc_800E098C[] = {'e', 'y', 'e', 'f', 'l', 'a', 's', 'h', '.', 'c', 0x0, 'h'}; - -// Enemy/asiato.c -const char aAsiatoc_800E0998[] = {'a', 's', 'i', 'a', 't', 'o', '.', 'c', 0x0, 0xBA, 0x0A, 0x80}; - -// Enemy/l_sight.c -const char aLSightC[] = {'l', '_', 's', 'i', 'g', 'h', 't', '.', 'c', 0x0, 's', 0x8}; - -// Enemy/grnad_e.c -const char aGrenadeModelD[] = "grenade model=%d \n"; -const char aGrnadEC[] = {'g', 'r', 'n', 'a', 'd', '_', 'e', '.', 'c', 0x0, 'e', 't'}; - -const int s01a_dword_800E4490 = 0x800D5810; -const int s01a_dword_800E4494 = 0x800D5840; -const int s01a_dword_800E4498 = 0x800D5870; -const int s01a_dword_800E449C = 0x800D58E8; -const int s01a_dword_800E44A0 = 0x800D5880; -const int s01a_dword_800E44A4 = 0x800D58E8; -const int s01a_dword_800E44A8 = 0x800D58A4; -const char s01a_aCamarm_800E44AC[] = "cam_arm"; -const char s01a_aCameral_800E44B4[] = "camera_l"; -const char s01a_aScamera_800E44C0[] = "s_camera"; -const char s01a_dword_800E44CC[] = {'c', 'a', 'm', 'e'}; -const char s01a_dword_800E44D0[] = {'r', 'a', '.', 'c'}; -const char s01a_dword_800E44D4[] = {0x0, 'f', 'l', 'a'}; - -const char anim_data_800E44D8[] = {0x0, 0x1d, 0x3, 0x0}; -const char s01a_dword_800E44DC[] = {0x9, 0x0, 0x10, 0x0}; -const char s01a_dword_800E44E0[] = {0x1b, 0x9, 0xb, 0xb8}; -const char s01a_dword_800E44E4[] = {0x2, 0x0, 0x1, 0xf}; -const char s01a_dword_800E44E8[] = {0x7, 0x3, '\n', 0xff}; -const char s01a_dword_800E44EC[] = {'8', 0xff, '8', 0x2}; -const char s01a_dword_800E44F0[] = {0x0, 0x1, 0xf, 0x7}; -const char s01a_dword_800E44F4[] = {0x3, '\n', 0xfe, 0x98}; -const char s01a_dword_800E44F8[] = {0xfe, 0xfc, 0x2, 0x0}; -const char s01a_dword_800E44FC[] = {0x1, 0xf, 0x0, 0x0}; - -const char anim_data_800E4500[] = {0x0, 0x13, 0x1, 0x0}; -const char s01a_dword_800E4504[] = {0x5, 0xc, 0x0, 0x7}; -const char s01a_dword_800E4508[] = {0x1, 0xff, '\n', 0x0}; -const char s01a_dword_800E450C[] = {'F', 0x0, 'F', 0x8}; -const char s01a_dword_800E4510[] = {0xf0, 0xf0, 0xf0, 0x2}; -const char s01a_dword_800E4514[] = {0x0, 0x1, 0xd, 0xf}; - -const char anim_data_800E4518[] = {0x0, '[', 0x4, 0x0}; -const char s01a_dword_800E451C[] = {0xb, 0x0, 0x1e, 0x0}; -const char s01a_dword_800E4520[] = {'6', 0x0, 'N', 0xc}; -const char s01a_dword_800E4524[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4528[] = {'\n', 0x0, 0xc8, 0x0}; -const char s01a_dword_800E452C[] = {0xc8, 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E4530[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4534[] = {0xd, 0xf, '\n', 0x1}; -const char s01a_dword_800E4538[] = {0x90, 0x1, 0x90, 0xc}; -const char s01a_dword_800E453C[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4540[] = {'\n', 0x1, ',', 0x1}; -const char s01a_dword_800E4544[] = {',', 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E4548[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E454C[] = {0xd, 0xf, '\n', 0x3}; -const char s01a_dword_800E4550[] = {' ', 0x3, ' ', 0xc}; -const char s01a_dword_800E4554[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4558[] = {'\n', 0x1, 0x90, 0x1}; -const char s01a_dword_800E455C[] = {0x90, 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E4560[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4564[] = {0xd, 0xf, '\n', 0x4}; -const char s01a_dword_800E4568[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s01a_dword_800E456C[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4570[] = {'\n', 0x1, 0xf4, 0x1}; -const char s01a_dword_800E4574[] = {0xf4, 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E4578[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E457C[] = {0xd, 0xf, 0x0, 0x0}; - -const char anim_data_800E4580[] = {0x0, 'k', 0x4, 0x0}; -const char s01a_dword_800E4584[] = {0xb, 0x0, '"', 0x0}; -const char s01a_dword_800E4588[] = {'>', 0x0, 'Z', 0x8}; -const char s01a_dword_800E458C[] = {0xff, 0xff, 0xff, 0xc}; -const char s01a_dword_800E4590[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4594[] = {'\n', 0x0, 0xc8, 0x0}; -const char s01a_dword_800E4598[] = {0xc8, 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E459C[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E45A0[] = {0xd, 0xf, 0x8, 0xff}; -const char s01a_dword_800E45A4[] = {0xff, 0xff, '\n', 0x1}; -const char s01a_dword_800E45A8[] = {0x90, 0x1, 0x90, 0xc}; -const char s01a_dword_800E45AC[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E45B0[] = {'\n', 0x1, ',', 0x1}; -const char s01a_dword_800E45B4[] = {',', 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E45B8[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E45BC[] = {0xd, 0xf, 0x8, 0xff}; -const char s01a_dword_800E45C0[] = {0xff, 0xff, '\n', 0x3}; -const char s01a_dword_800E45C4[] = {' ', 0x3, ' ', 0xc}; -const char s01a_dword_800E45C8[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E45CC[] = {'\n', 0x1, 0x90, 0x1}; -const char s01a_dword_800E45D0[] = {0x90, 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E45D4[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E45D8[] = {0xd, 0xf, 0x8, 0xff}; -const char s01a_dword_800E45DC[] = {0xff, 0xff, '\n', 0x4}; -const char s01a_dword_800E45E0[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s01a_dword_800E45E4[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E45E8[] = {'\n', 0x1, 0xf4, 0x1}; -const char s01a_dword_800E45EC[] = {0xf4, 0x8, 0xf0, 0xf0}; -const char s01a_dword_800E45F0[] = {0xf0, 0x2, 0x0, 0x1}; -const char s01a_dword_800E45F4[] = {0xd, 0xf, 0x0, 0x0}; - -const char anim_data_800E45F8[] = {0x0, '[', 0x4, 0x0}; -const char s01a_dword_800E45FC[] = {0xb, 0x0, 0x1e, 0x0}; -const char s01a_dword_800E4600[] = {'6', 0x0, 'N', 0xc}; -const char s01a_dword_800E4604[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4608[] = {'\n', 0x0, 0xc8, 0x0}; -const char s01a_dword_800E460C[] = {0xc8, 0x8, 0xfc, 0xfc}; -const char s01a_dword_800E4610[] = {0xfc, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4614[] = {0xd, 0xf, '\n', 0x1}; -const char s01a_dword_800E4618[] = {0x90, 0x1, 0x90, 0xc}; -const char s01a_dword_800E461C[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4620[] = {'\n', 0x1, ',', 0x1}; -const char s01a_dword_800E4624[] = {',', 0x8, 0xfc, 0xfc}; -const char s01a_dword_800E4628[] = {0xfc, 0x2, 0x0, 0x1}; -const char s01a_dword_800E462C[] = {0xd, 0xf, '\n', 0x3}; -const char s01a_dword_800E4630[] = {' ', 0x3, ' ', 0xc}; -const char s01a_dword_800E4634[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4638[] = {'\n', 0x1, 0x90, 0x1}; -const char s01a_dword_800E463C[] = {0x90, 0x8, 0xfc, 0xfc}; -const char s01a_dword_800E4640[] = {0xfc, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4644[] = {0xd, 0xf, '\n', 0x4}; -const char s01a_dword_800E4648[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s01a_dword_800E464C[] = {0x0, 0x7, 0x1, 0xff}; -const char s01a_dword_800E4650[] = {'\n', 0x1, 0xf4, 0x1}; -const char s01a_dword_800E4654[] = {0xf4, 0x8, 0xfc, 0xfc}; -const char s01a_dword_800E4658[] = {0xfc, 0x2, 0x0, 0x1}; -const char s01a_dword_800E465C[] = {0xd, 0xf, 'N', 'o'}; - -const SVECTOR s01a_svec_800E4660 = {0, 0, 65024}; - -const char aSearchliUDRotXLRRotY[] = "UD:ROT.X LR:ROT.Y\n"; -const char aSearchliUDPosXLRPosZ[] = "UD:POS.X LR:POS.Z\n"; -const char aSearchliUDPosYLRAngle[] = "UD:POS.Y LR:ANGLE\n"; -const char aSearchliRot7D7D7D[] = "ROT:%7d %7d %7d\n"; -const char aSearchliPos7D7D7D[] = "POS:%7d %7d %7d\n"; -const char aSearchliAngle4D[] = "ANGLE:%4d \n"; - -const SVECTOR SearchliCenter_800E46D8 = {0, 0, 3000, 0}; - -const char aSearchli0[] = "0"; -const char aSearchliShadow[] = "shadow"; -const char aSearchliC[] = {'s', 'e', 'a', 'r', 'c', 'h', 'l', 'i', '.', 'c', 0x0, 'e'}; - -const char anim_data_800E46F8[] = {0x0, 0x1f, 0x4, 0x0}; -const char s01a_dword_800E46FC[] = {0xb, 0x0, 0xf, 0x0}; -const char s01a_dword_800E4700[] = {0x18, 0x0, '!', 0x2}; -const char s01a_dword_800E4704[] = {0x0, 0x1, 0xf, '\n'}; -const char s01a_dword_800E4708[] = {0xff, 0xce, 0xff, 0xce}; -const char s01a_dword_800E470C[] = {0x2, 0x0, 0x1, 0xf}; -const char s01a_dword_800E4710[] = {'\n', 0xff, 0x9c, 0xff}; -const char s01a_dword_800E4714[] = {0x9c, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4718[] = {0xf, '\n', 0xff, 'j'}; -const char s01a_dword_800E471C[] = {0xff, 'j', 0x2, 0x0}; -const char s01a_dword_800E4720[] = {0x1, 0xf, 0x0, 0x0}; -const char anim_data_800E4724[] = {0x0, 0x10, 0x1, 0x0}; -const char s01a_dword_800E4728[] = {0x5, 0x2, 0x0, 0x1}; -const char s01a_dword_800E472C[] = {0x8, 0xf0, 0xf0, 0xf0}; -const char s01a_dword_800E4730[] = {'\n', 0x3, 0xe8, 0x3}; -const char s01a_dword_800E4734[] = {0xe8, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4738[] = {0xf, 0x0, 0x0, 0x0}; -const char anim_data_800E473C[] = {0x0, 0x8, 0x1, 0x0}; -const char s01a_dword_800E4740[] = {0x5, 0xc, 0x0, '<'}; -const char s01a_dword_800E4744[] = {0x2, 0x0, 0x1, 0xd}; -const char s01a_dword_800E4748[] = {0xf, 0x0, 0x0, 0x0}; -const char anim_data_800E474C[] = {0x0, 0xd, 0x2, 0x0}; -const char s01a_dword_800E4750[] = {0x7, 0x0, 0xb, 0x2}; -const char s01a_dword_800E4754[] = {0x0, 0x1, 0xf, '\n'}; -const char s01a_dword_800E4758[] = {0xfe, 'p', 0xfe, 'p'}; -const char s01a_dword_800E475C[] = {0x2, 0x0, 0x1, 0xf}; -const char anim_data_800E4760[] = {0x0, 0x4, 0x1, 0x0}; -const char s01a_dword_800E4764[] = {0x5, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4768[] = {0xf, 0x0, 0x0, 0x0}; - -const char anim_data_800E476C[] = {0x0, 0x13, 0x1, 0x0}; -const char s01a_dword_800E4770[] = {0x5, 0x8, 0xc8, 0xc8}; -const char s01a_dword_800E4774[] = {0xff, 0x2, 0x0, 0x1}; -const char s01a_dword_800E4778[] = {0xc, 0x0, 0x1f, 0x8}; -const char s01a_dword_800E477C[] = {0xfa, 0xfa, 0xf8, 0x2}; -const char s01a_dword_800E4780[] = {0x0, 0x1, 0xd, 0xf}; - -int SECTION("overlay.bss") s01a_dword_800E4B24; - -short SECTION("overlay.bss") sphere_image_width_800E4B28; -short SECTION("overlay.bss") sphere_image_height_800E4B2A; -short SECTION("overlay.bss") sphere_visible_tiles_x_800E4B2C; -short SECTION("overlay.bss") sphere_visible_tiles_y_800E4B2E; -short SECTION("overlay.bss") sphere_tiles_x_800E4B30; -short SECTION("overlay.bss") sphere_tiles_y_800E4B32; -short SECTION("overlay.bss") sphere_tile_width_800E4B34; -short SECTION("overlay.bss") sphere_tile_height_800E4B36; -short SECTION("overlay.bss") sphere_elevation_800E4B38; -short SECTION("overlay.bss") sphere_word_800E4B3A; - -int SECTION("overlay.bss") s00a_dword_800E0C9C; - -int SECTION("overlay.bss") s00a_dword_800E0CA0; -int SECTION("overlay.bss") s00a_dword_800E0CA4; -int SECTION("overlay.bss") s00a_dword_800E0CA8; -int SECTION("overlay.bss") s00a_dword_800E0CAC; - -GM_Camera SECTION("overlay.bss") s00a_dword_800E0CB0; - -int SECTION("overlay.bss") s00a_dword_800E0D2C; -int SECTION("overlay.bss") s00a_dword_800E0D30; -int SECTION("overlay.bss") s00a_dword_800E0D34; - -SVECTOR SECTION("overlay.bss") s00a_dword_800E0D38; - -int SECTION("overlay.bss") COM_PlayerOnZone_800E0D40; - -int SECTION("overlay.bss") COM_NoiseMinDisID_800E0D44; - -SVECTOR SECTION("overlay.bss") COM_PlayerPositionOne_800E0D48[8]; - -int SECTION("overlay.bss") COM_SHOOTRANGE_800E0D88; -int SECTION("overlay.bss") COM_EYE_LENGTH_800E0D8C; -int SECTION("overlay.bss") COM_PlayerAddress_800E0D90; -unsigned int SECTION("overlay.bss") ENE_SPECIAL_FLAG_800E0D94; - -ENEMY_COMMAND SECTION("overlay.bss") EnemyCommand_800E0D98; - -int SECTION("overlay.bss") COM_PlayerMap_800E0F1C; - -TOPCOMMAND_STRUCT SECTION("overlay.bss") TOPCOMMAND_800E0F20; - -TOPCOMMAND_STRUCT SECTION("overlay.bss") s00a_dword_800E0F28; - -SVECTOR SECTION("overlay.bss") COM_PlayerPosition_800E0F30; - -int SECTION("overlay.bss") COM_NOISEMODE_DIS_800E0F38; - -unsigned int SECTION("overlay.bss") COM_GameStatus_800E0F3C; - -int SECTION("overlay.bss") COM_PlayerAddressOne_800E0F40[8]; - -int SECTION("overlay.bss") COM_ALERT_DECREMENT_800E0F60; - -int SECTION("overlay.bss") GM_GameFlag_800E0F64; - -int SECTION("overlay.bss") COM_VibTime_800E0F68; - -int SECTION("overlay.bss") s00a_dword_800E0F6C; - -int SECTION("overlay.bss") COM_PlayerMapOne_800E0F70[8]; - -int SECTION("overlay.bss") s00a_dword_800E0F90; - -int SECTION("overlay.bss") s00a_dword_800E0F94; diff --git a/src/overlays/s01a/overlay9.c b/src/overlays/s01a/overlay9.c deleted file mode 100644 index 51c5e39cd..000000000 --- a/src/overlays/s01a/overlay9.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "linker.h" -#include "psyq.h" -#include "overlays/s00a/Enemy/enemy.h" - -const char aBoxkeriSnake[] = "スネーク"; -const char sBoxkeriDanbowl[] = "段ボール"; -const char aCbBox[] = "cb_box"; -const char aBoxkeriC[] = {'b', 'o', 'x', 'k', 'e', 'r', 'i', '.', 'c', 0x0, 0x7, 'R'}; - -const char aSmoke[] = "smoke"; -const char aSmokeC[] = "smoke.c"; - -// Enemy/wall.c -const char aDestroy[] = "destroy\n"; -const char aBox01[] = "box_01"; -const char aDbx1[] = "dbx1"; -const char aDbx2[] = "dbx2"; -const char aWallC[] = {'w', 'a', 'l', 'l', '.', 'c', 0x0, 0x80}; - -// Enemy/asioto.c -const char aAsiotoSeSetErr[] = " asioto se set err \n"; -const char aAsiotoSeNoiseSetErr[] = " asioto se noise set err \n"; -const char aMigiSodesuri[] = " migi sodesuri %d \n"; -const char aAsiotoC[] = {'a', 's', 'i', 'o', 't', 'o', '.', 'c', 0x0, 0x15, 'S', 'e'}; diff --git a/src/overlays/s01a/overlay_bss.c b/src/overlays/s01a/overlay_bss.c new file mode 100644 index 000000000..197dcd4e4 --- /dev/null +++ b/src/overlays/s01a/overlay_bss.c @@ -0,0 +1,72 @@ +#include "linker.h" +#include "psyq.h" +#include "overlays/s00a/Enemy/enemy.h" + +int SECTION("overlay.bss") s01a_dword_800E4B24; + +short SECTION("overlay.bss") sphere_image_width_800E4B28; +short SECTION("overlay.bss") sphere_image_height_800E4B2A; +short SECTION("overlay.bss") sphere_visible_tiles_x_800E4B2C; +short SECTION("overlay.bss") sphere_visible_tiles_y_800E4B2E; +short SECTION("overlay.bss") sphere_tiles_x_800E4B30; +short SECTION("overlay.bss") sphere_tiles_y_800E4B32; +short SECTION("overlay.bss") sphere_tile_width_800E4B34; +short SECTION("overlay.bss") sphere_tile_height_800E4B36; +short SECTION("overlay.bss") sphere_elevation_800E4B38; +short SECTION("overlay.bss") sphere_word_800E4B3A; + +int SECTION("overlay.bss") s00a_dword_800E0C9C; + +int SECTION("overlay.bss") s00a_dword_800E0CA0; +int SECTION("overlay.bss") s00a_dword_800E0CA4; +int SECTION("overlay.bss") s00a_dword_800E0CA8; +int SECTION("overlay.bss") s00a_dword_800E0CAC; + +GM_Camera SECTION("overlay.bss") s00a_dword_800E0CB0; + +int SECTION("overlay.bss") s00a_dword_800E0D2C; +int SECTION("overlay.bss") s00a_dword_800E0D30; +int SECTION("overlay.bss") s00a_dword_800E0D34; + +SVECTOR SECTION("overlay.bss") s00a_dword_800E0D38; + +int SECTION("overlay.bss") COM_PlayerOnZone_800E0D40; + +int SECTION("overlay.bss") COM_NoiseMinDisID_800E0D44; + +SVECTOR SECTION("overlay.bss") COM_PlayerPositionOne_800E0D48[8]; + +int SECTION("overlay.bss") COM_SHOOTRANGE_800E0D88; +int SECTION("overlay.bss") COM_EYE_LENGTH_800E0D8C; +int SECTION("overlay.bss") COM_PlayerAddress_800E0D90; +unsigned int SECTION("overlay.bss") ENE_SPECIAL_FLAG_800E0D94; + +ENEMY_COMMAND SECTION("overlay.bss") EnemyCommand_800E0D98; + +int SECTION("overlay.bss") COM_PlayerMap_800E0F1C; + +TOPCOMMAND_STRUCT SECTION("overlay.bss") TOPCOMMAND_800E0F20; + +TOPCOMMAND_STRUCT SECTION("overlay.bss") s00a_dword_800E0F28; + +SVECTOR SECTION("overlay.bss") COM_PlayerPosition_800E0F30; + +int SECTION("overlay.bss") COM_NOISEMODE_DIS_800E0F38; + +unsigned int SECTION("overlay.bss") COM_GameStatus_800E0F3C; + +int SECTION("overlay.bss") COM_PlayerAddressOne_800E0F40[8]; + +int SECTION("overlay.bss") COM_ALERT_DECREMENT_800E0F60; + +int SECTION("overlay.bss") GM_GameFlag_800E0F64; + +int SECTION("overlay.bss") COM_VibTime_800E0F68; + +int SECTION("overlay.bss") s00a_dword_800E0F6C; + +int SECTION("overlay.bss") COM_PlayerMapOne_800E0F70[8]; + +int SECTION("overlay.bss") s00a_dword_800E0F90; + +int SECTION("overlay.bss") s00a_dword_800E0F94; diff --git a/src/overlays/s03e/Game/evpanel.c b/src/overlays/s03e/Game/evpanel.c index a961180b7..af44d56fe 100644 --- a/src/overlays/s03e/Game/evpanel.c +++ b/src/overlays/s03e/Game/evpanel.c @@ -48,11 +48,26 @@ typedef struct EvPanelWork SVECTOR field_B4[0]; } EvPanelWork; +unsigned short s03e_dword_800C3268[] = {0x121F, 0x8D5C, HASH_ENTER, HASH_LEAVE, 0x8591, 0x6555, 0x2EAB}; + +char s03e_dword_800C3278[] = {0x7F, 0x02, 0x00, 0x00}; +char s03e_dword_800C327C[] = {0x55, 0x02, 0x6E, 0x02, 0x1E, 0x0E, 0x41, 0x04, 0x7D, 0x06, 0x5F, 0x06, 0x46, 0x08, 0x37, 0x0A, 0x2D, 0x0C, 0x00, 0x00}; +char s03e_dword_800C3290[] = {0x00, 0x0A, 0x7F, 0x02, 0x00, 0x1E, 0x7F, 0x02, 0x00, 0x00, 0x00, 0x00}; +char s03e_dword_800C329C[] = {0x23, 0x04, 0x4B, 0x04, 0x87, 0x06, 0x41, 0x08, 0x2D, 0x0C, 0x41, 0x06, 0x5F, 0x04, 0x00, 0x00}; + +const char s03e_aMessagein_800CBF18[] = "message in\n"; +const char s03e_aMessageout_800CBF24[] = "message out\n"; +const char s03e_aMessagex_800CBF34[] = "message %X\n"; +const char s03e_aNofloorproc_800CBF40[] = "NO FLOOR PROC\n"; +const char s03e_aRotd_800CBF50[] = "ROT %d\n"; +const char s03e_aReqdoorclose_800CBF58[] = "REQ:DOOR CLOSE\n"; +const char s03e_aInitopen_800CBF68[] = "INiTOPEN\n"; + +EvPanelWork *SECTION("overlay.bss") s03e_dword_800CC6B8; + int THING_Gcl_GetInt(int); int THING_Gcl_GetIntDefault(int, int); -extern char s03e_dword_800CBFA8[]; -extern EvPanelWork *s03e_dword_800CC6B8; extern int GV_Time_800AB330; extern int GM_CurrentMap_800AB9B0; extern GM_Camera GM_Camera_800B77E8; @@ -63,20 +78,6 @@ extern int GM_AlertMode_800ABA00; extern int GM_CameraShakeOffset_800ABA98; extern GV_PAD GV_PadData_800B05C0[4]; -extern unsigned short s03e_dword_800C3268[]; // = {0x121F, 0x8D5C, HASH_ENTER, HASH_LEAVE, 0x8591, 0x6555, 0x2EAB}; -extern char s03e_dword_800C3278[]; -extern char s03e_dword_800C327C[]; -extern char s03e_dword_800C3290[]; -extern char s03e_dword_800C329C[]; - -extern const char s03e_aMessagein_800CBF18[]; // = "message in\n" -extern const char s03e_aMessageout_800CBF24[]; // = "message out\n" -extern const char s03e_aMessagex_800CBF34[]; // = "message %X\n" -extern const char s03e_aNofloorproc_800CBF40[]; // = "NO FLOOR PROC\n" -extern const char s03e_aRotd_800CBF50[]; // = "ROT %d\n" -extern const char s03e_aReqdoorclose_800CBF58[]; // = "REQ:DOOR CLOSE\n" -extern const char s03e_aInitopen_800CBF68[]; // = "INiTOPEN\n" - void s03e_evpanel_800C33E0(DG_PRIM *prim, int texid) { int i; @@ -1008,6 +1009,8 @@ int EvpanelGetResources_800C496C(EvPanelWork *work, int map, int name, int arg3) return -1; } +const char s03e_dword_800CBFA8[] = "evpanel.c"; + GV_ACT *NewEvpanel_800C4AD8(int name, int where, int argc, char **argv) { EvPanelWork *work; diff --git a/src/overlays/s03e/Okajima/guncame.c b/src/overlays/s03e/Okajima/guncame.c index 929a80201..0dbfed669 100644 --- a/src/overlays/s03e/Okajima/guncame.c +++ b/src/overlays/s03e/Okajima/guncame.c @@ -72,23 +72,26 @@ typedef struct GunCamEWork int field_418; } GunCamEWork; +int s03e_dword_800C32B4 = 0x00000000; +int s03e_dword_800C32B8 = 0x00000000; +int s03e_dword_800C32BC = 0x00000000; + +RECT guncame_rect = {80, 80, 160, 160}; +SVECTOR guncame_svec = {300, 300, 300, 0}; + +int SECTION("overlay.bss") s03e_dword_800CC6BC; + extern int dword_8009F480; extern int s03e_dword_800C32B8; extern SVECTOR DG_ZeroVector_800AB39C; -extern char s03e_aGcaarm_800CC110[]; -extern char s03e_aGcagun_800CC108[]; extern int s03e_dword_800C32B4; extern SVECTOR guncame_svec; -extern int s03e_dword_800CC6BC; extern int s03e_dword_800C32B4; -extern char s03e_dword_800CC118[]; -extern char s03e_aCameral_800CC0FC[]; extern RECT guncame_rect; extern SVECTOR GM_PlayerPosition_800ABA10; extern int dword_8009F46C[]; extern int dword_8009F480; extern SVECTOR svector_8009F478; -extern SVECTOR s03e_svec_800CC0F4; extern int GV_Time_800AB330; extern int GM_GameStatus_800AB3CC; extern int GM_CurrentMap_800AB9B0; @@ -1016,6 +1019,8 @@ void s03e_guncame_800C8940(GunCamEWork *work) vec->pad = 0; } +const SVECTOR s03e_svec_800CC0F4 = {0, -150, -400, 0}; + int s03e_guncame_800C8978(GunCamEWork *work, int name, int map) { SVECTOR disp_local; @@ -1288,7 +1293,7 @@ int s03e_guncame_800C8E7C(GunCamEWork *work) if (prim != NULL) { prim->field_2E_k500 = 500; - tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC(s03e_aCameral_800CC0FC)); + tex = DG_GetTexture_8001D830(GV_StrCode_80016CCC("camera_l")); work->field_32C = tex; if (tex != 0) { @@ -1322,12 +1327,12 @@ int s03e_guncame_800C8F64(GunCamEWork *work, int name, int where) obj1 = &work->field_9C; do {} while (0); - GM_InitObject_80034A18(obj1, GV_StrCode_80016CCC(s03e_aGcagun_800CC108), 0x26D, 0); + GM_InitObject_80034A18(obj1, GV_StrCode_80016CCC("gca_gun"), 0x26D, 0); GM_ConfigObjectLight_80034C44(obj1, work->field_180); obj2 = &work->field_1F4; do {} while (0); - GM_InitObject_80034A18(obj2, GV_StrCode_80016CCC(s03e_aGcaarm_800CC110), 0x26D, 0); + GM_InitObject_80034A18(obj2, GV_StrCode_80016CCC("gca_arm"), 0x26D, 0); GM_ConfigObjectLight_80034C44(obj2, work->field_2D8); if (s03e_guncame_800C8E7C(work) == -1) @@ -1378,7 +1383,7 @@ GV_ACT *s03e_guncame_800C9190(int name, int where, int argc, char **argv) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s03e_guncame_800C80F4, - (TActorFunction)s03e_guncame_800C911C, s03e_dword_800CC118); + (TActorFunction)s03e_guncame_800C911C, "guncame.c"); if (s03e_guncame_800C8F64(work, name, where) < 0) { GV_DestroyActor_800151C8(&work->actor); diff --git a/src/overlays/s03e/chara/others/intr_cam.c b/src/overlays/s03e/chara/others/intr_cam.c index 3c157a344..4062fcb8e 100644 --- a/src/overlays/s03e/chara/others/intr_cam.c +++ b/src/overlays/s03e/chara/others/intr_cam.c @@ -13,7 +13,8 @@ typedef struct IntrCamWork SVECTOR field_34; } IntrCamWork; -extern char s03e_dword_800CBFD0[]; +const char s03e_dword_800CBFD0[] = "intr_cam.c"; + extern PlayerStatusFlag GM_PlayerStatus_800ABA50; extern UnkCameraStruct gUnkCameraStruct_800B77B8; diff --git a/src/overlays/s03e/chara/others/motse.c b/src/overlays/s03e/chara/others/motse.c index 2f693a58a..4eecf0ce5 100644 --- a/src/overlays/s03e/chara/others/motse.c +++ b/src/overlays/s03e/chara/others/motse.c @@ -16,8 +16,6 @@ typedef struct MotseWork MotseElem *field_28_elems; } MotseWork; -extern const char aMotseC[]; - extern int GM_PlayerAction_800ABA40; extern CONTROL *GM_PlayerControl_800AB9F4; extern PlayerStatusFlag GM_PlayerStatus_800ABA50; @@ -75,7 +73,7 @@ GV_ACT *s03e_motse_800C5944(int name, int where, int argc, char **argv) if (work != NULL) { GV_SetNamedActor_8001514C(&work->actor, (TActorFunction)s03e_motse_800C57CC, - (TActorFunction)s03e_motse_800C5864, aMotseC); + (TActorFunction)s03e_motse_800C5864, "motse.c"); if (s03e_motse_800C5888(work, name) < 0) { GV_DestroyActor_800151C8(&work->actor); diff --git a/src/overlays/s03e/overlay.c b/src/overlays/s03e/overlay.c index fc9184225..d0401feee 100755 --- a/src/overlays/s03e/overlay.c +++ b/src/overlays/s03e/overlay.c @@ -1,6 +1,5 @@ #include "libgcl/hash.h" #include "libgcl/libgcl.h" -#include "Anime/animeconv/anime.h" GCL_ActorTableEntry s03eOverlayCharas[] = { @@ -17,44 +16,3 @@ GCL_ActorTableEntry s03eOverlayCharas[] = { 0x0FAD, (TGCL_ActorCreateFn)0x800C5944 }, { 0, 0 } }; - -unsigned short s03e_dword_800C3268[] = {0x121F, 0x8D5C, HASH_ENTER, HASH_LEAVE, 0x8591, 0x6555, 0x2EAB}; - -char s03e_dword_800C3278[] = {0x7F, 0x02, 0x00, 0x00}; -char s03e_dword_800C327C[] = {0x55, 0x02, 0x6E, 0x02, 0x1E, 0x0E, 0x41, 0x04, 0x7D, 0x06, 0x5F, 0x06, 0x46, 0x08, 0x37, 0x0A, 0x2D, 0x0C, 0x00, 0x00}; -char s03e_dword_800C3290[] = {0x00, 0x0A, 0x7F, 0x02, 0x00, 0x1E, 0x7F, 0x02, 0x00, 0x00, 0x00, 0x00}; -char s03e_dword_800C329C[] = {0x23, 0x04, 0x4B, 0x04, 0x87, 0x06, 0x41, 0x08, 0x2D, 0x0C, 0x41, 0x06, 0x5F, 0x04, 0x00, 0x00}; - -// Okajima/uji.c -RECT uji_rect = {100, 100, 200, 200}; - -int s03e_dword_800C32B4 = 0x00000000; -int s03e_dword_800C32B8 = 0x00000000; -int s03e_dword_800C32BC = 0x00000000; - -RECT guncame_rect = {80, 80, 160, 160}; -SVECTOR guncame_svec = {300, 300, 300, 0}; - -extern const char anim_data_800CC124[]; -ANIMATION anm_800C3B78 = {PCX_SOCOM_F, 2, 2, 4, 1, 300, 1, 800, 800, 128, NULL, (char *)anim_data_800CC124}; - -extern const char anim_data_800CC14C[]; -ANIMATION anm_800C3B94 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800CC14C}; - -extern const char anim_data_800CC164[]; -ANIMATION anm_800C3BB0 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800CC164}; - -extern const char anim_data_800CC1CC[]; -ANIMATION anm_800C3BCC = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 0, NULL, (char *)anim_data_800CC1CC}; - -extern const char anim_data_800CC244[]; -ANIMATION anm_800C3BE8 = {PCX_SMOKE, 8, 4, 30, 1, 500, 2, 400, 400, 32, NULL, (char *)anim_data_800CC244}; - -const char s03e_aMessagein_800CBF18[] = "message in\n"; -const char s03e_aMessageout_800CBF24[] = "message out\n"; -const char s03e_aMessagex_800CBF34[] = "message %X\n"; -const char s03e_aNofloorproc_800CBF40[] = "NO FLOOR PROC\n"; -const char s03e_aRotd_800CBF50[] = "ROT %d\n"; -const char s03e_aReqdoorclose_800CBF58[] = "REQ:DOOR CLOSE\n"; -const char s03e_aInitopen_800CBF68[] = "INiTOPEN\n"; -const char s03e_dword_800CBF74[] = {0x0, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s03e/overlay2.c b/src/overlays/s03e/overlay2.c deleted file mode 100644 index 4328ac85e..000000000 --- a/src/overlays/s03e/overlay2.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "linker.h" -#include "libgv/libgv.h" - -const char s03e_dword_800CBFA8[] = {'e', 'v', 'p', 'a'}; -const char s03e_dword_800CBFAC[] = {'n', 'e', 'l', '.'}; -const char s03e_dword_800CBFB0[] = {'c', 0x0, '!', 0x90}; - -// Game/lamp.c -const char aTexparseerror[] = "TEX:PARSE ERROR\n"; -const char aLampC[] = {'l', 'a', 'm', 'p', '.', 'c', 0x0, 0x81}; - -const char s03e_dword_800CBFD0[] = {'i', 'n', 't', 'r'}; -const char s03e_dword_800CBFD4[] = {'_', 'c', 'a', 'm'}; -const char s03e_dword_800CBFD8[] = {'.', 'c', 0x0, 0x81}; - -const char aMotseC[] = "motse.c"; - -// Enemy/wall.c -const char aDestroy[] = "destroy\n"; -const char aBox01[] = "box_01"; -const char aDbx1[] = "dbx1"; -const char aDbx2[] = "dbx2"; -const char aWallC[] = {'w', 'a', 'l', 'l', '.', 'c', 0x0, 0x81}; - -// Enemy/asioto.c -const char aAsiotoSeSetErr[] = " asioto se set err \n"; -const char aAsiotoSeNoiseSetErr[] = " asioto se noise set err \n"; -const char aMigiSodesuri[] = " migi sodesuri %d \n"; -const char aAsiotoC[] = {'a', 's', 'i', 'o', 't', 'o', '.', 'c', 0x0, '\'', 0x91, 0x1}; - -// Okajima/uji.c -const char aUji[] = "uji"; -const char aUjiC[] = {'u', 'j', 'i', '.', 'c', 0x0, 0xc1, '#'}; diff --git a/src/overlays/s03e/overlay3.c b/src/overlays/s03e/overlay3.c deleted file mode 100644 index 3d23a6c3f..000000000 --- a/src/overlays/s03e/overlay3.c +++ /dev/null @@ -1,117 +0,0 @@ -#include "linker.h" -#include "libgv/libgv.h" - -const SVECTOR s03e_svec_800CC0F4 = {0, -150, -400, 0}; - -const char s03e_aCameral_800CC0FC[] = "camera_l"; -const char s03e_aGcagun_800CC108[] = "gca_gun"; -const char s03e_aGcaarm_800CC110[] = "gca_arm"; -const char s03e_dword_800CC118[] = {'g', 'u', 'n', 'c'}; -const char s03e_dword_800CC11C[] = {'a', 'm', 'e', '.'}; -const char s03e_dword_800CC120[] = {'c', 0x0, '+', 0x96}; - -const char anim_data_800CC124[] = {0x0, 0x1d, 0x3, 0x0}; -const char s03e_dword_800CC128[] = {0x9, 0x0, 0x10, 0x0}; -const char s03e_dword_800CC12C[] = {0x1b, 0x9, 0xb, 0xb8}; -const char s03e_dword_800CC130[] = {0x2, 0x0, 0x1, 0xf}; -const char s03e_dword_800CC134[] = {0x7, 0x3, '\n', 0xff}; -const char s03e_dword_800CC138[] = {'8', 0xff, '8', 0x2}; -const char s03e_dword_800CC13C[] = {0x0, 0x1, 0xf, 0x7}; -const char s03e_dword_800CC140[] = {0x3, '\n', 0xfe, 0x98}; -const char s03e_dword_800CC144[] = {0xfe, 0xfc, 0x2, 0x0}; -const char s03e_dword_800CC148[] = {0x1, 0xf, 0x0, 0x0}; - -const char anim_data_800CC14C[] = {0x0, 0x13, 0x1, 0x0}; -const char s03e_dword_800CC150[] = {0x5, 0xc, 0x0, 0x7}; -const char s03e_dword_800CC154[] = {0x1, 0xff, '\n', 0x0}; -const char s03e_dword_800CC158[] = {'F', 0x0, 'F', 0x8}; -const char s03e_dword_800CC15C[] = {0xf0, 0xf0, 0xf0, 0x2}; -const char s03e_dword_800CC160[] = {0x0, 0x1, 0xd, 0xf}; - -const char anim_data_800CC164[] = {0x0, '[', 0x4, 0x0}; -const char s03e_dword_800CC168[] = {0xb, 0x0, 0x1e, 0x0}; -const char s03e_dword_800CC16C[] = {'6', 0x0, 'N', 0xc}; -const char s03e_dword_800CC170[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC174[] = {'\n', 0x0, 0xc8, 0x0}; -const char s03e_dword_800CC178[] = {0xc8, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC17C[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC180[] = {0xd, 0xf, '\n', 0x1}; -const char s03e_dword_800CC184[] = {0x90, 0x1, 0x90, 0xc}; -const char s03e_dword_800CC188[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC18C[] = {'\n', 0x1, ',', 0x1}; -const char s03e_dword_800CC190[] = {',', 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC194[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC198[] = {0xd, 0xf, '\n', 0x3}; -const char s03e_dword_800CC19C[] = {' ', 0x3, ' ', 0xc}; -const char s03e_dword_800CC1A0[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1A4[] = {'\n', 0x1, 0x90, 0x1}; -const char s03e_dword_800CC1A8[] = {0x90, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC1AC[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC1B0[] = {0xd, 0xf, '\n', 0x4}; -const char s03e_dword_800CC1B4[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s03e_dword_800CC1B8[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1BC[] = {'\n', 0x1, 0xf4, 0x1}; -const char s03e_dword_800CC1C0[] = {0xf4, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC1C4[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC1C8[] = {0xd, 0xf, 0x0, 0x0}; - -const char anim_data_800CC1CC[] = {0x0, 'k', 0x4, 0x0}; -const char s03e_dword_800CC1D0[] = {0xb, 0x0, '"', 0x0}; -const char s03e_dword_800CC1D4[] = {'>', 0x0, 'Z', 0x8}; -const char s03e_dword_800CC1D8[] = {0xff, 0xff, 0xff, 0xc}; -const char s03e_dword_800CC1DC[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1E0[] = {'\n', 0x0, 0xc8, 0x0}; -const char s03e_dword_800CC1E4[] = {0xc8, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC1E8[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC1EC[] = {0xd, 0xf, 0x8, 0xff}; -const char s03e_dword_800CC1F0[] = {0xff, 0xff, '\n', 0x1}; -const char s03e_dword_800CC1F4[] = {0x90, 0x1, 0x90, 0xc}; -const char s03e_dword_800CC1F8[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1FC[] = {'\n', 0x1, ',', 0x1}; -const char s03e_dword_800CC200[] = {',', 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC204[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC208[] = {0xd, 0xf, 0x8, 0xff}; -const char s03e_dword_800CC20C[] = {0xff, 0xff, '\n', 0x3}; -const char s03e_dword_800CC210[] = {' ', 0x3, ' ', 0xc}; -const char s03e_dword_800CC214[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC218[] = {'\n', 0x1, 0x90, 0x1}; -const char s03e_dword_800CC21C[] = {0x90, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC220[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC224[] = {0xd, 0xf, 0x8, 0xff}; -const char s03e_dword_800CC228[] = {0xff, 0xff, '\n', 0x4}; -const char s03e_dword_800CC22C[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s03e_dword_800CC230[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC234[] = {'\n', 0x1, 0xf4, 0x1}; -const char s03e_dword_800CC238[] = {0xf4, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC23C[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC240[] = {0xd, 0xf, 0x0, 0x0}; - -const char anim_data_800CC244[] = {0x0, '[', 0x4, 0x0}; -const char s03e_dword_800CC248[] = {0xb, 0x0, 0x1e, 0x0}; -const char s03e_dword_800CC24C[] = {'6', 0x0, 'N', 0xc}; -const char s03e_dword_800CC250[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC254[] = {'\n', 0x0, 0xc8, 0x0}; -const char s03e_dword_800CC258[] = {0xc8, 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC25C[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC260[] = {0xd, 0xf, '\n', 0x1}; -const char s03e_dword_800CC264[] = {0x90, 0x1, 0x90, 0xc}; -const char s03e_dword_800CC268[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC26C[] = {'\n', 0x1, ',', 0x1}; -const char s03e_dword_800CC270[] = {',', 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC274[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC278[] = {0xd, 0xf, '\n', 0x3}; -const char s03e_dword_800CC27C[] = {' ', 0x3, ' ', 0xc}; -const char s03e_dword_800CC280[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC284[] = {'\n', 0x1, 0x90, 0x1}; -const char s03e_dword_800CC288[] = {0x90, 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC28C[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC290[] = {0xd, 0xf, '\n', 0x4}; -const char s03e_dword_800CC294[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s03e_dword_800CC298[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC29C[] = {'\n', 0x1, 0xf4, 0x1}; -const char s03e_dword_800CC2A0[] = {0xf4, 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC2A4[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC2A8[] = {0xd, 0xf}; - -void SECTION("overlay.bss") *s03e_dword_800CC6B8; -int SECTION("overlay.bss") s03e_dword_800CC6BC; diff --git a/src/overlays/s03er/overlay.c b/src/overlays/s03er/overlay.c deleted file mode 100755 index fc9184225..000000000 --- a/src/overlays/s03er/overlay.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "libgcl/hash.h" -#include "libgcl/libgcl.h" -#include "Anime/animeconv/anime.h" - -GCL_ActorTableEntry s03eOverlayCharas[] = -{ - { 0x92BC, (TGCL_ActorCreateFn)0x800C6558 }, - { 0x7A05, (TGCL_ActorCreateFn)0x800CBA94 }, - { 0xEC77, (TGCL_ActorCreateFn)0x800C5E68 }, - { 0xE253, (TGCL_ActorCreateFn)0x800C4AD8 }, - { 0xF5C5, (TGCL_ActorCreateFn)0x800C6EDC }, - { 0x1AD3, (TGCL_ActorCreateFn)0x800C5454 }, - { 0xA9C5, (TGCL_ActorCreateFn)0x800C9190 }, - { 0xA12E, (TGCL_ActorCreateFn)0x800CB2B8 }, - { 0xDD8B, (TGCL_ActorCreateFn)0x800C5748 }, - { 0x51C6, (TGCL_ActorCreateFn)0x800CBE84 }, - { 0x0FAD, (TGCL_ActorCreateFn)0x800C5944 }, - { 0, 0 } -}; - -unsigned short s03e_dword_800C3268[] = {0x121F, 0x8D5C, HASH_ENTER, HASH_LEAVE, 0x8591, 0x6555, 0x2EAB}; - -char s03e_dword_800C3278[] = {0x7F, 0x02, 0x00, 0x00}; -char s03e_dword_800C327C[] = {0x55, 0x02, 0x6E, 0x02, 0x1E, 0x0E, 0x41, 0x04, 0x7D, 0x06, 0x5F, 0x06, 0x46, 0x08, 0x37, 0x0A, 0x2D, 0x0C, 0x00, 0x00}; -char s03e_dword_800C3290[] = {0x00, 0x0A, 0x7F, 0x02, 0x00, 0x1E, 0x7F, 0x02, 0x00, 0x00, 0x00, 0x00}; -char s03e_dword_800C329C[] = {0x23, 0x04, 0x4B, 0x04, 0x87, 0x06, 0x41, 0x08, 0x2D, 0x0C, 0x41, 0x06, 0x5F, 0x04, 0x00, 0x00}; - -// Okajima/uji.c -RECT uji_rect = {100, 100, 200, 200}; - -int s03e_dword_800C32B4 = 0x00000000; -int s03e_dword_800C32B8 = 0x00000000; -int s03e_dword_800C32BC = 0x00000000; - -RECT guncame_rect = {80, 80, 160, 160}; -SVECTOR guncame_svec = {300, 300, 300, 0}; - -extern const char anim_data_800CC124[]; -ANIMATION anm_800C3B78 = {PCX_SOCOM_F, 2, 2, 4, 1, 300, 1, 800, 800, 128, NULL, (char *)anim_data_800CC124}; - -extern const char anim_data_800CC14C[]; -ANIMATION anm_800C3B94 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800CC14C}; - -extern const char anim_data_800CC164[]; -ANIMATION anm_800C3BB0 = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 128, NULL, (char *)anim_data_800CC164}; - -extern const char anim_data_800CC1CC[]; -ANIMATION anm_800C3BCC = {PCX_SMOKE, 8, 4, 30, 1, 500, 1, 400, 400, 0, NULL, (char *)anim_data_800CC1CC}; - -extern const char anim_data_800CC244[]; -ANIMATION anm_800C3BE8 = {PCX_SMOKE, 8, 4, 30, 1, 500, 2, 400, 400, 32, NULL, (char *)anim_data_800CC244}; - -const char s03e_aMessagein_800CBF18[] = "message in\n"; -const char s03e_aMessageout_800CBF24[] = "message out\n"; -const char s03e_aMessagex_800CBF34[] = "message %X\n"; -const char s03e_aNofloorproc_800CBF40[] = "NO FLOOR PROC\n"; -const char s03e_aRotd_800CBF50[] = "ROT %d\n"; -const char s03e_aReqdoorclose_800CBF58[] = "REQ:DOOR CLOSE\n"; -const char s03e_aInitopen_800CBF68[] = "INiTOPEN\n"; -const char s03e_dword_800CBF74[] = {0x0, 0x0, 0x0, 0x0}; diff --git a/src/overlays/s03er/overlay2.c b/src/overlays/s03er/overlay2.c deleted file mode 100644 index 73ffe9e2c..000000000 --- a/src/overlays/s03er/overlay2.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "linker.h" -#include "libgcl/libgcl.h" - -const char s03e_dword_800CBFA8[] = {'e', 'v', 'p', 'a'}; -const char s03e_dword_800CBFAC[] = {'n', 'e', 'l', '.'}; -const char s03e_dword_800CBFB0[] = {'c', 0x0, '0', '0'}; - -// Game/lamp.c -const char aTexparseerror[] = "TEX:PARSE ERROR\n"; -const char aLampC[] = {'l', 'a', 'm', 'p', '.', 'c', 0x0, '0'}; - -const char s03e_dword_800CBFD0[] = {'i', 'n', 't', 'r'}; -const char s03e_dword_800CBFD4[] = {'_', 'c', 'a', 'm'}; -const char s03e_dword_800CBFD8[] = {'.', 'c', 0x0, 'g'}; - -const char aMotseC[] = "motse.c"; - -// Enemy/wall.c -const char aDestroy[] = "destroy\n"; -const char aBox01[] = "box_01"; -const char aDbx1[] = "dbx1"; -const char aDbx2[] = "dbx2"; -const char aWallC[] = {'w', 'a', 'l', 'l', '.', 'c', 0x0, 'M'}; - -// Enemy/asioto.c -const char aAsiotoSeSetErr[] = " asioto se set err \n"; -const char aAsiotoSeNoiseSetErr[] = " asioto se noise set err \n"; -const char aMigiSodesuri[] = " migi sodesuri %d \n"; -const char aAsiotoC[] = {'a', 's', 'i', 'o', 't', 'o', '.', 'c', 0x0, 'r', 'e', 'A'}; - -// Okajima/uji.c -const char aUji[] = "uji"; -const char aUjiC[] = {'u', 'j', 'i', '.', 'c', 0x0, '4', '4'}; diff --git a/src/overlays/s03er/overlay3.c b/src/overlays/s03er/overlay3.c deleted file mode 100644 index 1693558b7..000000000 --- a/src/overlays/s03er/overlay3.c +++ /dev/null @@ -1,117 +0,0 @@ -#include "linker.h" -#include "libgcl/libgcl.h" - -const SVECTOR s03e_svec_800CC0F4 = {0, -150, -400, 0}; - -const char s03e_aCameral_800CC0FC[] = "camera_l"; -const char s03e_aGcagun_800CC108[] = "gca_gun"; -const char s03e_aGcaarm_800CC110[] = "gca_arm"; -const char s03e_dword_800CC118[] = {'g', 'u', 'n', 'c'}; -const char s03e_dword_800CC11C[] = {'a', 'm', 'e', '.'}; -const char s03e_dword_800CC120[] = {'c', 0x0, '7', '9'}; - -const char anim_data_800CC124[] = {0x0, 0x1d, 0x3, 0x0}; -const char s03e_dword_800CC128[] = {0x9, 0x0, 0x10, 0x0}; -const char s03e_dword_800CC12C[] = {0x1b, 0x9, 0xb, 0xb8}; -const char s03e_dword_800CC130[] = {0x2, 0x0, 0x1, 0xf}; -const char s03e_dword_800CC134[] = {0x7, 0x3, '\n', 0xff}; -const char s03e_dword_800CC138[] = {'8', 0xff, '8', 0x2}; -const char s03e_dword_800CC13C[] = {0x0, 0x1, 0xf, 0x7}; -const char s03e_dword_800CC140[] = {0x3, '\n', 0xfe, 0x98}; -const char s03e_dword_800CC144[] = {0xfe, 0xfc, 0x2, 0x0}; -const char s03e_dword_800CC148[] = {0x1, 0xf, 0x0, 0x0}; - -const char anim_data_800CC14C[] = {0x0, 0x13, 0x1, 0x0}; -const char s03e_dword_800CC150[] = {0x5, 0xc, 0x0, 0x7}; -const char s03e_dword_800CC154[] = {0x1, 0xff, '\n', 0x0}; -const char s03e_dword_800CC158[] = {'F', 0x0, 'F', 0x8}; -const char s03e_dword_800CC15C[] = {0xf0, 0xf0, 0xf0, 0x2}; -const char s03e_dword_800CC160[] = {0x0, 0x1, 0xd, 0xf}; - -const char anim_data_800CC164[] = {0x0, '[', 0x4, 0x0}; -const char s03e_dword_800CC168[] = {0xb, 0x0, 0x1e, 0x0}; -const char s03e_dword_800CC16C[] = {'6', 0x0, 'N', 0xc}; -const char s03e_dword_800CC170[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC174[] = {'\n', 0x0, 0xc8, 0x0}; -const char s03e_dword_800CC178[] = {0xc8, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC17C[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC180[] = {0xd, 0xf, '\n', 0x1}; -const char s03e_dword_800CC184[] = {0x90, 0x1, 0x90, 0xc}; -const char s03e_dword_800CC188[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC18C[] = {'\n', 0x1, ',', 0x1}; -const char s03e_dword_800CC190[] = {',', 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC194[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC198[] = {0xd, 0xf, '\n', 0x3}; -const char s03e_dword_800CC19C[] = {' ', 0x3, ' ', 0xc}; -const char s03e_dword_800CC1A0[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1A4[] = {'\n', 0x1, 0x90, 0x1}; -const char s03e_dword_800CC1A8[] = {0x90, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC1AC[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC1B0[] = {0xd, 0xf, '\n', 0x4}; -const char s03e_dword_800CC1B4[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s03e_dword_800CC1B8[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1BC[] = {'\n', 0x1, 0xf4, 0x1}; -const char s03e_dword_800CC1C0[] = {0xf4, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC1C4[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC1C8[] = {0xd, 0xf, 0x0, 0x0}; - -const char anim_data_800CC1CC[] = {0x0, 'k', 0x4, 0x0}; -const char s03e_dword_800CC1D0[] = {0xb, 0x0, '"', 0x0}; -const char s03e_dword_800CC1D4[] = {'>', 0x0, 'Z', 0x8}; -const char s03e_dword_800CC1D8[] = {0xff, 0xff, 0xff, 0xc}; -const char s03e_dword_800CC1DC[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1E0[] = {'\n', 0x0, 0xc8, 0x0}; -const char s03e_dword_800CC1E4[] = {0xc8, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC1E8[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC1EC[] = {0xd, 0xf, 0x8, 0xff}; -const char s03e_dword_800CC1F0[] = {0xff, 0xff, '\n', 0x1}; -const char s03e_dword_800CC1F4[] = {0x90, 0x1, 0x90, 0xc}; -const char s03e_dword_800CC1F8[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC1FC[] = {'\n', 0x1, ',', 0x1}; -const char s03e_dword_800CC200[] = {',', 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC204[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC208[] = {0xd, 0xf, 0x8, 0xff}; -const char s03e_dword_800CC20C[] = {0xff, 0xff, '\n', 0x3}; -const char s03e_dword_800CC210[] = {' ', 0x3, ' ', 0xc}; -const char s03e_dword_800CC214[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC218[] = {'\n', 0x1, 0x90, 0x1}; -const char s03e_dword_800CC21C[] = {0x90, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC220[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC224[] = {0xd, 0xf, 0x8, 0xff}; -const char s03e_dword_800CC228[] = {0xff, 0xff, '\n', 0x4}; -const char s03e_dword_800CC22C[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s03e_dword_800CC230[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC234[] = {'\n', 0x1, 0xf4, 0x1}; -const char s03e_dword_800CC238[] = {0xf4, 0x8, 0xf0, 0xf0}; -const char s03e_dword_800CC23C[] = {0xf0, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC240[] = {0xd, 0xf, 0x0, 0x0}; - -const char anim_data_800CC244[] = {0x0, '[', 0x4, 0x0}; -const char s03e_dword_800CC248[] = {0xb, 0x0, 0x1e, 0x0}; -const char s03e_dword_800CC24C[] = {'6', 0x0, 'N', 0xc}; -const char s03e_dword_800CC250[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC254[] = {'\n', 0x0, 0xc8, 0x0}; -const char s03e_dword_800CC258[] = {0xc8, 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC25C[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC260[] = {0xd, 0xf, '\n', 0x1}; -const char s03e_dword_800CC264[] = {0x90, 0x1, 0x90, 0xc}; -const char s03e_dword_800CC268[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC26C[] = {'\n', 0x1, ',', 0x1}; -const char s03e_dword_800CC270[] = {',', 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC274[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC278[] = {0xd, 0xf, '\n', 0x3}; -const char s03e_dword_800CC27C[] = {' ', 0x3, ' ', 0xc}; -const char s03e_dword_800CC280[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC284[] = {'\n', 0x1, 0x90, 0x1}; -const char s03e_dword_800CC288[] = {0x90, 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC28C[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC290[] = {0xd, 0xf, '\n', 0x4}; -const char s03e_dword_800CC294[] = {0xb0, 0x4, 0xb0, 0xc}; -const char s03e_dword_800CC298[] = {0x0, 0x7, 0x1, 0xff}; -const char s03e_dword_800CC29C[] = {'\n', 0x1, 0xf4, 0x1}; -const char s03e_dword_800CC2A0[] = {0xf4, 0x8, 0xfc, 0xfc}; -const char s03e_dword_800CC2A4[] = {0xfc, 0x2, 0x0, 0x1}; -const char s03e_dword_800CC2A8[] = {0xd, 0xf}; - -void SECTION("overlay.bss") *s03e_dword_800CC6B8; -int SECTION("overlay.bss") s03e_dword_800CC6BC; diff --git a/src/overlays/s16b/Enemy/asioto.c b/src/overlays/s16b/Enemy/asioto.c index e720bf57c..79c131a23 100644 --- a/src/overlays/s16b/Enemy/asioto.c +++ b/src/overlays/s16b/Enemy/asioto.c @@ -12,10 +12,10 @@ typedef struct _Work int noise[4]; } Work; -extern const char aAsiotoSeSetErr[]; -extern const char aAsiotoSeNoiseSetErr[]; -extern const char aMigiSodesuri[]; -extern const char aAsiotoC[]; +const char aAsiotoSeSetErr[] = " asioto se set err \n"; +const char aAsiotoSeNoiseSetErr[] = " asioto se noise set err \n"; +const char aMigiSodesuri[] = " migi sodesuri %d \n"; +const char aAsiotoC[] = "asioto.c"; extern int dword_800AB9D4; extern CONTROL *GM_PlayerControl_800AB9F4; diff --git a/src/overlays/s16b/Enemy/wall.c b/src/overlays/s16b/Enemy/wall.c index 0fedcb927..a664cea3c 100644 --- a/src/overlays/s16b/Enemy/wall.c +++ b/src/overlays/s16b/Enemy/wall.c @@ -15,16 +15,17 @@ typedef struct _Work short f156; } Work; +// Enemy/wall.c +const char aDestroy[] = "destroy\n"; +const char aBox01[] = "box_01"; +const char aDbx1[] = "dbx1"; +const char aDbx2[] = "dbx2"; +const char aWallC[] = "wall.c"; + extern SVECTOR DG_ZeroVector_800AB39C; extern int GM_GameStatus_800AB3CC; extern int GM_CurrentMap_800AB9B0; -extern const char aDestroy[]; // = "destroy\n"; -extern const char aBox01[]; // = "box_01"; -extern const char aDbx1[]; // = "dbx1"; -extern const char aDbx2[]; // = "dbx2"; -extern const char aWallC[]; // = "wall.c"; - #define EXEC_LEVEL 5 void asioto_800C3278(Work *work) diff --git a/src/overlays/s16b/overlay.c b/src/overlays/s16b/overlay.c index 039758fa3..2449b5bc5 100755 --- a/src/overlays/s16b/overlay.c +++ b/src/overlays/s16b/overlay.c @@ -1,6 +1,6 @@ +#include "libgcl/hash.h" #include "libgcl/libgcl.h" #include "Enemy/wall.h" -#include "libgcl/hash.h" GV_ACT *NewAsioto_800C3E08(int name, int where, int argc, char **argv); GV_ACT *NewShakemdl_800C54E8(int name, int where, int argc, char **argv); @@ -21,17 +21,3 @@ GCL_ActorTableEntry s16bOverlayCharas[] = { 0x001F, (TGCL_ActorCreateFn)NewSepia_800C4F9C }, { 0, 0 } }; - -// Enemy/wall.c -const char aDestroy[] = "destroy\n"; -const char aBox01[] = "box_01"; -const char aDbx1[] = "dbx1"; -const char aDbx2[] = "dbx2"; -const char aWallC[] = "wall.c"; - -// Enemy/asioto.c -const char aAsiotoSeSetErr[] = " asioto se set err \n"; -const char aAsiotoSeNoiseSetErr[] = " asioto se noise set err \n"; -const char aMigiSodesuri[] = " migi sodesuri %d \n"; -const char aAsiotoC[] = "asioto.c"; - diff --git a/um/d01a.bin b/um/d01a.bin index c80abc3fdd8ee9b7c269f2dcd9119a8b1cc7aef5..bc64b17fb1f6724e299f13481af0e6816dd5154c 100644 GIT binary patch literal 13 OcmZQzfPxkV1{MGUApnU0 literal 7 OcmZQzU}#}rU;zLE8vuy_ diff --git a/um/d03a.bin b/um/d03a.bin index d6cc9b29bfeaca71e50db46f2cf7816f054b59e0..5baa65da1df70e9ffd26f3fca5e40a2c7c96ed86 100644 GIT binary patch literal 11 ScmZROVPIfTU~*vK(E|VjGXS{& literal 10 Rcmb1PU|>*Sa$w-m0{{au0J#7F diff --git a/um/d11c.bin b/um/d11c.bin index e481c6e1b307066e1666a7c3973f2e06649c1ead..f19d5a81e731da2e9c299132e9e839085595898c 100644 GIT binary patch literal 10 RcmZQzV9@c(;N=P`000JP0k{AF literal 8 PcmZS3@yg)k3Mv2q24(@c diff --git a/um/s00a.bin b/um/s00a.bin index e186a8e74b771c188c7133c3ecab00c381665441..88d8ccc34a9497024faed0597b5f2cced073ec6f 100644 GIT binary patch delta 27 icmZ3_d6JWjfhpdPhj*f(GzXV}Bm+YT!~c!^3s?YC0R|`l delta 24 dcmX@fxt^1sfr$YGxCA5_7(y5rHfk1EBx_ diff --git a/um/s01a.bin b/um/s01a.bin index e1c4281f17052c18477970136e04a6aff1c26afd..5bfd3817f65f88c7de572b612d0af8f130260bb6 100644 GIT binary patch delta 60 zcmX@e`G(W@uz-tuykJmjS!Qu|aZnLgP-<~PnbC!8Ki}|-j9pv}#T=<6X*r30`KiSM QmFz(cqQR*fId-xD0HS6UssI20 delta 17 YcmaFEd61LiumA%CL$N^RM&q3<05J;%H~;_u diff --git a/um/s03e.bin b/um/s03e.bin index 0e0879ea81a3d0bd173f798a17a4132c842fab18..a35301b643e3241dbc4992d190b778c25761040c 100644 GIT binary patch literal 38 qcmZQzU|>+3(Ae0hK9TXDvi7v##zwEk35*j!sB;2PlHuvJXVU=YNDY+$ delta 10 PcmY$BVqpM+i2`B(1bG1b diff --git a/um/s03er.bin b/um/s03er.bin index e03f541cfd97e27b256e8950a2a4172ab225f436..4b5a45ae67502c94c0ab770bcfcffe2f65f6aa20 100644 GIT binary patch literal 38 scmZQzU|=vXFi7_;N_8|bF}EymNlfvyFffSs$>-%#07^2rnHd@Y0GlWWy#N3J delta 10 PcmY$BVqpM+i2`B(1bG1b