From 5b9e9106efc7115b1075a2a86a75de034617f5b5 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Wed, 27 May 2026 14:00:36 +0200 Subject: [PATCH 01/16] Fix mSkipEventName again They WAY undersized this in the original game it seems. The event used for the Zora overflows the original buffer size by *6* bytes. Fixes https://github.com/TwilitRealm/dusklight/issues/1531 --- include/d/d_event.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d/d_event.h b/include/d/d_event.h index ed0d749db4..e465b456d7 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -196,8 +196,8 @@ public: /* 0x108 */ int mSkipTimer; /* 0x10C */ int mSkipParameter; /* 0x110 */ BOOL mIsSkipFade; -#if TARGET_PC - /* 0x114 */ char mSkipEventName[21]; +#if AVOID_UB + /* 0x114 */ char mSkipEventName[32]; #else /* 0x114 */ char mSkipEventName[20]; #endif From a9c8f44a86d92034d7dd703c7c3f8054f5bd73d0 Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Wed, 27 May 2026 19:36:19 -0400 Subject: [PATCH 02/16] Set daObjAvalanche_c Matrix Properly - Set the matrix properly instead of multiplying based on the previous one Fixes an issue where the snow would not fall when bonking if you had bloom disabled --- src/d/actor/d_a_obj_avalanche.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 4742cf1683..d905500f02 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -134,7 +134,7 @@ int daObjAvalanche_c::checkCollapse() { local_28 = l_check_pos[0]; local_1c = l_check_pos[1]; cXyz playerDist = player->current.pos - current.pos; - mDoMtx_stack_c::YrotM(-shape_angle.y); + DUSK_IF_ELSE(mDoMtx_stack_c::YrotS(-shape_angle.y), mDoMtx_stack_c::YrotM(-shape_angle.y)); mDoMtx_stack_c::multVec(&playerDist, &playerDist); if (player->current.pos.y > current.pos.y && player->current.pos.y < current.pos.y + 300.0f && playerDist.x > local_28.x && playerDist.x < local_1c.x && playerDist.z > local_28.z && From eab481661d36249fd8b46d0d724d3c1ff3d024e3 Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Wed, 27 May 2026 22:18:44 -0400 Subject: [PATCH 03/16] Add Bug Report Issue Form (#1873) --- .github/ISSUE_TEMPLATE/bug-report.yml | 95 +++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yml diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml new file mode 100644 index 0000000000..a8ff55993a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -0,0 +1,95 @@ +name: Bug Report +description: Report an issue with Dusklight +type: Bug +body: +- type: checkboxes + attributes: + label: Mods and Forks + description: Certify that this issue exists on the official builds of Dusklight + options: + - label: The bug occurs on an **official release** of Dusklight, without any forks or third-party patches installed + required: true + validations: + required: true + +- type: input + attributes: + label: Dusklight Version + placeholder: ex. 1.3.1 + validations: + required: true + +- type: textarea + attributes: + label: Bug Description + placeholder: Describe the bug you are encountering. + validations: + required: true + +- type: textarea + attributes: + label: Steps to Reproduce + placeholder: | + "1. Load save" + "2. Go to Hyrule Field" + "3. See bug" +- type: textarea + attributes: + label: Expected Behavior + placeholder: Describe what should be happening +- type: textarea + attributes: + label: Current Behavior + placeholder: Describe what is happening instead +- type: dropdown + attributes: + label: OS / Architecture + description: The Operating System and architecture you are running Dusklight on + options: + - Windows x86-64 + - Windows ARM64 + - MacOS ARM64 + - MacOS x86-64 + - Linux ARM64 + - Linux x84-64 + - Android ARM64 + - iOS ARM64 + validations: + required: true +- type: dropdown + attributes: + label: Game Region + description: The game region you are playing on + options: + - NTSC-U (North America) + - PAL (Europe) + validations: + required: true +- type: input + attributes: + label: Game Language + description: The language you are playing the game in + placeholder: ex. English, Spanish, etc. +- type: dropdown + attributes: + label: Graphics Backend + options: + - Vulkan + - D3D12 + - Metal + - D3D11 + - OpenGL ES + - Unsure / Default + default: 5 +- type: textarea + attributes: + label: Texture Packs and Mods + placeholder: List any texture packs or mods you had installed +- type: upload + attributes: + label: Logs and Other Files + description: Include any relevant logs, config files, or saves to reproduce the bug +- type: textarea + attributes: + label: Additional Context + placeholder: Any other information that might be helpful From 496ddf63bd5de997692e41f7409be2db784e35bf Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Wed, 27 May 2026 23:40:13 -0400 Subject: [PATCH 04/16] More Issue Form Cleanup (#1877) * Bug Form Formatting - Space out yml more so it's easier to skim - Add id to each section (GitHub says it does something but I'm mostly adding it for completeness) - Tidy up some capitalization/punctuation for consistency * Feature Request Form - Add a simple feature request template that requires a feature description + marks it as the right type --- .github/ISSUE_TEMPLATE/bug-report.yml | 31 ++++++++++++++++++---- .github/ISSUE_TEMPLATE/feature-request.yml | 24 +++++++++++++++++ 2 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yml diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index a8ff55993a..ab91aca242 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -3,6 +3,7 @@ description: Report an issue with Dusklight type: Bug body: - type: checkboxes + id: official-build-certification attributes: label: Mods and Forks description: Certify that this issue exists on the official builds of Dusklight @@ -13,6 +14,7 @@ body: required: true - type: input + id: dusklight-version attributes: label: Dusklight Version placeholder: ex. 1.3.1 @@ -20,31 +22,39 @@ body: required: true - type: textarea + id: bug-description attributes: label: Bug Description - placeholder: Describe the bug you are encountering. + placeholder: Describe the bug you are encountering validations: required: true - type: textarea + id: repro-steps attributes: label: Steps to Reproduce placeholder: | - "1. Load save" - "2. Go to Hyrule Field" - "3. See bug" + 1. Load save + 2. Go to Hyrule Field + 3. See bug + - type: textarea + id: expected-behavior attributes: label: Expected Behavior placeholder: Describe what should be happening + - type: textarea + id: current-behavior attributes: label: Current Behavior placeholder: Describe what is happening instead + - type: dropdown + id: system-os-architecture attributes: label: OS / Architecture - description: The Operating System and architecture you are running Dusklight on + description: The operating system and architecture you are running Dusklight on options: - Windows x86-64 - Windows ARM64 @@ -56,7 +66,9 @@ body: - iOS ARM64 validations: required: true + - type: dropdown + id: game-region attributes: label: Game Region description: The game region you are playing on @@ -65,11 +77,14 @@ body: - PAL (Europe) validations: required: true + - type: input + id: game-language attributes: label: Game Language description: The language you are playing the game in placeholder: ex. English, Spanish, etc. + - type: dropdown attributes: label: Graphics Backend @@ -81,15 +96,21 @@ body: - OpenGL ES - Unsure / Default default: 5 + - type: textarea + id: texture-packs-mods attributes: label: Texture Packs and Mods placeholder: List any texture packs or mods you had installed + - type: upload + id: logs-upload attributes: label: Logs and Other Files description: Include any relevant logs, config files, or saves to reproduce the bug + - type: textarea + id: additional-context attributes: label: Additional Context placeholder: Any other information that might be helpful diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml new file mode 100644 index 0000000000..91b85243d0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -0,0 +1,24 @@ +name: Feature Request +description: Request a new Dusklight feature. Not all requests can/will be included, but we will take these ideas into consideration. +type: Feature +body: +- type: textarea + id: feature-description + attributes: + label: Feature Description + placeholder: Describe the feature you are requesting + validations: + required: true + +- type: input + id: feature-platform + attributes: + label: Platform + description: If applicable, list the platforms this feature applies to. If it is for all platforms, feel free to leave this field blank. + placeholder: ex. Mac, Android, Steam Deck, etc. + +- type: textarea + id: feature-related-info + attributes: + label: Additional Information + placeholder: Any other information that might be helpful (related features, existing implementations, open pull requests or issues, etc.) From 5d68762590af604b592e7c28750c10dcf4f555ec Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 28 May 2026 07:12:16 +0200 Subject: [PATCH 05/16] Add a *ton* of const and constexpr around the codebase. (#1864) * Add a *ton* of const and constexpr around the codebase. This makes the codebase compile without strings being cast to non-const char*. I also went through and added constexpr where appropriate for tons of static data. * Make process definitions const too Might as well --- CMakeLists.txt | 6 +- include/SSystem/SComponent/c_lib.h | 2 +- include/SSystem/SComponent/c_xyz.h | 6 +- include/Z2AudioLib/Z2StatusMgr.h | 2 +- include/d/actor/d_a_alink.h | 2 +- include/d/actor/d_a_b_tn.h | 2 +- include/d/actor/d_a_door_boss.h | 8 +- include/d/actor/d_a_door_bossL1.h | 4 +- include/d/actor/d_a_door_dbdoor00.h | 10 +- include/d/actor/d_a_door_knob00.h | 10 +- include/d/actor/d_a_door_mbossL1.h | 16 +- include/d/actor/d_a_door_shutter.h | 12 +- include/d/actor/d_a_e_arrow.h | 2 +- include/d/actor/d_a_e_ba.h | 2 +- include/d/actor/d_a_e_rd.h | 2 +- include/d/actor/d_a_e_rdy.h | 2 +- include/d/actor/d_a_e_tt.h | 2 +- include/d/actor/d_a_e_wb.h | 2 +- include/d/actor/d_a_kago.h | 4 +- include/d/actor/d_a_mg_fish.h | 2 +- include/d/actor/d_a_mg_rod.h | 2 +- include/d/actor/d_a_myna.h | 4 +- include/d/actor/d_a_npc.h | 8 +- include/d/actor/d_a_npc2.h | 8 +- include/d/actor/d_a_npc4.h | 12 +- include/d/actor/d_a_npc_aru.h | 6 +- include/d/actor/d_a_npc_ashB.h | 2 +- include/d/actor/d_a_npc_bans.h | 6 +- include/d/actor/d_a_npc_besu.h | 6 +- include/d/actor/d_a_npc_blue_ns.h | 2 +- include/d/actor/d_a_npc_bou.h | 6 +- include/d/actor/d_a_npc_chat.h | 2 +- include/d/actor/d_a_npc_clerka.h | 6 +- include/d/actor/d_a_npc_clerkb.h | 6 +- include/d/actor/d_a_npc_clerkt.h | 6 +- include/d/actor/d_a_npc_doc.h | 6 +- include/d/actor/d_a_npc_doorboy.h | 2 +- include/d/actor/d_a_npc_fairy.h | 6 +- include/d/actor/d_a_npc_fairy_seirei.h | 6 +- include/d/actor/d_a_npc_gnd.h | 6 +- include/d/actor/d_a_npc_gra.h | 4 +- include/d/actor/d_a_npc_grc.h | 4 +- include/d/actor/d_a_npc_grd.h | 4 +- include/d/actor/d_a_npc_grm.h | 6 +- include/d/actor/d_a_npc_grmc.h | 6 +- include/d/actor/d_a_npc_gro.h | 4 +- include/d/actor/d_a_npc_grr.h | 4 +- include/d/actor/d_a_npc_grs.h | 4 +- include/d/actor/d_a_npc_grz.h | 4 +- include/d/actor/d_a_npc_gwolf.h | 4 +- include/d/actor/d_a_npc_hanjo.h | 8 +- include/d/actor/d_a_npc_hoz.h | 6 +- include/d/actor/d_a_npc_jagar.h | 6 +- include/d/actor/d_a_npc_kakashi.h | 6 +- include/d/actor/d_a_npc_kasi_kyu.h | 2 +- include/d/actor/d_a_npc_kasi_mich.h | 2 +- include/d/actor/d_a_npc_kkri.h | 6 +- include/d/actor/d_a_npc_kn.h | 12 +- include/d/actor/d_a_npc_knj.h | 6 +- include/d/actor/d_a_npc_kolin.h | 6 +- include/d/actor/d_a_npc_kolinb.h | 6 +- include/d/actor/d_a_npc_kyury.h | 6 +- include/d/actor/d_a_npc_len.h | 6 +- include/d/actor/d_a_npc_lud.h | 6 +- include/d/actor/d_a_npc_maro.h | 6 +- include/d/actor/d_a_npc_midp.h | 6 +- include/d/actor/d_a_npc_moi.h | 6 +- include/d/actor/d_a_npc_myna2.h | 4 +- include/d/actor/d_a_npc_pachi_besu.h | 6 +- include/d/actor/d_a_npc_pachi_maro.h | 6 +- include/d/actor/d_a_npc_pachi_taro.h | 6 +- include/d/actor/d_a_npc_post.h | 6 +- include/d/actor/d_a_npc_pouya.h | 6 +- include/d/actor/d_a_npc_prayer.h | 2 +- include/d/actor/d_a_npc_raca.h | 6 +- include/d/actor/d_a_npc_saru.h | 6 +- include/d/actor/d_a_npc_seib.h | 6 +- include/d/actor/d_a_npc_seic.h | 6 +- include/d/actor/d_a_npc_seid.h | 6 +- include/d/actor/d_a_npc_seira.h | 6 +- include/d/actor/d_a_npc_seira2.h | 6 +- include/d/actor/d_a_npc_seirei.h | 6 +- include/d/actor/d_a_npc_shad.h | 2 +- include/d/actor/d_a_npc_shaman.h | 6 +- include/d/actor/d_a_npc_shoe.h | 2 +- include/d/actor/d_a_npc_shop0.h | 4 +- include/d/actor/d_a_npc_sola.h | 6 +- include/d/actor/d_a_npc_soldierA.h | 4 +- include/d/actor/d_a_npc_soldierB.h | 4 +- include/d/actor/d_a_npc_taro.h | 6 +- include/d/actor/d_a_npc_the.h | 4 +- include/d/actor/d_a_npc_tkj.h | 6 +- include/d/actor/d_a_npc_toby.h | 6 +- include/d/actor/d_a_npc_uri.h | 4 +- include/d/actor/d_a_npc_wrestler.h | 12 +- include/d/actor/d_a_npc_yamid.h | 6 +- include/d/actor/d_a_npc_yamis.h | 6 +- include/d/actor/d_a_npc_yamit.h | 6 +- include/d/actor/d_a_npc_yelia.h | 4 +- include/d/actor/d_a_npc_ykm.h | 6 +- include/d/actor/d_a_npc_ykw.h | 2 +- include/d/actor/d_a_npc_zanb.h | 6 +- include/d/actor/d_a_npc_zant.h | 6 +- include/d/actor/d_a_npc_zelR.h | 4 +- include/d/actor/d_a_npc_zelRo.h | 6 +- include/d/actor/d_a_npc_zelda.h | 4 +- include/d/actor/d_a_npc_zra.h | 6 +- include/d/actor/d_a_npc_zrc.h | 4 +- include/d/actor/d_a_npc_zrz.h | 4 +- include/d/actor/d_a_obj_bed.h | 2 +- include/d/actor/d_a_obj_boumato.h | 2 +- include/d/actor/d_a_obj_carry.h | 4 +- include/d/actor/d_a_obj_keyhole.h | 2 +- include/d/actor/d_a_obj_nameplate.h | 2 +- include/d/actor/d_a_obj_oiltubo.h | 2 +- include/d/actor/d_a_obj_pdtile.h | 4 +- include/d/actor/d_a_obj_pleaf.h | 2 +- include/d/actor/d_a_obj_roten.h | 2 +- include/d/actor/d_a_obj_scannon.h | 14 +- include/d/actor/d_a_obj_sekizoa.h | 6 +- include/d/actor/d_a_obj_ss_drink.h | 4 +- include/d/actor/d_a_obj_ss_item.h | 4 +- include/d/actor/d_a_obj_swpush.h | 2 +- include/d/actor/d_a_obj_toby.h | 2 +- include/d/actor/d_a_peru.h | 2 +- include/d/actor/d_a_tag_Lv7Gate.h | 2 +- include/d/actor/d_a_tag_evt.h | 2 +- include/d/actor/d_a_tag_evtmsg.h | 2 +- include/d/actor/d_a_tag_msg.h | 4 +- include/d/actor/d_a_tbox.h | 4 +- include/d/d_camera.h | 28 +- include/d/d_com_inf_game.h | 12 +- include/d/d_event.h | 2 +- include/d/d_event_manager.h | 2 +- include/d/d_jnt_col.h | 2 +- include/d/d_msg_scrn_3select.h | 4 +- include/d/d_msg_scrn_base.h | 8 +- include/d/d_particle_name.h | 4 +- include/d/d_shop_system.h | 2 +- include/f_op/f_op_actor.h | 12 +- include/f_pc/f_pc_base.h | 2 +- include/f_pc/f_pc_leaf.h | 8 +- include/f_pc/f_pc_method.h | 8 +- include/f_pc/f_pc_profile.h | 10 +- include/f_pc/f_pc_profile_lst.h | 1586 ++++++++--------- include/global.h | 3 + .../include/JSystem/JAudio2/JAUInitializer.h | 3 +- .../include/JSystem/JKernel/JKRArchive.h | 8 +- src/SSystem/SComponent/c_lib.cpp | 2 +- src/Z2AudioLib/Z2StatusMgr.cpp | 2 +- src/d/actor/d_a_L7demo_dr.cpp | 4 +- src/d/actor/d_a_L7low_dr.cpp | 4 +- src/d/actor/d_a_L7op_demo_dr.cpp | 4 +- src/d/actor/d_a_alink.cpp | 30 +- src/d/actor/d_a_alink_horse.inc | 2 +- src/d/actor/d_a_alink_wolf.inc | 4 +- src/d/actor/d_a_alldie.cpp | 4 +- src/d/actor/d_a_andsw.cpp | 4 +- src/d/actor/d_a_andsw2.cpp | 4 +- src/d/actor/d_a_arrow.cpp | 4 +- src/d/actor/d_a_b_bh.cpp | 4 +- src/d/actor/d_a_b_bq.cpp | 4 +- src/d/actor/d_a_b_dr.cpp | 4 +- src/d/actor/d_a_b_dre.cpp | 4 +- src/d/actor/d_a_b_ds.cpp | 4 +- src/d/actor/d_a_b_gg.cpp | 4 +- src/d/actor/d_a_b_gm.cpp | 4 +- src/d/actor/d_a_b_gnd.cpp | 6 +- src/d/actor/d_a_b_go.cpp | 4 +- src/d/actor/d_a_b_gos.cpp | 6 +- src/d/actor/d_a_b_mgn.cpp | 4 +- src/d/actor/d_a_b_ob.cpp | 4 +- src/d/actor/d_a_b_oh.cpp | 4 +- src/d/actor/d_a_b_oh2.cpp | 4 +- src/d/actor/d_a_b_tn.cpp | 4 +- src/d/actor/d_a_b_yo.cpp | 4 +- src/d/actor/d_a_b_yo_ice.cpp | 4 +- src/d/actor/d_a_b_zant.cpp | 4 +- src/d/actor/d_a_b_zant_magic.cpp | 4 +- src/d/actor/d_a_b_zant_mobile.cpp | 4 +- src/d/actor/d_a_b_zant_sima.cpp | 4 +- src/d/actor/d_a_balloon_2D.cpp | 6 +- src/d/actor/d_a_bd.cpp | 4 +- src/d/actor/d_a_bg.cpp | 4 +- src/d/actor/d_a_bg_obj.cpp | 6 +- src/d/actor/d_a_boomerang.cpp | 4 +- src/d/actor/d_a_bullet.cpp | 8 +- src/d/actor/d_a_canoe.cpp | 4 +- src/d/actor/d_a_coach_2D.cpp | 6 +- src/d/actor/d_a_coach_fire.cpp | 6 +- src/d/actor/d_a_cow.cpp | 4 +- src/d/actor/d_a_crod.cpp | 4 +- src/d/actor/d_a_cstaF.cpp | 4 +- src/d/actor/d_a_cstatue.cpp | 4 +- src/d/actor/d_a_demo00.cpp | 4 +- src/d/actor/d_a_demo_item.cpp | 4 +- src/d/actor/d_a_disappear.cpp | 4 +- src/d/actor/d_a_dmidna.cpp | 4 +- src/d/actor/d_a_do.cpp | 4 +- src/d/actor/d_a_door_boss.cpp | 14 +- src/d/actor/d_a_door_bossL1.cpp | 12 +- src/d/actor/d_a_door_bossL5.cpp | 6 +- src/d/actor/d_a_door_dbdoor00.cpp | 20 +- src/d/actor/d_a_door_knob00.cpp | 24 +- src/d/actor/d_a_door_mbossL1.cpp | 30 +- src/d/actor/d_a_door_push.cpp | 10 +- src/d/actor/d_a_door_shutter.cpp | 42 +- src/d/actor/d_a_door_spiral.cpp | 6 +- src/d/actor/d_a_dshutter.cpp | 6 +- src/d/actor/d_a_e_ai.cpp | 6 +- src/d/actor/d_a_e_arrow.cpp | 4 +- src/d/actor/d_a_e_ba.cpp | 8 +- src/d/actor/d_a_e_bee.cpp | 6 +- src/d/actor/d_a_e_bg.cpp | 4 +- src/d/actor/d_a_e_bi.cpp | 6 +- src/d/actor/d_a_e_bi_leaf.cpp | 4 +- src/d/actor/d_a_e_bs.cpp | 4 +- src/d/actor/d_a_e_bu.cpp | 4 +- src/d/actor/d_a_e_bug.cpp | 4 +- src/d/actor/d_a_e_cr.cpp | 4 +- src/d/actor/d_a_e_cr_egg.cpp | 4 +- src/d/actor/d_a_e_db.cpp | 4 +- src/d/actor/d_a_e_db_leaf.cpp | 4 +- src/d/actor/d_a_e_dd.cpp | 2 +- src/d/actor/d_a_e_df.cpp | 4 +- src/d/actor/d_a_e_dk.cpp | 4 +- src/d/actor/d_a_e_dn.cpp | 4 +- src/d/actor/d_a_e_dt.cpp | 4 +- src/d/actor/d_a_e_fb.cpp | 4 +- src/d/actor/d_a_e_fk.cpp | 4 +- src/d/actor/d_a_e_fm.cpp | 4 +- src/d/actor/d_a_e_fs.cpp | 6 +- src/d/actor/d_a_e_fz.cpp | 4 +- src/d/actor/d_a_e_ga.cpp | 4 +- src/d/actor/d_a_e_gb.cpp | 6 +- src/d/actor/d_a_e_ge.cpp | 4 +- src/d/actor/d_a_e_gi.cpp | 4 +- src/d/actor/d_a_e_gm.cpp | 4 +- src/d/actor/d_a_e_gob.cpp | 4 +- src/d/actor/d_a_e_gs.cpp | 4 +- src/d/actor/d_a_e_hb.cpp | 4 +- src/d/actor/d_a_e_hb_leaf.cpp | 4 +- src/d/actor/d_a_e_hm.cpp | 4 +- src/d/actor/d_a_e_hp.cpp | 4 +- src/d/actor/d_a_e_hz.cpp | 4 +- src/d/actor/d_a_e_hzelda.cpp | 4 +- src/d/actor/d_a_e_is.cpp | 6 +- src/d/actor/d_a_e_kg.cpp | 4 +- src/d/actor/d_a_e_kk.cpp | 4 +- src/d/actor/d_a_e_kr.cpp | 4 +- src/d/actor/d_a_e_mb.cpp | 4 +- src/d/actor/d_a_e_md.cpp | 4 +- src/d/actor/d_a_e_mf.cpp | 2 +- src/d/actor/d_a_e_mk.cpp | 4 +- src/d/actor/d_a_e_mk_bo.cpp | 4 +- src/d/actor/d_a_e_mm.cpp | 4 +- src/d/actor/d_a_e_mm_mt.cpp | 4 +- src/d/actor/d_a_e_ms.cpp | 4 +- src/d/actor/d_a_e_nest.cpp | 6 +- src/d/actor/d_a_e_nz.cpp | 4 +- src/d/actor/d_a_e_oc.cpp | 4 +- src/d/actor/d_a_e_oct_bg.cpp | 4 +- src/d/actor/d_a_e_ot.cpp | 4 +- src/d/actor/d_a_e_ph.cpp | 4 +- src/d/actor/d_a_e_pm.cpp | 4 +- src/d/actor/d_a_e_po.cpp | 6 +- src/d/actor/d_a_e_pz.cpp | 4 +- src/d/actor/d_a_e_rb.cpp | 4 +- src/d/actor/d_a_e_rd.cpp | 4 +- src/d/actor/d_a_e_rdb.cpp | 6 +- src/d/actor/d_a_e_rdy.cpp | 4 +- src/d/actor/d_a_e_s1.cpp | 4 +- src/d/actor/d_a_e_sb.cpp | 4 +- src/d/actor/d_a_e_sf.cpp | 4 +- src/d/actor/d_a_e_sg.cpp | 4 +- src/d/actor/d_a_e_sh.cpp | 4 +- src/d/actor/d_a_e_sm.cpp | 4 +- src/d/actor/d_a_e_sm2.cpp | 4 +- src/d/actor/d_a_e_st.cpp | 6 +- src/d/actor/d_a_e_st_line.cpp | 4 +- src/d/actor/d_a_e_sw.cpp | 4 +- src/d/actor/d_a_e_th.cpp | 4 +- src/d/actor/d_a_e_th_ball.cpp | 4 +- src/d/actor/d_a_e_tk.cpp | 4 +- src/d/actor/d_a_e_tk2.cpp | 4 +- src/d/actor/d_a_e_tk_ball.cpp | 4 +- src/d/actor/d_a_e_tt.cpp | 4 +- src/d/actor/d_a_e_vt.cpp | 4 +- src/d/actor/d_a_e_warpappear.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 60 +- src/d/actor/d_a_e_ws.cpp | 4 +- src/d/actor/d_a_e_ww.cpp | 4 +- src/d/actor/d_a_e_yc.cpp | 4 +- src/d/actor/d_a_e_yd.cpp | 4 +- src/d/actor/d_a_e_yd_leaf.cpp | 4 +- src/d/actor/d_a_e_yg.cpp | 4 +- src/d/actor/d_a_e_yh.cpp | 4 +- src/d/actor/d_a_e_yk.cpp | 4 +- src/d/actor/d_a_e_ym.cpp | 4 +- src/d/actor/d_a_e_ym_tag.cpp | 4 +- src/d/actor/d_a_e_ymb.cpp | 4 +- src/d/actor/d_a_e_yr.cpp | 4 +- src/d/actor/d_a_e_zh.cpp | 8 +- src/d/actor/d_a_e_zm.cpp | 6 +- src/d/actor/d_a_e_zs.cpp | 4 +- src/d/actor/d_a_econt.cpp | 4 +- src/d/actor/d_a_ep.cpp | 8 +- src/d/actor/d_a_formation_mng.cpp | 4 +- src/d/actor/d_a_fr.cpp | 4 +- src/d/actor/d_a_grass.cpp | 4 +- src/d/actor/d_a_guard_mng.cpp | 4 +- src/d/actor/d_a_hitobj.cpp | 4 +- src/d/actor/d_a_horse.cpp | 36 +- src/d/actor/d_a_hozelda.cpp | 4 +- src/d/actor/d_a_izumi_gate.cpp | 6 +- src/d/actor/d_a_kago.cpp | 4 +- src/d/actor/d_a_kytag00.cpp | 4 +- src/d/actor/d_a_kytag01.cpp | 4 +- src/d/actor/d_a_kytag02.cpp | 4 +- src/d/actor/d_a_kytag03.cpp | 4 +- src/d/actor/d_a_kytag04.cpp | 4 +- src/d/actor/d_a_kytag05.cpp | 4 +- src/d/actor/d_a_kytag06.cpp | 4 +- src/d/actor/d_a_kytag07.cpp | 4 +- src/d/actor/d_a_kytag08.cpp | 4 +- src/d/actor/d_a_kytag09.cpp | 4 +- src/d/actor/d_a_kytag10.cpp | 4 +- src/d/actor/d_a_kytag11.cpp | 4 +- src/d/actor/d_a_kytag12.cpp | 4 +- src/d/actor/d_a_kytag13.cpp | 4 +- src/d/actor/d_a_kytag14.cpp | 4 +- src/d/actor/d_a_kytag15.cpp | 4 +- src/d/actor/d_a_kytag16.cpp | 4 +- src/d/actor/d_a_kytag17.cpp | 4 +- src/d/actor/d_a_mant.cpp | 4 +- src/d/actor/d_a_mg_fish.cpp | 6 +- src/d/actor/d_a_mg_fshop.cpp | 4 +- src/d/actor/d_a_mg_rod.cpp | 4 +- src/d/actor/d_a_midna.cpp | 4 +- src/d/actor/d_a_mirror.cpp | 8 +- src/d/actor/d_a_movie_player.cpp | 4 +- src/d/actor/d_a_myna.cpp | 16 +- src/d/actor/d_a_nbomb.cpp | 4 +- src/d/actor/d_a_ni.cpp | 4 +- src/d/actor/d_a_no_chg_room.cpp | 4 +- src/d/actor/d_a_npc.cpp | 4 +- src/d/actor/d_a_npc2.cpp | 6 +- src/d/actor/d_a_npc4.cpp | 12 +- src/d/actor/d_a_npc_aru.cpp | 28 +- src/d/actor/d_a_npc_ash.cpp | 22 +- src/d/actor/d_a_npc_ashB.cpp | 18 +- src/d/actor/d_a_npc_bans.cpp | 34 +- src/d/actor/d_a_npc_besu.cpp | 38 +- src/d/actor/d_a_npc_blue_ns.cpp | 14 +- src/d/actor/d_a_npc_bou.cpp | 36 +- src/d/actor/d_a_npc_bouS.cpp | 18 +- src/d/actor/d_a_npc_cd.cpp | 64 +- src/d/actor/d_a_npc_cd2.cpp | 64 +- src/d/actor/d_a_npc_cdn3.cpp | 4 +- src/d/actor/d_a_npc_chat.cpp | 100 +- src/d/actor/d_a_npc_chin.cpp | 16 +- src/d/actor/d_a_npc_clerka.cpp | 26 +- src/d/actor/d_a_npc_clerkb.cpp | 26 +- src/d/actor/d_a_npc_clerkt.cpp | 26 +- src/d/actor/d_a_npc_coach.cpp | 12 +- src/d/actor/d_a_npc_df.cpp | 4 +- src/d/actor/d_a_npc_doc.cpp | 26 +- src/d/actor/d_a_npc_doorboy.cpp | 16 +- src/d/actor/d_a_npc_drainSol.cpp | 12 +- src/d/actor/d_a_npc_du.cpp | 4 +- src/d/actor/d_a_npc_fairy.cpp | 32 +- src/d/actor/d_a_npc_fairy_seirei.cpp | 24 +- src/d/actor/d_a_npc_fguard.cpp | 4 +- src/d/actor/d_a_npc_fish.cpp | 4 +- src/d/actor/d_a_npc_gnd.cpp | 26 +- src/d/actor/d_a_npc_gra.cpp | 52 +- src/d/actor/d_a_npc_grc.cpp | 32 +- src/d/actor/d_a_npc_grd.cpp | 32 +- src/d/actor/d_a_npc_grm.cpp | 26 +- src/d/actor/d_a_npc_grmc.cpp | 26 +- src/d/actor/d_a_npc_gro.cpp | 38 +- src/d/actor/d_a_npc_grr.cpp | 34 +- src/d/actor/d_a_npc_grs.cpp | 39 +- src/d/actor/d_a_npc_grz.cpp | 36 +- src/d/actor/d_a_npc_guard.cpp | 4 +- src/d/actor/d_a_npc_gwolf.cpp | 34 +- src/d/actor/d_a_npc_hanjo.cpp | 34 +- src/d/actor/d_a_npc_henna.cpp | 4 +- src/d/actor/d_a_npc_henna0.cpp | 2 +- src/d/actor/d_a_npc_hoz.cpp | 28 +- src/d/actor/d_a_npc_impal.cpp | 18 +- src/d/actor/d_a_npc_inko.cpp | 4 +- src/d/actor/d_a_npc_ins.cpp | 18 +- src/d/actor/d_a_npc_jagar.cpp | 30 +- src/d/actor/d_a_npc_kakashi.cpp | 26 +- src/d/actor/d_a_npc_kasi_hana.cpp | 14 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 16 +- src/d/actor/d_a_npc_kasi_mich.cpp | 16 +- src/d/actor/d_a_npc_kdk.cpp | 2 +- src/d/actor/d_a_npc_kkri.cpp | 28 +- src/d/actor/d_a_npc_kn.cpp | 34 +- src/d/actor/d_a_npc_kn_base.inc | 4 +- src/d/actor/d_a_npc_knj.cpp | 26 +- src/d/actor/d_a_npc_kolin.cpp | 36 +- src/d/actor/d_a_npc_kolinb.cpp | 28 +- src/d/actor/d_a_npc_ks.cpp | 6 +- src/d/actor/d_a_npc_kyury.cpp | 28 +- src/d/actor/d_a_npc_len.cpp | 28 +- src/d/actor/d_a_npc_lf.cpp | 4 +- src/d/actor/d_a_npc_lud.cpp | 32 +- src/d/actor/d_a_npc_maro.cpp | 32 +- src/d/actor/d_a_npc_midp.cpp | 26 +- src/d/actor/d_a_npc_mk.cpp | 4 +- src/d/actor/d_a_npc_moi.cpp | 34 +- src/d/actor/d_a_npc_moir.cpp | 24 +- src/d/actor/d_a_npc_myna2.cpp | 32 +- src/d/actor/d_a_npc_ne.cpp | 4 +- src/d/actor/d_a_npc_p2.cpp | 4 +- src/d/actor/d_a_npc_pachi_besu.cpp | 34 +- src/d/actor/d_a_npc_pachi_maro.cpp | 32 +- src/d/actor/d_a_npc_pachi_taro.cpp | 32 +- src/d/actor/d_a_npc_passer.cpp | 4 +- src/d/actor/d_a_npc_passer2.cpp | 4 +- src/d/actor/d_a_npc_post.cpp | 32 +- src/d/actor/d_a_npc_pouya.cpp | 28 +- src/d/actor/d_a_npc_prayer.cpp | 14 +- src/d/actor/d_a_npc_raca.cpp | 26 +- src/d/actor/d_a_npc_rafrel.cpp | 24 +- src/d/actor/d_a_npc_saru.cpp | 26 +- src/d/actor/d_a_npc_seib.cpp | 26 +- src/d/actor/d_a_npc_seic.cpp | 26 +- src/d/actor/d_a_npc_seid.cpp | 26 +- src/d/actor/d_a_npc_seira.cpp | 28 +- src/d/actor/d_a_npc_seira2.cpp | 26 +- src/d/actor/d_a_npc_seirei.cpp | 28 +- src/d/actor/d_a_npc_shad.cpp | 26 +- src/d/actor/d_a_npc_shaman.cpp | 26 +- src/d/actor/d_a_npc_shoe.cpp | 16 +- src/d/actor/d_a_npc_shop0.cpp | 14 +- src/d/actor/d_a_npc_shop_maro.cpp | 4 +- src/d/actor/d_a_npc_sola.cpp | 26 +- src/d/actor/d_a_npc_soldierA.cpp | 26 +- src/d/actor/d_a_npc_soldierB.cpp | 26 +- src/d/actor/d_a_npc_sq.cpp | 4 +- src/d/actor/d_a_npc_taro.cpp | 40 +- src/d/actor/d_a_npc_the.cpp | 32 +- src/d/actor/d_a_npc_theB.cpp | 16 +- src/d/actor/d_a_npc_tk.cpp | 8 +- src/d/actor/d_a_npc_tkc.cpp | 16 +- src/d/actor/d_a_npc_tkj.cpp | 26 +- src/d/actor/d_a_npc_tkj2.cpp | 4 +- src/d/actor/d_a_npc_tks.cpp | 26 +- src/d/actor/d_a_npc_toby.cpp | 32 +- src/d/actor/d_a_npc_tr.cpp | 4 +- src/d/actor/d_a_npc_uri.cpp | 34 +- src/d/actor/d_a_npc_worm.cpp | 4 +- src/d/actor/d_a_npc_wrestler.cpp | 38 +- src/d/actor/d_a_npc_yamid.cpp | 26 +- src/d/actor/d_a_npc_yamis.cpp | 26 +- src/d/actor/d_a_npc_yamit.cpp | 26 +- src/d/actor/d_a_npc_yelia.cpp | 36 +- src/d/actor/d_a_npc_ykm.cpp | 32 +- src/d/actor/d_a_npc_ykw.cpp | 28 +- src/d/actor/d_a_npc_zanb.cpp | 26 +- src/d/actor/d_a_npc_zant.cpp | 26 +- src/d/actor/d_a_npc_zelR.cpp | 24 +- src/d/actor/d_a_npc_zelRo.cpp | 26 +- src/d/actor/d_a_npc_zelda.cpp | 22 +- src/d/actor/d_a_npc_zra.cpp | 44 +- src/d/actor/d_a_npc_zrc.cpp | 36 +- src/d/actor/d_a_npc_zrz.cpp | 34 +- src/d/actor/d_a_obj_Lv5Key.cpp | 6 +- src/d/actor/d_a_obj_Turara.cpp | 4 +- src/d/actor/d_a_obj_TvCdlst.cpp | 4 +- src/d/actor/d_a_obj_Y_taihou.cpp | 4 +- src/d/actor/d_a_obj_amiShutter.cpp | 2 +- src/d/actor/d_a_obj_ari.cpp | 4 +- src/d/actor/d_a_obj_automata.cpp | 8 +- src/d/actor/d_a_obj_avalanche.cpp | 14 +- src/d/actor/d_a_obj_balloon.cpp | 4 +- src/d/actor/d_a_obj_barDesk.cpp | 4 +- src/d/actor/d_a_obj_batta.cpp | 4 +- src/d/actor/d_a_obj_bbox.cpp | 6 +- src/d/actor/d_a_obj_bed.cpp | 8 +- src/d/actor/d_a_obj_bemos.cpp | 24 +- src/d/actor/d_a_obj_bhashi.cpp | 6 +- src/d/actor/d_a_obj_bhbridge.cpp | 6 +- src/d/actor/d_a_obj_bk_leaf.cpp | 4 +- src/d/actor/d_a_obj_bkdoor.cpp | 6 +- src/d/actor/d_a_obj_bky_rock.cpp | 6 +- src/d/actor/d_a_obj_bmWindow.cpp | 4 +- src/d/actor/d_a_obj_bmshutter.cpp | 4 +- src/d/actor/d_a_obj_bombf.cpp | 4 +- src/d/actor/d_a_obj_bosswarp.cpp | 8 +- src/d/actor/d_a_obj_boumato.cpp | 8 +- src/d/actor/d_a_obj_brakeeff.cpp | 2 +- src/d/actor/d_a_obj_brg.cpp | 8 +- src/d/actor/d_a_obj_bsGate.cpp | 4 +- src/d/actor/d_a_obj_bubblePilar.cpp | 4 +- src/d/actor/d_a_obj_burnbox.cpp | 2 +- src/d/actor/d_a_obj_carry.cpp | 20 +- src/d/actor/d_a_obj_catdoor.cpp | 4 +- src/d/actor/d_a_obj_cb.cpp | 4 +- src/d/actor/d_a_obj_cblock.cpp | 8 +- src/d/actor/d_a_obj_cboard.cpp | 10 +- src/d/actor/d_a_obj_cdoor.cpp | 6 +- src/d/actor/d_a_obj_chandelier.cpp | 6 +- src/d/actor/d_a_obj_chest.cpp | 6 +- src/d/actor/d_a_obj_cho.cpp | 4 +- src/d/actor/d_a_obj_cowdoor.cpp | 4 +- src/d/actor/d_a_obj_crope.cpp | 4 +- src/d/actor/d_a_obj_crvfence.cpp | 6 +- src/d/actor/d_a_obj_crvgate.cpp | 6 +- src/d/actor/d_a_obj_crvhahen.cpp | 4 +- src/d/actor/d_a_obj_crvlh_down.cpp | 6 +- src/d/actor/d_a_obj_crvlh_up.cpp | 6 +- src/d/actor/d_a_obj_crvsteel.cpp | 6 +- src/d/actor/d_a_obj_crystal.cpp | 6 +- src/d/actor/d_a_obj_cwall.cpp | 8 +- src/d/actor/d_a_obj_damCps.cpp | 6 +- src/d/actor/d_a_obj_dan.cpp | 4 +- src/d/actor/d_a_obj_digholl.cpp | 4 +- src/d/actor/d_a_obj_digplace.cpp | 4 +- src/d/actor/d_a_obj_digsnow.cpp | 6 +- src/d/actor/d_a_obj_dmelevator.cpp | 6 +- src/d/actor/d_a_obj_drop.cpp | 4 +- src/d/actor/d_a_obj_dust.cpp | 4 +- src/d/actor/d_a_obj_eff.cpp | 4 +- src/d/actor/d_a_obj_enemy_create.cpp | 4 +- src/d/actor/d_a_obj_fallobj.cpp | 8 +- src/d/actor/d_a_obj_fan.cpp | 6 +- src/d/actor/d_a_obj_fchain.cpp | 4 +- src/d/actor/d_a_obj_fireWood.cpp | 6 +- src/d/actor/d_a_obj_fireWood2.cpp | 6 +- src/d/actor/d_a_obj_firepillar.cpp | 6 +- src/d/actor/d_a_obj_firepillar2.cpp | 8 +- src/d/actor/d_a_obj_flag.cpp | 4 +- src/d/actor/d_a_obj_flag2.cpp | 4 +- src/d/actor/d_a_obj_flag3.cpp | 4 +- src/d/actor/d_a_obj_fmobj.cpp | 4 +- src/d/actor/d_a_obj_food.cpp | 4 +- src/d/actor/d_a_obj_fw.cpp | 4 +- src/d/actor/d_a_obj_gadget.cpp | 6 +- src/d/actor/d_a_obj_ganonwall.cpp | 8 +- src/d/actor/d_a_obj_ganonwall2.cpp | 8 +- src/d/actor/d_a_obj_gb.cpp | 4 +- src/d/actor/d_a_obj_geyser.cpp | 8 +- src/d/actor/d_a_obj_glowSphere.cpp | 6 +- src/d/actor/d_a_obj_gm.cpp | 4 +- src/d/actor/d_a_obj_goGate.cpp | 4 +- src/d/actor/d_a_obj_gomikabe.cpp | 6 +- src/d/actor/d_a_obj_gpTaru.cpp | 4 +- src/d/actor/d_a_obj_gra2.cpp | 40 +- src/d/actor/d_a_obj_graWall.cpp | 4 +- src/d/actor/d_a_obj_gra_rock.cpp | 6 +- src/d/actor/d_a_obj_grave_stone.cpp | 4 +- src/d/actor/d_a_obj_groundwater.cpp | 4 +- src/d/actor/d_a_obj_grz_rock.cpp | 6 +- src/d/actor/d_a_obj_h_saku.cpp | 6 +- src/d/actor/d_a_obj_hakai_brl.cpp | 6 +- src/d/actor/d_a_obj_hakai_ftr.cpp | 4 +- src/d/actor/d_a_obj_hasu2.cpp | 4 +- src/d/actor/d_a_obj_hata.cpp | 6 +- src/d/actor/d_a_obj_hb.cpp | 4 +- src/d/actor/d_a_obj_hbombkoya.cpp | 6 +- src/d/actor/d_a_obj_heavySw.cpp | 4 +- src/d/actor/d_a_obj_hfuta.cpp | 6 +- src/d/actor/d_a_obj_hhashi.cpp | 6 +- src/d/actor/d_a_obj_hsTarget.cpp | 4 +- src/d/actor/d_a_obj_ice_l.cpp | 6 +- src/d/actor/d_a_obj_ice_s.cpp | 6 +- src/d/actor/d_a_obj_iceblock.cpp | 6 +- src/d/actor/d_a_obj_iceleaf.cpp | 6 +- src/d/actor/d_a_obj_ihasi.cpp | 4 +- src/d/actor/d_a_obj_ikada.cpp | 6 +- src/d/actor/d_a_obj_inobone.cpp | 4 +- src/d/actor/d_a_obj_ita.cpp | 6 +- src/d/actor/d_a_obj_itamato.cpp | 6 +- src/d/actor/d_a_obj_item.cpp | 4 +- src/d/actor/d_a_obj_ito.cpp | 4 +- src/d/actor/d_a_obj_kabuto.cpp | 4 +- src/d/actor/d_a_obj_kag.cpp | 4 +- src/d/actor/d_a_obj_kage.cpp | 4 +- src/d/actor/d_a_obj_kago.cpp | 8 +- src/d/actor/d_a_obj_kaisou.cpp | 6 +- src/d/actor/d_a_obj_kamakiri.cpp | 4 +- src/d/actor/d_a_obj_kanban2.cpp | 18 +- src/d/actor/d_a_obj_kantera.cpp | 4 +- src/d/actor/d_a_obj_katatsumuri.cpp | 4 +- src/d/actor/d_a_obj_kazeneko.cpp | 6 +- src/d/actor/d_a_obj_kbacket.cpp | 6 +- src/d/actor/d_a_obj_kbox.cpp | 4 +- src/d/actor/d_a_obj_key.cpp | 4 +- src/d/actor/d_a_obj_keyhole.cpp | 18 +- src/d/actor/d_a_obj_kgate.cpp | 12 +- src/d/actor/d_a_obj_ki.cpp | 4 +- src/d/actor/d_a_obj_kiPot.cpp | 6 +- src/d/actor/d_a_obj_kita.cpp | 4 +- src/d/actor/d_a_obj_kjgjs.cpp | 4 +- src/d/actor/d_a_obj_kkanban.cpp | 6 +- src/d/actor/d_a_obj_klift00.cpp | 4 +- src/d/actor/d_a_obj_knBullet.cpp | 4 +- src/d/actor/d_a_obj_kshutter.cpp | 28 +- src/d/actor/d_a_obj_ktOnFire.cpp | 6 +- src/d/actor/d_a_obj_kuwagata.cpp | 4 +- src/d/actor/d_a_obj_kwheel00.cpp | 4 +- src/d/actor/d_a_obj_kwheel01.cpp | 4 +- src/d/actor/d_a_obj_kznkarm.cpp | 6 +- src/d/actor/d_a_obj_ladder.cpp | 4 +- src/d/actor/d_a_obj_laundry.cpp | 6 +- src/d/actor/d_a_obj_laundry_rope.cpp | 6 +- src/d/actor/d_a_obj_lbox.cpp | 4 +- src/d/actor/d_a_obj_life_container.cpp | 4 +- src/d/actor/d_a_obj_lp.cpp | 4 +- src/d/actor/d_a_obj_lv1Candle00.cpp | 4 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 4 +- src/d/actor/d_a_obj_lv2Candle.cpp | 6 +- src/d/actor/d_a_obj_lv3Candle.cpp | 6 +- src/d/actor/d_a_obj_lv3Water.cpp | 6 +- src/d/actor/d_a_obj_lv3Water2.cpp | 6 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 4 +- src/d/actor/d_a_obj_lv3saka00.cpp | 6 +- src/d/actor/d_a_obj_lv3waterEff.cpp | 4 +- src/d/actor/d_a_obj_lv4CandleDemoTag.cpp | 4 +- src/d/actor/d_a_obj_lv4CandleTag.cpp | 4 +- src/d/actor/d_a_obj_lv4EdShutter.cpp | 4 +- src/d/actor/d_a_obj_lv4Gate.cpp | 4 +- src/d/actor/d_a_obj_lv4HsTarget.cpp | 4 +- src/d/actor/d_a_obj_lv4PoGate.cpp | 4 +- src/d/actor/d_a_obj_lv4RailWall.cpp | 6 +- src/d/actor/d_a_obj_lv4SlideWall.cpp | 4 +- src/d/actor/d_a_obj_lv4bridge.cpp | 6 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 6 +- src/d/actor/d_a_obj_lv4digsand.cpp | 6 +- src/d/actor/d_a_obj_lv4floor.cpp | 6 +- src/d/actor/d_a_obj_lv4gear.cpp | 6 +- src/d/actor/d_a_obj_lv4prelvtr.cpp | 6 +- src/d/actor/d_a_obj_lv4prwall.cpp | 6 +- src/d/actor/d_a_obj_lv4sand.cpp | 6 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 4 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 4 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 4 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 6 +- src/d/actor/d_a_obj_lv5yiblltray.cpp | 6 +- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 4 +- src/d/actor/d_a_obj_lv6FurikoTrap.cpp | 4 +- src/d/actor/d_a_obj_lv6Lblock.cpp | 4 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 6 +- src/d/actor/d_a_obj_lv6SzGate.cpp | 6 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 6 +- src/d/actor/d_a_obj_lv6TogeRoll.cpp | 4 +- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 6 +- src/d/actor/d_a_obj_lv6bemos.cpp | 8 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 32 +- src/d/actor/d_a_obj_lv6egate.cpp | 6 +- src/d/actor/d_a_obj_lv6elevta.cpp | 6 +- src/d/actor/d_a_obj_lv6swturn.cpp | 6 +- src/d/actor/d_a_obj_lv7BsGate.cpp | 12 +- src/d/actor/d_a_obj_lv7PropellerY.cpp | 12 +- src/d/actor/d_a_obj_lv7bridge.cpp | 6 +- src/d/actor/d_a_obj_lv8KekkaiTrap.cpp | 12 +- src/d/actor/d_a_obj_lv8Lift.cpp | 4 +- src/d/actor/d_a_obj_lv8OptiLift.cpp | 4 +- src/d/actor/d_a_obj_lv8UdFloor.cpp | 6 +- src/d/actor/d_a_obj_lv9SwShutter.cpp | 4 +- src/d/actor/d_a_obj_magLift.cpp | 4 +- src/d/actor/d_a_obj_magLiftRot.cpp | 6 +- src/d/actor/d_a_obj_magne_arm.cpp | 10 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_master_sword.cpp | 6 +- src/d/actor/d_a_obj_mato.cpp | 4 +- src/d/actor/d_a_obj_metalbox.cpp | 4 +- src/d/actor/d_a_obj_mgate.cpp | 14 +- src/d/actor/d_a_obj_mhole.cpp | 4 +- src/d/actor/d_a_obj_mie.cpp | 6 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 6 +- src/d/actor/d_a_obj_mirror_chain.cpp | 4 +- src/d/actor/d_a_obj_mirror_sand.cpp | 6 +- src/d/actor/d_a_obj_mirror_screw.cpp | 4 +- src/d/actor/d_a_obj_mirror_table.cpp | 4 +- src/d/actor/d_a_obj_movebox.cpp | 4 +- src/d/actor/d_a_obj_msima.cpp | 4 +- src/d/actor/d_a_obj_mvstair.cpp | 6 +- src/d/actor/d_a_obj_myogan.cpp | 4 +- src/d/actor/d_a_obj_nagaisu.cpp | 6 +- src/d/actor/d_a_obj_nameplate.cpp | 6 +- src/d/actor/d_a_obj_nan.cpp | 4 +- src/d/actor/d_a_obj_ndoor.cpp | 4 +- src/d/actor/d_a_obj_nougu.cpp | 6 +- src/d/actor/d_a_obj_octhashi.cpp | 6 +- src/d/actor/d_a_obj_oiltubo.cpp | 14 +- src/d/actor/d_a_obj_onsen.cpp | 6 +- src/d/actor/d_a_obj_onsenFire.cpp | 4 +- src/d/actor/d_a_obj_onsenTaru.cpp | 4 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 6 +- src/d/actor/d_a_obj_pdoor.cpp | 8 +- src/d/actor/d_a_obj_pdtile.cpp | 30 +- src/d/actor/d_a_obj_pdwall.cpp | 6 +- src/d/actor/d_a_obj_picture.cpp | 6 +- src/d/actor/d_a_obj_pillar.cpp | 6 +- src/d/actor/d_a_obj_pleaf.cpp | 8 +- src/d/actor/d_a_obj_poCandle.cpp | 4 +- src/d/actor/d_a_obj_poFire.cpp | 6 +- src/d/actor/d_a_obj_poTbox.cpp | 12 +- src/d/actor/d_a_obj_prop.cpp | 4 +- src/d/actor/d_a_obj_pumpkin.cpp | 8 +- src/d/actor/d_a_obj_rcircle.cpp | 6 +- src/d/actor/d_a_obj_rfHole.cpp | 4 +- src/d/actor/d_a_obj_rgate.cpp | 10 +- src/d/actor/d_a_obj_riverrock.cpp | 6 +- src/d/actor/d_a_obj_rock.cpp | 4 +- src/d/actor/d_a_obj_rope_bridge.cpp | 16 +- src/d/actor/d_a_obj_rotBridge.cpp | 6 +- src/d/actor/d_a_obj_rotTrap.cpp | 4 +- src/d/actor/d_a_obj_roten.cpp | 12 +- src/d/actor/d_a_obj_rstair.cpp | 6 +- src/d/actor/d_a_obj_rw.cpp | 6 +- src/d/actor/d_a_obj_sWallShutter.cpp | 6 +- src/d/actor/d_a_obj_saidan.cpp | 4 +- src/d/actor/d_a_obj_sakuita.cpp | 6 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 6 +- src/d/actor/d_a_obj_scannon.cpp | 44 +- src/d/actor/d_a_obj_scannon_crs.cpp | 12 +- src/d/actor/d_a_obj_scannon_ten.cpp | 12 +- src/d/actor/d_a_obj_sekidoor.cpp | 6 +- src/d/actor/d_a_obj_sekizo.cpp | 6 +- src/d/actor/d_a_obj_sekizoa.cpp | 38 +- src/d/actor/d_a_obj_shield.cpp | 4 +- src/d/actor/d_a_obj_sm_door.cpp | 6 +- src/d/actor/d_a_obj_smallkey.cpp | 4 +- src/d/actor/d_a_obj_smgdoor.cpp | 16 +- src/d/actor/d_a_obj_smoke.cpp | 4 +- src/d/actor/d_a_obj_smtile.cpp | 6 +- src/d/actor/d_a_obj_smw_stone.cpp | 6 +- src/d/actor/d_a_obj_snowEffTag.cpp | 4 +- src/d/actor/d_a_obj_snow_soup.cpp | 6 +- src/d/actor/d_a_obj_so.cpp | 6 +- src/d/actor/d_a_obj_spinLift.cpp | 6 +- src/d/actor/d_a_obj_ss_drink.cpp | 12 +- src/d/actor/d_a_obj_ss_item.cpp | 14 +- src/d/actor/d_a_obj_stairBlock.cpp | 4 +- src/d/actor/d_a_obj_stick.cpp | 6 +- src/d/actor/d_a_obj_stone.cpp | 6 +- src/d/actor/d_a_obj_stoneMark.cpp | 6 +- src/d/actor/d_a_obj_stopper.cpp | 4 +- src/d/actor/d_a_obj_stopper2.cpp | 12 +- src/d/actor/d_a_obj_suisya.cpp | 4 +- src/d/actor/d_a_obj_sw.cpp | 4 +- src/d/actor/d_a_obj_swBallA.cpp | 6 +- src/d/actor/d_a_obj_swBallB.cpp | 6 +- src/d/actor/d_a_obj_swBallC.cpp | 12 +- src/d/actor/d_a_obj_swLight.cpp | 8 +- src/d/actor/d_a_obj_swchain.cpp | 6 +- src/d/actor/d_a_obj_swhang.cpp | 12 +- src/d/actor/d_a_obj_sword.cpp | 6 +- src/d/actor/d_a_obj_swpropeller.cpp | 8 +- src/d/actor/d_a_obj_swpush.cpp | 6 +- src/d/actor/d_a_obj_swpush2.cpp | 2 +- src/d/actor/d_a_obj_swpush5.cpp | 6 +- src/d/actor/d_a_obj_swspinner.cpp | 6 +- src/d/actor/d_a_obj_swturn.cpp | 6 +- src/d/actor/d_a_obj_syRock.cpp | 4 +- src/d/actor/d_a_obj_szbridge.cpp | 4 +- src/d/actor/d_a_obj_taFence.cpp | 4 +- src/d/actor/d_a_obj_table.cpp | 6 +- src/d/actor/d_a_obj_takaraDai.cpp | 4 +- src/d/actor/d_a_obj_tatigi.cpp | 6 +- src/d/actor/d_a_obj_ten.cpp | 4 +- src/d/actor/d_a_obj_testcube.cpp | 4 +- src/d/actor/d_a_obj_tgake.cpp | 6 +- src/d/actor/d_a_obj_thashi.cpp | 6 +- src/d/actor/d_a_obj_thdoor.cpp | 12 +- src/d/actor/d_a_obj_timeFire.cpp | 4 +- src/d/actor/d_a_obj_timer.cpp | 2 +- src/d/actor/d_a_obj_tks.cpp | 14 +- src/d/actor/d_a_obj_tmoon.cpp | 4 +- src/d/actor/d_a_obj_toaru_maki.cpp | 6 +- src/d/actor/d_a_obj_toby.cpp | 10 +- src/d/actor/d_a_obj_tobyhouse.cpp | 16 +- src/d/actor/d_a_obj_togeTrap.cpp | 4 +- src/d/actor/d_a_obj_tombo.cpp | 4 +- src/d/actor/d_a_obj_tornado.cpp | 4 +- src/d/actor/d_a_obj_tornado2.cpp | 4 +- src/d/actor/d_a_obj_tp.cpp | 4 +- src/d/actor/d_a_obj_treesh.cpp | 6 +- src/d/actor/d_a_obj_twGate.cpp | 6 +- src/d/actor/d_a_obj_udoor.cpp | 4 +- src/d/actor/d_a_obj_usaku.cpp | 4 +- src/d/actor/d_a_obj_vground.cpp | 6 +- src/d/actor/d_a_obj_volcball.cpp | 4 +- src/d/actor/d_a_obj_volcbom.cpp | 16 +- src/d/actor/d_a_obj_warp_kbrg.cpp | 16 +- src/d/actor/d_a_obj_warp_obrg.cpp | 12 +- src/d/actor/d_a_obj_waterGate.cpp | 4 +- src/d/actor/d_a_obj_waterPillar.cpp | 2 +- src/d/actor/d_a_obj_waterfall.cpp | 6 +- src/d/actor/d_a_obj_wchain.cpp | 4 +- src/d/actor/d_a_obj_wdStick.cpp | 4 +- src/d/actor/d_a_obj_web0.cpp | 4 +- src/d/actor/d_a_obj_web1.cpp | 6 +- src/d/actor/d_a_obj_well_cover.cpp | 6 +- src/d/actor/d_a_obj_wflag.cpp | 4 +- src/d/actor/d_a_obj_wind_stone.cpp | 6 +- src/d/actor/d_a_obj_window.cpp | 6 +- src/d/actor/d_a_obj_wood_pendulum.cpp | 6 +- src/d/actor/d_a_obj_wood_statue.cpp | 10 +- src/d/actor/d_a_obj_wsword.cpp | 6 +- src/d/actor/d_a_obj_yel_bag.cpp | 8 +- src/d/actor/d_a_obj_yobikusa.cpp | 8 +- src/d/actor/d_a_obj_yousei.cpp | 4 +- src/d/actor/d_a_obj_ystone.cpp | 4 +- src/d/actor/d_a_obj_zcloth.cpp | 4 +- src/d/actor/d_a_obj_zdoor.cpp | 10 +- src/d/actor/d_a_obj_zrTurara.cpp | 4 +- src/d/actor/d_a_obj_zrTuraraRock.cpp | 4 +- src/d/actor/d_a_obj_zraMark.cpp | 6 +- src/d/actor/d_a_obj_zra_freeze.cpp | 8 +- src/d/actor/d_a_obj_zra_rock.cpp | 4 +- src/d/actor/d_a_passer_mng.cpp | 4 +- src/d/actor/d_a_path_line.cpp | 2 +- src/d/actor/d_a_peru.cpp | 22 +- src/d/actor/d_a_ppolamp.cpp | 6 +- src/d/actor/d_a_scene_exit.cpp | 4 +- src/d/actor/d_a_scene_exit2.cpp | 10 +- src/d/actor/d_a_set_bgobj.cpp | 4 +- src/d/actor/d_a_shop_item.cpp | 4 +- src/d/actor/d_a_skip_2D.cpp | 4 +- src/d/actor/d_a_spinner.cpp | 4 +- src/d/actor/d_a_sq.cpp | 4 +- src/d/actor/d_a_startAndGoal.cpp | 4 +- src/d/actor/d_a_suspend.cpp | 4 +- src/d/actor/d_a_swBall.cpp | 4 +- src/d/actor/d_a_swLBall.cpp | 4 +- src/d/actor/d_a_swTime.cpp | 4 +- src/d/actor/d_a_swc00.cpp | 4 +- src/d/actor/d_a_swhit0.cpp | 8 +- src/d/actor/d_a_tag_CstaSw.cpp | 4 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 6 +- src/d/actor/d_a_tag_Lv7Gate.cpp | 6 +- src/d/actor/d_a_tag_Lv8Gate.cpp | 6 +- src/d/actor/d_a_tag_TWgate.cpp | 16 +- src/d/actor/d_a_tag_ajnot.cpp | 4 +- src/d/actor/d_a_tag_allmato.cpp | 8 +- src/d/actor/d_a_tag_arena.cpp | 4 +- src/d/actor/d_a_tag_assistance.cpp | 4 +- src/d/actor/d_a_tag_attack_item.cpp | 4 +- src/d/actor/d_a_tag_attention.cpp | 4 +- src/d/actor/d_a_tag_bottle_item.cpp | 4 +- src/d/actor/d_a_tag_camera.cpp | 4 +- src/d/actor/d_a_tag_chgrestart.cpp | 4 +- src/d/actor/d_a_tag_chkpoint.cpp | 4 +- src/d/actor/d_a_tag_csw.cpp | 4 +- src/d/actor/d_a_tag_escape.cpp | 4 +- src/d/actor/d_a_tag_event.cpp | 4 +- src/d/actor/d_a_tag_evt.cpp | 10 +- src/d/actor/d_a_tag_evtarea.cpp | 4 +- src/d/actor/d_a_tag_evtmsg.cpp | 8 +- src/d/actor/d_a_tag_firewall.cpp | 4 +- src/d/actor/d_a_tag_gra.cpp | 4 +- src/d/actor/d_a_tag_gstart.cpp | 4 +- src/d/actor/d_a_tag_guard.cpp | 4 +- src/d/actor/d_a_tag_hinit.cpp | 4 +- src/d/actor/d_a_tag_hjump.cpp | 4 +- src/d/actor/d_a_tag_howl.cpp | 4 +- src/d/actor/d_a_tag_hstop.cpp | 4 +- src/d/actor/d_a_tag_instruction.cpp | 4 +- src/d/actor/d_a_tag_kago_fall.cpp | 4 +- src/d/actor/d_a_tag_kmsg.cpp | 10 +- src/d/actor/d_a_tag_lantern.cpp | 4 +- src/d/actor/d_a_tag_lightball.cpp | 4 +- src/d/actor/d_a_tag_lv2prchk.cpp | 4 +- src/d/actor/d_a_tag_lv5soup.cpp | 4 +- src/d/actor/d_a_tag_lv6CstaSw.cpp | 4 +- src/d/actor/d_a_tag_magne.cpp | 4 +- src/d/actor/d_a_tag_mhint.cpp | 4 +- src/d/actor/d_a_tag_mist.cpp | 4 +- src/d/actor/d_a_tag_mmsg.cpp | 4 +- src/d/actor/d_a_tag_msg.cpp | 12 +- src/d/actor/d_a_tag_mstop.cpp | 4 +- src/d/actor/d_a_tag_mwait.cpp | 4 +- src/d/actor/d_a_tag_myna2.cpp | 4 +- src/d/actor/d_a_tag_myna_light.cpp | 4 +- src/d/actor/d_a_tag_pachi.cpp | 4 +- src/d/actor/d_a_tag_poFire.cpp | 4 +- src/d/actor/d_a_tag_push.cpp | 4 +- src/d/actor/d_a_tag_qs.cpp | 4 +- src/d/actor/d_a_tag_ret_room.cpp | 4 +- src/d/actor/d_a_tag_river_back.cpp | 12 +- src/d/actor/d_a_tag_rmbit_sw.cpp | 4 +- src/d/actor/d_a_tag_schedule.cpp | 4 +- src/d/actor/d_a_tag_setBall.cpp | 4 +- src/d/actor/d_a_tag_setrestart.cpp | 4 +- src/d/actor/d_a_tag_shop_camera.cpp | 4 +- src/d/actor/d_a_tag_shop_item.cpp | 4 +- src/d/actor/d_a_tag_smk_emt.cpp | 4 +- src/d/actor/d_a_tag_spinner.cpp | 4 +- src/d/actor/d_a_tag_sppath.cpp | 4 +- src/d/actor/d_a_tag_spring.cpp | 4 +- src/d/actor/d_a_tag_ss_drink.cpp | 4 +- src/d/actor/d_a_tag_statue_evt.cpp | 20 +- src/d/actor/d_a_tag_stream.cpp | 4 +- src/d/actor/d_a_tag_telop.cpp | 4 +- src/d/actor/d_a_tag_theB_hint.cpp | 4 +- src/d/actor/d_a_tag_wara_howl.cpp | 4 +- src/d/actor/d_a_tag_watchge.cpp | 4 +- src/d/actor/d_a_tag_waterfall.cpp | 4 +- src/d/actor/d_a_tag_wljump.cpp | 4 +- src/d/actor/d_a_tag_yami.cpp | 4 +- src/d/actor/d_a_talk.cpp | 4 +- src/d/actor/d_a_tbox.cpp | 22 +- src/d/actor/d_a_tbox2.cpp | 10 +- src/d/actor/d_a_tboxSw.cpp | 4 +- src/d/actor/d_a_title.cpp | 4 +- src/d/actor/d_a_vrbox.cpp | 4 +- src/d/actor/d_a_vrbox2.cpp | 4 +- src/d/actor/d_a_warp_bug.cpp | 6 +- src/d/actor/d_a_ykgr.cpp | 4 +- src/d/d_camera.cpp | 8 +- src/d/d_envse.cpp | 2 +- src/d/d_ev_camera.cpp | 40 +- src/d/d_event.cpp | 6 +- src/d/d_event_manager.cpp | 6 +- src/d/d_file_select.cpp | 2 +- src/d/d_gameover.cpp | 2 +- src/d/d_k_wmark.cpp | 2 +- src/d/d_k_wpillar.cpp | 2 +- src/d/d_kankyo.cpp | 6 +- src/d/d_ky_thunder.cpp | 2 +- src/d/d_kyeff.cpp | 2 +- src/d/d_kyeff2.cpp | 2 +- src/d/d_menu_collect.cpp | 12 +- src/d/d_menu_fmap.cpp | 4 +- src/d/d_menu_window.cpp | 2 +- src/d/d_meter2.cpp | 2 +- src/d/d_msg_object.cpp | 2 +- src/d/d_msg_scrn_3select.cpp | 4 +- src/d/d_msg_scrn_base.cpp | 4 +- src/d/d_ovlp_fade.cpp | 16 +- src/d/d_ovlp_fade2.cpp | 2 +- src/d/d_ovlp_fade3.cpp | 2 +- src/d/d_particle_name.cpp | 4 +- src/d/d_s_logo.cpp | 2 +- src/d/d_s_menu.cpp | 4 +- src/d/d_s_name.cpp | 12 +- src/d/d_s_play.cpp | 4 +- src/d/d_s_room.cpp | 4 +- src/d/d_s_title.cpp | 4 +- src/d/d_select_cursor.cpp | 10 +- src/d/d_timer.cpp | 2 +- src/f_op/f_op_actor.cpp | 6 +- src/f_pc/f_pc_leaf.cpp | 4 +- src/f_pc/f_pc_method.cpp | 8 +- src/f_pc/f_pc_profile.cpp | 6 +- src/f_pc/f_pc_profile_lst.cpp | 2 +- 954 files changed, 4693 insertions(+), 4682 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 696e8a74bb..4d118d37d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,10 +219,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux) # -Wno-multichar: Multi-character constants ('ABCD') are implementation-defined but all compilers # (CW, GCC, Clang, MSVC) encode them identically in big-endian order. # For >4-char literals (which GCC/Clang truncate to int), use the MULTI_CHAR() macro. - # -Wwrite-strings: Game code relies on implicit const char* -> char* conversions # -Wdeprecated-declarations: JSystem uses std::iterator, deprecated in C++17 - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar -Wno-write-strings") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-write-strings -Wno-trigraphs -Wno-deprecated-declarations") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-multichar") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-trigraphs -Wno-deprecated-declarations") set(CMAKE_INSTALL_RPATH "$ORIGIN") set(CMAKE_BUILD_RPATH "$ORIGIN") elseif (APPLE) @@ -232,7 +231,6 @@ elseif (APPLE) elseif (MSVC) add_compile_options( $<$:/bigobj> - $<$:/Zc:strictStrings-> $<$:/MP> $<$:/FS> ) diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index e3654846e0..75d4544341 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -98,7 +98,7 @@ T cLib_calcTimer(T* value) { void MtxInit(void); void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); -void MtxPosition(cXyz*, cXyz*); +void MtxPosition(cXyz DUSK_CONST*, cXyz*); void MtxPush(void); void MtxPull(void); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 1f99737825..66dff18fd2 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -45,17 +45,17 @@ struct cXyz : Vec { ~cXyz() = default; cXyz(const cXyz& vec) = default; #endif - cXyz(f32 x, f32 y, f32 z) { + DUSK_CONSTEXPR cXyz(f32 x, f32 y, f32 z) { this->x = x; this->y = y; this->z = z; } - cXyz(const Vec& vec) { + DUSK_CONSTEXPR cXyz(const Vec& vec) { this->x = vec.x; this->y = vec.y; this->z = vec.z; } - cXyz& operator=(const Vec& vec) { + DUSK_CONSTEXPR cXyz& operator=(const Vec& vec) { this->x = vec.x; this->y = vec.y; this->z = vec.z; diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index 88bd393361..f4517bd55c 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -14,7 +14,7 @@ struct Z2StatusMgr : public JASGlobalInstance { void menuIn(); void menuOut(); bool isMovieDemo(); - void setDemoName(char* demoName); + void setDemoName(DUSK_CONST char* demoName); void processTime(); bool checkDayTime(); void setEventBit(void* eventBit); diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 8f6a40ae13..9f69900bcb 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -4545,7 +4545,7 @@ public: /* 0x03840 */ cXyz* mIronBallChainPos; /* 0x03844 */ csXyz* mIronBallChainAngle; /* 0x03848 */ cXyz* field_0x3848; - /* 0x0384C */ cXyz* field_0x384c; + /* 0x0384C */ cXyz DUSK_CONST* field_0x384c; /* 0x03850 */ daAlink_procFunc mpProcFunc; #if TARGET_PC diff --git a/include/d/actor/d_a_b_tn.h b/include/d/actor/d_a_b_tn.h index 0a782d7f89..7de1007d28 100644 --- a/include/d/actor/d_a_b_tn.h +++ b/include/d/actor/d_a_b_tn.h @@ -203,7 +203,7 @@ private: /* 0x0AAD */ bool mStayNo2Flag; /* 0x0AAE */ u8 mBlendStatus; /* 0x0AB0 */ f32 mBlend; - /* 0x0AB4 */ char* mArcName; + /* 0x0AB4 */ char DUSK_CONST* mArcName; /* 0x0AB8 */ dBgS_AcchCir mAcchCir; /* 0x0AF8 */ dBgS_ObjAcch mAcch; /* 0x0CD0 */ dBgS_AcchCir mAcchCirArr[16]; diff --git a/include/d/actor/d_a_door_boss.h b/include/d/actor/d_a_door_boss.h index ed7afe97d4..afd7984bf1 100644 --- a/include/d/actor/d_a_door_boss.h +++ b/include/d/actor/d_a_door_boss.h @@ -23,10 +23,10 @@ public: /* 3 */ ACT_END, }; - char* getArcName(); - char* getBmd(); - char* getDzb(); - char* getBmd2(); + DUSK_CONST char* getArcName(); + DUSK_CONST char* getBmd(); + DUSK_CONST char* getDzb(); + DUSK_CONST char* getBmd2(); J3DModelData* getDoorModelData(); int CreateHeap(); void calcMtx(); diff --git a/include/d/actor/d_a_door_bossL1.h b/include/d/actor/d_a_door_bossL1.h index 397b7d90ce..7e14025cd2 100644 --- a/include/d/actor/d_a_door_bossL1.h +++ b/include/d/actor/d_a_door_bossL1.h @@ -33,8 +33,8 @@ public: typedef int (daBdoorL1_c::*actionFunc)(); - char* getDoorEventName(); - char* getDoorEventName2(); + DUSK_CONST char* getDoorEventName(); + DUSK_CONST char* getDoorEventName2(); const char* getArcName(); const char* getAnmArcName(); int getDoorType(); diff --git a/include/d/actor/d_a_door_dbdoor00.h b/include/d/actor/d_a_door_dbdoor00.h index e635eb4f00..9b2f65e756 100644 --- a/include/d/actor/d_a_door_dbdoor00.h +++ b/include/d/actor/d_a_door_dbdoor00.h @@ -14,11 +14,11 @@ */ class daDbDoor00_c : public fopAc_ac_c { public: - char* getAlwaysArcName(); - char* getDzb(); - char* getDummyBmdName(); - char* getBmdArcName(); - char* getBmdName(); + DUSK_CONST char* getAlwaysArcName(); + DUSK_CONST char* getDzb(); + DUSK_CONST char* getDummyBmdName(); + DUSK_CONST char* getBmdArcName(); + DUSK_CONST char* getBmdName(); J3DModelData* getDoorModelData(); int CreateHeap(); void calcMtx(); diff --git a/include/d/actor/d_a_door_knob00.h b/include/d/actor/d_a_door_knob00.h index d6e0fd5db2..577b26b58e 100644 --- a/include/d/actor/d_a_door_knob00.h +++ b/include/d/actor/d_a_door_knob00.h @@ -29,11 +29,11 @@ public: typedef int (daKnob20_c::*actionFunc)(); - char* getAlwaysArcName(); - char* getEvArcName(); - char* getDzb(); - char* getDummyBmd(); - char* getBmd(); + DUSK_CONST char* getAlwaysArcName(); + DUSK_CONST char* getEvArcName(); + DUSK_CONST char* getDzb(); + DUSK_CONST char* getDummyBmd(); + DUSK_CONST char* getBmd(); J3DModelData* getDoorModelData(); int CreateHeap(); void calcMtx(); diff --git a/include/d/actor/d_a_door_mbossL1.h b/include/d/actor/d_a_door_mbossL1.h index fc49529018..2bd95d920b 100644 --- a/include/d/actor/d_a_door_mbossL1.h +++ b/include/d/actor/d_a_door_mbossL1.h @@ -54,15 +54,15 @@ public: typedef int (daMBdoorL1_c::*actionFunc)(); - char* getAnmArcName(); - char* getArcName(); - char* getAlwaysArcName(); + DUSK_CONST char* getAnmArcName(); + DUSK_CONST char* getArcName(); + DUSK_CONST char* getAlwaysArcName(); int getDoorType(); - char* getOpenAnm(); - char* getCloseAnm(); - char* getBmd(); - char* getBtk(); - char* getDzb(); + DUSK_CONST char* getOpenAnm(); + DUSK_CONST char* getCloseAnm(); + DUSK_CONST char* getBmd(); + DUSK_CONST char* getBtk(); + DUSK_CONST char* getDzb(); J3DModelData* getDoorModelData(); int CreateHeap(); void calcMtx(); diff --git a/include/d/actor/d_a_door_shutter.h b/include/d/actor/d_a_door_shutter.h index 1b32c7d357..a8e99f1295 100644 --- a/include/d/actor/d_a_door_shutter.h +++ b/include/d/actor/d_a_door_shutter.h @@ -45,12 +45,12 @@ public: ACTION_DEMO, }; - char* getStopBmdName(); + char DUSK_CONST* getStopBmdName(); J3DModelData* getStopModelData(); - char* getAlwaysArcName(); - char* getArcName(); - char* getBmdName(); - char* getBtk(); + char DUSK_CONST* getAlwaysArcName(); + char DUSK_CONST* getArcName(); + char DUSK_CONST* getBmdName(); + char DUSK_CONST* getBtk(); J3DModelData* getModelData(); f32 getSize2X(); int CreateHeap(); @@ -115,7 +115,7 @@ public: int chkStopOpen(); int chkMakeKey(); - virtual char* getDzbName(); + virtual char DUSK_CONST* getDzbName(); virtual int getDemoAction(); void onFlag(u16 flag) { field_0x68e |= flag; } diff --git a/include/d/actor/d_a_e_arrow.h b/include/d/actor/d_a_e_arrow.h index 4e592eef8e..00f3218783 100644 --- a/include/d/actor/d_a_e_arrow.h +++ b/include/d/actor/d_a_e_arrow.h @@ -32,7 +32,7 @@ public: /* 0x5B4 */ J3DModel* mpModel; /* 0x5B8 */ u8 mArrowType; /* 0x5B9 */ u8 mFlags; - /* 0x5BC */ char* mResName; + /* 0x5BC */ char DUSK_CONST* mResName; /* 0x5C0 */ s16 field_0x5c0; /* 0x5C2 */ s16 mAction; /* 0x5C4 */ s16 mMode; diff --git a/include/d/actor/d_a_e_ba.h b/include/d/actor/d_a_e_ba.h index aeb4b3506b..6bcb4758be 100644 --- a/include/d/actor/d_a_e_ba.h +++ b/include/d/actor/d_a_e_ba.h @@ -60,7 +60,7 @@ public: /* 0x5B5 */ u8 mDistanceParam; /* 0x5B6 */ u8 mType; /* 0x5B7 */ u8 mPathIndex; - /* 0x5B8 */ char* mArcName; + /* 0x5B8 */ DUSK_CONST char* mArcName; /* 0x5BC */ u8 field_0x5bc; /* 0x5BD */ s8 mPathPoint; /* 0x5BE */ s8 mPathStep; diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h index ad27501841..c84b412589 100644 --- a/include/d/actor/d_a_e_rd.h +++ b/include/d/actor/d_a_e_rd.h @@ -38,7 +38,7 @@ public: /* 0x05CC */ s16 target_ya; /* 0x05D0 */ mDoExt_McaMorfSO* anm_p; /* 0x05D4 */ Z2CreatureEnemy sound; - /* 0x0678 */ char* resName; + /* 0x0678 */ DUSK_CONST char* resName; /* 0x067C */ int anm; /* 0x0680 */ int field_0x680; /* 0x0684 */ dJntCol_c mJntCol; diff --git a/include/d/actor/d_a_e_rdy.h b/include/d/actor/d_a_e_rdy.h index 0a318f2b38..51037ecac9 100644 --- a/include/d/actor/d_a_e_rdy.h +++ b/include/d/actor/d_a_e_rdy.h @@ -36,7 +36,7 @@ public: /* 0x05C8 */ s16 mTargetAngleY; /* 0x05CC */ mDoExt_McaMorfSO* mpMorf; /* 0x05D0 */ Z2CreatureEnemy mSound; - /* 0x0674 */ char* mpArcName; + /* 0x0674 */ char DUSK_CONST* mpArcName; /* 0x0678 */ int mAnm; /* 0x067C */ u8 field_0x67c[0x680 - 0x67c]; /* 0x0680 */ dJntCol_c mJntCol; diff --git a/include/d/actor/d_a_e_tt.h b/include/d/actor/d_a_e_tt.h index 8798393740..f3b79a69b3 100644 --- a/include/d/actor/d_a_e_tt.h +++ b/include/d/actor/d_a_e_tt.h @@ -63,7 +63,7 @@ private: /* 0x6D4 */ f32 field_0x6d4; /* 0x6D8 */ s16 mFootJoints[4]; /* 0x6E0 */ s16 field_0x6e0; - /* 0x6E4 */ char* mpResName; + /* 0x6E4 */ char DUSK_CONST* mpResName; /* 0x6E8 */ u16 mDamageCooldownTimer; /* 0x6EA */ u8 mGenericTimer; /* 0x6EC */ int mAttackTimer; diff --git a/include/d/actor/d_a_e_wb.h b/include/d/actor/d_a_e_wb.h index ba680366fb..aecbac96a1 100644 --- a/include/d/actor/d_a_e_wb.h +++ b/include/d/actor/d_a_e_wb.h @@ -99,7 +99,7 @@ public: /* 0x0000 */ fopEn_enemy_c enemy; ///< @brief Base enemy class instance. /* 0x05AC */ request_of_phase_process_class phase; ///< @brief Phase process request handler. /* 0x05B4 */ s16 ride_mode; ///< @brief Current sub-action mode within the run action. - /* 0x05B8 */ char* resName; ///< @brief Resource name for loading models/animations. + /* 0x05B8 */ char DUSK_CONST* resName; ///< @brief Resource name for loading models/animations. /* 0x05BC */ u8 arg0; ///< @brief Creation parameter 1. /* 0x05BD */ u8 arg1; ///< @brief Creation parameter 2. /* 0x05BE */ u8 field_0x5be; diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h index 90de3b74bf..33ec51672f 100644 --- a/include/d/actor/d_a_kago.h +++ b/include/d/actor/d_a_kago.h @@ -213,8 +213,8 @@ private: /* 0x750 */ int field_0x750; /* 0x754 */ int field_0x754; /* 0x758 */ int field_0x758; - /* 0x75C */ char* mArcName; - /* 0x760 */ char* mDemoName; + /* 0x75C */ DUSK_CONST char* mArcName; + /* 0x760 */ DUSK_CONST char* mDemoName; /* 0x764 */ u32 mShadowId; /* 0x768 */ dPath* mpPath1; /* 0x76C */ dPath* mpPath2; diff --git a/include/d/actor/d_a_mg_fish.h b/include/d/actor/d_a_mg_fish.h index b1102ee550..f02a34a778 100644 --- a/include/d/actor/d_a_mg_fish.h +++ b/include/d/actor/d_a_mg_fish.h @@ -49,7 +49,7 @@ public: /* 0x5F4 */ s16 mYawToPlayer; /* 0x5F6 */ s16 field_0x5f6; /* 0x5F8 */ s16 field_0x5f8; - /* 0x5FC */ char* mResName; + /* 0x5FC */ DUSK_CONST char* mResName; /* 0x600 */ mDoExt_McaMorf* mpMorf; /* 0x604 */ J3DAnmTransform* mAnmTransform; /* 0x608 */ u32 mShadowId; diff --git a/include/d/actor/d_a_mg_rod.h b/include/d/actor/d_a_mg_rod.h index e8ef9a6128..d91cda43f1 100644 --- a/include/d/actor/d_a_mg_rod.h +++ b/include/d/actor/d_a_mg_rod.h @@ -90,7 +90,7 @@ public: /* 0x0000 */ fopAc_ac_c actor; /* 0x0568 */ request_of_phase_process_class phase; - /* 0x0570 */ char* arcname; + /* 0x0570 */ DUSK_CONST char* arcname; /* 0x0574 */ u8 arg0; /* 0x0575 */ u8 arg1; /* 0x0576 */ u8 arg2; diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h index e93e28b2cd..0ef55d11ad 100644 --- a/include/d/actor/d_a_myna.h +++ b/include/d/actor/d_a_myna.h @@ -103,8 +103,8 @@ public: void animePlay(); int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - J3DAnmTransformKey* getTrnsfrmKeyAnm(char*); - J3DAnmTexPattern* getTexPtrnAnm(char*); + J3DAnmTransformKey* getTrnsfrmKeyAnm(DUSK_CONST char*); + J3DAnmTexPattern* getTexPtrnAnm(DUSK_CONST char*); int checkEndAnm(J3DFrameCtrl*); int checkEndAnm(f32); u8 getItemNumMax(); diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index f9ebfaaa47..70e3e01270 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -519,7 +519,7 @@ public: /* 0x568 */ daNpcT_faceMotionAnmData_c const* mpFaceMotionAnmData; /* 0x56C */ daNpcT_motionAnmData_c const* mpMotionAnmData; /* 0x570 */ daNpcT_evtData_c const* mpEvtData; - /* 0x574 */ char** mpArcNames; + /* 0x574 */ DUSK_CONST char* DUSK_CONST* mpArcNames; /* 0x578 */ mDoExt_McaMorfSO* mpMorf[2]; /* 0x580 */ Z2Creature mSound; /* 0x610 */ mDoExt_bckAnm mBckAnm; @@ -627,7 +627,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, - int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames) + int i_motionStepNum, daNpcT_evtData_c const* i_evtData, DUSK_CONST char* DUSK_CONST* i_arcNames) : mpFaceMotionAnmData(i_faceMotionAnmData), mpMotionAnmData(i_motionAnmData), @@ -654,8 +654,8 @@ public: int setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); int setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int); int setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int); - int loadRes(s8 const*, char const**); - void deleteRes(s8 const*, char const**); + int loadRes(s8 const*, char const* DUSK_CONST*); + void deleteRes(s8 const*, char const* DUSK_CONST*); int execute(); int draw(BOOL, BOOL, f32, GXColorS10*, f32, BOOL, BOOL, BOOL); void setEnvTevColor(); diff --git a/include/d/actor/d_a_npc2.h b/include/d/actor/d_a_npc2.h index c940d14a87..58343a47b0 100644 --- a/include/d/actor/d_a_npc2.h +++ b/include/d/actor/d_a_npc2.h @@ -86,12 +86,12 @@ public: class daBaseNpc_c : public fopAc_ac_c { public: daBaseNpc_c(); - J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int); + J3DAnmTransform* getTrnsfrmKeyAnmP(char DUSK_CONST*, int); int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); - J3DAnmTransform* getTexPtrnAnmP(char*, int); + J3DAnmTransform* getTexPtrnAnmP(char DUSK_CONST*, int); int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); - void orderEvent(int, char*); + void orderEvent(int, char DUSK_CONST*); void setEnvTevColor(); void setRoomNo(); int checkEndAnm(f32); @@ -128,7 +128,7 @@ public: /* 0x808 */ mDoExt_btpAnm mBtp; /* 0x820 */ mDoExt_btkAnm mBtk; /* 0x838 */ s16 field_0x838; - /* 0x83C */ u16* field_0x83c; + /* 0x83C */ u16 DUSK_CONST* field_0x83c; /* 0x840 */ u16 field_0x840; /* 0x842 */ u16 field_0x842; /* 0x844 */ u8 field_0x844; diff --git a/include/d/actor/d_a_npc4.h b/include/d/actor/d_a_npc4.h index 952c023889..6532d92842 100644 --- a/include/d/actor/d_a_npc4.h +++ b/include/d/actor/d_a_npc4.h @@ -311,10 +311,10 @@ public: static void* srchActor(void*, void*); void initialize(); - J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int); - J3DAnmTexPattern* getTexPtrnAnmP(char*, int); - J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int); - J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int); + J3DAnmTransformKey* getTrnsfrmKeyAnmP(DUSK_CONST char*, int); + J3DAnmTexPattern* getTexPtrnAnmP(DUSK_CONST char*, int); + J3DAnmTextureSRTKey* getTexSRTKeyAnmP(DUSK_CONST char*, int); + J3DAnmTevRegKey* getTevRegKeyAnmP(DUSK_CONST char*, int); BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr, int i_start, int i_end); BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start, @@ -336,8 +336,8 @@ public: BOOL hitChk2(dCcD_Cyl*, BOOL, BOOL); void setDamage(int, int, int); int ctrlMsgAnm(int&, int&, fopAc_ac_c*, BOOL); - void orderEvent(int, char*, u16, u16, u8, u16); - void changeEvent(char*, char*, u16, u16); + void orderEvent(int, DUSK_CONST char*, u16, u16, u8, u16); + void changeEvent(DUSK_CONST char*, DUSK_CONST char*, u16, u16); BOOL chkActorInSight(fopAc_ac_c*, f32); BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16); BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int); diff --git a/include/d/actor/d_a_npc_aru.h b/include/d/actor/d_a_npc_aru.h index 84496ea6d6..a0a30a676f 100644 --- a/include/d/actor/d_a_npc_aru.h +++ b/include/d/actor/d_a_npc_aru.h @@ -149,7 +149,7 @@ public: int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -171,8 +171,8 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } void setLastIn() { mLastGoatIn = true; } - static char* mCutNameList[7]; - static cutFunc mCutList[7]; + static char DUSK_CONST* DUSK_CONST mCutNameList[7]; + static cutFunc DUSK_CONST mCutList[7]; private: /* 0xE40 */ NPC_ARU_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_ashB.h b/include/d/actor/d_a_npc_ashB.h index cbba17f4c5..12037188c6 100644 --- a/include/d/actor/d_a_npc_ashB.h +++ b/include/d/actor/d_a_npc_ashB.h @@ -135,7 +135,7 @@ public: inline bool step(s16, int, f32); inline void playExpression(); - static EventFn mEvtSeqList[2]; + static EventFn DUSK_CONST mEvtSeqList[2]; private: /* 0xB48 */ Z2Creature mCreatureSound; diff --git a/include/d/actor/d_a_npc_bans.h b/include/d/actor/d_a_npc_bans.h index 7c60822f5e..b09143caa7 100644 --- a/include/d/actor/d_a_npc_bans.h +++ b/include/d/actor/d_a_npc_bans.h @@ -90,7 +90,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -117,8 +117,8 @@ public: return rv; } - static char* mCutNameList[4]; - static cutFunc mCutList[4]; + static char DUSK_CONST* DUSK_CONST mCutNameList[4]; + static cutFunc DUSK_CONST mCutList[4]; /* 0x0F7C */ mDoExt_McaMorfSO* mpScoopMorf; /* 0x0F80 */ NPC_BANS_HIO_CLASS* mHIO; diff --git a/include/d/actor/d_a_npc_besu.h b/include/d/actor/d_a_npc_besu.h index c4b1e3cf91..f0e26e1538 100644 --- a/include/d/actor/d_a_npc_besu.h +++ b/include/d/actor/d_a_npc_besu.h @@ -112,7 +112,7 @@ public: int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -140,8 +140,8 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; } u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; } - static char* mCutNameList[15]; - static cutFunc mCutList[15]; + static char DUSK_CONST* DUSK_CONST mCutNameList[15]; + static cutFunc DUSK_CONST mCutList[15]; private: /* 0x0E40 */ mDoExt_McaMorfSO* mpCupModelMorf; diff --git a/include/d/actor/d_a_npc_blue_ns.h b/include/d/actor/d_a_npc_blue_ns.h index fb30855c23..8920bc1be5 100644 --- a/include/d/actor/d_a_npc_blue_ns.h +++ b/include/d/actor/d_a_npc_blue_ns.h @@ -124,7 +124,7 @@ public: return var_r30; } - static EventFn mEvtSeqList[]; + static EventFn DUSK_CONST mEvtSeqList[]; /* 0xB48 */ Z2Creature mSound; /* 0xBD8 */ u8 field_0xBD8[0xBDC - 0xBD8]; diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index ea597e23a9..25dd490fd9 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -89,7 +89,7 @@ public: daNpc_Bou_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} @@ -114,8 +114,8 @@ public: virtual int drawDbgInfo(); virtual void changeAnm(int*, int*); - static char* mCutNameList[9]; - static cutFunc mCutList[9]; + static char DUSK_CONST* DUSK_CONST mCutNameList[9]; + static cutFunc DUSK_CONST mCutList[9]; int getFlowNodeNo() { u16 nodeNo = home.angle.x; diff --git a/include/d/actor/d_a_npc_chat.h b/include/d/actor/d_a_npc_chat.h index 4ec81ee4c0..a835a4c49d 100644 --- a/include/d/actor/d_a_npc_chat.h +++ b/include/d/actor/d_a_npc_chat.h @@ -102,7 +102,7 @@ public: void setFear() { mFear = true; } void setTalkFlag() { mTalkFlag = true; } - static eventFunc mEvtSeqList[1]; + static eventFunc DUSK_CONST mEvtSeqList[1]; private: /* 0xB48 */ Z2CreatureCitizen mSound; diff --git a/include/d/actor/d_a_npc_clerka.h b/include/d/actor/d_a_npc_clerka.h index a20c12c001..92236edb03 100644 --- a/include/d/actor/d_a_npc_clerka.h +++ b/include/d/actor/d_a_npc_clerka.h @@ -100,7 +100,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, - int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames) + int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -124,8 +124,8 @@ public: u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0x0F7C */ NPC_CLERKA_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_clerkb.h b/include/d/actor/d_a_npc_clerkb.h index f83ec949d4..79e13f3a0e 100644 --- a/include/d/actor/d_a_npc_clerkb.h +++ b/include/d/actor/d_a_npc_clerkb.h @@ -113,7 +113,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, - int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames) + int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -137,8 +137,8 @@ public: u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0x0F7C */ mDoExt_bpkAnm mBpkAnm2; diff --git a/include/d/actor/d_a_npc_clerkt.h b/include/d/actor/d_a_npc_clerkt.h index 5480338e1e..e21f000c32 100644 --- a/include/d/actor/d_a_npc_clerkt.h +++ b/include/d/actor/d_a_npc_clerkt.h @@ -91,7 +91,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -125,8 +125,8 @@ public: } } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0x0F7C */ NPC_CLERKT_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h index 286405d074..7d9c6dabfe 100644 --- a/include/d/actor/d_a_npc_doc.h +++ b/include/d/actor/d_a_npc_doc.h @@ -66,7 +66,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) @@ -133,8 +133,8 @@ public: return (fopAcM_GetParam(this) & 0xFF00) >> 8; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_DOC_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_doorboy.h b/include/d/actor/d_a_npc_doorboy.h index cc7261d64c..7d6cb47436 100644 --- a/include/d/actor/d_a_npc_doorboy.h +++ b/include/d/actor/d_a_npc_doorboy.h @@ -78,7 +78,7 @@ public: inline int getTimeHour(); inline bool isDummyTalk(); - static EventFn mEvtSeqList[1]; + static EventFn DUSK_CONST mEvtSeqList[1]; private: /* 0xB48 */ Z2CreatureCitizen mSound; diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h index 139555950a..d5c1d2fa0e 100644 --- a/include/d/actor/d_a_npc_fairy.h +++ b/include/d/actor/d_a_npc_fairy.h @@ -256,7 +256,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -294,8 +294,8 @@ public: u8 getSceneNo1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; } u8 getSceneNo2() { return (fopAcM_GetParam(this) >> 16) & 0xFF; } - static char* mCutNameList[18]; - static cutFunc mCutList[18]; + static char DUSK_CONST* DUSK_CONST mCutNameList[18]; + static cutFunc DUSK_CONST mCutList[18]; private: /* 0x0E40 */ NPC_FAIRY_HIO_CLASS* mHIO; /* 0x0E44 */ dCcD_Cyl mCyl; diff --git a/include/d/actor/d_a_npc_fairy_seirei.h b/include/d/actor/d_a_npc_fairy_seirei.h index d3b5a23823..62b3cbcc6c 100644 --- a/include/d/actor/d_a_npc_fairy_seirei.h +++ b/include/d/actor/d_a_npc_fairy_seirei.h @@ -71,7 +71,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, - int param_6, daNpcT_evtData_c const* param_7, char** param_8) + int param_6, daNpcT_evtData_c const* param_7, DUSK_CONST char* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u8 getType() { return fopAcM_GetParam(this) & 0xFF; } @@ -90,8 +90,8 @@ public: int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static DUSK_CONST char* mCutNameList[1]; + static DUSK_CONST cutFunc mCutList[1]; private: /* 0xE40 */ NPC_FAIRY_SEIREI_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_gnd.h b/include/d/actor/d_a_npc_gnd.h index 983928570a..d76fae5d61 100644 --- a/include/d/actor/d_a_npc_gnd.h +++ b/include/d/actor/d_a_npc_gnd.h @@ -83,7 +83,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -96,8 +96,8 @@ public: s32 getNeckJointNo() { return 3; } s32 getBackboneJointNo() { return 1; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_GND_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_gra.h b/include/d/actor/d_a_npc_gra.h index 236755aba7..117aa9ade0 100644 --- a/include/d/actor/d_a_npc_gra.h +++ b/include/d/actor/d_a_npc_gra.h @@ -138,9 +138,9 @@ public: void addCarryNum() { field_0x1692++; } u8 getPathNoFromParam() { return home.angle.z; } void setGateWalk() { field_0x14D0 = 1; } - static char* mEvtCutNameList[12]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[12]; typedef BOOL (daNpc_grA_c::*cut_type)(int); - static cut_type mEvtCutList[]; + static cut_type DUSK_CONST mEvtCutList[]; private: typedef BOOL (daNpc_grA_c::*daNpc_grA_c_Action)(void*); diff --git a/include/d/actor/d_a_npc_grc.h b/include/d/actor/d_a_npc_grc.h index 0375dbd17f..072a4f9fd2 100644 --- a/include/d/actor/d_a_npc_grc.h +++ b/include/d/actor/d_a_npc_grc.h @@ -89,8 +89,8 @@ public: void setPrtcl(); void adjustShapeAngle() {} - static char* mEvtCutNameList; - static EventFn mEvtCutList[1]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList; + static EventFn DUSK_CONST mEvtCutList[1]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_grd.h b/include/d/actor/d_a_npc_grd.h index 95b23152ae..e8a9e19baf 100644 --- a/include/d/actor/d_a_npc_grd.h +++ b/include/d/actor/d_a_npc_grd.h @@ -81,8 +81,8 @@ public: BOOL ECut_nodToGrz(int); void adjustShapeAngle() {} - static char* mEvtCutNameList[2]; - static cutFunc mEvtCutList[2]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; + static cutFunc DUSK_CONST mEvtCutList[2]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_grm.h b/include/d/actor/d_a_npc_grm.h index 866c4f342e..addd5485be 100644 --- a/include/d/actor/d_a_npc_grm.h +++ b/include/d/actor/d_a_npc_grm.h @@ -120,7 +120,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -131,8 +131,8 @@ public: BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; } BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0x0F7C */ NPC_GRM_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_grmc.h b/include/d/actor/d_a_npc_grmc.h index b5c72e7d10..4d1752c266 100644 --- a/include/d/actor/d_a_npc_grmc.h +++ b/include/d/actor/d_a_npc_grmc.h @@ -113,7 +113,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -124,8 +124,8 @@ public: BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; } u16 getEyeballMaterialNo() { return 1; }; - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0x0F7C */ NPC_GRMC_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_gro.h b/include/d/actor/d_a_npc_gro.h index f83cf1957a..0881270516 100644 --- a/include/d/actor/d_a_npc_gro.h +++ b/include/d/actor/d_a_npc_gro.h @@ -85,8 +85,8 @@ public: int test(void*); void adjustShapeAngle() {} - static char* mEvtCutNameList[3]; - static cutFunc mEvtCutList[3]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3]; + static cutFunc DUSK_CONST mEvtCutList[3]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h index 0fdd240f9b..280df27a48 100644 --- a/include/d/actor/d_a_npc_grr.h +++ b/include/d/actor/d_a_npc_grr.h @@ -83,8 +83,8 @@ public: int test(void*); void adjustShapeAngle() {} - static char* mEvtCutNameList; - static cutFunc mEvtCutList[1]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList; + static cutFunc DUSK_CONST mEvtCutList[1]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_grs.h b/include/d/actor/d_a_npc_grs.h index d2a0c5359d..d08b4ec008 100644 --- a/include/d/actor/d_a_npc_grs.h +++ b/include/d/actor/d_a_npc_grs.h @@ -84,8 +84,8 @@ public: void setPrtcl(); void adjustShapeAngle() {} - static char* mEvtCutNameList[2]; - static cutFunc mEvtCutList[2]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; + static cutFunc DUSK_CONST mEvtCutList[2]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_grz.h b/include/d/actor/d_a_npc_grz.h index d7c947f19e..555b1f09e2 100644 --- a/include/d/actor/d_a_npc_grz.h +++ b/include/d/actor/d_a_npc_grz.h @@ -116,8 +116,8 @@ public: u8 getPathNoFromParam() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } - static char* mEvtCutNameList[7]; - static cutFunc mEvtCutList[7]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[7]; + static cutFunc DUSK_CONST mEvtCutList[7]; private: /* 0x0B48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_gwolf.h b/include/d/actor/d_a_npc_gwolf.h index fcf5d804d0..e9c37a38bb 100644 --- a/include/d/actor/d_a_npc_gwolf.h +++ b/include/d/actor/d_a_npc_gwolf.h @@ -104,8 +104,8 @@ public: void setHowlingEndFlag() { field_0xe1c = 2; } void setHowlingFlag() { field_0xe1c = 1; } - static char* mEvtCutNameList[5]; - static cutFunc mEvtCutList[5]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5]; + static cutFunc DUSK_CONST mEvtCutList[5]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_hanjo.h b/include/d/actor/d_a_npc_hanjo.h index 867f4674b6..6e912cb638 100644 --- a/include/d/actor/d_a_npc_hanjo.h +++ b/include/d/actor/d_a_npc_hanjo.h @@ -194,7 +194,7 @@ public: daNpc_Hanjo_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u16 getEyeballMaterialNo() { return 2; } @@ -218,9 +218,9 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; } static dCcD_SrcGObjInf const mStoneCcDObjInfo; - static char* mCutNameList[6]; - static cutFunc mCutList[6]; - static dCcD_SrcSph mStoneCcDSph; + static char DUSK_CONST* DUSK_CONST mCutNameList[6]; + static cutFunc DUSK_CONST mCutList[6]; + static dCcD_SrcSph DUSK_CONST mStoneCcDSph; private: /* 0x0E40 */ NPC_HANJO_HIO_CLASS* mpHIO; /* 0x0E44 */ J3DModel* mModel1; diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index 645940b0cb..72ec648696 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -91,7 +91,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) @@ -125,8 +125,8 @@ public: bool getGameStartFlag() { return mGameStartFlag; } void setPotBreakFlag() { mPotBreakFlag = true; } - static char* mCutNameList[8]; - static cutFunc mCutList[]; + static char DUSK_CONST* DUSK_CONST mCutNameList[8]; + static cutFunc DUSK_CONST mCutList[]; private: /* 0xE40 */ NPC_HOZ_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_jagar.h b/include/d/actor/d_a_npc_jagar.h index fbedc8ca1e..3c4a4ac723 100644 --- a/include/d/actor/d_a_npc_jagar.h +++ b/include/d/actor/d_a_npc_jagar.h @@ -138,7 +138,7 @@ public: daNpc_Jagar_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u16 getEyeballMaterialNo() { return MAT_JAGA_EYEBALL; } @@ -223,8 +223,8 @@ public: return 0; } - static char* mCutNameList[7]; - static cutFunc mCutList[7]; + static char DUSK_CONST* DUSK_CONST mCutNameList[7]; + static cutFunc DUSK_CONST mCutList[7]; private: /* 0x0E40 */ NPC_JAGAR_HIO_CLASS* mpHIO; /* 0x0E44 */ dCcD_Cyl mCyl1; diff --git a/include/d/actor/d_a_npc_kakashi.h b/include/d/actor/d_a_npc_kakashi.h index 80dadc3e47..7a5cca61f3 100644 --- a/include/d/actor/d_a_npc_kakashi.h +++ b/include/d/actor/d_a_npc_kakashi.h @@ -76,7 +76,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) @@ -113,8 +113,8 @@ public: u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; } - static char* mCutNameList[4]; - static int (daNpc_Kakashi_c::*mCutList[])(int); + static char DUSK_CONST* DUSK_CONST mCutNameList[4]; + static int (daNpc_Kakashi_c::* DUSK_CONST mCutList[])(int); private: /* 0x0E40 */ NPC_KAKASHI_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_kasi_kyu.h b/include/d/actor/d_a_npc_kasi_kyu.h index 0387c563b7..8353648675 100644 --- a/include/d/actor/d_a_npc_kasi_kyu.h +++ b/include/d/actor/d_a_npc_kasi_kyu.h @@ -120,7 +120,7 @@ public: void chgWeightLight() { mCcStts.SetWeight(0xD8); } BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); } - static EventFn mEvtSeqList[1]; + static EventFn DUSK_CONST mEvtSeqList[1]; static daTagEscape_c* mTargetTag; static f32 mTargetTagDist; static s16 mWolfAngle; diff --git a/include/d/actor/d_a_npc_kasi_mich.h b/include/d/actor/d_a_npc_kasi_mich.h index e3782f1b27..460c5c191a 100644 --- a/include/d/actor/d_a_npc_kasi_mich.h +++ b/include/d/actor/d_a_npc_kasi_mich.h @@ -121,7 +121,7 @@ public: void chgWeightLight() { mCcStts.SetWeight(0xD8); } BOOL pl_front_check() { return actor_front_check(daPy_getPlayerActorClass()); } - static EventFn mEvtSeqList[1]; + static EventFn DUSK_CONST mEvtSeqList[1]; static daTagEscape_c* mTargetTag; static f32 mTargetTagDist; static s16 mWolfAngle; diff --git a/include/d/actor/d_a_npc_kkri.h b/include/d/actor/d_a_npc_kkri.h index 964599d45e..a5e74880a9 100644 --- a/include/d/actor/d_a_npc_kkri.h +++ b/include/d/actor/d_a_npc_kkri.h @@ -71,7 +71,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) @@ -118,8 +118,8 @@ public: return mpMorf[0]->getModel()->getAnmMtx(5); } - static char* mCutNameList[3]; - static int (daNpc_Kkri_c::*mCutList[])(int); + static char DUSK_CONST* DUSK_CONST mCutNameList[3]; + static int (daNpc_Kkri_c::* DUSK_CONST mCutList[])(int); private: /* 0xE40 */ NPC_KKRI_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h index e97431baef..37b248fbe5 100644 --- a/include/d/actor/d_a_npc_kn.h +++ b/include/d/actor/d_a_npc_kn.h @@ -88,7 +88,7 @@ public: /* 0x05AC */ const daNpcT_faceMotionAnmData_c* mpFaceMotionAnmData; /* 0x05B0 */ const daNpcT_motionAnmData_c* mpMotionAnmData; /* 0x05B4 */ const daNpcT_evtData_c* mpEventData; - /* 0x05B8 */ char** mpArcNames; + /* 0x05B8 */ char DUSK_CONST* DUSK_CONST* mpArcNames; /* 0x05BC */ mDoExt_McaMorfSO* mpModelMorf[2]; /* 0x05C4 */ Z2Creature mSound; /* 0x0654 */ mDoExt_bckAnm mBckAnm; @@ -322,8 +322,8 @@ public: int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int); BOOL setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int); BOOL setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int); - int loadRes(s8 const*, char const**); - void deleteRes(s8 const*, char const**); + int loadRes(s8 const*, char const* DUSK_CONST*); + void deleteRes(s8 const*, char const* DUSK_CONST*); int execute(); int draw(int, int, f32, GXColorS10*, f32, int, int, int); void setEnvTevColor(); @@ -355,7 +355,7 @@ public: daNpcT_motionAnmData_c const* param_1, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2, int param_3, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4, int param_5, - daNpcT_evtData_c const* param_6, char** param_7) + daNpcT_evtData_c const* param_6, char DUSK_CONST* DUSK_CONST* param_7) : mpFaceMotionAnmData(param_0), mpMotionAnmData(param_1), mFaceMotionSeqMngr(param_2, param_3), mMotionSeqMngr(param_4, param_5), mpEventData(param_6), mpArcNames(param_7) { @@ -413,8 +413,8 @@ public: virtual bool afterSetMotionAnm(int, int, f32, int); static const dCcD_SrcGObjInf mCcDObjData; - static char* mCutNameList[21]; - static cutFunc mCutList[21]; + static char DUSK_CONST* DUSK_CONST mCutNameList[21]; + static cutFunc DUSK_CONST mCutList[21]; static dCcD_SrcCyl mCcDCyl; static dCcD_SrcSph mCcDSph; static s16 mSrchName; diff --git a/include/d/actor/d_a_npc_knj.h b/include/d/actor/d_a_npc_knj.h index b9677c7507..8aa5ff860a 100644 --- a/include/d/actor/d_a_npc_knj.h +++ b/include/d/actor/d_a_npc_knj.h @@ -75,13 +75,13 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_KNJ_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index b6fded937b..819eb81078 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -93,7 +93,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -120,8 +120,8 @@ public: virtual void changeAnm(int*, int*); virtual void changeBck(int*, int*); - static char* mCutNameList[11]; - static cutFunc mCutList[11]; + static char DUSK_CONST* DUSK_CONST mCutNameList[11]; + static cutFunc DUSK_CONST mCutList[11]; u32 getFlowNodeNo() { u16 nodeNo = home.angle.x; diff --git a/include/d/actor/d_a_npc_kolinb.h b/include/d/actor/d_a_npc_kolinb.h index cea3e7a3e2..b3858a908e 100644 --- a/include/d/actor/d_a_npc_kolinb.h +++ b/include/d/actor/d_a_npc_kolinb.h @@ -140,7 +140,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -150,8 +150,8 @@ public: s32 getBackboneJointNo() { return mType == 2 ? ZRCB_JNT_BACKBONE1 : KOLINB_JNT_BACKBONE1; } s32 getNeckJointNo() { return mType == 2 ? ZRCB_JNT_NECK : KOLINB_JNT_NECK; } - static char* mCutNameList[7]; - static cutFunc mCutList[7]; + static char DUSK_CONST* DUSK_CONST mCutNameList[7]; + static cutFunc DUSK_CONST mCutList[7]; u32 getFlowNodeNo() { u16 nodeNo = home.angle.x; diff --git a/include/d/actor/d_a_npc_kyury.h b/include/d/actor/d_a_npc_kyury.h index 98d87398e1..62ba0433cf 100644 --- a/include/d/actor/d_a_npc_kyury.h +++ b/include/d/actor/d_a_npc_kyury.h @@ -106,7 +106,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, - int param_6, daNpcT_evtData_c const* param_7, char** param_8) + int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u16 getEyeballMaterialNo() { return 2; } s32 getHeadJointNo() { return 4; } @@ -123,8 +123,8 @@ public: return nodeNo; } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0xE40 */ NPC_KYURY_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_len.h b/include/d/actor/d_a_npc_len.h index 71e659274a..da5a0e0777 100644 --- a/include/d/actor/d_a_npc_len.h +++ b/include/d/actor/d_a_npc_len.h @@ -86,7 +86,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -100,8 +100,8 @@ public: s32 getFootRJointNo() { return 32; } BOOL chkXYItems() { return TRUE; } - static char* mCutNameList[4]; - static cutFunc mCutList[4]; + static char DUSK_CONST* DUSK_CONST mCutNameList[4]; + static cutFunc DUSK_CONST mCutList[4]; int getFlowNodeNo() { u16 nodeNo = home.angle.x; diff --git a/include/d/actor/d_a_npc_lud.h b/include/d/actor/d_a_npc_lud.h index 1adad66e20..b84e6aafac 100644 --- a/include/d/actor/d_a_npc_lud.h +++ b/include/d/actor/d_a_npc_lud.h @@ -91,7 +91,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -111,8 +111,8 @@ public: } u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; } - static char* mCutNameList[8]; - static cutFunc mCutList[8]; + static char DUSK_CONST* DUSK_CONST mCutNameList[8]; + static cutFunc DUSK_CONST mCutList[8]; private: /* 0xE40 */ mDoExt_McaMorfSO* mpBowlMorf; diff --git a/include/d/actor/d_a_npc_maro.h b/include/d/actor/d_a_npc_maro.h index 18944ad9d7..b8ec85b9fb 100644 --- a/include/d/actor/d_a_npc_maro.h +++ b/include/d/actor/d_a_npc_maro.h @@ -132,7 +132,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -167,8 +167,8 @@ public: void startChoccai() { field_0x1134 = 1; } void endChoccai() { field_0x1134 = 0; } - static char* mCutNameList[17]; - static cutFunc mCutList[17]; + static char DUSK_CONST* DUSK_CONST mCutNameList[17]; + static cutFunc DUSK_CONST mCutList[17]; u8 getGroupId() { return (fopAcM_GetParam(this) & 0xF0000000) >> 28; diff --git a/include/d/actor/d_a_npc_midp.h b/include/d/actor/d_a_npc_midp.h index fcbc4ed3fa..810f9eca45 100644 --- a/include/d/actor/d_a_npc_midp.h +++ b/include/d/actor/d_a_npc_midp.h @@ -130,7 +130,7 @@ public: daNpc_midP_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u16 getEyeballRMaterialNo() { return 3; } u16 getEyeballLMaterialNo() { return 2; } @@ -148,8 +148,8 @@ public: return nodeNo; } - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_MIDP_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_moi.h b/include/d/actor/d_a_npc_moi.h index b387a58235..eb00654fd9 100644 --- a/include/d/actor/d_a_npc_moi.h +++ b/include/d/actor/d_a_npc_moi.h @@ -128,7 +128,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -158,8 +158,8 @@ public: bool chkSFight() { return field_0x166b == 1; } u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; } - static char* mCutNameList[5]; - static cutFunc mCutList[5]; + static char DUSK_CONST* DUSK_CONST mCutNameList[5]; + static cutFunc DUSK_CONST mCutList[5]; private: /* 0x0E40 */ NPC_MOI_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_myna2.h b/include/d/actor/d_a_npc_myna2.h index ac6af4d8f7..4cb0356832 100644 --- a/include/d/actor/d_a_npc_myna2.h +++ b/include/d/actor/d_a_npc_myna2.h @@ -87,8 +87,8 @@ public: int getType() { return mType; } - static char* mEvtCutNameList[5]; - static EventFn mEvtCutList[]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[5]; + static EventFn DUSK_CONST mEvtCutList[]; /* 0xB48 */ u8 field_0xB48[0xB4C - 0xB48]; /* 0xB4C */ daNpcF_Lookat_c mLookat; diff --git a/include/d/actor/d_a_npc_pachi_besu.h b/include/d/actor/d_a_npc_pachi_besu.h index 2dd99f1b98..be623faf38 100644 --- a/include/d/actor/d_a_npc_pachi_besu.h +++ b/include/d/actor/d_a_npc_pachi_besu.h @@ -115,7 +115,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -144,8 +144,8 @@ public: void setTagPos(cXyz const& i_pos) { mTagPos = i_pos; } void setLookPos(cXyz const& i_pos) { mLookPos = i_pos; } - static char* mCutNameList[11]; - static cutFunc mCutList[11]; + static char DUSK_CONST* DUSK_CONST mCutNameList[11]; + static cutFunc DUSK_CONST mCutList[11]; private: /* 0xE40 */ NPC_PACHI_BESU_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_pachi_maro.h b/include/d/actor/d_a_npc_pachi_maro.h index 716e599ffd..ffb33d1fbc 100644 --- a/include/d/actor/d_a_npc_pachi_maro.h +++ b/include/d/actor/d_a_npc_pachi_maro.h @@ -149,7 +149,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -184,8 +184,8 @@ public: void setFMotion_Niramu_to_Besu() { mFMotion = 1; } void setFMotion_LookNone() { mFMotion = 2; } - static char* mCutNameList[11]; - static cutFunc mCutList[11]; + static char DUSK_CONST* DUSK_CONST mCutNameList[11]; + static cutFunc DUSK_CONST mCutList[11]; private: /* 0xE40 */ NPC_PACHI_MARO_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_pachi_taro.h b/include/d/actor/d_a_npc_pachi_taro.h index b9c24cde8c..9faee13c23 100644 --- a/include/d/actor/d_a_npc_pachi_taro.h +++ b/include/d/actor/d_a_npc_pachi_taro.h @@ -166,7 +166,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -196,8 +196,8 @@ public: void setTagPos(cXyz const& i_pos) { mTagPos = i_pos; } void setLookPos(cXyz const& i_pos) { mLookPos = i_pos; } - static char* mCutNameList[11]; - static cutFunc mCutList[11]; + static char DUSK_CONST* DUSK_CONST mCutNameList[11]; + static cutFunc DUSK_CONST mCutList[11]; private: /* 0x0E40 */ NPC_PACHI_TARO_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_post.h b/include/d/actor/d_a_npc_post.h index 91b6396ed8..5450dbfe68 100644 --- a/include/d/actor/d_a_npc_post.h +++ b/include/d/actor/d_a_npc_post.h @@ -125,7 +125,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -153,8 +153,8 @@ public: u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0x0E40 */ mDoExt_McaMorfSO* mpFlagModelMorf; diff --git a/include/d/actor/d_a_npc_pouya.h b/include/d/actor/d_a_npc_pouya.h index 19cf0b94b8..c94f777d87 100644 --- a/include/d/actor/d_a_npc_pouya.h +++ b/include/d/actor/d_a_npc_pouya.h @@ -121,7 +121,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -146,8 +146,8 @@ public: MtxP getHeadMtx() { return mpMorf[0]->getModel()->getAnmMtx(4); } - static char* mCutNameList[3]; - static cutFunc mCutList[3]; + static char DUSK_CONST* DUSK_CONST mCutNameList[3]; + static cutFunc DUSK_CONST mCutList[3]; private: /* 0xE40 */ NPC_POUYA_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_prayer.h b/include/d/actor/d_a_npc_prayer.h index 459710f049..fd1afa2ddf 100644 --- a/include/d/actor/d_a_npc_prayer.h +++ b/include/d/actor/d_a_npc_prayer.h @@ -77,7 +77,7 @@ public: s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; } - static EvtSeq mEvtSeqList[]; + static EvtSeq DUSK_CONST mEvtSeqList[]; private: /* 0xB48 */ Z2CreatureCitizen mSound; diff --git a/include/d/actor/d_a_npc_raca.h b/include/d/actor/d_a_npc_raca.h index 42a3229e8f..985f370dbb 100644 --- a/include/d/actor/d_a_npc_raca.h +++ b/include/d/actor/d_a_npc_raca.h @@ -121,7 +121,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -145,8 +145,8 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; } - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_RACA_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_saru.h b/include/d/actor/d_a_npc_saru.h index 14c36ec633..05535786fe 100644 --- a/include/d/actor/d_a_npc_saru.h +++ b/include/d/actor/d_a_npc_saru.h @@ -115,7 +115,7 @@ public: daNpc_Saru_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} s32 getHeadJointNo() { return JNT_HEAD; } @@ -133,8 +133,8 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; } u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff00) >> 8; } - static char* mCutNameList[4]; - static cutFunc mCutList[4]; + static char DUSK_CONST* DUSK_CONST mCutNameList[4]; + static cutFunc DUSK_CONST mCutList[4]; private: /* 0xE40 */ NPC_SARU_HIO_CLASS* mpHIO; /* 0xE44 */ J3DModel* mpRoseModels[2]; diff --git a/include/d/actor/d_a_npc_seib.h b/include/d/actor/d_a_npc_seib.h index 43e887dc64..b7af300cee 100644 --- a/include/d/actor/d_a_npc_seib.h +++ b/include/d/actor/d_a_npc_seib.h @@ -80,12 +80,12 @@ public: daNpc_seiB_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_SEIB_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h index dd860a8869..bbdaf19431 100644 --- a/include/d/actor/d_a_npc_seic.h +++ b/include/d/actor/d_a_npc_seic.h @@ -82,13 +82,13 @@ public: daNpc_seiC_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {}; - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_SEIC_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_seid.h b/include/d/actor/d_a_npc_seid.h index 7119761b25..f83d8a2909 100644 --- a/include/d/actor/d_a_npc_seid.h +++ b/include/d/actor/d_a_npc_seid.h @@ -81,13 +81,13 @@ public: daNpc_seiD_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {}; - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_SEID_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_seira.h b/include/d/actor/d_a_npc_seira.h index 5c387526d8..0528dd5c01 100644 --- a/include/d/actor/d_a_npc_seira.h +++ b/include/d/actor/d_a_npc_seira.h @@ -100,7 +100,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -114,8 +114,8 @@ public: BOOL checkChangeJoint(int val) { return val == 4; } BOOL checkRemoveJoint(int val) { return val == 8; } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0x0F7C */ mDoExt_McaMorfSO* mpSeiraMorf; diff --git a/include/d/actor/d_a_npc_seira2.h b/include/d/actor/d_a_npc_seira2.h index 9743a2b7a3..b3157b2924 100644 --- a/include/d/actor/d_a_npc_seira2.h +++ b/include/d/actor/d_a_npc_seira2.h @@ -92,7 +92,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -106,8 +106,8 @@ public: BOOL checkChangeJoint(int val) { return val == 4; } BOOL checkRemoveJoint(int val) { return val == 8; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0x0F7C */ mDoExt_McaMorfSO* mpSeiraMorf; diff --git a/include/d/actor/d_a_npc_seirei.h b/include/d/actor/d_a_npc_seirei.h index 8e42d1a035..ca0c7f9985 100644 --- a/include/d/actor/d_a_npc_seirei.h +++ b/include/d/actor/d_a_npc_seirei.h @@ -83,7 +83,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -99,8 +99,8 @@ public: u32 getBitSW() { return (fopAcM_GetParam(this) & 0xFF000) >> 12; } bool getDoBtnChkFlag() { return (fopAcM_GetParam(this) & 0x100) == 0; } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0xE40 */ NPC_SEIREI_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h index ba94bbe74e..d33a6af350 100644 --- a/include/d/actor/d_a_npc_shad.h +++ b/include/d/actor/d_a_npc_shad.h @@ -184,7 +184,7 @@ public: void lookat(); BOOL drawDbgInfo(); - static EventFn mEvtSeqList[14]; + static EventFn DUSK_CONST mEvtSeqList[14]; u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; } s16 getMessageNo() { return shape_angle.x; } diff --git a/include/d/actor/d_a_npc_shaman.h b/include/d/actor/d_a_npc_shaman.h index 5f0a26b52f..76231f2756 100644 --- a/include/d/actor/d_a_npc_shaman.h +++ b/include/d/actor/d_a_npc_shaman.h @@ -94,7 +94,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { OS_REPORT("|%06d:%x|daNpc_Sha_c -> コンストラクト\n", g_Counter.mCounter0, this); } @@ -110,8 +110,8 @@ public: return nodeNo == 0xFFFF ? -1 : nodeNo; } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; static const u16 mEvtBitLabels[6]; static const u16 mTmpBitLabels[6]; static const int mSceneChangeNoTable[48]; diff --git a/include/d/actor/d_a_npc_shoe.h b/include/d/actor/d_a_npc_shoe.h index 0b96f8567b..67b746546b 100644 --- a/include/d/actor/d_a_npc_shoe.h +++ b/include/d/actor/d_a_npc_shoe.h @@ -110,7 +110,7 @@ public: inline bool chkFindPlayer(); inline void playMotion(); - static EventFn mEvtSeqList[1]; + static EventFn DUSK_CONST mEvtSeqList[1]; private: /* 0xB48 */ J3DModel* mpModel1; diff --git a/include/d/actor/d_a_npc_shop0.h b/include/d/actor/d_a_npc_shop0.h index a2a1ac50a6..21e6916ac1 100644 --- a/include/d/actor/d_a_npc_shop0.h +++ b/include/d/actor/d_a_npc_shop0.h @@ -34,12 +34,12 @@ public: int destroy(); int execute(); int draw(); - char* getResName(); + char DUSK_CONST* getResName(); void getParam(); int getFlowNodeNum(); int isDelete(); int init(); - J3DAnmTransform* getTrnsfrmAnmP(int, char**); + J3DAnmTransform* getTrnsfrmAnmP(int, char DUSK_CONST* DUSK_CONST*); int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool); int setCollision(); int checkEvent(); diff --git a/include/d/actor/d_a_npc_sola.h b/include/d/actor/d_a_npc_sola.h index 0b13842f9c..7b622d121c 100644 --- a/include/d/actor/d_a_npc_sola.h +++ b/include/d/actor/d_a_npc_sola.h @@ -105,14 +105,14 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, - int param_6, daNpcT_evtData_c const* param_7, char** param_8) + int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} s32 getHeadJointNo() { return JNT_HEAD; } s32 getNeckJointNo() { return JNT_NECK; } s32 getBackboneJointNo() { return JNT_BACKBONE1; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_SOLA_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_soldierA.h b/include/d/actor/d_a_npc_soldierA.h index cc841c7092..f7c9153dd9 100644 --- a/include/d/actor/d_a_npc_soldierA.h +++ b/include/d/actor/d_a_npc_soldierA.h @@ -79,8 +79,8 @@ public: u8 getType() { return mType; } - static char* mEvtCutNameList[3]; - static cutFunc mEvtCutList[3]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[3]; + static cutFunc DUSK_CONST mEvtCutList[3]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_soldierB.h b/include/d/actor/d_a_npc_soldierB.h index 6e864b0cd2..a99e10a813 100644 --- a/include/d/actor/d_a_npc_soldierB.h +++ b/include/d/actor/d_a_npc_soldierB.h @@ -75,8 +75,8 @@ public: int ECut_listenLake(int); int test(void*); - static char* mEvtCutNameList[2]; - static cutFunc mEvtCutList[2]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; + static cutFunc DUSK_CONST mEvtCutList[2]; private: /* 0xB48 */ Z2Creature mSound; diff --git a/include/d/actor/d_a_npc_taro.h b/include/d/actor/d_a_npc_taro.h index 8db2ec3270..6e7e394406 100644 --- a/include/d/actor/d_a_npc_taro.h +++ b/include/d/actor/d_a_npc_taro.h @@ -126,7 +126,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, - int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char** i_arcNames) + int i_motionStepNum, daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -156,8 +156,8 @@ public: u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff0000) >> 16; } u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xff000000) >> 24; } - static char* mCutNameList[17]; - static cutFunc mCutList[17]; + static char DUSK_CONST* DUSK_CONST mCutNameList[17]; + static cutFunc DUSK_CONST mCutList[17]; private: /* 0x0E40 */ NPC_TARO_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_the.h b/include/d/actor/d_a_npc_the.h index bc78a93925..c131d442f6 100644 --- a/include/d/actor/d_a_npc_the.h +++ b/include/d/actor/d_a_npc_the.h @@ -231,8 +231,8 @@ private: /* 0xE1D */ bool field_0xe1d; /* 0xE1E */ u8 mType; - static char* mEvtCutNameList[4]; - static EventFn mEvtCutList[4]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[4]; + static EventFn DUSK_CONST mEvtCutList[4]; }; STATIC_ASSERT(sizeof(daNpcThe_c) == 0xE20); diff --git a/include/d/actor/d_a_npc_tkj.h b/include/d/actor/d_a_npc_tkj.h index e2718d8b45..dc0e595cb7 100644 --- a/include/d/actor/d_a_npc_tkj.h +++ b/include/d/actor/d_a_npc_tkj.h @@ -67,7 +67,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) @@ -94,8 +94,8 @@ public: int getPath() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } - static char* mCutNameList[2]; - static int (daNpcTkj_c::*mCutList[])(int); + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static int (daNpcTkj_c::* DUSK_CONST mCutList[])(int); private: /* 0xE40 */ NPC_TKJ_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 0c3de69c6f..7cce8adf7e 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -97,7 +97,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -129,8 +129,8 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; } - static char* mCutNameList[7]; - static cutFunc mCutList[7]; + static char DUSK_CONST* DUSK_CONST mCutNameList[7]; + static cutFunc DUSK_CONST mCutList[7]; private: /* 0x0E40 */ NPC_TOBY_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_uri.h b/include/d/actor/d_a_npc_uri.h index 5efde8c51d..0c29bd56ee 100644 --- a/include/d/actor/d_a_npc_uri.h +++ b/include/d/actor/d_a_npc_uri.h @@ -113,7 +113,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, - int param_6, daNpcT_evtData_c const* param_7, char** param_8) + int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u16 getEyeballMaterialNo() { return 2; } s32 getHeadJointNo() { return 4; } @@ -137,7 +137,7 @@ public: u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; } static const char* mCutNameList[7]; - static cutFunc mCutList[7]; + static cutFunc DUSK_CONST mCutList[7]; private: /* 0x0E40 */ NPC_URI_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_wrestler.h b/include/d/actor/d_a_npc_wrestler.h index e9df8ff516..e4c98c8abb 100644 --- a/include/d/actor/d_a_npc_wrestler.h +++ b/include/d/actor/d_a_npc_wrestler.h @@ -110,10 +110,10 @@ public: #endif struct WrestlerParamList { - daNpc_GetParam1* bck_list; - daNpc_GetParam2* face_list; - daNpc_GetParam1* btp_list; - daNpc_GetParam1* btk_list; + DUSK_CONST daNpc_GetParam1* bck_list; + DUSK_CONST daNpc_GetParam2* face_list; + DUSK_CONST daNpc_GetParam1* btp_list; + DUSK_CONST daNpc_GetParam1* btk_list; }; struct DemoCamera_c { @@ -230,7 +230,7 @@ public: inline void initDemoCamera_ReadyWrestler(); inline void playExpression(); - static EventFn mEvtSeqList[7]; + static EventFn DUSK_CONST mEvtSeqList[7]; private: /* 0xB48 */ Z2Creature mSound; @@ -254,7 +254,7 @@ private: u8 chkFlag; } mArenaInfo; /* 0xE03 */ u8 field_0xe03; - /* 0xE04 */ WrestlerParamList* field_0xe04; + /* 0xE04 */ WrestlerParamList DUSK_CONST* field_0xe04; /* 0xE08 */ DemoCamera_c mDemoCam; /* 0xE50 */ f32 mDemoCamFovy; /* 0xE54 */ f32 field_0xe54; diff --git a/include/d/actor/d_a_npc_yamid.h b/include/d/actor/d_a_npc_yamid.h index 77287cb6a1..3133cbd84f 100644 --- a/include/d/actor/d_a_npc_yamid.h +++ b/include/d/actor/d_a_npc_yamid.h @@ -84,7 +84,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -129,8 +129,8 @@ public: field_0xe44.OffTgSetBit(); } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0xE40 */ NPC_YAMID_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_yamis.h b/include/d/actor/d_a_npc_yamis.h index 1a8bc3a56b..edf87ee174 100644 --- a/include/d/actor/d_a_npc_yamis.h +++ b/include/d/actor/d_a_npc_yamis.h @@ -81,7 +81,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -124,8 +124,8 @@ public: field_0xe44.OffTgSetBit(); } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0xE40 */ NPC_YAMIS_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_yamit.h b/include/d/actor/d_a_npc_yamit.h index f2ddaea4b6..4f7a5393f8 100644 --- a/include/d/actor/d_a_npc_yamit.h +++ b/include/d/actor/d_a_npc_yamit.h @@ -84,7 +84,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -123,8 +123,8 @@ public: } u8 _is_stopper_off() { return fopAcM_isSwitch(this, 0x3D) && fopAcM_isSwitch(this, 0x3E); } - static char* mCutNameList[2]; - static cutFunc mCutList[2]; + static char DUSK_CONST* DUSK_CONST mCutNameList[2]; + static cutFunc DUSK_CONST mCutList[2]; private: /* 0xE40 */ NPC_YAMIT_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_yelia.h b/include/d/actor/d_a_npc_yelia.h index d512ad8d75..fb934a25c5 100644 --- a/include/d/actor/d_a_npc_yelia.h +++ b/include/d/actor/d_a_npc_yelia.h @@ -82,7 +82,7 @@ public: int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -102,7 +102,7 @@ public: return no; } - static char* mCutNameList[6]; + static char DUSK_CONST* DUSK_CONST mCutNameList[6]; static int (daNpc_Yelia_c::*mCutList[6])(int); private: /* 0xE40 */ NPC_YELIA_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h index 69c9d99858..391203948d 100644 --- a/include/d/actor/d_a_npc_ykm.h +++ b/include/d/actor/d_a_npc_ykm.h @@ -258,7 +258,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, daNpcT_evtData_c const* i_evtData, - char** i_arcNames) + char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -285,8 +285,8 @@ public: int getBitTRB() { return (u8)((fopAcM_GetParam(this) & 0x3F0000) >> 16); } u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; } - static char* mCutNameList[10]; - static cutFunc mCutList[10]; + static char DUSK_CONST* DUSK_CONST mCutNameList[10]; + static cutFunc DUSK_CONST mCutList[10]; private: /* 0x0E40 */ mDoExt_McaMorfSO* mFishModelMorf; /* 0x0E44 */ mDoExt_McaMorfSO* mLeafModelMorf; diff --git a/include/d/actor/d_a_npc_ykw.h b/include/d/actor/d_a_npc_ykw.h index 770d452af2..91517d4e17 100644 --- a/include/d/actor/d_a_npc_ykw.h +++ b/include/d/actor/d_a_npc_ykw.h @@ -132,7 +132,7 @@ public: } static const char* mCutNameList[8]; - static cutFunc mCutList[8]; + static cutFunc DUSK_CONST mCutList[8]; void setDialogueTmr1(int param_1) { field_0x1024 = param_1; diff --git a/include/d/actor/d_a_npc_zanb.h b/include/d/actor/d_a_npc_zanb.h index b2c8aa704a..6feaf3fc72 100644 --- a/include/d/actor/d_a_npc_zanb.h +++ b/include/d/actor/d_a_npc_zanb.h @@ -78,7 +78,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) { @@ -99,8 +99,8 @@ public: return nodeNo; } - static char* mCutNameList[1]; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_ZANB_HIO_CLASS* mHIO; diff --git a/include/d/actor/d_a_npc_zant.h b/include/d/actor/d_a_npc_zant.h index fb5d430694..d2d1949bda 100644 --- a/include/d/actor/d_a_npc_zant.h +++ b/include/d/actor/d_a_npc_zant.h @@ -80,11 +80,11 @@ public: daNpc_Zant_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_ZANT_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_zelR.h b/include/d/actor/d_a_npc_zelR.h index 0c6fcd81b4..ce3314c694 100644 --- a/include/d/actor/d_a_npc_zelR.h +++ b/include/d/actor/d_a_npc_zelR.h @@ -83,7 +83,7 @@ public: daNpc_ZelR_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) : + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} u16 getEyeballRMaterialNo() { return 3; } @@ -93,7 +93,7 @@ public: BOOL checkChangeJoint(int param_1) { return param_1 == 3; }; BOOL checkRemoveJoint(int param_1) { return param_1 == 13; }; - static char* mCutNameList; + static char DUSK_CONST* DUSK_CONST mCutNameList; static EventFn mCutList[1]; private: diff --git a/include/d/actor/d_a_npc_zelRo.h b/include/d/actor/d_a_npc_zelRo.h index b137c3bedb..40e0b3e391 100644 --- a/include/d/actor/d_a_npc_zelRo.h +++ b/include/d/actor/d_a_npc_zelRo.h @@ -135,7 +135,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum, - daNpcT_evtData_c const* i_evtData, char** i_arcNames) + daNpcT_evtData_c const* i_evtData, char DUSK_CONST* DUSK_CONST* i_arcNames) : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData, i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData, i_arcNames) {} @@ -147,8 +147,8 @@ public: BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; } BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; } - static char* mCutNameList; - static cutFunc mCutList[1]; + static char DUSK_CONST* DUSK_CONST mCutNameList; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_ZELRO_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_zelda.h b/include/d/actor/d_a_npc_zelda.h index 78630dbb5b..5a2d70b658 100644 --- a/include/d/actor/d_a_npc_zelda.h +++ b/include/d/actor/d_a_npc_zelda.h @@ -88,7 +88,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2, int param_3, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4, - int param_5, daNpcT_evtData_c const* param_6, char** param_7) : + int param_5, daNpcT_evtData_c const* param_6, char DUSK_CONST* DUSK_CONST* param_7) : daNpcT_c(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) { OS_REPORT("|%06d:%x|daNpc_Zelda_c -> コンストラクト\n", g_Counter.mCounter0, this); } @@ -101,7 +101,7 @@ public: int checkRemoveJoint(int param_0) { return param_0 == 17; } static const char* mCutNameList; - static cutFunc mCutList[1]; + static cutFunc DUSK_CONST mCutList[1]; private: /* 0xE40 */ NPC_ZELDA_HIO_CLASS* mpHIO; diff --git a/include/d/actor/d_a_npc_zra.h b/include/d/actor/d_a_npc_zra.h index 1760d3c41d..31ea1431b7 100644 --- a/include/d/actor/d_a_npc_zra.h +++ b/include/d/actor/d_a_npc_zra.h @@ -399,7 +399,7 @@ public: /* 0x14F0 */ int mBtkID; /* 0x14F4 */ int mBpkID; /* 0x14F8 */ u32 mWaterAnmFlags; - /* 0x14FC */ char* mStaffName; + /* 0x14FC */ DUSK_CONST char* mStaffName; /* 0x1500 */ cXyz field_0x1500; /* 0x150C */ u8 mMeterCount; /* 0x150D */ u8 mGameMode; @@ -443,8 +443,8 @@ public: /* 0x15C0 */ u8 field_0x15c0; /* 0x15C1 */ bool mBlastFlag; - static char* mEvtCutNameList[11]; - static EventFn mEvtCutList[11]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[11]; + static EventFn DUSK_CONST mEvtCutList[11]; }; STATIC_ASSERT(sizeof(daNpc_zrA_c) == 0x15C4); diff --git a/include/d/actor/d_a_npc_zrc.h b/include/d/actor/d_a_npc_zrc.h index 327d87beb5..184a4e31c0 100644 --- a/include/d/actor/d_a_npc_zrc.h +++ b/include/d/actor/d_a_npc_zrc.h @@ -93,8 +93,8 @@ public: BOOL ECut_earringGet(int); void adjustShapeAngle() {} - static char* mEvtCutNameList[2]; - static EventFn mEvtCutList[2]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[2]; + static EventFn DUSK_CONST mEvtCutList[2]; private: /* 0xB48 */ Z2Creature mCreatureSound; diff --git a/include/d/actor/d_a_npc_zrz.h b/include/d/actor/d_a_npc_zrz.h index 4201047ed7..a9a294b97f 100644 --- a/include/d/actor/d_a_npc_zrz.h +++ b/include/d/actor/d_a_npc_zrz.h @@ -160,8 +160,8 @@ private: /* 0x14C0 */ BOOL mMusicSet; /* 0x14C4 */ bool mSealReleased; - static char* mEvtCutNameList[8]; - static EventFn mEvtCutList[8]; + static char DUSK_CONST* DUSK_CONST mEvtCutNameList[8]; + static EventFn DUSK_CONST mEvtCutList[8]; enum Animation { /* 0x0 */ ANM_NONE, diff --git a/include/d/actor/d_a_obj_bed.h b/include/d/actor/d_a_obj_bed.h index 68919a8461..883dd64f73 100644 --- a/include/d/actor/d_a_obj_bed.h +++ b/include/d/actor/d_a_obj_bed.h @@ -71,7 +71,7 @@ public: int Draw(); static int createHeapCallBack(fopAc_ac_c*); u8 getType(); - char* getResName(); + char DUSK_CONST* getResName(); int isDelete(); void setEnvTevColor(); void setRoomNo(); diff --git a/include/d/actor/d_a_obj_boumato.h b/include/d/actor/d_a_obj_boumato.h index 176832f24f..3a988d9b4b 100644 --- a/include/d/actor/d_a_obj_boumato.h +++ b/include/d/actor/d_a_obj_boumato.h @@ -89,7 +89,7 @@ public: static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); static void* srchArrow(void*, void*); void deleteStuckArrow(); - char* getResName(); + char DUSK_CONST* getResName(); void setSwayParam(fopAc_ac_c*); void setEnvTevColor(); void setRoomNo(); diff --git a/include/d/actor/d_a_obj_carry.h b/include/d/actor/d_a_obj_carry.h index 0581dda831..621b8efabb 100644 --- a/include/d/actor/d_a_obj_carry.h +++ b/include/d/actor/d_a_obj_carry.h @@ -111,8 +111,8 @@ public: static void setRoomNo(int, s8); static s8 getRoomNo(int); const daObjCarry_dt_t& data(); - char* getArcName(); - char* getBmdName(); + DUSK_CONST char* getArcName(); + DUSK_CONST char* getBmdName(); BOOL checkFlag(u8); void initBaseMtx(); void setBaseMtx(); diff --git a/include/d/actor/d_a_obj_keyhole.h b/include/d/actor/d_a_obj_keyhole.h index 423cae4453..fd39641ad8 100644 --- a/include/d/actor/d_a_obj_keyhole.h +++ b/include/d/actor/d_a_obj_keyhole.h @@ -34,7 +34,7 @@ public: /* 0x0000 */ fopAc_ac_c actor; /* 0x0568 */ request_of_phase_process_class phase; - /* 0x0570 */ char* arcname; + /* 0x0570 */ DUSK_CONST char* arcname; /* 0x0574 */ mDoExt_McaMorf* lock_modelMorf; /* 0x0578 */ J3DModel* lock_model; /* 0x057C */ int chain_num; diff --git a/include/d/actor/d_a_obj_nameplate.h b/include/d/actor/d_a_obj_nameplate.h index 7c1c77cc3c..97b313099c 100644 --- a/include/d/actor/d_a_obj_nameplate.h +++ b/include/d/actor/d_a_obj_nameplate.h @@ -43,7 +43,7 @@ public: static M_attrs const M_attr; static M_attrs const& attr() { return M_attr; } - static char* l_arcName; + static char DUSK_CONST* DUSK_CONST l_arcName; ~daObjNameplate_c() { dComIfG_resDelete(&this->mPhase, l_arcName); } diff --git a/include/d/actor/d_a_obj_oiltubo.h b/include/d/actor/d_a_obj_oiltubo.h index 35b102211e..fa1dc47fd9 100644 --- a/include/d/actor/d_a_obj_oiltubo.h +++ b/include/d/actor/d_a_obj_oiltubo.h @@ -34,7 +34,7 @@ public: int wait(void*); static const dCcD_SrcGObjInf mCcDObjInfo; - static dCcD_SrcCyl mCcDCyl; + static dCcD_SrcCyl DUSK_CONST mCcDCyl; private: /* 0x568 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_pdtile.h b/include/d/actor/d_a_obj_pdtile.h index 36293fd0b8..1dcb327acc 100644 --- a/include/d/actor/d_a_obj_pdtile.h +++ b/include/d/actor/d_a_obj_pdtile.h @@ -55,10 +55,10 @@ private: /* 0x7B4 */ u8 field_0x7b4; /* 0x7B5 */ u8 field_0x7b5; /* 0x7B8 */ int field_0x7b8; - /* 0x7BC */ char* mArcName; + /* 0x7BC */ char DUSK_CONST* mArcName; /* 0x7C0 */ u32 mDzbId; /* 0x7C4 */ u32 mBmdId; - /* 0x7C8 */ cull_box* mCullBox; + /* 0x7C8 */ cull_box DUSK_CONST* mCullBox; /* 0x7CC */ f32 field_0x7cc; /* 0x7D0 */ u8 field_0x7d0; /* 0x7D4 */ int field_0x7d4; diff --git a/include/d/actor/d_a_obj_pleaf.h b/include/d/actor/d_a_obj_pleaf.h index 084f4f1543..3571bb4026 100644 --- a/include/d/actor/d_a_obj_pleaf.h +++ b/include/d/actor/d_a_obj_pleaf.h @@ -65,7 +65,7 @@ public: int Execute(); int Draw(); static int createHeapCallBack(fopAc_ac_c*); - char* getResName(); + char DUSK_CONST* getResName(); int isDelete(); void setEnvTevColor(); void setRoomNo(); diff --git a/include/d/actor/d_a_obj_roten.h b/include/d/actor/d_a_obj_roten.h index 91e786c1b8..9b4b17a19d 100644 --- a/include/d/actor/d_a_obj_roten.h +++ b/include/d/actor/d_a_obj_roten.h @@ -22,7 +22,7 @@ public: int Execute(Mtx**); int Draw(); int Delete(); - char* getResName(); + char DUSK_CONST* getResName(); virtual ~daObj_Roten_c(); private: diff --git a/include/d/actor/d_a_obj_scannon.h b/include/d/actor/d_a_obj_scannon.h index 4e054ed765..9aa871bd77 100644 --- a/include/d/actor/d_a_obj_scannon.h +++ b/include/d/actor/d_a_obj_scannon.h @@ -14,8 +14,8 @@ class daSCannon_c : public fopAc_ac_c, public request_of_phase_process_class { public: struct demoTable_s { - /* 0x0 */ void (daSCannon_c::*(*demo_proc_table)[2])(); - /* 0x4 */ char** cut_table; + /* 0x0 */ void (daSCannon_c::*DUSK_CONST (*demo_proc_table)[2])(); + /* 0x4 */ char DUSK_CONST* DUSK_CONST* cut_table; /* 0x8 */ int cut_num; }; @@ -77,11 +77,11 @@ public: int getSw2() { return fopAcM_GetParamBit(this, 8, 8); } static const demoTable_s s_demoTable[]; - static void (daSCannon_c::*s_exeProc[])(); - static void (daSCannon_c::*s_demoExeProc_WarpEnd[][2])(); - static void (daSCannon_c::*s_demoExeProc_FireTks[][2])(); - static void (daSCannon_c::*s_demoExeProc_FireFirst[][2])(); - static void (daSCannon_c::*s_demoExeProc_FireSecond[][2])(); + static void (daSCannon_c::*DUSK_CONST s_exeProc[])(); + static void (daSCannon_c::*DUSK_CONST s_demoExeProc_WarpEnd[][2])(); + static void (daSCannon_c::*DUSK_CONST s_demoExeProc_FireTks[][2])(); + static void (daSCannon_c::*DUSK_CONST s_demoExeProc_FireFirst[][2])(); + static void (daSCannon_c::*DUSK_CONST s_demoExeProc_FireSecond[][2])(); private: /* 0x574 */ request_of_phase_process_class mZevPhase; diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h index 8f01206e88..ce924915e1 100644 --- a/include/d/actor/d_a_obj_sekizoa.h +++ b/include/d/actor/d_a_obj_sekizoa.h @@ -169,7 +169,7 @@ public: daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, - int param_6, daNpcT_evtData_c const* param_7, char** param_8) + int param_6, daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} BOOL chkGoal() { daTag_EvtArea_c* evt_area_A = (daTag_EvtArea_c*)mActorMngrs[5].getActorP(); @@ -268,8 +268,8 @@ public: -300.0f, 0); } - static char* mCutNameList[9]; - static cutFunc mCutList[9]; + static char DUSK_CONST* DUSK_CONST mCutNameList[9]; + static cutFunc DUSK_CONST mCutList[9]; /* 0x0E40 */ mDoExt_McaMorfSO* mpMcaMorf; /* 0x0E44 */ mDoExt_invisibleModel mInvModel; diff --git a/include/d/actor/d_a_obj_ss_drink.h b/include/d/actor/d_a_obj_ss_drink.h index f4865350a4..c20992163b 100644 --- a/include/d/actor/d_a_obj_ss_drink.h +++ b/include/d/actor/d_a_obj_ss_drink.h @@ -21,7 +21,7 @@ public: int Execute(); int Draw(); static int createHeapCallBack(fopAc_ac_c*); - char* getResName(); + char DUSK_CONST* getResName(); u8 getTypeFromParam(); u8 getSwitchFromParam(); u8 getCapacityFromParam(); @@ -48,7 +48,7 @@ public: virtual void setSoldOut(); static dCcD_SrcGObjInf const mCcDObjInfo; - static dCcD_SrcCyl mCcDCyl; + static dCcD_SrcCyl DUSK_CONST mCcDCyl; private: /* 0x578 */ mDoExt_btpAnm* mpBtpAnm; diff --git a/include/d/actor/d_a_obj_ss_item.h b/include/d/actor/d_a_obj_ss_item.h index bdf61d1ec8..2b05046e28 100644 --- a/include/d/actor/d_a_obj_ss_item.h +++ b/include/d/actor/d_a_obj_ss_item.h @@ -30,7 +30,7 @@ public: void setSoldOut(); u32 getProcessID(); daObj_SSItem_c* getExchangeItemPtr(); - char* getResName(); + char DUSK_CONST* getResName(); u8 getTypeFromParam(); u16 getFlowNodeNum(); u16 getValue(); @@ -47,7 +47,7 @@ public: int cancel(void* param_0); static dCcD_SrcGObjInf const mCcDObjInfo; - static dCcD_SrcCyl mCcDCyl; + static dCcD_SrcCyl DUSK_CONST mCcDCyl; private: /* 0x578 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_obj_swpush.h b/include/d/actor/d_a_obj_swpush.h index c222e0f833..5c73d2b310 100644 --- a/include/d/actor/d_a_obj_swpush.h +++ b/include/d/actor/d_a_obj_swpush.h @@ -147,7 +147,7 @@ namespace daObjSwpush { static u32 const M_heap_size[3]; static Hio_c::Attr_c const M_attr[5]; static u8 const M_op_vtx[4]; - static char* M_arcname[3]; + static DUSK_CONST char* M_arcname[3]; /* 0x568 */ request_of_phase_process_class mPhase; /* 0x570 */ dBgWSv* mpBgW; diff --git a/include/d/actor/d_a_obj_toby.h b/include/d/actor/d_a_obj_toby.h index 6a3510b5d9..6f6124ed28 100644 --- a/include/d/actor/d_a_obj_toby.h +++ b/include/d/actor/d_a_obj_toby.h @@ -38,7 +38,7 @@ class obj_toby_class { public: /* 0x0000 */ fopAc_ac_c mBase; /* 0x0568 */ request_of_phase_process_class mPhase; - /* 0x0570 */ char* mArcName; + /* 0x0570 */ char DUSK_CONST* mArcName; /* 0x0574 */ u8 field_0x574; /* 0x0575 */ u8 field_0x575; /* 0x0576 */ u8 field_0x576; diff --git a/include/d/actor/d_a_peru.h b/include/d/actor/d_a_peru.h index df9f494936..9ea1ce80c1 100644 --- a/include/d/actor/d_a_peru.h +++ b/include/d/actor/d_a_peru.h @@ -137,7 +137,7 @@ public: daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) { OS_REPORT("|%06d:%x|daPeru_c -> コンストラクト\n", g_Counter.mCounter0, this); } diff --git a/include/d/actor/d_a_tag_Lv7Gate.h b/include/d/actor/d_a_tag_Lv7Gate.h index efbb88b0cf..da9938f7bd 100644 --- a/include/d/actor/d_a_tag_Lv7Gate.h +++ b/include/d/actor/d_a_tag_Lv7Gate.h @@ -31,7 +31,7 @@ public: /* 0x57C */ cXyz mPos2; /* 0x588 */ cXyz mPos1; /* 0x594 */ csXyz field_0x594; - /* 0x59C */ char* mEvName; + /* 0x59C */ char DUSK_CONST* mEvName; /* 0x5A0 */ int field_0x5a0; /* 0x5A4 */ f32 mDistance; /* 0x5A8 */ f32 mLastFrame; diff --git a/include/d/actor/d_a_tag_evt.h b/include/d/actor/d_a_tag_evt.h index b9be601276..fda3192704 100644 --- a/include/d/actor/d_a_tag_evt.h +++ b/include/d/actor/d_a_tag_evt.h @@ -17,7 +17,7 @@ public: int doEvtCutTalk(int); int doEvtCutNext(int); - static char* mEvtCutList[3]; + static DUSK_CONST char* mEvtCutList[3]; /* 0x568 */ char field_0x568[8]; /* 0x570 */ u16 field_0x570; diff --git a/include/d/actor/d_a_tag_evtmsg.h b/include/d/actor/d_a_tag_evtmsg.h index 3ca4e03545..33a8d41f49 100644 --- a/include/d/actor/d_a_tag_evtmsg.h +++ b/include/d/actor/d_a_tag_evtmsg.h @@ -32,7 +32,7 @@ public: virtual ~daTag_EvtMsg_c(); - static char* mEvtCutNameList[]; + static DUSK_CONST char* mEvtCutNameList[]; static EvtCutFunc mEvtCutList[]; }; diff --git a/include/d/actor/d_a_tag_msg.h b/include/d/actor/d_a_tag_msg.h index 5ff6163559..b1104d6846 100644 --- a/include/d/actor/d_a_tag_msg.h +++ b/include/d/actor/d_a_tag_msg.h @@ -43,11 +43,11 @@ public: int draw(); BOOL rangeCheck(); BOOL otherCheck(); - char* getResName(); + DUSK_CONST char* getResName(); void getParam(); BOOL cut_speak(int, BOOL); - static char* mEvtCutTBL[2]; + static DUSK_CONST char* mEvtCutTBL[2]; /* 0x56C */ char mStaffName[8]; /* 0x574 */ request_of_phase_process_class mPhase; diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index 798a1c8661..2b48a156eb 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -22,7 +22,7 @@ protected: STATIC_ASSERT(sizeof(daTboxBase_c) == 0x718); struct daTbox_ModelInfo { - /* 0x00 */ char* mArcName; + /* 0x00 */ DUSK_CONST char* mArcName; /* 0x04 */ int mModelResNo; /* 0x08 */ int mBckResNo; /* 0x0C */ int mClosedDzbResNo; @@ -58,7 +58,7 @@ public: MODE_EXEC = 1, }; - daTbox_ModelInfo* getModelInfo(); + DUSK_CONST daTbox_ModelInfo* getModelInfo(); cPhs_Step commonShapeSet(); cPhs_Step effectShapeSet(); cPhs_Step envShapeSet(); diff --git a/include/d/d_camera.h b/include/d/d_camera.h index b694933461..7b12493360 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -900,24 +900,24 @@ public: int StartEventCamera(int, int, ...); int EndEventCamera(int); - int searchEventArgData(char*); - bool getEvIntData(int*, char*, int); - bool getEvIntData(int*, char*); - bool getEvFloatData(f32*, char*); - bool getEvFloatData(f32*, char*, f32); - int getEvFloatListData(f32**, char*); - int getEvXyzListData(cXyz**, char*); - char* getEvStringPntData(char*, char*); - char* getEvStringPntData(char*); - bool getEvXyzData(cXyz*, char*, cXyz); + int searchEventArgData(DUSK_CONST char*); + bool getEvIntData(int*, DUSK_CONST char*, int); + bool getEvIntData(int*, DUSK_CONST char*); + bool getEvFloatData(f32*, DUSK_CONST char*); + bool getEvFloatData(f32*, DUSK_CONST char*, f32); + int getEvFloatListData(f32**, DUSK_CONST char*); + int getEvXyzListData(cXyz**, DUSK_CONST char*); + char DUSK_CONST* getEvStringPntData(DUSK_CONST char*, char DUSK_CONST*); + char DUSK_CONST* getEvStringPntData(DUSK_CONST char*); + bool getEvXyzData(cXyz*, DUSK_CONST char*, cXyz); #if TARGET_PC template - bool getEvStringData(char (&)[N], char*, char*); + bool getEvStringData(char (&)[N], DUSK_CONST char*, char DUSK_CONST*); #else - bool getEvStringData(char*, char*, char*); + bool getEvStringData(char*, DUSK_CONST char*, char DUSK_CONST*); #endif - fopAc_ac_c* getEvActor(char*); - fopAc_ac_c* getEvActor(char*, char*); + fopAc_ac_c* getEvActor(DUSK_CONST char*); + fopAc_ac_c* getEvActor(DUSK_CONST char*, char DUSK_CONST*); bool pauseEvCamera(); bool fixedFrameEvCamera(); bool stokerEvCamera(); diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 2e644b2d3e..fbc9964ca2 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -2830,27 +2830,27 @@ inline int dComIfGp_evmng_getIsAddvance(int i_staffId) { return dComIfGp_getPEvtManager()->getIsAddvance(i_staffId); } -inline int dComIfGp_evmng_getMyActIdx(int i_staffId, char** i_actions, int i_actionNum, BOOL param_3, BOOL param_4) { +inline int dComIfGp_evmng_getMyActIdx(int i_staffId, DUSK_CONST char* DUSK_CONST* i_actions, int i_actionNum, BOOL param_3, BOOL param_4) { return dComIfGp_getPEvtManager()->getMyActIdx(i_staffId, i_actions, i_actionNum, param_3, param_4); } -inline f32* dComIfGp_evmng_getMyFloatP(int i_staffId, char* i_dataname) { +inline f32* dComIfGp_evmng_getMyFloatP(int i_staffId, DUSK_CONST char* i_dataname) { return (f32*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_FLOAT); } -inline cXyz* dComIfGp_evmng_getMyXyzP(int i_staffId, char* i_dataname) { +inline cXyz* dComIfGp_evmng_getMyXyzP(int i_staffId, DUSK_CONST char* i_dataname) { return (cXyz*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_VEC); } -inline int* dComIfGp_evmng_getMyIntegerP(int i_staffId, char* i_dataname) { +inline int* dComIfGp_evmng_getMyIntegerP(int i_staffId, DUSK_CONST char* i_dataname) { return (int*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_INT); } -inline char* dComIfGp_evmng_getMyStringP(int i_staffId, char* i_dataname) { +inline char* dComIfGp_evmng_getMyStringP(int i_staffId, DUSK_CONST char* i_dataname) { return (char*)dComIfGp_getPEvtManager()->getMySubstanceP(i_staffId, i_dataname, dEvDtData_c::TYPE_STRING); } -inline int dComIfGp_evmng_getMySubstanceNum(int i_staffId, char* i_dataname) { +inline int dComIfGp_evmng_getMySubstanceNum(int i_staffId, DUSK_CONST char* i_dataname) { return dComIfGp_getPEvtManager()->getMySubstanceNum(i_staffId, i_dataname); } diff --git a/include/d/d_event.h b/include/d/d_event.h index e465b456d7..203ec43423 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -84,7 +84,7 @@ public: void clearSkipSystem(); char* getSkipEventName(); void setSkipProc(void* skipActor, dEvt_SkipCb skipCb, int skipParameter); - void setSkipZev(void* skipActor, char* eventName); + void setSkipZev(void* skipActor, DUSK_CONST char* eventName); void onSkipFade(); void offSkipFade(); bool skipper(); diff --git a/include/d/d_event_manager.h b/include/d/d_event_manager.h index 590d20f25c..03a8ef7ac3 100644 --- a/include/d/d_event_manager.h +++ b/include/d/d_event_manager.h @@ -53,7 +53,7 @@ public: dEvent_manager_c(); ~dEvent_manager_c() {} int create(); - bool setObjectArchive(char* arcname); + bool setObjectArchive(DUSK_CONST char* arcname); void demoInit(); void roomInit(int roomNo); void roomFinish(int roomNo); diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index cc67b7104d..7cd00459a2 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -14,7 +14,7 @@ public: /* 0x1 */ u8 mType; /* 0x2 */ s16 mJntNum; /* 0x4 */ f32 field_0x4; - /* 0x8 */ Vec* field_0x8; + /* 0x8 */ DUSK_CONST Vec* field_0x8; }; class dJntCol_c { diff --git a/include/d/d_msg_scrn_3select.h b/include/d/d_msg_scrn_3select.h index 90a64ead62..949db3f130 100644 --- a/include/d/d_msg_scrn_3select.h +++ b/include/d/d_msg_scrn_3select.h @@ -26,8 +26,8 @@ public: dMsgScrn3Select_c(); virtual ~dMsgScrn3Select_c(); bool isSelect(); - void setString(char*, char*, char*); - void setRubyString(char*, char*, char*); + void setString(DUSK_CONST char*, DUSK_CONST char*, DUSK_CONST char*); + void setRubyString(DUSK_CONST char*, DUSK_CONST char*, DUSK_CONST char*); void translate(f32, f32); void draw(f32, f32); void selAnimeInit(u8, u8, u8, f32, u8); diff --git a/include/d/d_msg_scrn_base.h b/include/d/d_msg_scrn_base.h index c1b9f16166..17fd7380d3 100644 --- a/include/d/d_msg_scrn_base.h +++ b/include/d/d_msg_scrn_base.h @@ -13,8 +13,8 @@ public: dMsgScrnBase_c(); void init(); void drawOutFont(f32, f32, f32); - void setString(char*, char*); - void setRubyString(char*); + void setString(char DUSK_CONST*, char DUSK_CONST*); + void setRubyString(char DUSK_CONST*); bool isTalkNow(); virtual void draw(); @@ -22,8 +22,8 @@ public: virtual void exec() {} virtual void multiDraw(); virtual void drawSelf(); - virtual void setSelectString(char*, char*, char*) {} - virtual void setSelectRubyString(char*, char*, char*) {} + virtual void setSelectString(char DUSK_CONST*, char DUSK_CONST*, char DUSK_CONST*) {} + virtual void setSelectRubyString(char DUSK_CONST*, char DUSK_CONST*, char DUSK_CONST*) {} virtual void arwAnimeInit() {} virtual void arwAnimeMove() {} virtual void dotAnimeInit() {} diff --git a/include/d/d_particle_name.h b/include/d/d_particle_name.h index 72a3332558..193cd9c96d 100644 --- a/include/d/d_particle_name.h +++ b/include/d/d_particle_name.h @@ -8,11 +8,11 @@ #define dPa_RM(id) (0x8000 | (id)) struct dPa_name { - static char* getName(u32 i_id); + static DUSK_CONST char* getName(u32 i_id); static u16 j_o_id[5]; static u16 s_o_id[14]; - static char* jpaName[]; + static DUSK_CONST char* jpaName[]; }; // enum names made up based on debug strings diff --git a/include/d/d_shop_system.h b/include/d/d_shop_system.h index 02f76074dd..f733a2979f 100644 --- a/include/d/d_shop_system.h +++ b/include/d/d_shop_system.h @@ -31,7 +31,7 @@ public: dShopSystem_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4, daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, - daNpcT_evtData_c const* param_7, char** param_8) + daNpcT_evtData_c const* param_7, char DUSK_CONST* DUSK_CONST* param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) { OS_REPORT("|%06d:%x|dShopSystem_c -> コンストラクト\n", g_Counter.mCounter0, this); initShopSystem(); diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index b8918eae57..ed0126eefa 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -15,7 +15,7 @@ struct actor_method_class { }; struct actor_process_profile_definition { /* 0x00 */ leaf_process_profile_definition base; - /* 0x24 */ actor_method_class* sub_method; + /* 0x24 */ DUSK_CONST actor_method_class* sub_method; /* 0x28 */ u32 status; /* 0x2C */ u8 group; /* 0x2D */ u8 cullType; @@ -202,7 +202,7 @@ class dEvt_info_c { public: dEvt_info_c(); virtual ~dEvt_info_c() {} - void setEventName(char*); + void setEventName(DUSK_CONST char*); char* getEventName(); void beforeProc(); void onCondition(u16 cond) { mCondition |= cond; } @@ -218,12 +218,12 @@ public: void setEventId(s16 id) { mEventId = id; } void setCondition(u16 condition) { mCondition = condition; } u16 getCondition() { return mCondition; } - void setArchiveName(char* name) { mArchiveName = name; } + void setArchiveName(DUSK_CONST char* name) { mArchiveName = name; } u8 getMapToolId() { return mMapToolId; } s16 getEventId() { return mEventId; } s16 getIdx() { return (s8)mIndex; } void setIdx(u8 i_idx) { mIndex = i_idx; } - char* getArchiveName() { return mArchiveName; } + DUSK_CONST char* getArchiveName() { return mArchiveName; } BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; } void suspendProc(void* actor) { @@ -237,7 +237,7 @@ public: /* 0x08 */ s16 mEventId; /* 0x0A */ u8 mMapToolId; /* 0x0B */ u8 mIndex; - /* 0x0C */ char* mArchiveName; + /* 0x0C */ DUSK_CONST char* mArchiveName; /* 0x10 */ u8 field_0x10; /* 0x14 */ void (*field_0x14)(void*); }; // Size = 0x18 @@ -279,7 +279,7 @@ public: /* 0x0C0 */ int actor_type; /* 0x0C4 */ create_tag_class actor_tag; /* 0x0D8 */ create_tag_class draw_tag; - /* 0x0EC */ profile_method_class* sub_method; + /* 0x0EC */ profile_method_class DUSK_CONST* sub_method; /* 0x0F0 */ JKRSolidHeap* heap; /* 0x0F4 */ dEvt_info_c eventInfo; /* 0x10C */ dKy_tevstr_c tevStr; diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 4910b1e86a..23c7893b91 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -33,7 +33,7 @@ typedef struct base_process_class { /* 0x34 */ line_tag line_tag_; /* 0x4C */ delete_tag_class delete_tag; /* 0x68 */ process_priority_class priority; - /* 0xA8 */ process_method_class* methods; + /* 0xA8 */ process_method_class DUSK_CONST* methods; /* 0xAC */ void* append; /* 0xB0 */ u32 parameters; /* 0xB4 */ int subtype; diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 414d706b6a..2234fa87a5 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -23,7 +23,7 @@ typedef struct leafdraw_class { typedef struct leafdraw_class : base_process_class { #endif - /* 0xB8 */ leafdraw_method_class* leaf_methods; + /* 0xB8 */ leafdraw_method_class DUSK_CONST* leaf_methods; /* 0xBC */ s8 unk_0xBC; /* 0xBD */ u8 draw_interp_frame; /* 0xBE */ draw_priority_class draw_priority; @@ -31,12 +31,12 @@ typedef struct leafdraw_class : base_process_class { typedef struct leaf_process_profile_definition { /* 0x00 */ process_profile_definition base; - /* 0x1C */ leafdraw_method_class* sub_method; // Subclass methods + /* 0x1C */ leafdraw_method_class DUSK_CONST* sub_method; // Subclass methods /* 0x20 */ s16 priority; // mDrawPriority } leaf_process_profile_definition; s16 fpcLf_GetPriority(const leafdraw_class* i_leaf); -int fpcLf_DrawMethod(leafdraw_method_class* i_method, void* i_process); +int fpcLf_DrawMethod(leafdraw_method_class DUSK_CONST* i_method, void* i_process); int fpcLf_Draw(leafdraw_class* i_method); int fpcLf_Execute(leafdraw_class* i_leaf); int fpcLf_IsDelete(leafdraw_class* i_leaf); @@ -44,6 +44,6 @@ int fpcLf_Delete(leafdraw_class* i_leaf); int fpcLf_Create(leafdraw_class* i_leaf); extern int g_fpcLf_type; -extern leafdraw_method_class g_fpcLf_Method; +extern leafdraw_method_class DUSK_CONST g_fpcLf_Method; #endif diff --git a/include/f_pc/f_pc_method.h b/include/f_pc/f_pc_method.h index 342a41008c..420e89ec4a 100644 --- a/include/f_pc/f_pc_method.h +++ b/include/f_pc/f_pc_method.h @@ -13,9 +13,9 @@ typedef struct process_method_class { } process_method_class; int fpcMtd_Method(process_method_func i_method, void* i_process); -int fpcMtd_Execute(process_method_class* i_methods, void* i_process); -int fpcMtd_IsDelete(process_method_class* i_methods, void* i_process); -int fpcMtd_Delete(process_method_class* i_methods, void* i_process); -int fpcMtd_Create(process_method_class* i_methods, void* i_process); +int fpcMtd_Execute(process_method_class DUSK_CONST* i_methods, void* i_process); +int fpcMtd_IsDelete(process_method_class DUSK_CONST* i_methods, void* i_process); +int fpcMtd_Delete(process_method_class DUSK_CONST* i_methods, void* i_process); +int fpcMtd_Create(process_method_class DUSK_CONST* i_methods, void* i_process); #endif diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h index 865d9a9a4f..bccbfda215 100644 --- a/include/f_pc/f_pc_profile.h +++ b/include/f_pc/f_pc_profile.h @@ -3,6 +3,10 @@ #define F_PC_PROFILE_H_ #include +#include "global.h" + +// Putting const on these profiles make them have internal linkage. Make sure they're extern! +#define DUSK_PROFILE IF_DUSK(extern) typedef struct nodedraw_method_class nodedraw_method_class; typedef struct leafdraw_method_class leafdraw_method_class; @@ -13,7 +17,7 @@ typedef struct process_profile_definition { /* 0x04 */ u16 list_id; /* 0x06 */ u16 list_priority; /* 0x08 */ s16 name; - /* 0x0C */ process_method_class* methods; + /* 0x0C */ process_method_class DUSK_CONST* methods; /* 0x10 */ u32 process_size; /* 0x14 */ u32 unk_size; /* 0x18 */ u32 parameters; @@ -22,7 +26,7 @@ typedef struct process_profile_definition { #define LAYER_DEFAULT (-2) struct leaf_process_profile_definition; -process_profile_definition* fpcPf_Get(s16 i_profname); -extern process_profile_definition** g_fpcPf_ProfileList_p; +process_profile_definition DUSK_CONST* fpcPf_Get(s16 i_profname); +extern process_profile_definition DUSK_CONST* DUSK_CONST* DUSK_CONST g_fpcPf_ProfileList_p; #endif diff --git a/include/f_pc/f_pc_profile_lst.h b/include/f_pc/f_pc_profile_lst.h index a7f100b654..e4e2e7c95f 100644 --- a/include/f_pc/f_pc_profile_lst.h +++ b/include/f_pc/f_pc_profile_lst.h @@ -806,801 +806,801 @@ extern process_profile_definition g_profile_TBOX_SW; extern process_profile_definition g_profile_TITLE; extern process_profile_definition g_profile_WarpBug; #else -extern actor_process_profile_definition g_profile_ALINK; -extern actor_process_profile_definition g_profile_NO_CHG_ROOM; -extern actor_process_profile_definition g_profile_ITEM; -extern camera_process_profile_definition g_profile_CAMERA; -extern camera_process_profile_definition g_profile_CAMERA2; -extern kankyo_process_profile_definition g_profile_ENVSE; -extern msg_process_profile_definition g_profile_GAMEOVER; -extern kankyo_process_profile_definition g_profile_KANKYO; -extern kankyo_process_profile_definition g_profile_KYEFF; -extern kankyo_process_profile_definition g_profile_KYEFF2; -extern kankyo_process_profile_definition g_profile_KY_THUNDER; -extern msg_process_profile_definition g_profile_MENUWINDOW; -extern msg_process_profile_definition g_profile_METER2; -extern msg_process_profile_definition g_profile_MSG_OBJECT; -extern overlap_process_profile_definition g_profile_OVERLAP0; -extern overlap_process_profile_definition g_profile_OVERLAP1; -extern overlap_process_profile_definition g_profile_OVERLAP6; -extern overlap_process_profile_definition g_profile_OVERLAP7; -extern overlap_process_profile_definition g_profile_OVERLAP8; -extern overlap_process_profile_definition g_profile_OVERLAP9; -extern overlap_process_profile_definition g_profile_OVERLAP10; -extern overlap_process_profile_definition g_profile_OVERLAP11; -extern overlap_process_profile_definition g_profile_OVERLAP2; -extern overlap_process_profile_definition g_profile_OVERLAP3; -extern scene_process_profile_definition g_profile_LOGO_SCENE; -extern scene_process_profile_definition g_profile_MENU_SCENE; -extern scene_process_profile_definition g_profile_NAME_SCENE; -extern scene_process_profile_definition g_profile_NAMEEX_SCENE; -extern scene_process_profile_definition g_profile_PLAY_SCENE; -extern scene_process_profile_definition g_profile_OPENING_SCENE; -extern scene_process_profile_definition g_profile_ROOM_SCENE; -extern scene_process_profile_definition g_profile_WARNING_SCENE; -extern scene_process_profile_definition g_profile_WARNING2_SCENE; -extern msg_process_profile_definition g_profile_TIMER; -extern kankyo_process_profile_definition g_profile_WMARK; -extern kankyo_process_profile_definition g_profile_WPILLAR; -extern actor_process_profile_definition g_profile_ANDSW; -extern actor_process_profile_definition2 g_profile_BG; -extern actor_process_profile_definition g_profile_BG_OBJ; -extern actor_process_profile_definition g_profile_DMIDNA; -extern actor_process_profile_definition g_profile_DBDOOR; -extern actor_process_profile_definition g_profile_KNOB20; -extern actor_process_profile_definition g_profile_DOOR20; -extern actor_process_profile_definition g_profile_SPIRAL_DOOR; -extern actor_process_profile_definition2 g_profile_DSHUTTER; -extern actor_process_profile_definition g_profile_EP; -extern actor_process_profile_definition g_profile_HITOBJ; -extern actor_process_profile_definition g_profile_KYTAG00; -extern actor_process_profile_definition g_profile_KYTAG04; -extern actor_process_profile_definition g_profile_KYTAG17; -extern actor_process_profile_definition g_profile_OBJ_BEF; -extern actor_process_profile_definition g_profile_Obj_BurnBox; -extern actor_process_profile_definition g_profile_Obj_Carry; -extern actor_process_profile_definition g_profile_OBJ_ITO; -extern actor_process_profile_definition g_profile_Obj_Movebox; -extern actor_process_profile_definition g_profile_Obj_Swpush; -extern actor_process_profile_definition g_profile_Obj_Timer; -extern actor_process_profile_definition2 g_profile_PATH_LINE; -extern actor_process_profile_definition2 g_profile_SCENE_EXIT; -extern actor_process_profile_definition g_profile_SET_BG_OBJ; -extern actor_process_profile_definition g_profile_SWHIT0; -extern actor_process_profile_definition g_profile_TAG_ALLMATO; -extern actor_process_profile_definition g_profile_TAG_CAMERA; -extern actor_process_profile_definition g_profile_TAG_CHKPOINT; -extern actor_process_profile_definition g_profile_TAG_EVENT; -extern actor_process_profile_definition g_profile_TAG_EVT; -extern actor_process_profile_definition g_profile_TAG_EVTAREA; -extern actor_process_profile_definition g_profile_TAG_EVTMSG; -extern actor_process_profile_definition g_profile_TAG_HOWL; -extern actor_process_profile_definition g_profile_TAG_KMSG; -extern actor_process_profile_definition g_profile_TAG_LANTERN; -extern actor_process_profile_definition g_profile_Tag_Mist; -extern actor_process_profile_definition g_profile_TAG_MSG; -extern actor_process_profile_definition g_profile_TAG_PUSH; -extern actor_process_profile_definition g_profile_TAG_TELOP; -extern actor_process_profile_definition g_profile_TBOX; -extern actor_process_profile_definition g_profile_TBOX2; -extern actor_process_profile_definition g_profile_VRBOX; -extern actor_process_profile_definition g_profile_VRBOX2; -extern actor_process_profile_definition g_profile_ARROW; -extern actor_process_profile_definition g_profile_BOOMERANG; -extern actor_process_profile_definition g_profile_CROD; -extern actor_process_profile_definition g_profile_DEMO00; -extern actor_process_profile_definition g_profile_DISAPPEAR; -extern actor_process_profile_definition g_profile_MG_ROD; -extern actor_process_profile_definition g_profile_MIDNA; -extern actor_process_profile_definition g_profile_NBOMB; -extern actor_process_profile_definition g_profile_Obj_LifeContainer; -extern actor_process_profile_definition g_profile_Obj_Yousei; -extern actor_process_profile_definition g_profile_SPINNER; -extern actor_process_profile_definition g_profile_SUSPEND; -extern actor_process_profile_definition g_profile_Tag_Attp; -extern actor_process_profile_definition g_profile_ALLDIE; -extern actor_process_profile_definition g_profile_ANDSW2; -extern actor_process_profile_definition g_profile_BD; -extern actor_process_profile_definition g_profile_CANOE; -extern actor_process_profile_definition g_profile_CSTAF; -extern actor_process_profile_definition g_profile_Demo_Item; -extern actor_process_profile_definition g_profile_L1BOSS_DOOR; -extern actor_process_profile_definition g_profile_E_DN; -extern actor_process_profile_definition g_profile_E_FM; -extern actor_process_profile_definition g_profile_E_GA; -extern actor_process_profile_definition g_profile_E_HB; -extern actor_process_profile_definition g_profile_E_NEST; -extern actor_process_profile_definition g_profile_E_RD; -extern actor_process_profile_definition g_profile_ECONT; -extern actor_process_profile_definition g_profile_FR; -extern actor_process_profile_definition g_profile_GRASS; -extern actor_process_profile_definition g_profile_KYTAG05; -extern actor_process_profile_definition g_profile_KYTAG10; -extern actor_process_profile_definition g_profile_KYTAG11; -extern actor_process_profile_definition g_profile_KYTAG14; -extern actor_process_profile_definition g_profile_MG_FISH; -extern actor_process_profile_definition g_profile_NPC_BESU; -extern actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI; -extern actor_process_profile_definition g_profile_NPC_FISH; -extern actor_process_profile_definition g_profile_NPC_HENNA; -extern actor_process_profile_definition g_profile_NPC_KAKASHI; -extern actor_process_profile_definition g_profile_NPC_KKRI; -extern actor_process_profile_definition g_profile_NPC_KOLIN; -extern actor_process_profile_definition g_profile_NPC_MARO; -extern actor_process_profile_definition g_profile_NPC_TARO; -extern actor_process_profile_definition g_profile_NPC_TKJ; -extern actor_process_profile_definition g_profile_Obj_BHASHI; -extern actor_process_profile_definition g_profile_Obj_BkDoor; -extern actor_process_profile_definition g_profile_Obj_BossWarp; -extern actor_process_profile_definition g_profile_Obj_Cboard; -extern actor_process_profile_definition g_profile_Obj_Digpl; -extern actor_process_profile_definition g_profile_Obj_Eff; -extern actor_process_profile_definition g_profile_OBJ_FMOBJ; -extern actor_process_profile_definition g_profile_Obj_GpTaru; -extern actor_process_profile_definition g_profile_Obj_HHASHI; -extern actor_process_profile_definition g_profile_OBJ_KANBAN2; -extern actor_process_profile_definition g_profile_OBJ_KBACKET; -extern actor_process_profile_definition g_profile_Obj_KkrGate; -extern actor_process_profile_definition g_profile_Obj_KLift00; -extern actor_process_profile_definition g_profile_Tag_KtOnFire; -extern actor_process_profile_definition g_profile_Obj_Ladder; -extern actor_process_profile_definition g_profile_Obj_Lv2Candle; -extern actor_process_profile_definition g_profile_Obj_MagneArm; -extern actor_process_profile_definition g_profile_Obj_MetalBox; -extern actor_process_profile_definition g_profile_Obj_MGate; -extern actor_process_profile_definition g_profile_Obj_NamePlate; -extern actor_process_profile_definition g_profile_Obj_OnCloth; -extern actor_process_profile_definition g_profile_Obj_RopeBridge; -extern actor_process_profile_definition g_profile_Obj_SwallShutter; -extern actor_process_profile_definition g_profile_OBJ_STICK; -extern actor_process_profile_definition g_profile_Obj_StoneMark; -extern actor_process_profile_definition g_profile_Obj_Swpropeller; -extern actor_process_profile_definition g_profile_Obj_Swpush5; -extern actor_process_profile_definition g_profile_Obj_Yobikusa; -extern actor_process_profile_definition g_profile_SCENE_EXIT2; -extern actor_process_profile_definition g_profile_ShopItem; -extern actor_process_profile_definition g_profile_SQ; -extern actor_process_profile_definition g_profile_SWC00; -extern actor_process_profile_definition g_profile_Tag_CstaSw; -extern actor_process_profile_definition g_profile_Tag_AJnot; -extern actor_process_profile_definition g_profile_Tag_AttackItem; -extern actor_process_profile_definition g_profile_Tag_Gstart; -extern actor_process_profile_definition g_profile_Tag_Hinit; -extern actor_process_profile_definition g_profile_Tag_Hjump; -extern actor_process_profile_definition g_profile_Tag_Hstop; -extern actor_process_profile_definition g_profile_Tag_Lv2PrChk; -extern actor_process_profile_definition g_profile_Tag_Magne; -extern actor_process_profile_definition g_profile_Tag_Mhint; -extern actor_process_profile_definition g_profile_Tag_Mstop; -extern actor_process_profile_definition g_profile_Tag_Spring; -extern actor_process_profile_definition g_profile_Tag_Statue; -extern actor_process_profile_definition g_profile_Ykgr; -extern actor_process_profile_definition g_profile_DR; -extern actor_process_profile_definition g_profile_L7lowDr; -extern actor_process_profile_definition g_profile_L7ODR; -extern actor_process_profile_definition g_profile_B_BH; -extern actor_process_profile_definition g_profile_B_BQ; -extern actor_process_profile_definition g_profile_B_DR; -extern actor_process_profile_definition g_profile_B_DRE; -extern actor_process_profile_definition g_profile_B_DS; -extern actor_process_profile_definition g_profile_B_GG; -extern actor_process_profile_definition g_profile_B_GM; -extern actor_process_profile_definition g_profile_B_GND; -extern actor_process_profile_definition g_profile_B_GO; -extern actor_process_profile_definition g_profile_B_GOS; -extern actor_process_profile_definition g_profile_B_MGN; -extern actor_process_profile_definition g_profile_B_OB; -extern actor_process_profile_definition g_profile_B_OH; -extern actor_process_profile_definition g_profile_B_OH2; -extern actor_process_profile_definition g_profile_B_TN; -extern actor_process_profile_definition g_profile_B_YO; -extern actor_process_profile_definition g_profile_B_YOI; -extern actor_process_profile_definition g_profile_B_ZANT; -extern actor_process_profile_definition g_profile_B_ZANTM; -extern actor_process_profile_definition g_profile_B_ZANTZ; -extern actor_process_profile_definition g_profile_B_ZANTS; -extern actor_process_profile_definition g_profile_BALLOON2D; -extern actor_process_profile_definition g_profile_BULLET; -extern actor_process_profile_definition g_profile_COACH2D; -extern actor_process_profile_definition g_profile_COACH_FIRE; -extern actor_process_profile_definition g_profile_COW; -extern actor_process_profile_definition g_profile_CSTATUE; -extern actor_process_profile_definition g_profile_DO; -extern actor_process_profile_definition g_profile_BOSS_DOOR; -extern actor_process_profile_definition g_profile_L5BOSS_DOOR; -extern actor_process_profile_definition g_profile_L1MBOSS_DOOR; -extern actor_process_profile_definition g_profile_PushDoor; -extern actor_process_profile_definition g_profile_E_AI; -extern actor_process_profile_definition g_profile_E_ARROW; -extern actor_process_profile_definition g_profile_E_BA; -extern actor_process_profile_definition g_profile_E_BEE; -extern actor_process_profile_definition g_profile_E_BG; -extern actor_process_profile_definition g_profile_E_BI; -extern actor_process_profile_definition g_profile_E_BI_LEAF; -extern actor_process_profile_definition g_profile_E_BS; -extern actor_process_profile_definition g_profile_E_BU; -extern actor_process_profile_definition g_profile_E_BUG; -extern actor_process_profile_definition g_profile_E_CR; -extern actor_process_profile_definition g_profile_E_CR_EGG; -extern actor_process_profile_definition g_profile_E_DB; -extern actor_process_profile_definition g_profile_E_DB_LEAF; -extern actor_process_profile_definition g_profile_E_DD; -extern actor_process_profile_definition g_profile_E_DF; -extern actor_process_profile_definition g_profile_E_DK; -extern actor_process_profile_definition g_profile_E_DT; -extern actor_process_profile_definition g_profile_E_FB; -extern actor_process_profile_definition g_profile_E_FK; -extern actor_process_profile_definition g_profile_E_FS; -extern actor_process_profile_definition g_profile_E_FZ; -extern actor_process_profile_definition g_profile_E_GB; -extern actor_process_profile_definition g_profile_E_GE; -extern actor_process_profile_definition g_profile_E_GI; -extern actor_process_profile_definition g_profile_E_GM; -extern actor_process_profile_definition g_profile_E_GOB; -extern actor_process_profile_definition g_profile_E_GS; -extern actor_process_profile_definition g_profile_E_HB_LEAF; -extern actor_process_profile_definition g_profile_E_HM; -extern actor_process_profile_definition g_profile_E_HP; -extern actor_process_profile_definition g_profile_E_HZ; -extern actor_process_profile_definition g_profile_E_HZELDA; -extern actor_process_profile_definition g_profile_E_IS; -extern actor_process_profile_definition g_profile_E_KG; -extern actor_process_profile_definition g_profile_E_KK; -extern actor_process_profile_definition g_profile_E_KR; -extern actor_process_profile_definition g_profile_E_MB; -extern actor_process_profile_definition g_profile_E_MD; -extern actor_process_profile_definition g_profile_E_MF; -extern actor_process_profile_definition g_profile_E_MK; -extern actor_process_profile_definition g_profile_E_MK_BO; -extern actor_process_profile_definition g_profile_E_MM; -extern actor_process_profile_definition g_profile_E_MM_MT; -extern actor_process_profile_definition g_profile_E_MS; -extern actor_process_profile_definition g_profile_E_NZ; -extern actor_process_profile_definition g_profile_E_OC; -extern actor_process_profile_definition g_profile_E_OctBg; -extern actor_process_profile_definition g_profile_E_OT; -extern actor_process_profile_definition g_profile_E_PH; -extern actor_process_profile_definition g_profile_E_PM; -extern actor_process_profile_definition g_profile_E_PO; -extern actor_process_profile_definition g_profile_E_PZ; -extern actor_process_profile_definition g_profile_E_RB; -extern actor_process_profile_definition g_profile_E_RDB; -extern actor_process_profile_definition g_profile_E_RDY; -extern actor_process_profile_definition g_profile_E_S1; -extern actor_process_profile_definition g_profile_E_SB; -extern actor_process_profile_definition g_profile_E_SF; -extern actor_process_profile_definition g_profile_E_SG; -extern actor_process_profile_definition g_profile_E_SH; -extern actor_process_profile_definition g_profile_E_SM; -extern actor_process_profile_definition g_profile_E_SM2; -extern actor_process_profile_definition g_profile_E_ST; -extern actor_process_profile_definition g_profile_E_ST_LINE; -extern actor_process_profile_definition g_profile_E_SW; -extern actor_process_profile_definition g_profile_E_TH; -extern actor_process_profile_definition g_profile_E_TH_BALL; -extern actor_process_profile_definition g_profile_E_TK; -extern actor_process_profile_definition g_profile_E_TK2; -extern actor_process_profile_definition g_profile_E_TK_BALL; -extern actor_process_profile_definition g_profile_E_TT; -extern actor_process_profile_definition g_profile_E_VT; -extern actor_process_profile_definition g_profile_E_WAP; -extern actor_process_profile_definition g_profile_E_WB; -extern actor_process_profile_definition g_profile_E_WS; -extern actor_process_profile_definition g_profile_E_WW; -extern actor_process_profile_definition g_profile_E_YC; -extern actor_process_profile_definition g_profile_E_YD; -extern actor_process_profile_definition g_profile_E_YD_LEAF; -extern actor_process_profile_definition g_profile_E_YG; -extern actor_process_profile_definition g_profile_E_YH; -extern actor_process_profile_definition g_profile_E_YK; -extern actor_process_profile_definition g_profile_E_YM; -extern actor_process_profile_definition g_profile_E_YM_TAG; -extern actor_process_profile_definition g_profile_E_YMB; -extern actor_process_profile_definition g_profile_E_YR; -extern actor_process_profile_definition g_profile_E_ZH; -extern actor_process_profile_definition g_profile_E_ZM; -extern actor_process_profile_definition g_profile_E_ZS; -extern actor_process_profile_definition g_profile_FORMATION_MNG; -extern actor_process_profile_definition g_profile_GUARD_MNG; -extern actor_process_profile_definition g_profile_HORSE; -extern actor_process_profile_definition g_profile_HOZELDA; -extern actor_process_profile_definition g_profile_Izumi_Gate; -extern actor_process_profile_definition g_profile_KAGO; -extern actor_process_profile_definition g_profile_KYTAG01; -extern actor_process_profile_definition g_profile_KYTAG02; -extern actor_process_profile_definition g_profile_KYTAG03; -extern actor_process_profile_definition g_profile_KYTAG06; -extern actor_process_profile_definition g_profile_KYTAG07; -extern actor_process_profile_definition g_profile_KYTAG08; -extern actor_process_profile_definition g_profile_KYTAG09; -extern actor_process_profile_definition g_profile_KYTAG12; -extern actor_process_profile_definition g_profile_KYTAG13; -extern actor_process_profile_definition g_profile_KYTAG15; -extern actor_process_profile_definition g_profile_KYTAG16; -extern actor_process_profile_definition g_profile_MANT; -extern actor_process_profile_definition g_profile_FSHOP; -extern actor_process_profile_definition g_profile_MIRROR; -extern actor_process_profile_definition g_profile_MOVIE_PLAYER; -extern actor_process_profile_definition g_profile_MYNA; -extern actor_process_profile_definition g_profile_NI; -extern actor_process_profile_definition g_profile_NPC_ARU; -extern actor_process_profile_definition g_profile_NPC_ASH; -extern actor_process_profile_definition g_profile_NPC_ASHB; -extern actor_process_profile_definition g_profile_NPC_BANS; -extern actor_process_profile_definition g_profile_NPC_BLUENS; -extern actor_process_profile_definition g_profile_NPC_BOU; -extern actor_process_profile_definition g_profile_NPC_BOU_S; -extern actor_process_profile_definition g_profile_NPC_CD3; -extern actor_process_profile_definition g_profile_NPC_CHAT; -extern actor_process_profile_definition g_profile_NPC_CHIN; -extern actor_process_profile_definition g_profile_NPC_CLERKA; -extern actor_process_profile_definition g_profile_NPC_CLERKB; -extern actor_process_profile_definition g_profile_NPC_CLERKT; -extern actor_process_profile_definition g_profile_NPC_COACH; -extern actor_process_profile_definition g_profile_NPC_DF; -extern actor_process_profile_definition g_profile_NPC_DOC; -extern actor_process_profile_definition g_profile_NPC_DOORBOY; -extern actor_process_profile_definition g_profile_NPC_DRSOL; -extern actor_process_profile_definition g_profile_NPC_DU; -extern actor_process_profile_definition g_profile_NPC_FAIRY; -extern actor_process_profile_definition g_profile_NPC_FGUARD; -extern actor_process_profile_definition g_profile_NPC_GND; -extern actor_process_profile_definition g_profile_NPC_GRA; -extern actor_process_profile_definition g_profile_NPC_GRC; -extern actor_process_profile_definition g_profile_NPC_GRD; -extern actor_process_profile_definition g_profile_NPC_GRM; -extern actor_process_profile_definition g_profile_NPC_GRMC; -extern actor_process_profile_definition g_profile_NPC_GRO; -extern actor_process_profile_definition g_profile_NPC_GRR; -extern actor_process_profile_definition g_profile_NPC_GRS; -extern actor_process_profile_definition g_profile_NPC_GRZ; -extern actor_process_profile_definition g_profile_NPC_GUARD; -extern actor_process_profile_definition g_profile_NPC_GWOLF; -extern actor_process_profile_definition g_profile_NPC_HANJO; -extern actor_process_profile_definition g_profile_NPC_HENNA0; -extern actor_process_profile_definition g_profile_NPC_HOZ; -extern actor_process_profile_definition g_profile_NPC_IMPAL; -extern actor_process_profile_definition g_profile_NPC_INKO; -extern actor_process_profile_definition g_profile_NPC_INS; -extern actor_process_profile_definition g_profile_NPC_JAGAR; -extern actor_process_profile_definition g_profile_NPC_KASIHANA; -extern actor_process_profile_definition g_profile_NPC_KASIKYU; -extern actor_process_profile_definition g_profile_NPC_KASIMICH; -extern actor_process_profile_definition g_profile_NPC_KDK; -extern actor_process_profile_definition g_profile_NPC_KN; -extern actor_process_profile_definition g_profile_NPC_KNJ; -extern actor_process_profile_definition g_profile_NPC_KOLINB; -extern actor_process_profile_definition g_profile_NPC_KS; -extern actor_process_profile_definition g_profile_NPC_KYURY; -extern actor_process_profile_definition g_profile_NPC_LEN; -extern actor_process_profile_definition g_profile_NPC_LF; -extern actor_process_profile_definition g_profile_NPC_LUD; -extern actor_process_profile_definition g_profile_NPC_MIDP; -extern actor_process_profile_definition g_profile_NPC_MK; -extern actor_process_profile_definition g_profile_NPC_MOI; -extern actor_process_profile_definition g_profile_NPC_MOIR; -extern actor_process_profile_definition g_profile_MYNA2; -extern actor_process_profile_definition g_profile_NPC_NE; -extern actor_process_profile_definition g_profile_NPC_P2; -extern actor_process_profile_definition g_profile_NPC_PACHI_BESU; -extern actor_process_profile_definition g_profile_NPC_PACHI_MARO; -extern actor_process_profile_definition g_profile_NPC_PACHI_TARO; -extern actor_process_profile_definition g_profile_NPC_PASSER; -extern actor_process_profile_definition g_profile_NPC_PASSER2; -extern actor_process_profile_definition g_profile_NPC_POST; -extern actor_process_profile_definition g_profile_NPC_POUYA; -extern actor_process_profile_definition g_profile_NPC_PRAYER; -extern actor_process_profile_definition g_profile_NPC_RACA; -extern actor_process_profile_definition g_profile_NPC_RAFREL; -extern actor_process_profile_definition g_profile_NPC_SARU; -extern actor_process_profile_definition g_profile_NPC_SEIB; -extern actor_process_profile_definition g_profile_NPC_SEIC; -extern actor_process_profile_definition g_profile_NPC_SEID; -extern actor_process_profile_definition g_profile_NPC_SEIRA; -extern actor_process_profile_definition g_profile_NPC_SERA2; -extern actor_process_profile_definition g_profile_NPC_SEIREI; -extern actor_process_profile_definition g_profile_NPC_SHAD; -extern actor_process_profile_definition g_profile_NPC_SHAMAN; -extern actor_process_profile_definition g_profile_NPC_SHOE; -extern actor_process_profile_definition g_profile_NPC_SHOP0; -extern actor_process_profile_definition g_profile_NPC_SMARO; -extern actor_process_profile_definition g_profile_NPC_SOLA; -extern actor_process_profile_definition g_profile_NPC_SOLDIERa; -extern actor_process_profile_definition g_profile_NPC_SOLDIERb; -extern actor_process_profile_definition g_profile_NPC_SQ; -extern actor_process_profile_definition g_profile_NPC_THE; -extern actor_process_profile_definition g_profile_NPC_THEB; -extern actor_process_profile_definition g_profile_NPC_TK; -extern actor_process_profile_definition g_profile_NPC_TKC; -extern actor_process_profile_definition g_profile_NPC_TKJ2; -extern actor_process_profile_definition g_profile_NPC_TKS; -extern actor_process_profile_definition g_profile_NPC_TOBY; -extern actor_process_profile_definition g_profile_NPC_TR; -extern actor_process_profile_definition g_profile_NPC_URI; -extern actor_process_profile_definition g_profile_NPC_WORM; -extern actor_process_profile_definition g_profile_NPC_WRESTLER; -extern actor_process_profile_definition g_profile_NPC_YAMID; -extern actor_process_profile_definition g_profile_NPC_YAMIS; -extern actor_process_profile_definition g_profile_NPC_YAMIT; -extern actor_process_profile_definition g_profile_NPC_YELIA; -extern actor_process_profile_definition g_profile_NPC_YKM; -extern actor_process_profile_definition g_profile_NPC_YKW; -extern actor_process_profile_definition g_profile_NPC_ZANB; -extern actor_process_profile_definition g_profile_NPC_ZANT; -extern actor_process_profile_definition g_profile_NPC_ZELR; -extern actor_process_profile_definition g_profile_NPC_ZELRO; -extern actor_process_profile_definition g_profile_NPC_ZELDA; -extern actor_process_profile_definition g_profile_NPC_ZRA; -extern actor_process_profile_definition g_profile_NPC_ZRC; -extern actor_process_profile_definition g_profile_NPC_ZRZ; -extern actor_process_profile_definition g_profile_Obj_Lv5Key; -extern actor_process_profile_definition g_profile_Obj_Turara; -extern actor_process_profile_definition g_profile_Obj_TvCdlst; -extern actor_process_profile_definition g_profile_Obj_Ytaihou; -extern actor_process_profile_definition g_profile_Obj_AmiShutter; -extern actor_process_profile_definition g_profile_Obj_Ari; -extern actor_process_profile_definition g_profile_OBJ_AUTOMATA; -extern actor_process_profile_definition g_profile_Obj_Avalanche; -extern actor_process_profile_definition g_profile_OBJ_BALLOON; -extern actor_process_profile_definition g_profile_Obj_BarDesk; -extern actor_process_profile_definition g_profile_Obj_Batta; -extern actor_process_profile_definition g_profile_Obj_BBox; -extern actor_process_profile_definition g_profile_OBJ_BED; -extern actor_process_profile_definition g_profile_Obj_Bemos; -extern actor_process_profile_definition g_profile_Obj_Bhbridge; -extern actor_process_profile_definition g_profile_Obj_BkLeaf; -extern actor_process_profile_definition g_profile_BkyRock; -extern actor_process_profile_definition g_profile_Obj_BmWindow; -extern actor_process_profile_definition g_profile_Obj_BoomShutter; -extern actor_process_profile_definition g_profile_Obj_Bombf; -extern actor_process_profile_definition g_profile_OBJ_BOUMATO; -extern actor_process_profile_definition g_profile_OBJ_BRG; -extern actor_process_profile_definition g_profile_Obj_BsGate; -extern actor_process_profile_definition g_profile_Obj_awaPlar; -extern actor_process_profile_definition g_profile_Obj_CatDoor; -extern actor_process_profile_definition g_profile_OBJ_CB; -extern actor_process_profile_definition g_profile_Obj_ChainBlock; -extern actor_process_profile_definition g_profile_Obj_Cdoor; -extern actor_process_profile_definition g_profile_Obj_Chandelier; -extern actor_process_profile_definition g_profile_Obj_Chest; -extern actor_process_profile_definition g_profile_Obj_Cho; -extern actor_process_profile_definition g_profile_Obj_Cowdoor; -extern actor_process_profile_definition g_profile_Obj_Crope; -extern actor_process_profile_definition g_profile_Obj_CRVFENCE; -extern actor_process_profile_definition g_profile_Obj_CRVGATE; -extern actor_process_profile_definition g_profile_Obj_CRVHAHEN; -extern actor_process_profile_definition g_profile_Obj_CRVLH_DW; -extern actor_process_profile_definition g_profile_Obj_CRVLH_UP; -extern actor_process_profile_definition g_profile_Obj_CRVSTEEL; -extern actor_process_profile_definition g_profile_Obj_Crystal; -extern actor_process_profile_definition g_profile_Obj_ChainWall; -extern actor_process_profile_definition g_profile_Obj_DamCps; -extern actor_process_profile_definition g_profile_Obj_Dan; -extern actor_process_profile_definition g_profile_Obj_Digholl; -extern actor_process_profile_definition g_profile_Obj_DigSnow; -extern actor_process_profile_definition g_profile_Obj_Elevator; -extern actor_process_profile_definition g_profile_Obj_Drop; -extern actor_process_profile_definition g_profile_Obj_DUST; -extern actor_process_profile_definition g_profile_Obj_E_CREATE; -extern actor_process_profile_definition g_profile_Obj_FallObj; -extern actor_process_profile_definition g_profile_Obj_Fan; -extern actor_process_profile_definition g_profile_Obj_Fchain; -extern actor_process_profile_definition g_profile_Obj_FireWood; -extern actor_process_profile_definition g_profile_Obj_FireWood2; -extern actor_process_profile_definition g_profile_Obj_FirePillar; -extern actor_process_profile_definition g_profile_Obj_FirePillar2; -extern actor_process_profile_definition g_profile_Obj_Flag; -extern actor_process_profile_definition g_profile_Obj_Flag2; -extern actor_process_profile_definition g_profile_Obj_Flag3; -extern actor_process_profile_definition g_profile_OBJ_FOOD; -extern actor_process_profile_definition g_profile_OBJ_FW; -extern actor_process_profile_definition g_profile_OBJ_GADGET; -extern actor_process_profile_definition g_profile_Obj_GanonWall; -extern actor_process_profile_definition g_profile_Obj_GanonWall2; -extern actor_process_profile_definition g_profile_OBJ_GB; -extern actor_process_profile_definition g_profile_Obj_Geyser; -extern actor_process_profile_definition g_profile_Obj_glowSphere; -extern actor_process_profile_definition g_profile_OBJ_GM; -extern actor_process_profile_definition g_profile_Obj_GoGate; -extern actor_process_profile_definition g_profile_Obj_GOMIKABE; -extern actor_process_profile_definition g_profile_OBJ_GRA; -extern actor_process_profile_definition g_profile_GRA_WALL; -extern actor_process_profile_definition g_profile_Obj_GraRock; -extern actor_process_profile_definition g_profile_Obj_GraveStone; -extern actor_process_profile_definition g_profile_GRDWATER; -extern actor_process_profile_definition g_profile_Obj_GrzRock; -extern actor_process_profile_definition g_profile_Obj_H_Saku; -extern actor_process_profile_definition g_profile_Obj_HBarrel; -extern actor_process_profile_definition g_profile_Obj_HFtr; -extern actor_process_profile_definition g_profile_Obj_MHasu; -extern actor_process_profile_definition g_profile_Obj_Hata; -extern actor_process_profile_definition g_profile_OBJ_HB; -extern actor_process_profile_definition g_profile_Obj_HBombkoya; -extern actor_process_profile_definition g_profile_Obj_HeavySw; -extern actor_process_profile_definition g_profile_Obj_Hfuta; -extern actor_process_profile_definition g_profile_Obj_HsTarget; -extern actor_process_profile_definition g_profile_Obj_Ice_l; -extern actor_process_profile_definition g_profile_Obj_Ice_s; -extern actor_process_profile_definition g_profile_Obj_IceBlock; -extern actor_process_profile_definition g_profile_Obj_IceLeaf; -extern actor_process_profile_definition g_profile_OBJ_IHASI; -extern actor_process_profile_definition g_profile_Obj_Ikada; -extern actor_process_profile_definition g_profile_Obj_InoBone; -extern actor_process_profile_definition g_profile_Obj_ITA; -extern actor_process_profile_definition g_profile_OBJ_ITAMATO; -extern actor_process_profile_definition g_profile_Obj_Kabuto; -extern actor_process_profile_definition g_profile_Obj_Kag; -extern actor_process_profile_definition g_profile_OBJ_KAGE; -extern actor_process_profile_definition g_profile_OBJ_KAGO; -extern actor_process_profile_definition g_profile_Obj_Kaisou; -extern actor_process_profile_definition g_profile_Obj_Kam; -extern actor_process_profile_definition g_profile_Obj_Kantera; -extern actor_process_profile_definition g_profile_Obj_Kat; -extern actor_process_profile_definition g_profile_Obj_KazeNeko; -extern actor_process_profile_definition g_profile_OBJ_KBOX; -extern actor_process_profile_definition g_profile_OBJ_KEY; -extern actor_process_profile_definition g_profile_OBJ_KEYHOLE; -extern actor_process_profile_definition g_profile_OBJ_KI; -extern actor_process_profile_definition g_profile_Obj_KiPot; -extern actor_process_profile_definition g_profile_OBJ_KITA; -extern actor_process_profile_definition g_profile_Obj_KJgjs; -extern actor_process_profile_definition g_profile_Obj_KKanban; -extern actor_process_profile_definition g_profile_KN_BULLET; -extern actor_process_profile_definition g_profile_Obj_Kshutter; -extern actor_process_profile_definition g_profile_Obj_Kuw; -extern actor_process_profile_definition g_profile_Obj_KWheel00; -extern actor_process_profile_definition g_profile_Obj_KWheel01; -extern actor_process_profile_definition g_profile_Obj_KznkArm; -extern actor_process_profile_definition g_profile_Obj_Laundry; -extern actor_process_profile_definition g_profile_Obj_LndRope; -extern actor_process_profile_definition g_profile_OBJ_LBOX; -extern actor_process_profile_definition g_profile_OBJ_LP; -extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00; -extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01; -extern actor_process_profile_definition g_profile_Obj_Lv3Candle; -extern actor_process_profile_definition g_profile_Obj_Lv3Water; -extern actor_process_profile_definition g_profile_Obj_Lv3Water2; -extern actor_process_profile_definition g_profile_OBJ_LV3WATERB; -extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka; -extern actor_process_profile_definition g_profile_Obj_WaterEff; -extern actor_process_profile_definition g_profile_Tag_Lv4CandleDm; -extern actor_process_profile_definition g_profile_Tag_Lv4Candle; -extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter; -extern actor_process_profile_definition g_profile_Obj_Lv4Gate; -extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget; -extern actor_process_profile_definition g_profile_Obj_Lv4PoGate; -extern actor_process_profile_definition g_profile_Obj_Lv4RailWall; -extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall; -extern actor_process_profile_definition g_profile_Obj_Lv4Bridge; -extern actor_process_profile_definition g_profile_Obj_Lv4Chan; -extern actor_process_profile_definition g_profile_Obj_Lv4DigSand; -extern actor_process_profile_definition g_profile_Obj_Lv4Floor; -extern actor_process_profile_definition g_profile_Obj_Lv4Gear; -extern actor_process_profile_definition g_profile_Obj_PRElvtr; -extern actor_process_profile_definition g_profile_Obj_Lv4PRwall; -extern actor_process_profile_definition g_profile_Obj_Lv4Sand; -extern actor_process_profile_definition g_profile_Obj_Lv5FBoard; -extern actor_process_profile_definition g_profile_Obj_IceWall; -extern actor_process_profile_definition g_profile_Obj_Lv5SwIce; -extern actor_process_profile_definition g_profile_Obj_Ychndlr; -extern actor_process_profile_definition g_profile_Obj_YIblltray; -extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate; -extern actor_process_profile_definition g_profile_Obj_Lv6FuriTrap; -extern actor_process_profile_definition g_profile_Obj_Lv6Lblock; -extern actor_process_profile_definition g_profile_Obj_Lv6SwGate; -extern actor_process_profile_definition g_profile_Obj_Lv6SzGate; -extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin; -extern actor_process_profile_definition g_profile_Obj_Lv6TogeRoll; -extern actor_process_profile_definition g_profile_Obj_Lv6TogeTrap; -extern actor_process_profile_definition g_profile_Obj_Lv6bemos; -extern actor_process_profile_definition g_profile_Obj_Lv6bemos2; -extern actor_process_profile_definition g_profile_Obj_Lv6EGate; -extern actor_process_profile_definition g_profile_Obj_Lv6ElevtA; -extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn; -extern actor_process_profile_definition g_profile_Obj_Lv7BsGate; -extern actor_process_profile_definition g_profile_Obj_Lv7PropY; -extern actor_process_profile_definition g_profile_Obj_Lv7Bridge; -extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap; -extern actor_process_profile_definition g_profile_Obj_Lv8Lift; -extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift; -extern actor_process_profile_definition g_profile_Obj_Lv8UdFloor; -extern actor_process_profile_definition g_profile_Obj_Lv9SwShutter; -extern actor_process_profile_definition g_profile_Obj_MagLift; -extern actor_process_profile_definition g_profile_Obj_MagLiftRot; -extern actor_process_profile_definition g_profile_OBJ_MAKI; -extern actor_process_profile_definition g_profile_Obj_MasterSword; -extern actor_process_profile_definition g_profile_Obj_Mato; -extern actor_process_profile_definition g_profile_Obj_MHole; -extern actor_process_profile_definition g_profile_OBJ_MIE; -extern actor_process_profile_definition g_profile_Obj_Mirror6Pole; -extern actor_process_profile_definition g_profile_Obj_MirrorChain; -extern actor_process_profile_definition g_profile_Obj_MirrorSand; -extern actor_process_profile_definition g_profile_Obj_MirrorScrew; -extern actor_process_profile_definition g_profile_Obj_MirrorTable; -extern actor_process_profile_definition g_profile_OBJ_MSIMA; -extern actor_process_profile_definition g_profile_Obj_MvStair; -extern actor_process_profile_definition g_profile_OBJ_MYOGAN; -extern actor_process_profile_definition g_profile_Obj_Nagaisu; -extern actor_process_profile_definition g_profile_Obj_Nan; -extern actor_process_profile_definition g_profile_OBJ_NDOOR; -extern actor_process_profile_definition g_profile_OBJ_NOUGU; -extern actor_process_profile_definition g_profile_OCTHASHI; -extern actor_process_profile_definition g_profile_OBJ_OILTUBO; -extern actor_process_profile_definition g_profile_Obj_Onsen; -extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE; -extern actor_process_profile_definition g_profile_Obj_OnsenTaru; -extern actor_process_profile_definition g_profile_Obj_PushDoor; -extern actor_process_profile_definition g_profile_Obj_PDtile; -extern actor_process_profile_definition g_profile_Obj_PDwall; -extern actor_process_profile_definition g_profile_Obj_Picture; -extern actor_process_profile_definition g_profile_Obj_Pillar; -extern actor_process_profile_definition g_profile_OBJ_PLEAF; -extern actor_process_profile_definition g_profile_Obj_poCandle; -extern actor_process_profile_definition g_profile_Obj_poFire; -extern actor_process_profile_definition g_profile_Obj_poTbox; -extern actor_process_profile_definition g_profile_Obj_Prop; -extern actor_process_profile_definition g_profile_OBJ_PUMPKIN; -extern actor_process_profile_definition g_profile_Obj_RCircle; -extern actor_process_profile_definition g_profile_Obj_RfHole; -extern actor_process_profile_definition g_profile_Obj_RiderGate; -extern actor_process_profile_definition g_profile_Obj_RIVERROCK; -extern actor_process_profile_definition g_profile_OBJ_ROCK; -extern actor_process_profile_definition g_profile_Obj_RotBridge; -extern actor_process_profile_definition g_profile_Obj_RotTrap; -extern actor_process_profile_definition g_profile_OBJ_ROTEN; -extern actor_process_profile_definition g_profile_Obj_RotStair; -extern actor_process_profile_definition g_profile_OBJ_RW; -extern actor_process_profile_definition g_profile_Obj_Saidan; -extern actor_process_profile_definition g_profile_Obj_Sakuita; -extern actor_process_profile_definition g_profile_Obj_ItaRope; -extern actor_process_profile_definition g_profile_Obj_SCannon; -extern actor_process_profile_definition g_profile_Obj_SCannonCrs; -extern actor_process_profile_definition g_profile_Obj_SCannonTen; -extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR; -extern actor_process_profile_definition g_profile_OBJ_SEKIZO; -extern actor_process_profile_definition g_profile_OBJ_SEKIZOA; -extern actor_process_profile_definition g_profile_Obj_Shield; -extern actor_process_profile_definition g_profile_Obj_SM_DOOR; -extern actor_process_profile_definition g_profile_Obj_SmallKey; -extern actor_process_profile_definition g_profile_Obj_SmgDoor; -extern actor_process_profile_definition g_profile_Obj_Smoke; -extern actor_process_profile_definition g_profile_OBJ_SMTILE; -extern actor_process_profile_definition g_profile_Obj_SmWStone; -extern actor_process_profile_definition g_profile_Tag_SnowEff; -extern actor_process_profile_definition g_profile_Obj_SnowSoup; -extern actor_process_profile_definition g_profile_OBJ_SO; -extern actor_process_profile_definition g_profile_Obj_SpinLift; -extern actor_process_profile_definition g_profile_OBJ_SSDRINK; -extern actor_process_profile_definition g_profile_OBJ_SSITEM; -extern actor_process_profile_definition g_profile_Obj_StairBlock; -extern actor_process_profile_definition g_profile_Obj_Stone; -extern actor_process_profile_definition g_profile_Obj_Stopper; -extern actor_process_profile_definition g_profile_Obj_Stopper2; -extern actor_process_profile_definition g_profile_OBJ_SUISYA; -extern actor_process_profile_definition g_profile_OBJ_SW; -extern actor_process_profile_definition g_profile_Obj_SwBallA; -extern actor_process_profile_definition g_profile_Obj_SwBallB; -extern actor_process_profile_definition g_profile_Obj_SwBallC; -extern actor_process_profile_definition g_profile_Obj_SwLight; -extern actor_process_profile_definition g_profile_Obj_SwChain; -extern actor_process_profile_definition g_profile_Obj_SwHang; -extern actor_process_profile_definition g_profile_Obj_Sword; -extern actor_process_profile_definition g_profile_Obj_Swpush2; -extern actor_process_profile_definition g_profile_Obj_SwSpinner; -extern actor_process_profile_definition g_profile_Obj_SwTurn; -extern actor_process_profile_definition g_profile_Obj_SyRock; -extern actor_process_profile_definition g_profile_Obj_SZbridge; -extern actor_process_profile_definition g_profile_Obj_TaFence; -extern actor_process_profile_definition g_profile_Obj_Table; -extern actor_process_profile_definition g_profile_Obj_TakaraDai; -extern actor_process_profile_definition g_profile_OBJ_TATIGI; -extern actor_process_profile_definition g_profile_Obj_Ten; -extern actor_process_profile_definition g_profile_Obj_TestCube; -extern actor_process_profile_definition g_profile_Obj_Gake; +extern actor_process_profile_definition DUSK_CONST g_profile_ALINK; +extern actor_process_profile_definition DUSK_CONST g_profile_NO_CHG_ROOM; +extern actor_process_profile_definition DUSK_CONST g_profile_ITEM; +extern camera_process_profile_definition DUSK_CONST g_profile_CAMERA; +extern camera_process_profile_definition DUSK_CONST g_profile_CAMERA2; +extern kankyo_process_profile_definition DUSK_CONST g_profile_ENVSE; +extern msg_process_profile_definition DUSK_CONST g_profile_GAMEOVER; +extern kankyo_process_profile_definition DUSK_CONST g_profile_KANKYO; +extern kankyo_process_profile_definition DUSK_CONST g_profile_KYEFF; +extern kankyo_process_profile_definition DUSK_CONST g_profile_KYEFF2; +extern kankyo_process_profile_definition DUSK_CONST g_profile_KY_THUNDER; +extern msg_process_profile_definition DUSK_CONST g_profile_MENUWINDOW; +extern msg_process_profile_definition DUSK_CONST g_profile_METER2; +extern msg_process_profile_definition DUSK_CONST g_profile_MSG_OBJECT; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP0; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP1; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP6; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP7; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP8; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP9; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP10; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP11; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP2; +extern overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP3; +extern scene_process_profile_definition DUSK_CONST g_profile_LOGO_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_MENU_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_NAME_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_NAMEEX_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_PLAY_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_OPENING_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_ROOM_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_WARNING_SCENE; +extern scene_process_profile_definition DUSK_CONST g_profile_WARNING2_SCENE; +extern msg_process_profile_definition DUSK_CONST g_profile_TIMER; +extern kankyo_process_profile_definition DUSK_CONST g_profile_WMARK; +extern kankyo_process_profile_definition DUSK_CONST g_profile_WPILLAR; +extern actor_process_profile_definition DUSK_CONST g_profile_ANDSW; +extern actor_process_profile_definition2 DUSK_CONST g_profile_BG; +extern actor_process_profile_definition DUSK_CONST g_profile_BG_OBJ; +extern actor_process_profile_definition DUSK_CONST g_profile_DMIDNA; +extern actor_process_profile_definition DUSK_CONST g_profile_DBDOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_KNOB20; +extern actor_process_profile_definition DUSK_CONST g_profile_DOOR20; +extern actor_process_profile_definition DUSK_CONST g_profile_SPIRAL_DOOR; +extern actor_process_profile_definition2 DUSK_CONST g_profile_DSHUTTER; +extern actor_process_profile_definition DUSK_CONST g_profile_EP; +extern actor_process_profile_definition DUSK_CONST g_profile_HITOBJ; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG00; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG04; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG17; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_BEF; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BurnBox; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Carry; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_ITO; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Movebox; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpush; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Timer; +extern actor_process_profile_definition2 DUSK_CONST g_profile_PATH_LINE; +extern actor_process_profile_definition2 DUSK_CONST g_profile_SCENE_EXIT; +extern actor_process_profile_definition DUSK_CONST g_profile_SET_BG_OBJ; +extern actor_process_profile_definition DUSK_CONST g_profile_SWHIT0; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_ALLMATO; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_CAMERA; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_CHKPOINT; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_EVENT; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_EVT; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_EVTAREA; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_EVTMSG; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_HOWL; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_KMSG; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_LANTERN; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Mist; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_MSG; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_PUSH; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_TELOP; +extern actor_process_profile_definition DUSK_CONST g_profile_TBOX; +extern actor_process_profile_definition DUSK_CONST g_profile_TBOX2; +extern actor_process_profile_definition DUSK_CONST g_profile_VRBOX; +extern actor_process_profile_definition DUSK_CONST g_profile_VRBOX2; +extern actor_process_profile_definition DUSK_CONST g_profile_ARROW; +extern actor_process_profile_definition DUSK_CONST g_profile_BOOMERANG; +extern actor_process_profile_definition DUSK_CONST g_profile_CROD; +extern actor_process_profile_definition DUSK_CONST g_profile_DEMO00; +extern actor_process_profile_definition DUSK_CONST g_profile_DISAPPEAR; +extern actor_process_profile_definition DUSK_CONST g_profile_MG_ROD; +extern actor_process_profile_definition DUSK_CONST g_profile_MIDNA; +extern actor_process_profile_definition DUSK_CONST g_profile_NBOMB; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_LifeContainer; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Yousei; +extern actor_process_profile_definition DUSK_CONST g_profile_SPINNER; +extern actor_process_profile_definition DUSK_CONST g_profile_SUSPEND; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Attp; +extern actor_process_profile_definition DUSK_CONST g_profile_ALLDIE; +extern actor_process_profile_definition DUSK_CONST g_profile_ANDSW2; +extern actor_process_profile_definition DUSK_CONST g_profile_BD; +extern actor_process_profile_definition DUSK_CONST g_profile_CANOE; +extern actor_process_profile_definition DUSK_CONST g_profile_CSTAF; +extern actor_process_profile_definition DUSK_CONST g_profile_Demo_Item; +extern actor_process_profile_definition DUSK_CONST g_profile_L1BOSS_DOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DN; +extern actor_process_profile_definition DUSK_CONST g_profile_E_FM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GA; +extern actor_process_profile_definition DUSK_CONST g_profile_E_HB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_NEST; +extern actor_process_profile_definition DUSK_CONST g_profile_E_RD; +extern actor_process_profile_definition DUSK_CONST g_profile_ECONT; +extern actor_process_profile_definition DUSK_CONST g_profile_FR; +extern actor_process_profile_definition DUSK_CONST g_profile_GRASS; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG05; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG10; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG11; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG14; +extern actor_process_profile_definition DUSK_CONST g_profile_MG_FISH; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_BESU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_FAIRY_SEIREI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_FISH; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_HENNA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KAKASHI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KKRI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KOLIN; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_MARO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TARO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TKJ; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BHASHI; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BkDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BossWarp; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Cboard; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Digpl; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Eff; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_FMOBJ; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GpTaru; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_HHASHI; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KANBAN2; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KBACKET; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KkrGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KLift00; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_KtOnFire; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ladder; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv2Candle; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MagneArm; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MetalBox; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_NamePlate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_OnCloth; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RopeBridge; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwallShutter; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_STICK; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_StoneMark; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpropeller; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpush5; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Yobikusa; +extern actor_process_profile_definition DUSK_CONST g_profile_SCENE_EXIT2; +extern actor_process_profile_definition DUSK_CONST g_profile_ShopItem; +extern actor_process_profile_definition DUSK_CONST g_profile_SQ; +extern actor_process_profile_definition DUSK_CONST g_profile_SWC00; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_CstaSw; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_AJnot; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_AttackItem; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Gstart; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Hinit; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Hjump; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Hstop; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv2PrChk; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Magne; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Mhint; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Mstop; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Spring; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Statue; +extern actor_process_profile_definition DUSK_CONST g_profile_Ykgr; +extern actor_process_profile_definition DUSK_CONST g_profile_DR; +extern actor_process_profile_definition DUSK_CONST g_profile_L7lowDr; +extern actor_process_profile_definition DUSK_CONST g_profile_L7ODR; +extern actor_process_profile_definition DUSK_CONST g_profile_B_BH; +extern actor_process_profile_definition DUSK_CONST g_profile_B_BQ; +extern actor_process_profile_definition DUSK_CONST g_profile_B_DR; +extern actor_process_profile_definition DUSK_CONST g_profile_B_DRE; +extern actor_process_profile_definition DUSK_CONST g_profile_B_DS; +extern actor_process_profile_definition DUSK_CONST g_profile_B_GG; +extern actor_process_profile_definition DUSK_CONST g_profile_B_GM; +extern actor_process_profile_definition DUSK_CONST g_profile_B_GND; +extern actor_process_profile_definition DUSK_CONST g_profile_B_GO; +extern actor_process_profile_definition DUSK_CONST g_profile_B_GOS; +extern actor_process_profile_definition DUSK_CONST g_profile_B_MGN; +extern actor_process_profile_definition DUSK_CONST g_profile_B_OB; +extern actor_process_profile_definition DUSK_CONST g_profile_B_OH; +extern actor_process_profile_definition DUSK_CONST g_profile_B_OH2; +extern actor_process_profile_definition DUSK_CONST g_profile_B_TN; +extern actor_process_profile_definition DUSK_CONST g_profile_B_YO; +extern actor_process_profile_definition DUSK_CONST g_profile_B_YOI; +extern actor_process_profile_definition DUSK_CONST g_profile_B_ZANT; +extern actor_process_profile_definition DUSK_CONST g_profile_B_ZANTM; +extern actor_process_profile_definition DUSK_CONST g_profile_B_ZANTZ; +extern actor_process_profile_definition DUSK_CONST g_profile_B_ZANTS; +extern actor_process_profile_definition DUSK_CONST g_profile_BALLOON2D; +extern actor_process_profile_definition DUSK_CONST g_profile_BULLET; +extern actor_process_profile_definition DUSK_CONST g_profile_COACH2D; +extern actor_process_profile_definition DUSK_CONST g_profile_COACH_FIRE; +extern actor_process_profile_definition DUSK_CONST g_profile_COW; +extern actor_process_profile_definition DUSK_CONST g_profile_CSTATUE; +extern actor_process_profile_definition DUSK_CONST g_profile_DO; +extern actor_process_profile_definition DUSK_CONST g_profile_BOSS_DOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_L5BOSS_DOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_L1MBOSS_DOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_PushDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_E_AI; +extern actor_process_profile_definition DUSK_CONST g_profile_E_ARROW; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BA; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BEE; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BI; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BI_LEAF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BS; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BU; +extern actor_process_profile_definition DUSK_CONST g_profile_E_BUG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_CR; +extern actor_process_profile_definition DUSK_CONST g_profile_E_CR_EGG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DB_LEAF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DD; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DK; +extern actor_process_profile_definition DUSK_CONST g_profile_E_DT; +extern actor_process_profile_definition DUSK_CONST g_profile_E_FB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_FK; +extern actor_process_profile_definition DUSK_CONST g_profile_E_FS; +extern actor_process_profile_definition DUSK_CONST g_profile_E_FZ; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GE; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GI; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GOB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_GS; +extern actor_process_profile_definition DUSK_CONST g_profile_E_HB_LEAF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_HM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_HP; +extern actor_process_profile_definition DUSK_CONST g_profile_E_HZ; +extern actor_process_profile_definition DUSK_CONST g_profile_E_HZELDA; +extern actor_process_profile_definition DUSK_CONST g_profile_E_IS; +extern actor_process_profile_definition DUSK_CONST g_profile_E_KG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_KK; +extern actor_process_profile_definition DUSK_CONST g_profile_E_KR; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MD; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MK; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MK_BO; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MM_MT; +extern actor_process_profile_definition DUSK_CONST g_profile_E_MS; +extern actor_process_profile_definition DUSK_CONST g_profile_E_NZ; +extern actor_process_profile_definition DUSK_CONST g_profile_E_OC; +extern actor_process_profile_definition DUSK_CONST g_profile_E_OctBg; +extern actor_process_profile_definition DUSK_CONST g_profile_E_OT; +extern actor_process_profile_definition DUSK_CONST g_profile_E_PH; +extern actor_process_profile_definition DUSK_CONST g_profile_E_PM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_PO; +extern actor_process_profile_definition DUSK_CONST g_profile_E_PZ; +extern actor_process_profile_definition DUSK_CONST g_profile_E_RB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_RDB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_RDY; +extern actor_process_profile_definition DUSK_CONST g_profile_E_S1; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SH; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SM2; +extern actor_process_profile_definition DUSK_CONST g_profile_E_ST; +extern actor_process_profile_definition DUSK_CONST g_profile_E_ST_LINE; +extern actor_process_profile_definition DUSK_CONST g_profile_E_SW; +extern actor_process_profile_definition DUSK_CONST g_profile_E_TH; +extern actor_process_profile_definition DUSK_CONST g_profile_E_TH_BALL; +extern actor_process_profile_definition DUSK_CONST g_profile_E_TK; +extern actor_process_profile_definition DUSK_CONST g_profile_E_TK2; +extern actor_process_profile_definition DUSK_CONST g_profile_E_TK_BALL; +extern actor_process_profile_definition DUSK_CONST g_profile_E_TT; +extern actor_process_profile_definition DUSK_CONST g_profile_E_VT; +extern actor_process_profile_definition DUSK_CONST g_profile_E_WAP; +extern actor_process_profile_definition DUSK_CONST g_profile_E_WB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_WS; +extern actor_process_profile_definition DUSK_CONST g_profile_E_WW; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YC; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YD; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YD_LEAF; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YH; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YK; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YM_TAG; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YMB; +extern actor_process_profile_definition DUSK_CONST g_profile_E_YR; +extern actor_process_profile_definition DUSK_CONST g_profile_E_ZH; +extern actor_process_profile_definition DUSK_CONST g_profile_E_ZM; +extern actor_process_profile_definition DUSK_CONST g_profile_E_ZS; +extern actor_process_profile_definition DUSK_CONST g_profile_FORMATION_MNG; +extern actor_process_profile_definition DUSK_CONST g_profile_GUARD_MNG; +extern actor_process_profile_definition DUSK_CONST g_profile_HORSE; +extern actor_process_profile_definition DUSK_CONST g_profile_HOZELDA; +extern actor_process_profile_definition DUSK_CONST g_profile_Izumi_Gate; +extern actor_process_profile_definition DUSK_CONST g_profile_KAGO; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG01; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG02; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG03; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG06; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG07; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG08; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG09; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG12; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG13; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG15; +extern actor_process_profile_definition DUSK_CONST g_profile_KYTAG16; +extern actor_process_profile_definition DUSK_CONST g_profile_MANT; +extern actor_process_profile_definition DUSK_CONST g_profile_FSHOP; +extern actor_process_profile_definition DUSK_CONST g_profile_MIRROR; +extern actor_process_profile_definition DUSK_CONST g_profile_MOVIE_PLAYER; +extern actor_process_profile_definition DUSK_CONST g_profile_MYNA; +extern actor_process_profile_definition DUSK_CONST g_profile_NI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ARU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ASH; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ASHB; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_BANS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_BLUENS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_BOU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_BOU_S; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_CD3; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_CHAT; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_CHIN; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_CLERKA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_CLERKB; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_CLERKT; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_COACH; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_DF; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_DOC; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_DOORBOY; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_DRSOL; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_DU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_FAIRY; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_FGUARD; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GND; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRC; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRD; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRM; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRMC; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRR; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GRZ; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GUARD; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_GWOLF; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_HANJO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_HENNA0; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_HOZ; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_IMPAL; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_INKO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_INS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_JAGAR; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KASIHANA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KASIKYU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KASIMICH; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KDK; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KN; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KNJ; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KOLINB; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_KYURY; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_LEN; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_LF; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_LUD; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_MIDP; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_MK; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_MOI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_MOIR; +extern actor_process_profile_definition DUSK_CONST g_profile_MYNA2; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_NE; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_P2; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_PACHI_BESU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_PACHI_MARO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_PACHI_TARO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_PASSER; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_PASSER2; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_POST; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_POUYA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_PRAYER; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_RACA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_RAFREL; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SARU; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIB; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIC; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SEID; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIRA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SERA2; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIREI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SHAD; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SHAMAN; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SHOE; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SHOP0; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SMARO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SOLA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SOLDIERa; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SOLDIERb; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_SQ; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_THE; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_THEB; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TK; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TKC; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TKJ2; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TKS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TOBY; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_TR; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_URI; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_WORM; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_WRESTLER; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_YAMID; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_YAMIS; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_YAMIT; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_YELIA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_YKM; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_YKW; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZANB; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZANT; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZELR; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZELRO; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZELDA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZRA; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZRC; +extern actor_process_profile_definition DUSK_CONST g_profile_NPC_ZRZ; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv5Key; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Turara; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TvCdlst; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ytaihou; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_AmiShutter; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ari; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_AUTOMATA; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Avalanche; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_BALLOON; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BarDesk; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Batta; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BBox; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_BED; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Bemos; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Bhbridge; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BkLeaf; +extern actor_process_profile_definition DUSK_CONST g_profile_BkyRock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BmWindow; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BoomShutter; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Bombf; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_BOUMATO; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_BRG; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_BsGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_awaPlar; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CatDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_CB; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ChainBlock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Cdoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Chandelier; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Chest; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Cho; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Cowdoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Crope; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVFENCE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVGATE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVHAHEN; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVLH_DW; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVLH_UP; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVSTEEL; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Crystal; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ChainWall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_DamCps; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Dan; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Digholl; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_DigSnow; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Elevator; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Drop; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_DUST; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_E_CREATE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_FallObj; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Fan; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Fchain; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_FireWood; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_FireWood2; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_FirePillar; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_FirePillar2; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Flag; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Flag2; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Flag3; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_FOOD; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_FW; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_GADGET; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GanonWall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GanonWall2; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_GB; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Geyser; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_glowSphere; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_GM; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GoGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GOMIKABE; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_GRA; +extern actor_process_profile_definition DUSK_CONST g_profile_GRA_WALL; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GraRock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GraveStone; +extern actor_process_profile_definition DUSK_CONST g_profile_GRDWATER; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_GrzRock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_H_Saku; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_HBarrel; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_HFtr; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MHasu; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Hata; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_HB; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_HBombkoya; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_HeavySw; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Hfuta; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_HsTarget; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ice_l; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ice_s; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_IceBlock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_IceLeaf; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_IHASI; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ikada; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_InoBone; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ITA; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_ITAMATO; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kabuto; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kag; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KAGE; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KAGO; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kaisou; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kam; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kantera; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kat; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KazeNeko; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KBOX; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KEY; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KEYHOLE; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KI; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KiPot; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_KITA; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KJgjs; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KKanban; +extern actor_process_profile_definition DUSK_CONST g_profile_KN_BULLET; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kshutter; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Kuw; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KWheel00; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KWheel01; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KznkArm; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Laundry; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_LndRope; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_LBOX; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_LP; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv1Cdl00; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv1Cdl01; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3Candle; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3Water; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3Water2; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_LV3WATERB; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3R10Saka; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WaterEff; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv4CandleDm; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv4Candle; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4EdShutter; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Gate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4HsTarget; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4PoGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4RailWall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4SlideWall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Bridge; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Chan; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4DigSand; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Floor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Gear; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_PRElvtr; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4PRwall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Sand; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv5FBoard; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_IceWall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv5SwIce; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ychndlr; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_YIblltray; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6ChgGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6FuriTrap; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6Lblock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6SwGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6SzGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6Tenbin; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6TogeRoll; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6TogeTrap; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6bemos; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6bemos2; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6EGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6ElevtA; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6SwTurn; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv7BsGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv7PropY; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv7Bridge; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8KekkaiTrap; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8Lift; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8OptiLift; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8UdFloor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv9SwShutter; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MagLift; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MagLiftRot; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_MAKI; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MasterSword; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Mato; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MHole; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_MIE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Mirror6Pole; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorChain; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorSand; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorScrew; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorTable; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_MSIMA; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_MvStair; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_MYOGAN; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Nagaisu; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Nan; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_NDOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_NOUGU; +extern actor_process_profile_definition DUSK_CONST g_profile_OCTHASHI; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_OILTUBO; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Onsen; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_ONSEN_FIRE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_OnsenTaru; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_PushDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_PDtile; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_PDwall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Picture; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Pillar; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_PLEAF; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_poCandle; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_poFire; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_poTbox; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Prop; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_PUMPKIN; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RCircle; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RfHole; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RiderGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RIVERROCK; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_ROCK; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RotBridge; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RotTrap; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_ROTEN; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_RotStair; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_RW; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Saidan; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Sakuita; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ItaRope; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SCannon; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SCannonCrs; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SCannonTen; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SEKIDOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SEKIZO; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SEKIZOA; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Shield; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SM_DOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SmallKey; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SmgDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Smoke; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SMTILE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SmWStone; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_SnowEff; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SnowSoup; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SO; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SpinLift; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SSDRINK; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SSITEM; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_StairBlock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Stone; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Stopper; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Stopper2; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SUISYA; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_SW; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwBallA; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwBallB; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwBallC; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwLight; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwChain; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwHang; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Sword; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpush2; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwSpinner; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SwTurn; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SyRock; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_SZbridge; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TaFence; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Table; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TakaraDai; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_TATIGI; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Ten; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TestCube; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Gake; -extern actor_process_profile_definition g_profile_Obj_THASHI; -extern actor_process_profile_definition g_profile_Obj_TDoor; -extern actor_process_profile_definition g_profile_Obj_TimeFire; -extern actor_process_profile_definition g_profile_OBJ_TKS; -extern actor_process_profile_definition g_profile_Obj_TMoon; -extern actor_process_profile_definition g_profile_Obj_ToaruMaki; -extern actor_process_profile_definition g_profile_OBJ_TOBY; -extern actor_process_profile_definition g_profile_Obj_TobyHouse; -extern actor_process_profile_definition g_profile_Obj_TogeTrap; -extern actor_process_profile_definition g_profile_Obj_Tombo; -extern actor_process_profile_definition g_profile_Obj_Tornado; -extern actor_process_profile_definition g_profile_Obj_Tornado2; -extern actor_process_profile_definition g_profile_OBJ_TP; -extern actor_process_profile_definition g_profile_TREESH; -extern actor_process_profile_definition g_profile_Obj_TwGate; -extern actor_process_profile_definition g_profile_OBJ_UDOOR; -extern actor_process_profile_definition g_profile_OBJ_USAKU; -extern actor_process_profile_definition g_profile_Obj_VolcGnd; -extern actor_process_profile_definition g_profile_Obj_VolcanicBall; -extern actor_process_profile_definition g_profile_Obj_VolcanicBomb; -extern actor_process_profile_definition g_profile_Obj_KakarikoBrg; -extern actor_process_profile_definition g_profile_Obj_OrdinBrg; -extern actor_process_profile_definition g_profile_Obj_WtGate; -extern actor_process_profile_definition g_profile_Obj_WaterPillar; -extern actor_process_profile_definition g_profile_Obj_WaterFall; -extern actor_process_profile_definition g_profile_Obj_Wchain; -extern actor_process_profile_definition g_profile_Obj_WdStick; -extern actor_process_profile_definition g_profile_OBJ_WEB0; -extern actor_process_profile_definition g_profile_OBJ_WEB1; -extern actor_process_profile_definition g_profile_Obj_WellCover; -extern actor_process_profile_definition g_profile_OBJ_WFLAG; -extern actor_process_profile_definition g_profile_Obj_WindStone; -extern actor_process_profile_definition g_profile_Obj_Window; -extern actor_process_profile_definition g_profile_Obj_WoodPendulum; -extern actor_process_profile_definition g_profile_Obj_WoodStatue; -extern actor_process_profile_definition g_profile_Obj_WoodenSword; -extern actor_process_profile_definition g_profile_OBJ_YBAG; -extern actor_process_profile_definition g_profile_OBJ_YSTONE; -extern actor_process_profile_definition g_profile_Obj_ZoraCloth; -extern actor_process_profile_definition g_profile_Obj_ZDoor; -extern actor_process_profile_definition g_profile_Obj_zrTurara; -extern actor_process_profile_definition g_profile_Obj_zrTuraraRc; -extern actor_process_profile_definition g_profile_ZRA_MARK; -extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE; -extern actor_process_profile_definition g_profile_Obj_ZraRock; -extern actor_process_profile_definition g_profile_PASSER_MNG; -extern actor_process_profile_definition g_profile_PERU; -extern actor_process_profile_definition g_profile_PPolamp; -extern actor_process_profile_definition g_profile_SKIP2D; -extern actor_process_profile_definition g_profile_START_AND_GOAL; -extern actor_process_profile_definition g_profile_SwBall; -extern actor_process_profile_definition g_profile_SwLBall; -extern actor_process_profile_definition g_profile_SwTime; -extern actor_process_profile_definition g_profile_Tag_Lv6Gate; -extern actor_process_profile_definition g_profile_Tag_Lv7Gate; -extern actor_process_profile_definition g_profile_Tag_Lv8Gate; -extern actor_process_profile_definition g_profile_Tag_TWGate; -extern actor_process_profile_definition g_profile_Tag_Arena; -extern actor_process_profile_definition g_profile_Tag_Assist; -extern actor_process_profile_definition g_profile_TAG_BTLITM; -extern actor_process_profile_definition g_profile_Tag_ChgRestart; -extern actor_process_profile_definition g_profile_TAG_CSW; -extern actor_process_profile_definition g_profile_Tag_Escape; -extern actor_process_profile_definition g_profile_Tag_FWall; -extern actor_process_profile_definition g_profile_TAG_GRA; -extern actor_process_profile_definition g_profile_TAG_GUARD; -extern actor_process_profile_definition g_profile_Tag_Instruction; -extern actor_process_profile_definition g_profile_Tag_KagoFall; -extern actor_process_profile_definition g_profile_Tag_LightBall; -extern actor_process_profile_definition g_profile_TAG_LV5SOUP; -extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw; -extern actor_process_profile_definition g_profile_Tag_Mmsg; -extern actor_process_profile_definition g_profile_Tag_Mwait; -extern actor_process_profile_definition g_profile_TAG_MYNA2; -extern actor_process_profile_definition g_profile_TAG_MNLIGHT; -extern actor_process_profile_definition g_profile_TAG_PATI; -extern actor_process_profile_definition g_profile_Tag_poFire; -extern actor_process_profile_definition g_profile_TAG_QS; -extern actor_process_profile_definition g_profile_Tag_RetRoom; -extern actor_process_profile_definition g_profile_Tag_RiverBack; -extern actor_process_profile_definition g_profile_Tag_RmbitSw; -extern actor_process_profile_definition g_profile_Tag_Schedule; -extern actor_process_profile_definition g_profile_Tag_SetBall; -extern actor_process_profile_definition g_profile_Tag_Restart; -extern actor_process_profile_definition g_profile_TAG_SHOPCAM; -extern actor_process_profile_definition g_profile_TAG_SHOPITM; -extern actor_process_profile_definition g_profile_Tag_SmkEmt; -extern actor_process_profile_definition g_profile_Tag_Spinner; -extern actor_process_profile_definition g_profile_Tag_Sppath; -extern actor_process_profile_definition g_profile_TAG_SSDRINK; -extern actor_process_profile_definition g_profile_Tag_Stream; -extern actor_process_profile_definition g_profile_Tag_TheBHint; -extern actor_process_profile_definition g_profile_Tag_WaraHowl; -extern actor_process_profile_definition g_profile_Tag_WatchGe; -extern actor_process_profile_definition g_profile_Tag_WaterFall; -extern actor_process_profile_definition g_profile_Tag_Wljump; -extern actor_process_profile_definition g_profile_TAG_YAMI; -extern actor_process_profile_definition g_profile_TALK; -extern actor_process_profile_definition g_profile_TBOX_SW; -extern actor_process_profile_definition g_profile_TITLE; -extern actor_process_profile_definition g_profile_WarpBug; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_THASHI; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TimeFire; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_TKS; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TMoon; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ToaruMaki; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_TOBY; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TobyHouse; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TogeTrap; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Tombo; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Tornado; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Tornado2; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_TP; +extern actor_process_profile_definition DUSK_CONST g_profile_TREESH; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_TwGate; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_UDOOR; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_USAKU; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_VolcGnd; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_VolcanicBall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_VolcanicBomb; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_KakarikoBrg; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_OrdinBrg; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WtGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WaterPillar; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WaterFall; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Wchain; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WdStick; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_WEB0; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_WEB1; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WellCover; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_WFLAG; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WindStone; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_Window; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WoodPendulum; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WoodStatue; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_WoodenSword; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_YBAG; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_YSTONE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ZoraCloth; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ZDoor; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_zrTurara; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_zrTuraraRc; +extern actor_process_profile_definition DUSK_CONST g_profile_ZRA_MARK; +extern actor_process_profile_definition DUSK_CONST g_profile_OBJ_ZRAFREEZE; +extern actor_process_profile_definition DUSK_CONST g_profile_Obj_ZraRock; +extern actor_process_profile_definition DUSK_CONST g_profile_PASSER_MNG; +extern actor_process_profile_definition DUSK_CONST g_profile_PERU; +extern actor_process_profile_definition DUSK_CONST g_profile_PPolamp; +extern actor_process_profile_definition DUSK_CONST g_profile_SKIP2D; +extern actor_process_profile_definition DUSK_CONST g_profile_START_AND_GOAL; +extern actor_process_profile_definition DUSK_CONST g_profile_SwBall; +extern actor_process_profile_definition DUSK_CONST g_profile_SwLBall; +extern actor_process_profile_definition DUSK_CONST g_profile_SwTime; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv6Gate; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv7Gate; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv8Gate; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_TWGate; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Arena; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Assist; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_BTLITM; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_ChgRestart; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_CSW; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Escape; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_FWall; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_GRA; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_GUARD; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Instruction; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_KagoFall; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_LightBall; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_LV5SOUP; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv6CstaSw; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Mmsg; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Mwait; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_MYNA2; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_MNLIGHT; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_PATI; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_poFire; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_QS; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_RetRoom; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_RiverBack; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_RmbitSw; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Schedule; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_SetBall; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Restart; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_SHOPCAM; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_SHOPITM; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_SmkEmt; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Spinner; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Sppath; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_SSDRINK; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Stream; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_TheBHint; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_WaraHowl; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_WatchGe; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_WaterFall; +extern actor_process_profile_definition DUSK_CONST g_profile_Tag_Wljump; +extern actor_process_profile_definition DUSK_CONST g_profile_TAG_YAMI; +extern actor_process_profile_definition DUSK_CONST g_profile_TALK; +extern actor_process_profile_definition DUSK_CONST g_profile_TBOX_SW; +extern actor_process_profile_definition DUSK_CONST g_profile_TITLE; +extern actor_process_profile_definition DUSK_CONST g_profile_WarpBug; #endif -extern process_profile_definition* g_fpcPfLst_ProfileList[]; +extern process_profile_definition DUSK_CONST* DUSK_CONST g_fpcPfLst_ProfileList[]; #endif /* F_PC_PROFILE_LST_H_ */ diff --git a/include/global.h b/include/global.h index 556c5f6207..170461ea5f 100644 --- a/include/global.h +++ b/include/global.h @@ -244,4 +244,7 @@ using std::isnan; #define DUSK_IF_ELSE(dusk, orig) orig #endif +#define DUSK_CONST IF_DUSK(const) +#define DUSK_CONSTEXPR IF_DUSK(constexpr) + #endif diff --git a/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h b/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h index 9f9e5bc6fd..4753a9212d 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h @@ -2,6 +2,7 @@ #define JAUINITIALIZER_H #include +#include "global.h" class JKRSolidHeap; @@ -26,7 +27,7 @@ public: /* 0x24 */ int aramBlockSize_; /* 0x28 */ int aramChannelNum_; /* 0x2C */ f32 dspLevel_; - /* 0x30 */ char* waveArcDir_; + /* 0x30 */ DUSK_CONST char* waveArcDir_; }; /** diff --git a/libs/JSystem/include/JSystem/JKernel/JKRArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRArchive.h index 6397955a3d..89f3835364 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRArchive.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRArchive.h @@ -39,13 +39,13 @@ struct SArcDataInfo { /* 0x1B */ u8 field_1b[5]; }; -inline u32 read_big_endian_u32(void* ptr) { - u8* uptr = (u8*)ptr; +inline u32 read_big_endian_u32(void DUSK_CONST* ptr) { + u8 DUSK_CONST* uptr = (u8 DUSK_CONST*)ptr; return ((u32)uptr[0] << 0x18) | ((u32)uptr[1] << 0x10) | ((u32)uptr[2] << 8) | (u32)uptr[3]; } -inline u16 read_big_endian_u16(void* ptr) { - u8* uptr = (u8*)ptr; +inline u16 read_big_endian_u16(void DUSK_CONST* ptr) { + u8 DUSK_CONST* uptr = (u8 DUSK_CONST*)ptr; return ((u16)uptr[0] << 8) | ((u16)uptr[1]); } diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp index d73dfb8627..0f1404642f 100644 --- a/src/SSystem/SComponent/c_lib.cpp +++ b/src/SSystem/SComponent/c_lib.cpp @@ -530,7 +530,7 @@ void MtxScale(f32 x_trans, f32 y_trans, f32 z_trans, u8 param_3) { * @param src The src position to be multiplied * @param dest The resulting multiplied position */ -void MtxPosition(cXyz* src, cXyz* dest) { +void MtxPosition(cXyz DUSK_CONST* src, cXyz* dest) { MTXMultVec(*calc_mtx, src, dest); } diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/src/Z2AudioLib/Z2StatusMgr.cpp index a044b552b6..1cd5e9cdc9 100644 --- a/src/Z2AudioLib/Z2StatusMgr.cpp +++ b/src/Z2AudioLib/Z2StatusMgr.cpp @@ -91,7 +91,7 @@ bool Z2StatusMgr::isMovieDemo() { return mDemoStatus == 2 || mDemoStatus == 8 || mDemoStatus == 9; } -void Z2StatusMgr::setDemoName(char* demoName) { +void Z2StatusMgr::setDemoName(DUSK_CONST char* demoName) { if (mDemoStatus == 11) { mDemoStatus = 0; if (Z2GetSceneMgr()->isInGame()) { diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 468675cd09..47b46284eb 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -399,7 +399,7 @@ static int daDr_Create(daDr_c* i_this) { return i_this->create(); } -static actor_method_class l_daDr_Method = { +static DUSK_CONST actor_method_class l_daDr_Method = { (process_method_func)daDr_Create, (process_method_func)daDr_Delete, (process_method_func)daDr_Execute, @@ -407,7 +407,7 @@ static actor_method_class l_daDr_Method = { (process_method_func)daDr_Draw, }; -actor_process_profile_definition g_profile_DR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index 6afb2e63e9..863c030bd8 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -189,7 +189,7 @@ static int daL7lowDr_IsDelete(daL7lowDr_c* i_this) { return 1; } -static actor_method_class l_daL7lowDr_Method = { +static DUSK_CONST actor_method_class l_daL7lowDr_Method = { (process_method_func)daL7lowDr_Create, (process_method_func)daL7lowDr_Delete, (process_method_func)daL7lowDr_Execute, @@ -197,7 +197,7 @@ static actor_method_class l_daL7lowDr_Method = { (process_method_func)daL7lowDr_Draw, }; -actor_process_profile_definition g_profile_L7lowDr = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L7lowDr = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index 7881507271..3b3cb0a2db 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -835,7 +835,7 @@ static int daL7ODR_Create(daL7ODR_c* i_this) { return i_this->create(); } -static actor_method_class l_daL7ODR_Method = { +static DUSK_CONST actor_method_class l_daL7ODR_Method = { (process_method_func)daL7ODR_Create, (process_method_func)daL7ODR_Delete, (process_method_func)daL7ODR_Execute, @@ -843,7 +843,7 @@ static actor_method_class l_daL7ODR_Method = { (process_method_func)daL7ODR_Draw, }; -actor_process_profile_definition g_profile_L7ODR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L7ODR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 9bec9da6d0..34690accab 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -113,31 +113,31 @@ static void daAlink_coHitCallback(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjI static_cast(i_coActorA)->coHitCallback(i_coActorB, i_coObjInfA); } -static cXyz l_waitBaseAnime(1.24279f, 102.00054f, 5.0f); +static DUSK_CONSTEXPR cXyz l_waitBaseAnime(1.24279f, 102.00054f, 5.0f); -static cXyz l_ironBallBaseAnime(-4.248938f, 89.0f, -5.267045f); +static DUSK_CONSTEXPR cXyz l_ironBallBaseAnime(-4.248938f, 89.0f, -5.267045f); -static cXyz l_halfAtnWaitBaseAnime(3.5f, 97.0f, -7.0f); +static DUSK_CONSTEXPR cXyz l_halfAtnWaitBaseAnime(3.5f, 97.0f, -7.0f); -static cXyz l_rWaitBaseAnime(4.313951f, 93.94436f, -5.207283f); +static DUSK_CONSTEXPR cXyz l_rWaitBaseAnime(4.313951f, 93.94436f, -5.207283f); -static cXyz l_lWaitBaseAnime(-4.300988f, 93.95595f, -5.218504f); +static DUSK_CONSTEXPR cXyz l_lWaitBaseAnime(-4.300988f, 93.95595f, -5.218504f); -static cXyz l_horseBaseAnime(-l_waitBaseAnime.x, 225.7f, 1.81f - l_waitBaseAnime.z); +static DUSK_CONSTEXPR cXyz l_horseBaseAnime(-l_waitBaseAnime.x, 225.7f, 1.81f - l_waitBaseAnime.z); -static cXyz l_boarBaseAnime(-l_waitBaseAnime.x, 186.17f, -20.29f - l_waitBaseAnime.z); +static DUSK_CONSTEXPR cXyz l_boarBaseAnime(-l_waitBaseAnime.x, 186.17f, -20.29f - l_waitBaseAnime.z); -static cXyz l_localHorseRidePos(-68.208984f, 41.609924f, 0.883789f); +static DUSK_CONSTEXPR cXyz l_localHorseRidePos(-68.208984f, 41.609924f, 0.883789f); -static cXyz l_localBoarRidePos(0.0f, 15.0f, 0.0f); +static DUSK_CONSTEXPR cXyz l_localBoarRidePos(0.0f, 15.0f, 0.0f); -static cXyz l_canoeBaseAnime(1.24279f - l_waitBaseAnime.x, 56.0f, -72.0f - l_waitBaseAnime.z); +static DUSK_CONSTEXPR cXyz l_canoeBaseAnime(1.24279f - l_waitBaseAnime.x, 56.0f, -72.0f - l_waitBaseAnime.z); -static cXyz l_sumouBaseAnimeSp(0.0f, 0.0f, 32.0f - l_waitBaseAnime.z); +static DUSK_CONSTEXPR cXyz l_sumouBaseAnimeSp(0.0f, 0.0f, 32.0f - l_waitBaseAnime.z); -static cXyz l_wolfBaseAnime(1.0f, 88.63934f, -28.497932f); +static cXyz DUSK_CONST l_wolfBaseAnime(1.0f, 88.63934f, -28.497932f); -static cXyz l_wolfRopeBaseAnime(0.115164f, 68.336296f, -7.667817f); +static cXyz DUSK_CONST l_wolfRopeBaseAnime(0.115164f, 68.336296f, -7.667817f); static void dummy_lit_3757() { Vec temp = { 0.0f, 0.0f, 0.0f }; @@ -19890,13 +19890,13 @@ static int daAlink_Delete(daAlink_c* i_this) { } } -static actor_method_class l_daAlink_Method = { +static DUSK_CONST actor_method_class l_daAlink_Method = { (process_method_func)daAlink_Create, (process_method_func)daAlink_Delete, (process_method_func)daAlink_Execute, (process_method_func)NULL, (process_method_func)daAlink_Draw, }; -actor_process_profile_definition g_profile_ALINK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ALINK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 5, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc index f0c585f1b8..cc2bf54121 100644 --- a/src/d/actor/d_a_alink_horse.inc +++ b/src/d/actor/d_a_alink_horse.inc @@ -1270,7 +1270,7 @@ int daAlink_c::procHorseRideInit() { daAlink_ANM anm; MtxP rideMtx; - Vec* localRidePos_p; + Vec DUSK_CONST* localRidePos_p; u32 mode; if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) { daHorse_c* horse = (daHorse_c*)field_0x27f4; diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index 43b60e9d42..46d599daa5 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -65,8 +65,8 @@ extern Vec const l_crawlSideOffset; extern Vec const l_wolfLieSideOffset; extern Vec const l_crawlMinSideOffset; extern f32 const l_wolfFootOnFrame[][4]; -extern cXyz l_wolfBaseAnime; -extern cXyz l_wolfRopeBaseAnime; +extern cXyz DUSK_CONST l_wolfBaseAnime; +extern cXyz DUSK_CONST l_wolfRopeBaseAnime; void daAlink_c::changeCommon() { diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 092e86143b..68eeaaeb1c 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -179,7 +179,7 @@ static int daAlldie_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daAlldie_Method = { +static DUSK_CONST actor_method_class l_daAlldie_Method = { (process_method_func)daAlldie_Create, (process_method_func)daAlldie_Delete, (process_method_func)daAlldie_Execute, @@ -187,7 +187,7 @@ static actor_method_class l_daAlldie_Method = { (process_method_func)daAlldie_Draw, }; -actor_process_profile_definition g_profile_ALLDIE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ALLDIE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 097d7096c5..6f4fb37df4 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -104,7 +104,7 @@ static int daAndsw_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daAndsw_Method = { +static DUSK_CONST actor_method_class l_daAndsw_Method = { (process_method_func)daAndsw_Create, (process_method_func)daAndsw_Delete, (process_method_func)daAndsw_Execute, @@ -112,7 +112,7 @@ static actor_method_class l_daAndsw_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_ANDSW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ANDSW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 146dcb5929..f6e770b80c 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -336,13 +336,13 @@ static int daAndsw2_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daAndsw2_Method = { +static DUSK_CONST actor_method_class l_daAndsw2_Method = { (process_method_func)daAndsw2_Create, (process_method_func)daAndsw2_Delete, (process_method_func)daAndsw2_Execute, }; -actor_process_profile_definition g_profile_ANDSW2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ANDSW2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index c18d19e149..7e9d052302 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1220,7 +1220,7 @@ AUDIO_INSTANCES; template<> JAUSectionHeap* JASGlobalInstance::sInstance; -static actor_method_class l_daArrowMethodTable = { +static DUSK_CONST actor_method_class l_daArrowMethodTable = { (process_method_func)daArrow_create, (process_method_func)daArrow_delete, (process_method_func)daArrow_execute, @@ -1228,7 +1228,7 @@ static actor_method_class l_daArrowMethodTable = { (process_method_func)daArrow_draw, }; -actor_process_profile_definition g_profile_ARROW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ARROW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index e2c35acca0..3c82cb27c8 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -1568,7 +1568,7 @@ static int daB_BH_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daB_BH_Method = { +static DUSK_CONST actor_method_class l_daB_BH_Method = { (process_method_func)daB_BH_Create, (process_method_func)daB_BH_Delete, (process_method_func)daB_BH_Execute, @@ -1576,7 +1576,7 @@ static actor_method_class l_daB_BH_Method = { (process_method_func)daB_BH_Draw, }; -actor_process_profile_definition g_profile_B_BH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_BH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 637e82360e..2c9f4bd893 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -2674,13 +2674,13 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { b_bq_class::b_bq_class() {} -static actor_method_class l_daB_BQ_Method = { +static DUSK_CONST actor_method_class l_daB_BQ_Method = { (process_method_func)daB_BQ_Create, (process_method_func)daB_BQ_Delete, (process_method_func)daB_BQ_Execute, (process_method_func)daB_BQ_IsDelete, (process_method_func)daB_BQ_Draw, }; -actor_process_profile_definition g_profile_B_BQ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_BQ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 1d172cf8d1..7e1cc8c0d5 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -4285,7 +4285,7 @@ static int daB_DR_Create(daB_DR_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_DR_Method = { +static DUSK_CONST actor_method_class l_daB_DR_Method = { (process_method_func)daB_DR_Create, (process_method_func)daB_DR_Delete, (process_method_func)daB_DR_Execute, @@ -4293,7 +4293,7 @@ static actor_method_class l_daB_DR_Method = { (process_method_func)daB_DR_Draw, }; -actor_process_profile_definition g_profile_B_DR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_DR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index c25b187b76..b26e815ddd 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -937,13 +937,13 @@ static int daB_DRE_IsDelete(daB_DRE_c* i_this) { return 1; } -static actor_method_class l_daB_DRE_Method = { +static DUSK_CONST actor_method_class l_daB_DRE_Method = { (process_method_func)daB_DRE_Create, (process_method_func)daB_DRE_Delete, (process_method_func)daB_DRE_Execute, (process_method_func)daB_DRE_IsDelete, (process_method_func)daB_DRE_Draw, }; -actor_process_profile_definition g_profile_B_DRE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_DRE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 487addd826..17bdd9564b 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -5680,13 +5680,13 @@ static cPhs_Step daB_DS_Create(daB_DS_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_DS_Method = { +static DUSK_CONST actor_method_class l_daB_DS_Method = { (process_method_func)daB_DS_Create, (process_method_func)daB_DS_Delete, (process_method_func)daB_DS_Execute, (process_method_func)daB_DS_IsDelete, (process_method_func)daB_DS_Draw, }; -actor_process_profile_definition g_profile_B_DS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_DS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index dac161d266..f6259b1f7b 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -4456,7 +4456,7 @@ static int daB_GG_Create(fopAc_ac_c* i_this) { return ((daB_GG_c*)i_this)->Create(); } -static actor_method_class l_daB_GG_Method = { +static DUSK_CONST actor_method_class l_daB_GG_Method = { (process_method_func)daB_GG_Create, (process_method_func)daB_GG_Delete, (process_method_func)daB_GG_Execute, @@ -4464,7 +4464,7 @@ static actor_method_class l_daB_GG_Method = { (process_method_func)daB_GG_Draw, }; -actor_process_profile_definition g_profile_B_GG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 0f9304e22a..2b65b8095b 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -2223,7 +2223,7 @@ static int daB_GM_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daB_GM_Method = { +static DUSK_CONST actor_method_class l_daB_GM_Method = { (process_method_func)daB_GM_Create, (process_method_func)daB_GM_Delete, (process_method_func)daB_GM_Execute, @@ -2231,7 +2231,7 @@ static actor_method_class l_daB_GM_Method = { (process_method_func)daB_GM_Draw, }; -actor_process_profile_definition g_profile_B_GM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 0f982e59e8..80cca37f6e 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -4937,7 +4937,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - static dCcD_SrcCyl co_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl co_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -5018,7 +5018,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { b_gnd_class::b_gnd_class() {} -static actor_method_class l_daB_GND_Method = { +static DUSK_CONST actor_method_class l_daB_GND_Method = { (process_method_func)daB_GND_Create, (process_method_func)daB_GND_Delete, (process_method_func)daB_GND_Execute, @@ -5026,7 +5026,7 @@ static actor_method_class l_daB_GND_Method = { (process_method_func)daB_GND_Draw, }; -actor_process_profile_definition g_profile_B_GND = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GND = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 04d16d2c09..cb8e9e2d9f 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -284,13 +284,13 @@ static int daB_GO_Create(fopAc_ac_c* i_this) { b_go_class::b_go_class() {} -static actor_method_class l_daB_GO_Method = { +static DUSK_CONST actor_method_class l_daB_GO_Method = { (process_method_func)daB_GO_Create, (process_method_func)daB_GO_Delete, (process_method_func)daB_GO_Execute, (process_method_func)daB_GO_IsDelete, (process_method_func)daB_GO_Draw, }; -actor_process_profile_definition g_profile_B_GO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 65a1bd85b7..9496a70e2b 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -383,7 +383,7 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) { a_this->gravity = -7.0f; a_this->mAction = ACTION_WAIT; - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -411,13 +411,13 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) { b_gos_class::b_gos_class() {} -static actor_method_class l_daB_GOS_Method = { +static DUSK_CONST actor_method_class l_daB_GOS_Method = { (process_method_func)daB_GOS_Create, (process_method_func)daB_GOS_Delete, (process_method_func)daB_GOS_Execute, (process_method_func)daB_GOS_IsDelete, (process_method_func)daB_GOS_Draw, }; -actor_process_profile_definition g_profile_B_GOS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_GOS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 169db10cd3..a293fc63ad 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -3576,13 +3576,13 @@ static int daB_MGN_Create(daB_MGN_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_MGN_Method = { +static DUSK_CONST actor_method_class l_daB_MGN_Method = { (process_method_func)daB_MGN_Create, (process_method_func)daB_MGN_Delete, (process_method_func)daB_MGN_Execute, (process_method_func)daB_MGN_IsDelete, (process_method_func)daB_MGN_Draw, }; -actor_process_profile_definition g_profile_B_MGN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_MGN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index f7aa9b1f0b..2725c4b754 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3649,7 +3649,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daB_OB_Method = { +static DUSK_CONST actor_method_class l_daB_OB_Method = { (process_method_func)daB_OB_Create, (process_method_func)daB_OB_Delete, (process_method_func)daB_OB_Execute, @@ -3657,7 +3657,7 @@ static actor_method_class l_daB_OB_Method = { (process_method_func)daB_OB_Draw, }; -actor_process_profile_definition g_profile_B_OB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_OB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index e52b965b65..e6e9db3dfe 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -822,7 +822,7 @@ static int daB_OH_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daB_OH_Method = { +static DUSK_CONST actor_method_class l_daB_OH_Method = { (process_method_func)daB_OH_Create, (process_method_func)daB_OH_Delete, (process_method_func)daB_OH_Execute, @@ -830,7 +830,7 @@ static actor_method_class l_daB_OH_Method = { (process_method_func)daB_OH_Draw, }; -actor_process_profile_definition g_profile_B_OH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_OH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index 2e2619d155..8bf8773d51 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -293,13 +293,13 @@ static int daB_OH2_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daB_OH2_Method = { +static DUSK_CONST actor_method_class l_daB_OH2_Method = { (process_method_func)daB_OH2_Create, (process_method_func)daB_OH2_Delete, (process_method_func)daB_OH2_Execute, (process_method_func)daB_OH2_IsDelete, (process_method_func)daB_OH2_Draw, }; -actor_process_profile_definition g_profile_B_OH2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_OH2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 17f6616314..8ad5edece5 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -5168,13 +5168,13 @@ static int daB_TN_Create(daB_TN_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_TN_Method = { +static DUSK_CONST actor_method_class l_daB_TN_Method = { (process_method_func)daB_TN_Create, (process_method_func)daB_TN_Delete, (process_method_func)daB_TN_Execute, (process_method_func)daB_TN_IsDelete, (process_method_func)daB_TN_Draw, }; -actor_process_profile_definition g_profile_B_TN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_TN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 58f77ca5c2..2bc83b9473 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -3426,7 +3426,7 @@ static u32 m_common_count; } // namespace -static actor_method_class l_daB_YO_Method = { +static DUSK_CONST actor_method_class l_daB_YO_Method = { (process_method_func)daB_YO_Create, (process_method_func)daB_YO_Delete, (process_method_func)daB_YO_Execute, @@ -3434,7 +3434,7 @@ static actor_method_class l_daB_YO_Method = { (process_method_func)daB_YO_Draw, }; -actor_process_profile_definition g_profile_B_YO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_YO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index ee55b8c9f2..50a6e49ba6 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -1091,7 +1091,7 @@ static cPhs_Step daB_YOI_Create(daB_YOI_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_YOI_Method = { +static DUSK_CONST actor_method_class l_daB_YOI_Method = { (process_method_func)daB_YOI_Create, (process_method_func)daB_YOI_Delete, (process_method_func)daB_YOI_Execute, @@ -1099,7 +1099,7 @@ static actor_method_class l_daB_YOI_Method = { (process_method_func)daB_YOI_Draw, }; -actor_process_profile_definition g_profile_B_YOI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_YOI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 3c590fe101..b3405adb7d 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -5591,7 +5591,7 @@ static int daB_ZANT_Create(daB_ZANT_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_ZANT_Method = { +static DUSK_CONST actor_method_class l_daB_ZANT_Method = { (process_method_func)daB_ZANT_Create, (process_method_func)daB_ZANT_Delete, (process_method_func)daB_ZANT_Execute, @@ -5599,7 +5599,7 @@ static actor_method_class l_daB_ZANT_Method = { (process_method_func)daB_ZANT_Draw, }; -actor_process_profile_definition g_profile_B_ZANT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 97eeec2c4c..133ec3d4da 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -268,7 +268,7 @@ static int daB_ZANTM_Create(daB_ZANTM_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_ZANTM_Method = { +static DUSK_CONST actor_method_class l_daB_ZANTM_Method = { (process_method_func)daB_ZANTM_Create, (process_method_func)daB_ZANTM_Delete, (process_method_func)daB_ZANTM_Execute, @@ -276,7 +276,7 @@ static actor_method_class l_daB_ZANTM_Method = { (process_method_func)daB_ZANTM_Draw, }; -actor_process_profile_definition g_profile_B_ZANTM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANTM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 5ac969969b..556fe7288b 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -500,7 +500,7 @@ static int daB_ZANTZ_Create(daB_ZANTZ_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_ZANTZ_Method = { +static DUSK_CONST actor_method_class l_daB_ZANTZ_Method = { (process_method_func)daB_ZANTZ_Create, (process_method_func)daB_ZANTZ_Delete, (process_method_func)daB_ZANTZ_Execute, @@ -508,7 +508,7 @@ static actor_method_class l_daB_ZANTZ_Method = { (process_method_func)daB_ZANTZ_Draw, }; -actor_process_profile_definition g_profile_B_ZANTZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANTZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 83429a84a0..a1d284e001 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -221,13 +221,13 @@ static int daB_ZANTS_Create(daB_ZANTS_c* i_this) { return i_this->create(); } -static actor_method_class l_daB_ZANTS_Method = { +static DUSK_CONST actor_method_class l_daB_ZANTS_Method = { (process_method_func)daB_ZANTS_Create, (process_method_func)daB_ZANTS_Delete, (process_method_func)daB_ZANTS_Execute, (process_method_func)daB_ZANTS_IsDelete, (process_method_func)daB_ZANTS_Draw, }; -actor_process_profile_definition g_profile_B_ZANTS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_B_ZANTS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 8627505371..ebd9396759 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -154,7 +154,7 @@ static int daBalloon2D_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_arcName = "Balloon2D"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Balloon2D"; int daBalloon2D_c::createHeap() { mScreen = JKR_NEW J2DScreen(); @@ -687,7 +687,7 @@ void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) { } #endif -static actor_method_class daBalloon2D_METHODS = { +static DUSK_CONST actor_method_class daBalloon2D_METHODS = { (process_method_func)daBalloon2D_create, (process_method_func)daBalloon2D_destroy, (process_method_func)daBalloon2D_execute, @@ -695,7 +695,7 @@ static actor_method_class daBalloon2D_METHODS = { (process_method_func)daBalloon2D_draw, }; -actor_process_profile_definition g_profile_BALLOON2D = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BALLOON2D = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index ea786a60a1..e2cdc30329 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -1048,13 +1048,13 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { return phase_state; } -static actor_method_class l_daBd_Method = { +static DUSK_CONST actor_method_class l_daBd_Method = { (process_method_func)daBd_Create, (process_method_func)daBd_Delete, (process_method_func)daBd_Execute, (process_method_func)daBd_IsDelete, (process_method_func)daBd_Draw, }; -actor_process_profile_definition g_profile_BD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 9c453b6553..110e2aef15 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -631,7 +631,7 @@ int daBg_c::create() { return cPhs_COMPLEATE_e; } -static actor_method_class l_daBg_Method = { +static DUSK_CONST actor_method_class l_daBg_Method = { (process_method_func)daBg_Create, (process_method_func)daBg_Delete, (process_method_func)daBg_Execute, @@ -639,7 +639,7 @@ static actor_method_class l_daBg_Method = { (process_method_func)daBg_Draw, }; -actor_process_profile_definition2 g_profile_BG = { +DUSK_PROFILE actor_process_profile_definition2 DUSK_CONST g_profile_BG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 026ef1a7fd..a2d4e3b1a6 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -499,7 +499,7 @@ static dCcD_SrcTri l_tri_src = { }, }; -static char* l_specName = "spec.dat"; +static DUSK_CONST char* l_specName = "spec.dat"; createHeapFunc daBgObj_c::mCreateHeapFunc[] = { &daBgObj_c::CreateHeapType0, @@ -1355,7 +1355,7 @@ static int daBgObj_MoveBGDraw(daBgObj_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daBgObj_METHODS = { +static DUSK_CONST actor_method_class daBgObj_METHODS = { (process_method_func)daBgObj_create1st, (process_method_func)daBgObj_MoveBGDelete, (process_method_func)daBgObj_MoveBGExecute, @@ -1363,7 +1363,7 @@ static actor_method_class daBgObj_METHODS = { (process_method_func)daBgObj_MoveBGDraw, }; -actor_process_profile_definition g_profile_BG_OBJ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BG_OBJ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 590897640e..a745807ce4 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1489,7 +1489,7 @@ static int daBoomerang_Create(fopAc_ac_c* i_this) { return ((daBoomerang_c*)i_this)->create(); } -static actor_method_class l_daBoomerang_Method = { +static DUSK_CONST actor_method_class l_daBoomerang_Method = { (process_method_func)daBoomerang_Create, (process_method_func)daBoomerang_Delete, (process_method_func)daBoomerang_Execute, @@ -1497,7 +1497,7 @@ static actor_method_class l_daBoomerang_Method = { (process_method_func)daBoomerang_Draw, }; -actor_process_profile_definition g_profile_BOOMERANG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BOOMERANG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 6, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index cac505a0bb..2bdd114436 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -8,9 +8,9 @@ #include "d/actor/d_a_bullet.h" #include "d/d_com_inf_game.h" -static char* l_resFileNameList[] = {"Hanjo1"}; +static DUSK_CONST char* l_resFileNameList[] = {"Hanjo1"}; -static char* l_bmdFileNameList[] = {"hanjo_stone.bmd"}; +static DUSK_CONST char* l_bmdFileNameList[] = {"hanjo_stone.bmd"}; static BULLET_HIO_CLASS l_HIO; @@ -267,7 +267,7 @@ static int daBullet_IsDelete(void* i_this) { return 1; } -static actor_method_class daBullet_MethodTable = { +static DUSK_CONST actor_method_class daBullet_MethodTable = { (process_method_func)daBullet_Create, (process_method_func)daBullet_Delete, (process_method_func)daBullet_Execute, @@ -275,7 +275,7 @@ static actor_method_class daBullet_MethodTable = { (process_method_func)daBullet_Draw, }; -actor_process_profile_definition g_profile_BULLET = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BULLET = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 7f393263f7..d0c1a86130 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -909,7 +909,7 @@ static int daCanoe_Draw(daCanoe_c* i_this) { return i_this->draw(); } -static actor_method_class l_daCanoe_Method = { +static DUSK_CONST actor_method_class l_daCanoe_Method = { (process_method_func)daCanoe_Create, (process_method_func)daCanoe_Delete, (process_method_func)daCanoe_Execute, @@ -917,7 +917,7 @@ static actor_method_class l_daCanoe_Method = { (process_method_func)daCanoe_Draw, }; -actor_process_profile_definition g_profile_CANOE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CANOE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index eab333cb8b..4592be183d 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -105,7 +105,7 @@ static int daCoach2D_createHeap(fopAc_ac_c* i_this) { return ((daCoach2D_c*)i_this)->createHeap(); } -static char* l_arcName = "Coach2D"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Coach2D"; static daCoach2D_HIO_c l_HOSTIO; @@ -349,7 +349,7 @@ static int daCoach2D_draw(daCoach2D_c* i_this) { return i_this->draw(); } -static actor_method_class daCoach2D_METHODS = { +static DUSK_CONST actor_method_class daCoach2D_METHODS = { (process_method_func)daCoach2D_create, (process_method_func)daCoach2D_destroy, (process_method_func)daCoach2D_execute, @@ -357,7 +357,7 @@ static actor_method_class daCoach2D_METHODS = { (process_method_func)daCoach2D_draw, }; -actor_process_profile_definition g_profile_COACH2D = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_COACH2D = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index 8ffc1b1105..d69fd63452 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -155,15 +155,15 @@ static int daCoachFire_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static char* stringBase_80658454 = "Coach"; +static DUSK_CONST char* stringBase_80658454 = "Coach"; -static actor_method_class l_daCoachFire_Method = { +static DUSK_CONST actor_method_class l_daCoachFire_Method = { (process_method_func)daCoachFire_Create, (process_method_func)daCoachFire_Delete, (process_method_func)daCoachFire_Execute, (process_method_func)daCoachFire_IsDelete, (process_method_func)daCoachFire_Draw, }; -actor_process_profile_definition g_profile_COACH_FIRE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_COACH_FIRE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index bdb3ab08da..4132b151b0 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -3283,11 +3283,11 @@ static int daCow_IsDelete(void* actor) { return true; } -static actor_method_class daCow_MethodTable = { +static DUSK_CONST actor_method_class daCow_MethodTable = { daCow_Create, daCow_Delete, daCow_Execute, daCow_IsDelete, daCow_Draw, }; -actor_process_profile_definition g_profile_COW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_COW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 0aecb4ab0e..2851c651db 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -376,13 +376,13 @@ static int daCrod_Draw(daCrod_c* i_this) { return i_this->draw(); } -static actor_method_class l_daCrod_Method = { +static DUSK_CONST actor_method_class l_daCrod_Method = { (process_method_func)daCrod_Create, (process_method_func)daCrod_Delete, (process_method_func)daCrod_Execute, (process_method_func)NULL, (process_method_func)daCrod_Draw, }; -actor_process_profile_definition g_profile_CROD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CROD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 76b83c8243..d52f6c1389 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -571,7 +571,7 @@ static int daCstaF_Draw(daCstaF_c* a_this) { return a_this->MoveBGDraw(); } -static actor_method_class l_daCstaF_Method = { +static DUSK_CONST actor_method_class l_daCstaF_Method = { (process_method_func)daCstaF_Create, (process_method_func)daCstaF_Delete, (process_method_func)daCstaF_Execute, @@ -579,7 +579,7 @@ static actor_method_class l_daCstaF_Method = { (process_method_func)daCstaF_Draw, }; -actor_process_profile_definition g_profile_CSTAF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CSTAF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 7dd3ea8a32..d267d87611 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -1206,7 +1206,7 @@ static int daCstatue_Draw(daCstatue_c* actor) { return static_cast(actor)->draw(); } -static actor_method_class l_daCstatue_Method = { +static DUSK_CONST actor_method_class l_daCstatue_Method = { (process_method_func)daCstatue_Create, (process_method_func)daCstatue_Delete, (process_method_func)daCstatue_Execute, @@ -1214,7 +1214,7 @@ static actor_method_class l_daCstatue_Method = { (process_method_func)daCstatue_Draw, }; -actor_process_profile_definition g_profile_CSTATUE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_CSTATUE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 99ad6c1587..b737083598 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -1893,7 +1893,7 @@ class JAUSectionHeap; template<> JAUSectionHeap* JASGlobalInstance::sInstance; -static actor_method_class l_daDemo00_Method = { +static DUSK_CONST actor_method_class l_daDemo00_Method = { (process_method_func)daDemo00_Create, (process_method_func)daDemo00_Delete, (process_method_func)daDemo00_Execute, @@ -1901,7 +1901,7 @@ static actor_method_class l_daDemo00_Method = { (process_method_func)daDemo00_Draw, }; -actor_process_profile_definition g_profile_DEMO00 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DEMO00 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 6168a6b7e8..209bd483c4 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -552,7 +552,7 @@ static int daDitem_Draw(daDitem_c* i_this) { return i_this->draw(); } -static actor_method_class l_daDitem_Method = { +static DUSK_CONST actor_method_class l_daDitem_Method = { (process_method_func)daDitem_Create, (process_method_func)daDitem_Delete, (process_method_func)daDitem_Execute, @@ -560,7 +560,7 @@ static actor_method_class l_daDitem_Method = { (process_method_func)daDitem_Draw, }; -actor_process_profile_definition g_profile_Demo_Item = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Demo_Item = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 2aec26258f..755de634bd 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -116,13 +116,13 @@ static int daDisappear_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daDisappear_Method = { +static DUSK_CONST actor_method_class l_daDisappear_Method = { (process_method_func)daDisappear_Create, (process_method_func)daDisappear_Delete, (process_method_func)daDisappear_Execute, (process_method_func)daDisappear_IsDelete, (process_method_func)daDisappear_Draw, }; -actor_process_profile_definition g_profile_DISAPPEAR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DISAPPEAR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index 09d6187d21..42228f3593 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -82,13 +82,13 @@ static int daDmidna_Draw(daDmidna_c* i_this) { return i_this->draw(); } -static actor_method_class l_daDmidna_Method = { +static DUSK_CONST actor_method_class l_daDmidna_Method = { (process_method_func)daDmidna_Create, (process_method_func)daDmidna_Delete, (process_method_func)daDmidna_Execute, (process_method_func)NULL, (process_method_func)daDmidna_Draw, }; -actor_process_profile_definition g_profile_DMIDNA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DMIDNA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index ffe31165fa..00fbfa5af9 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -2492,7 +2492,7 @@ static cPhs_Step daDo_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daDo_Method = { +static DUSK_CONST actor_method_class l_daDo_Method = { (process_method_func)daDo_Create, (process_method_func)daDo_Delete, (process_method_func)daDo_Execute, @@ -2500,7 +2500,7 @@ static actor_method_class l_daDo_Method = { (process_method_func)daDo_Draw, }; -actor_process_profile_definition g_profile_DO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index bf042b3323..37034cdcc9 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -12,19 +12,19 @@ #include "d/d_door_param2.h" #include "SSystem/SComponent/c_math.h" -char* daBdoor_c::getArcName() { +DUSK_CONST char* daBdoor_c::getArcName() { return "Z_bdor00"; } -char* daBdoor_c::getBmd() { +DUSK_CONST char* daBdoor_c::getBmd() { return "Z_bdor00.bmd"; } -char* daBdoor_c::getDzb() { +DUSK_CONST char* daBdoor_c::getDzb() { return "door30.dzb"; } -char* daBdoor_c::getBmd2() { +DUSK_CONST char* daBdoor_c::getBmd2() { return "door_shutterBoss.bmd"; } @@ -119,7 +119,7 @@ cPhs_Step daBdoor_c::create() { } int daBdoor_c::getDemoAction() { - static char* action_table[11] = { + static DUSK_CONST char* action_table[11] = { "WAIT", "UNLOCK", "OPEN", @@ -412,7 +412,7 @@ static cPhs_Step daBdoor_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBdoor_Method = { +static DUSK_CONST actor_method_class l_daBdoor_Method = { (process_method_func)daBdoor_Create, (process_method_func)daBdoor_Delete, (process_method_func)daBdoor_Execute, @@ -420,7 +420,7 @@ static actor_method_class l_daBdoor_Method = { (process_method_func)daBdoor_Draw, }; -actor_process_profile_definition g_profile_BOSS_DOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BOSS_DOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 649ebbd5f3..5dc5dc5631 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -15,7 +15,7 @@ #include "f_op/f_op_actor_mng.h" #include -static char* l_stageName[20] = { +static DUSK_CONST char* l_stageName[20] = { "D_MN05", "D_MN05A", "D_MN04", @@ -50,7 +50,7 @@ static int getNowLevel() { return -1; } -char* daBdoorL1_c::getDoorEventName() { +DUSK_CONST char* daBdoorL1_c::getDoorEventName() { switch (getNowLevel()) { case 1: return "DEFAULT_BS_SHUTTER_L1_F"; @@ -71,7 +71,7 @@ char* daBdoorL1_c::getDoorEventName() { } } -char* daBdoorL1_c::getDoorEventName2() { +DUSK_CONST char* daBdoorL1_c::getDoorEventName2() { switch (getNowLevel()) { case 1: return "DEFAULT_BS_SHUTTER_L1_F_2"; @@ -230,7 +230,7 @@ int daBdoorL1_c::CreateHeap() { return 1; } -static char* action_table[18] = { +static DUSK_CONST char* action_table[18] = { "WAIT", "SETANGLE", "UNLOCK", @@ -972,7 +972,7 @@ static int daBdoorL1_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBdoorL1_Method = { +static DUSK_CONST actor_method_class l_daBdoorL1_Method = { (process_method_func)daBdoorL1_Create, (process_method_func)daBdoorL1_Delete, (process_method_func)daBdoorL1_Execute, @@ -980,7 +980,7 @@ static actor_method_class l_daBdoorL1_Method = { (process_method_func)daBdoorL1_Draw, }; -actor_process_profile_definition g_profile_L1BOSS_DOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L1BOSS_DOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index 34dac15fa9..d4c05b4685 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -54,7 +54,7 @@ static char const l_door_open_demo_1st[26] = "DEFAULT_BS_SHUTTER_L5_1ST"; static char const l_staff_name[13] = "SHUTTER_DOOR"; -static char* action_table[14] = { +static DUSK_CONSTEXPR char DUSK_CONST* action_table[14] = { "WAIT", "UNLOCK", "OPEN", @@ -498,7 +498,7 @@ static int daBdoorL5_Create(fopAc_ac_c* i_this) { } -static actor_method_class l_daBdoorL5_Method = { +static DUSK_CONST actor_method_class l_daBdoorL5_Method = { (process_method_func)daBdoorL5_Create, (process_method_func)daBdoorL5_Delete, (process_method_func)daBdoorL5_Execute, @@ -506,7 +506,7 @@ static actor_method_class l_daBdoorL5_Method = { (process_method_func)daBdoorL5_Draw, }; -actor_process_profile_definition g_profile_L5BOSS_DOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L5BOSS_DOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index edac3c14f8..2aa1f4e23f 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -27,29 +27,29 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static char* dummyStringFunc() { +static DUSK_CONST char* dummyStringFunc() { return "door-pushDouble_"; } -char* daDbDoor00_c::getAlwaysArcName() { +DUSK_CONST char* daDbDoor00_c::getAlwaysArcName() { return "static"; } -char* daDbDoor00_c::getDzb() { +DUSK_CONST char* daDbDoor00_c::getDzb() { return "door-pushDouble.dzb"; } -char* daDbDoor00_c::getDummyBmdName() { +DUSK_CONST char* daDbDoor00_c::getDummyBmdName() { return "door-pushDoubleDummy.bmd"; } -char* daDbDoor00_c::getBmdArcName() { +DUSK_CONST char* daDbDoor00_c::getBmdArcName() { return "DbDoor0"; } -static char* l_bmd_base_name = "door-pushDouble_"; +static DUSK_CONST char* l_bmd_base_name = "door-pushDouble_"; -char* daDbDoor00_c::getBmdName() { +DUSK_CONST char* daDbDoor00_c::getBmdName() { static char l_bmdName[32]; SAFE_SPRINTF(l_bmdName, "%s%02d.bmd", l_bmd_base_name, door_param2_c::getDoorModel(this)); return l_bmdName; @@ -167,7 +167,7 @@ int daDbDoor00_c::create() { } int daDbDoor00_c::getDemoAction() { - static char* action_table[9] = { + static DUSK_CONST char* action_table[9] = { "WAIT", "SET_START", "SET_ANGLE", "END", "OPEN", "STOP_OPEN", "SET_GOAL", "SET_GOAL2", "ADJUSTMENT", }; @@ -408,13 +408,13 @@ static int daDbdoor00_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daDbdoor00_Method = { +static DUSK_CONST actor_method_class l_daDbdoor00_Method = { (process_method_func)daDbdoor00_Create, (process_method_func)daDbdoor00_Delete, (process_method_func)daDbdoor00_Execute, (process_method_func)daDbdoor00_IsDelete, (process_method_func)daDbdoor00_Draw, }; -actor_process_profile_definition g_profile_DBDOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DBDOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index ea4a9c8679..918ac2fb71 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -30,29 +30,29 @@ u8 knob_param_c::getExitNo(fopAc_ac_c* i_this) { return fopAcM_GetParamBit(i_this, 25, 6); } -static char* dummyStringFunc() { +static DUSK_CONST char* dummyStringFunc() { return "door-knob_"; } -char* daKnob20_c::getAlwaysArcName() { +DUSK_CONST char* daKnob20_c::getAlwaysArcName() { return "static"; } -char* daKnob20_c::getEvArcName() { +DUSK_CONST char* daKnob20_c::getEvArcName() { return "DoorK10"; } -char* daKnob20_c::getDzb() { +DUSK_CONST char* daKnob20_c::getDzb() { return "door-knob.dzb"; } -char* daKnob20_c::getDummyBmd() { +DUSK_CONST char* daKnob20_c::getDummyBmd() { return "door-knobDummy.bmd"; } -static char* l_bmd_base_name = "door-knob_"; +static DUSK_CONST char* l_bmd_base_name = "door-knob_"; -char* daKnob20_c::getBmd() { +DUSK_CONST char* daKnob20_c::getBmd() { static char l_bmdName[32]; SAFE_SPRINTF(l_bmdName, "%s%02d.bmd", l_bmd_base_name, knob_param_c::getDoorModel(this)); @@ -194,7 +194,7 @@ void daKnob20_c::setActionFromFlow() { } void daKnob20_c::setEventId() { - static char* ev_name_table[7] = { + static DUSK_CONSTEXPR char DUSK_CONST* ev_name_table[7] = { "DEFAULT_KNOB_DOOR_F_OPEN", "DEFAULT_KNOB_DOOR_B_OPEN", "DEFAULT_KNOB_TALK", @@ -296,7 +296,7 @@ int daKnob20_c::frontCheck() { } int daKnob20_c::getDemoAction() { - static char* action_table[16] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[16] = { "WAIT", "SETSTART", "SETANGLE", @@ -463,7 +463,7 @@ int daKnob20_c::adjustmentProc() { } int daKnob20_c::openInit(int param_1) { - static char* bck_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* bck_table[4] = { "FDoorA.bck", "FDoorB.bck", "FDoorA.bck", @@ -694,13 +694,13 @@ static int daKnob20_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daKnob20_Method = { +static DUSK_CONST actor_method_class l_daKnob20_Method = { (process_method_func)daKnob20_Create, (process_method_func)daKnob20_Delete, (process_method_func)daKnob20_Execute, (process_method_func)NULL, (process_method_func)daKnob20_Draw, }; -actor_process_profile_definition g_profile_KNOB20 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KNOB20 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 5dfd3bb96c..a982d0af20 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -57,7 +57,7 @@ static u16 const l_stop_heap_size[12] = { 0x0EA0, 0x0800, 0x0EB0, 0x0800, 0x0800, 0x1BD0, }; -static char* l_door_open_demo[11] = { +static DUSK_CONST char* l_door_open_demo[11] = { NULL, "DEFAULT_MBS_SHUTTER_L1_F", "DEFAULT_MBS_SHUTTER_L1_F", @@ -71,7 +71,7 @@ static char* l_door_open_demo[11] = { "DEFAULT_MBS_SHUTTER_L7_F", }; -static char* l_door_open_demoB[11] = { +static DUSK_CONST char* l_door_open_demoB[11] = { NULL, "DEFAULT_MBS_SHUTTER_L1_B", "DEFAULT_MBS_SHUTTER_L1_B", @@ -85,7 +85,7 @@ static char* l_door_open_demoB[11] = { "DEFAULT_MBS_SHUTTER_L7_B", }; -static char* l_door_open_demoLv5[4] = { +static DUSK_CONST char* l_door_open_demoLv5[4] = { "DEFAULT_MBS_KNOB_OPEN_B", "DEFAULT_MBS_KNOB_OPEN_F", "DEFAULT_MBS_KNOB_NOTOPEN_B", @@ -193,7 +193,7 @@ f32 dDoor_stop2_c::getHeight() { } -char* daMBdoorL1_c::getAnmArcName() { +DUSK_CONST char* daMBdoorL1_c::getAnmArcName() { switch(getDoorType()) { case 0: return "DoorY00"; @@ -205,7 +205,7 @@ char* daMBdoorL1_c::getAnmArcName() { return "DoorT00"; } -char* daMBdoorL1_c::getArcName() { +DUSK_CONST char* daMBdoorL1_c::getArcName() { switch (getNowLevel(this)) { case 0: case 1: @@ -228,7 +228,7 @@ char* daMBdoorL1_c::getArcName() { } } -char* daMBdoorL1_c::getAlwaysArcName() { +DUSK_CONST char* daMBdoorL1_c::getAlwaysArcName() { return "static"; } @@ -245,7 +245,7 @@ int daMBdoorL1_c::getDoorType() { } } -char* daMBdoorL1_c::getOpenAnm() { +DUSK_CONST char* daMBdoorL1_c::getOpenAnm() { if (getDoorType() == DOOR_TYPE_1) { return "oj_DoorOpD.bck"; } @@ -255,7 +255,7 @@ char* daMBdoorL1_c::getOpenAnm() { return NULL; } -char* daMBdoorL1_c::getCloseAnm() { +DUSK_CONST char* daMBdoorL1_c::getCloseAnm() { if (getDoorType() == DOOR_TYPE_1) { return "oj_DoorCloseD.bck"; } @@ -265,7 +265,7 @@ char* daMBdoorL1_c::getCloseAnm() { return NULL; } -char* daMBdoorL1_c::getBmd() { +DUSK_CONST char* daMBdoorL1_c::getBmd() { switch(getNowLevel(this)) { case 5: case 11: @@ -275,11 +275,11 @@ char* daMBdoorL1_c::getBmd() { } } -char* daMBdoorL1_c::getBtk() { +DUSK_CONST char* daMBdoorL1_c::getBtk() { return "door-shutter_00.btk"; } -char* daMBdoorL1_c::getDzb() { +DUSK_CONST char* daMBdoorL1_c::getDzb() { if (getNowLevel(this) == 5) { return "door-shutter.dzb"; } @@ -529,7 +529,7 @@ int daMBdoorL1_c::create() { } int daMBdoorL1_c::getDemoAction() { - static char* action_table[26] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[26] = { "WAIT", "SETANGLE", "UNLOCK", @@ -1066,7 +1066,7 @@ int daMBdoorL1_c::unlock() { } int daMBdoorL1_c::openInitKnob(int param_1) { - static char* bck_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* bck_table[4] = { "FDoorA.bck", "FDoorB.bck", "FDoorA.bck", @@ -1723,7 +1723,7 @@ static int daMBdoorL1_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daMBdoorL1_Method = { +static DUSK_CONST actor_method_class l_daMBdoorL1_Method = { (process_method_func)daMBdoorL1_Create, (process_method_func)daMBdoorL1_Delete, (process_method_func)daMBdoorL1_Execute, @@ -1731,7 +1731,7 @@ static actor_method_class l_daMBdoorL1_Method = { (process_method_func)daMBdoorL1_Draw, }; -actor_process_profile_definition g_profile_L1MBOSS_DOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_L1MBOSS_DOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 78e9156294..531f5be5f6 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -74,9 +74,9 @@ void daDoorPush_c::setBaseMtx() { } } -static char* l_arcName = "V_OsuDoor"; +static DUSK_CONST char* l_arcName = "V_OsuDoor"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-600.0f, 0.0f, -600.0f}, {600.0f, 1000.0f, 600.0f}, }; @@ -233,7 +233,7 @@ void daDoorPush_c::actionEvent() { } int daDoorPush_c::demoProc() { - static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"}; + static DUSK_CONST char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"}; daPy_py_c* player = daPy_getPlayerActorClass(); @@ -364,13 +364,13 @@ static int daDoorPush_MoveBGDraw(daDoorPush_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daDoorPush_METHODS = { +static DUSK_CONST actor_method_class daDoorPush_METHODS = { (process_method_func)daDoorPush_create1st, (process_method_func)daDoorPush_MoveBGDelete, (process_method_func)daDoorPush_MoveBGExecute, (process_method_func)NULL, (process_method_func)daDoorPush_MoveBGDraw, }; -actor_process_profile_definition g_profile_PushDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_PushDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index ba825fe4bd..3b7cdcc5f2 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -22,7 +22,7 @@ #include #endif -char* daDoor20_c::getStopBmdName() { +char DUSK_CONST* daDoor20_c::getStopBmdName() { switch (door_param2_c::getKind(this)) { case 3: case 11: @@ -35,11 +35,11 @@ J3DModelData* daDoor20_c::getStopModelData() { return (J3DModelData*)dComIfG_getStageRes(getStopBmdName()); } -char* daDoor20_c::getAlwaysArcName() { +char DUSK_CONST* daDoor20_c::getAlwaysArcName() { return "static"; } -char* daDoor20_c::getArcName() { +char DUSK_CONST* daDoor20_c::getArcName() { switch (door_param2_c::getKind(this)) { default: return "DoorT00"; @@ -56,7 +56,7 @@ char* daDoor20_c::getArcName() { } } -char* daDoor20_c::getBmdName() { +char DUSK_CONST* daDoor20_c::getBmdName() { static char bmdName[32]; switch(door_param2_c::getKind(this)) { case 0: @@ -74,11 +74,11 @@ char* daDoor20_c::getBmdName() { return bmdName; } -char* daDoor20_c::getBtk() { +char DUSK_CONST* daDoor20_c::getBtk() { return "door-shutter_00.btk"; } -char* daDoor20_c::getDzbName() { +char DUSK_CONST* daDoor20_c::getDzbName() { switch(door_param2_c::getKind(this)) { case 0: case 1: @@ -1536,7 +1536,7 @@ void daDoor20_c::startDemoProc() { } void daDoor20_c::makeEventId() { - static char* table[19] = { + static DUSK_CONSTEXPR char DUSK_CONST* table[19] = { "DEFAULT_STOP_OPEN", "DEFAULT_STOP_OPEN", NULL, @@ -1558,49 +1558,49 @@ void daDoor20_c::makeEventId() { NULL, }; - static char* tate_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* tate_table[4] = { "DEFAULT_SHUTTER_DOOR_10", "DEFAULT_SHUTTER_DOOR_10", "DEFAULT_SHUTTER_DOOR_F_STOP", "DEFAULT_SHUTTER_DOOR_F_STOP", }; - static char* tate_w_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* tate_w_table[4] = { "WOLF_SHUTTER_DOOR_10", "WOLF_SHUTTER_DOOR_10", "WOLF_SHUTTER_DOOR_F_STOP", "WOLF_SHUTTER_DOOR_F_STOP", }; - static char* yoko_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* yoko_table[4] = { "DEFAULT_SHUTTER_DOOR_14", "DEFAULT_SHUTTER_DOOR_14", "DEFAULT_SHUTTER_DOOR_F_STOP_14", "DEFAULT_SHUTTER_DOOR_F_STOP_14", }; - static char* yoko_w_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* yoko_w_table[4] = { "WOLF_SHUTTER_DOOR_14", "WOLF_SHUTTER_DOOR_14", "WOLF_SHUTTER_DOOR_F_STOP_14", "WOLF_SHUTTER_DOOR_F_STOP_14", }; - static char* lv8_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* lv8_table[4] = { "DEFAULT_SHUTTER_DOOR_18", "DEFAULT_SHUTTER_DOOR_18", "DEFAULT_SHUTTER_DOOR_F_STOP_18", "DEFAULT_SHUTTER_DOOR_F_STOP_18", }; - static char* lv8_w_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* lv8_w_table[4] = { "WOLF_SHUTTER_DOOR_18", "WOLF_SHUTTER_DOOR_18", "WOLF_SHUTTER_DOOR_F_STOP_18", "WOLF_SHUTTER_DOOR_F_STOP_18", }; - static char* knob_table[7] = { + static DUSK_CONSTEXPR char DUSK_CONST* knob_table[7] = { "DEFAULT_KNOB_DOOR_F", "DEFAULT_KNOB_DOOR_B", "DEFAULT_KNOB_DOOR_F_STOP", @@ -1610,28 +1610,28 @@ void daDoor20_c::makeEventId() { "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", }; - static char* lv7_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* lv7_table[4] = { "DEFAULT_SHUTTER_DOOR_20", "DEFAULT_SHUTTER_DOOR_20", "DEFAULT_SHUTTER_DOOR_F_STOP_20", "DEFAULT_SHUTTER_DOOR_F_STOP_20", }; - static char* lv7_w_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* lv7_w_table[4] = { "WOLF_SHUTTER_DOOR_20", "WOLF_SHUTTER_DOOR_20", "WOLF_SHUTTER_DOOR_F_STOP_20", "WOLF_SHUTTER_DOOR_F_STOP_20", }; - static char* lv9_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* lv9_table[4] = { "DEFAULT_SHUTTER_DOOR_22", "DEFAULT_SHUTTER_DOOR_22", "DEFAULT_SHUTTER_DOOR_F_STOP_22", "DEFAULT_SHUTTER_DOOR_F_STOP_22", }; - static char* lv9_w_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* lv9_w_table[4] = { "WOLF_SHUTTER_DOOR_22", "WOLF_SHUTTER_DOOR_22", "WOLF_SHUTTER_DOOR_F_STOP_22", @@ -1842,7 +1842,7 @@ void daDoor20_c::getRestartPos(cXyz* param_1) { } int daDoor20_c::getDemoAction() { - static char* action_table[29] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[29] = { "WAIT", "STOP_OPEN", "STOP_CLOSE", @@ -2151,13 +2151,13 @@ static int daDoor20_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daDoor20_Method = { +static DUSK_CONST actor_method_class l_daDoor20_Method = { (process_method_func)daDoor20_Create, (process_method_func)daDoor20_Delete, (process_method_func)daDoor20_Execute, (process_method_func)NULL, (process_method_func)daDoor20_Draw, }; -actor_process_profile_definition g_profile_DOOR20 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_DOOR20 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index d0c34c6dbd..6d103cca70 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -432,7 +432,7 @@ void daSpiral_c::initOpenDemo(int param_0) { } int daSpiral_c::getDemoAction() { - static char* action_table[] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[] = { "WAIT", "START", "SETGOAL", @@ -1178,7 +1178,7 @@ int daSpiral_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daSpiral_Method = { +static DUSK_CONST actor_method_class l_daSpiral_Method = { (process_method_func)daSpiral_Create, (process_method_func)daSpiral_Delete, (process_method_func)daSpiral_Execute, (process_method_func)NULL, (process_method_func)daSpiral_Draw, @@ -1191,7 +1191,7 @@ static actor_method_class l_daSpiral_Method = { #define DASPIRAL_METHODS NULL #endif -actor_process_profile_definition g_profile_SPIRAL_DOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SPIRAL_DOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index 264f559e07..4d7bdc14dd 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -static char* l_arcName[] = { +static DUSK_CONST char* l_arcName[] = { "K_tetd", "S_bsaku00", "S_lv7saku", @@ -247,13 +247,13 @@ static int daDsh_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daDsh_Method = { +static DUSK_CONST actor_method_class l_daDsh_Method = { (process_method_func)daDsh_Create, (process_method_func)daDsh_Delete, (process_method_func)daDsh_Execute, (process_method_func)daDsh_IsDelete, (process_method_func)daDsh_Draw, }; -actor_process_profile_definition2 g_profile_DSHUTTER = { +DUSK_PROFILE actor_process_profile_definition2 DUSK_CONST g_profile_DSHUTTER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index d9f0c5fadd..251a026b88 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -71,7 +71,7 @@ void e_ai_class::initCcCylinder() { m_ccShieldSph.SetStts(&m_ccShieldStts); m_ccShieldSph.OnCoSetBit(); - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xdafbf9ff, 0x43}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -942,7 +942,7 @@ static int daE_AI_Create(fopAc_ac_c* i_this) { return ((e_ai_class*)i_this)->Create(); } -static actor_method_class l_daE_AI_Method = { +static DUSK_CONST actor_method_class l_daE_AI_Method = { (process_method_func)daE_AI_Create, (process_method_func)daE_AI_Delete, (process_method_func)daE_AI_Execute, @@ -950,7 +950,7 @@ static actor_method_class l_daE_AI_Method = { (process_method_func)daE_AI_Draw, }; -actor_process_profile_definition g_profile_E_AI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_AI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 155f36e2fb..f4acdd918e 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -769,13 +769,13 @@ static int daE_ARROW_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_ARROW_Method = { +static DUSK_CONST actor_method_class l_daE_ARROW_Method = { (process_method_func)daE_ARROW_Create, (process_method_func)daE_ARROW_Delete, (process_method_func)daE_ARROW_Execute, (process_method_func)daE_ARROW_IsDelete, (process_method_func)daE_ARROW_Draw, }; -actor_process_profile_definition g_profile_E_ARROW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ARROW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 65aeb2e442..83afd65004 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -990,9 +990,9 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) { - static char* arc_name[3] = {"E_ba", "E_fb", "E_ib"}; + static DUSK_CONST char* arc_name[3] = {"E_ba", "E_fb", "E_ib"}; - static dCcD_SrcSph cc_sph_src = { + static DUSK_CONSTEXPR dCcD_SrcSph cc_sph_src = { { {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1096,7 +1096,7 @@ static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daE_BA_Method = { +static DUSK_CONST actor_method_class l_daE_BA_Method = { (process_method_func)daE_BA_Create, (process_method_func)daE_BA_Delete, (process_method_func)daE_BA_Execute, @@ -1104,7 +1104,7 @@ static actor_method_class l_daE_BA_Method = { (process_method_func)daE_BA_Draw, }; -actor_process_profile_definition g_profile_E_BA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index d3d308c418..09909f9e0a 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -762,7 +762,7 @@ static cPhs_Step daE_Bee_Create(fopAc_ac_c* i_this) { _this->mCounter = fopAcM_GetID(i_this); _this->mCcStts.Init(0, 0, i_this); - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x410022, 0x23}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -807,7 +807,7 @@ static cPhs_Step daE_Bee_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daE_Bee_Method = { +static DUSK_CONST actor_method_class l_daE_Bee_Method = { (process_method_func)daE_Bee_Create, (process_method_func)daE_Bee_Delete, (process_method_func)daE_Bee_Execute, @@ -815,7 +815,7 @@ static actor_method_class l_daE_Bee_Method = { (process_method_func)daE_Bee_Draw, }; -actor_process_profile_definition g_profile_E_BEE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BEE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 1b1ec722ca..bdaca15723 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -1429,7 +1429,7 @@ static int daE_BG_Create(daE_BG_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_BG_Method = { +static DUSK_CONST actor_method_class l_daE_BG_Method = { (process_method_func)daE_BG_Create, (process_method_func)daE_BG_Delete, (process_method_func)daE_BG_Execute, @@ -1437,7 +1437,7 @@ static actor_method_class l_daE_BG_Method = { (process_method_func)daE_BG_Draw, }; -actor_process_profile_definition g_profile_E_BG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index c9284aa356..b6027badd3 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -908,7 +908,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { actor->health = 30; actor->field_0x560 = 30; - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -987,7 +987,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { AUDIO_INSTANCES; -static actor_method_class l_daE_BI_Method = { +static DUSK_CONST actor_method_class l_daE_BI_Method = { (process_method_func)daE_BI_Create, (process_method_func)daE_BI_Delete, (process_method_func)daE_BI_Execute, @@ -995,7 +995,7 @@ static actor_method_class l_daE_BI_Method = { (process_method_func)daE_BI_Draw, }; -actor_process_profile_definition g_profile_E_BI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index ed2000b3c5..ef17113b43 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -116,13 +116,13 @@ static int daE_BI_LEAF_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daE_BI_LEAF_Method = { +static DUSK_CONST actor_method_class l_daE_BI_LEAF_Method = { (process_method_func)daE_BI_LEAF_Create, (process_method_func)daE_BI_LEAF_Delete, (process_method_func)daE_BI_LEAF_Execute, (process_method_func)daE_BI_LEAF_IsDelete, (process_method_func)daE_BI_LEAF_Draw, }; -actor_process_profile_definition g_profile_E_BI_LEAF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BI_LEAF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 64350e0264..30ab4a7658 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -920,7 +920,7 @@ static int daE_BS_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_BS_Method = { +static DUSK_CONST actor_method_class l_daE_BS_Method = { (process_method_func)daE_BS_Create, (process_method_func)daE_BS_Delete, (process_method_func)daE_BS_Execute, @@ -928,7 +928,7 @@ static actor_method_class l_daE_BS_Method = { (process_method_func)daE_BS_Draw, }; -actor_process_profile_definition g_profile_E_BS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index cd8a3cf766..b3ed379a76 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -1128,7 +1128,7 @@ static int daE_BU_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_BU_Method = { +static DUSK_CONST actor_method_class l_daE_BU_Method = { (process_method_func)daE_BU_Create, (process_method_func)daE_BU_Delete, (process_method_func)daE_BU_Execute, @@ -1136,7 +1136,7 @@ static actor_method_class l_daE_BU_Method = { (process_method_func)daE_BU_Draw, }; -actor_process_profile_definition g_profile_E_BU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index e9ad4ab32c..0fb63e4a3b 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -893,7 +893,7 @@ static cPhs_Step daE_Bug_Create(fopAc_ac_c* a_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_Bug_Method = { +static DUSK_CONST actor_method_class l_daE_Bug_Method = { (process_method_func)daE_Bug_Create, (process_method_func)daE_Bug_Delete, (process_method_func)daE_Bug_Execute, @@ -901,7 +901,7 @@ static actor_method_class l_daE_Bug_Method = { (process_method_func)daE_Bug_Draw, }; -actor_process_profile_definition g_profile_E_BUG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_BUG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index ac245c6985..f9367cc242 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -537,7 +537,7 @@ static int daE_CR_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_CR_Method = { +static DUSK_CONST actor_method_class l_daE_CR_Method = { (process_method_func)daE_CR_Create, (process_method_func)daE_CR_Delete, (process_method_func)daE_CR_Execute, @@ -545,7 +545,7 @@ static actor_method_class l_daE_CR_Method = { (process_method_func)daE_CR_Draw, }; -actor_process_profile_definition g_profile_E_CR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_CR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index fa3c60f270..8ccfbcd519 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -215,7 +215,7 @@ static int daE_CR_EGG_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_CR_EGG_Method = { +static DUSK_CONST actor_method_class l_daE_CR_EGG_Method = { (process_method_func)daE_CR_EGG_Create, (process_method_func)daE_CR_EGG_Delete, (process_method_func)daE_CR_EGG_Execute, @@ -223,7 +223,7 @@ static actor_method_class l_daE_CR_EGG_Method = { (process_method_func)daE_CR_EGG_Draw, }; -actor_process_profile_definition g_profile_E_CR_EGG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_CR_EGG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index 6a4ed52aba..dcc3849756 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -2228,7 +2228,7 @@ static int daE_DB_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_DB_Method = { +static DUSK_CONST actor_method_class l_daE_DB_Method = { (process_method_func)daE_DB_Create, (process_method_func)daE_DB_Delete, (process_method_func)daE_DB_Execute, @@ -2236,7 +2236,7 @@ static actor_method_class l_daE_DB_Method = { (process_method_func)daE_DB_Draw, }; -actor_process_profile_definition g_profile_E_DB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index c712a437fa..cb8e54093c 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -59,7 +59,7 @@ static int daE_DB_LEAF_Create(fopAc_ac_c* i_this) { return ret; } -static actor_method_class l_daE_DB_LEAF_Method = { +static DUSK_CONST actor_method_class l_daE_DB_LEAF_Method = { (process_method_func)daE_DB_LEAF_Create, (process_method_func)daE_DB_LEAF_Delete, (process_method_func)daE_DB_LEAF_Execute, @@ -67,7 +67,7 @@ static actor_method_class l_daE_DB_LEAF_Method = { (process_method_func)daE_DB_LEAF_Draw, }; -actor_process_profile_definition g_profile_E_DB_LEAF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DB_LEAF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 360fa65442..3c28489d36 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1783,7 +1783,7 @@ actor_method_class l_daE_DD_Method = { (process_method_func)daE_DD_Draw, }; -actor_process_profile_definition g_profile_E_DD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 1039e2ddf7..fb7d472dfc 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -711,13 +711,13 @@ static int daE_DF_Create(fopAc_ac_c* i_this) { return a_this->Create(); } -static actor_method_class l_daE_DF_Method = { +static DUSK_CONST actor_method_class l_daE_DF_Method = { (process_method_func)daE_DF_Create, (process_method_func)daE_DF_Delete, (process_method_func)daE_DF_Execute, (process_method_func)daE_DF_IsDelete, (process_method_func)daE_DF_Draw, }; -actor_process_profile_definition g_profile_E_DF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 82fa722157..f61f3f474e 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -1073,7 +1073,7 @@ static int daE_DK_Create(daE_DK_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_DK_Method = { +static DUSK_CONST actor_method_class l_daE_DK_Method = { (process_method_func)daE_DK_Create, (process_method_func)daE_DK_Delete, (process_method_func)daE_DK_Execute, @@ -1081,7 +1081,7 @@ static actor_method_class l_daE_DK_Method = { (process_method_func)daE_DK_Draw, }; -actor_process_profile_definition g_profile_E_DK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index d7d0e056ef..954bf657eb 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -3506,7 +3506,7 @@ e_dn_class::e_dn_class() {} AUDIO_INSTANCES; -static actor_method_class l_daE_DN_Method = { +static DUSK_CONST actor_method_class l_daE_DN_Method = { (process_method_func)daE_DN_Create, (process_method_func)daE_DN_Delete, (process_method_func)daE_DN_Execute, @@ -3514,7 +3514,7 @@ static actor_method_class l_daE_DN_Method = { (process_method_func)daE_DN_Draw, }; -actor_process_profile_definition g_profile_E_DN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index c88635d111..e52cadfd93 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -2558,7 +2558,7 @@ static cPhs_Step daE_DT_Create(daE_DT_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_DT_Method = { +static DUSK_CONST actor_method_class l_daE_DT_Method = { (process_method_func)daE_DT_Create, (process_method_func)daE_DT_Delete, (process_method_func)daE_DT_Execute, @@ -2566,7 +2566,7 @@ static actor_method_class l_daE_DT_Method = { (process_method_func)daE_DT_Draw, }; -actor_process_profile_definition g_profile_E_DT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_DT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 937eb801fb..3bc8de04c0 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -993,7 +993,7 @@ static int daE_FB_Create(daE_FB_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_FB_Method = { +static DUSK_CONST actor_method_class l_daE_FB_Method = { (process_method_func)daE_FB_Create, (process_method_func)daE_FB_Delete, (process_method_func)daE_FB_Execute, @@ -1001,7 +1001,7 @@ static actor_method_class l_daE_FB_Method = { (process_method_func)daE_FB_Draw, }; -actor_process_profile_definition g_profile_E_FB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 5840df0495..aa75087d66 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -803,7 +803,7 @@ static int daE_FK_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES -static actor_method_class l_daE_FK_Method = { +static DUSK_CONST actor_method_class l_daE_FK_Method = { (process_method_func)daE_FK_Create, (process_method_func)daE_FK_Delete, (process_method_func)daE_FK_Execute, @@ -811,7 +811,7 @@ static actor_method_class l_daE_FK_Method = { (process_method_func)daE_FK_Draw, }; -actor_process_profile_definition g_profile_E_FK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 81a1b404f0..101b8dd06e 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -3880,7 +3880,7 @@ static int daE_FM_Create(fopAc_ac_c* i_this) { e_fm_class::e_fm_class() {} -static actor_method_class l_daE_FM_Method = { +static DUSK_CONST actor_method_class l_daE_FM_Method = { (process_method_func)daE_FM_Create, (process_method_func)daE_FM_Delete, (process_method_func)daE_FM_Execute, @@ -3888,7 +3888,7 @@ static actor_method_class l_daE_FM_Method = { (process_method_func)daE_FM_Draw, }; -actor_process_profile_definition g_profile_E_FM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 3ed859c686..7d6ca7b2d4 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -787,7 +787,7 @@ static cPhs_Step daE_Fs_Create(fopAc_ac_c* i_this) { _this->mAtInfo.mpSound = &_this->mCreatureSound; _this->mAtInfo.field_0x18 = 0x25; - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -844,7 +844,7 @@ static cPhs_Step daE_Fs_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_Fs_Method = { +static DUSK_CONST actor_method_class l_daE_Fs_Method = { (process_method_func)daE_Fs_Create, (process_method_func)daE_Fs_Delete, (process_method_func)daE_Fs_Execute, @@ -852,7 +852,7 @@ static actor_method_class l_daE_Fs_Method = { (process_method_func)daE_Fs_Draw, }; -actor_process_profile_definition g_profile_E_FS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index a48c4df8f0..4d8ad1feaf 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -1039,13 +1039,13 @@ static int daE_FZ_Create(daE_FZ_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_FZ_Method = { +static DUSK_CONST actor_method_class l_daE_FZ_Method = { (process_method_func)daE_FZ_Create, (process_method_func)daE_FZ_Delete, (process_method_func)daE_FZ_Execute, (process_method_func)daE_FZ_IsDelete, (process_method_func)daE_FZ_Draw, }; -actor_process_profile_definition g_profile_E_FZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_FZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index f5405f6a6b..1db46aeec7 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -256,7 +256,7 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_Ga_Method = { +static DUSK_CONST actor_method_class l_daE_Ga_Method = { (process_method_func)daE_Ga_Create, (process_method_func)daE_Ga_Delete, (process_method_func)daE_Ga_Execute, @@ -264,7 +264,7 @@ static actor_method_class l_daE_Ga_Method = { (process_method_func)daE_Ga_Draw, }; -actor_process_profile_definition g_profile_E_GA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 4ef42d2d9b..09b6556548 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1632,7 +1632,7 @@ static cPhs_Step daE_GB_Create(fopAc_ac_c* actor) { } // mSphAttr }; - static dCcD_SrcCyl body_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl body_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1721,7 +1721,7 @@ static cPhs_Step daE_GB_Create(fopAc_ac_c* actor) { e_gb_class::e_gb_class() {} -static actor_method_class l_daE_GB_Method = { +static DUSK_CONST actor_method_class l_daE_GB_Method = { (process_method_func)daE_GB_Create, (process_method_func)daE_GB_Delete, (process_method_func)daE_GB_Execute, @@ -1729,7 +1729,7 @@ static actor_method_class l_daE_GB_Method = { (process_method_func)daE_GB_Draw, }; -actor_process_profile_definition g_profile_E_GB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 5159649d54..20e7cd9cb2 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -1370,13 +1370,13 @@ static int daE_GE_Create(daE_GE_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_GE_Method = { +static DUSK_CONST actor_method_class l_daE_GE_Method = { (process_method_func)daE_GE_Create, (process_method_func)daE_GE_Delete, (process_method_func)daE_GE_Execute, (process_method_func)daE_GE_IsDelete, (process_method_func)daE_GE_Draw, }; -actor_process_profile_definition g_profile_E_GE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 9f2033cdbb..7bcf0269ff 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -1103,7 +1103,7 @@ static int daE_GI_Create(daE_GI_c* a_this) { return a_this->create(); } -static actor_method_class l_daE_GI_Method = { +static DUSK_CONST actor_method_class l_daE_GI_Method = { (process_method_func)daE_GI_Create, (process_method_func)daE_GI_Delete, (process_method_func)daE_GI_Execute, @@ -1111,7 +1111,7 @@ static actor_method_class l_daE_GI_Method = { (process_method_func)daE_GI_Draw, }; -actor_process_profile_definition g_profile_E_GI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index c9a326804c..007f5e3cd5 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -1815,7 +1815,7 @@ static int daE_GM_Create(daE_GM_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_GM_Method = { +static DUSK_CONST actor_method_class l_daE_GM_Method = { (process_method_func)daE_GM_Create, (process_method_func)daE_GM_Delete, (process_method_func)daE_GM_Execute, @@ -1823,7 +1823,7 @@ static actor_method_class l_daE_GM_Method = { (process_method_func)daE_GM_Draw, }; -actor_process_profile_definition g_profile_E_GM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index 6824263328..65c084eaf8 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -2394,7 +2394,7 @@ static int daE_GOB_Create(fopAc_ac_c* i_this) { e_gob_class::e_gob_class() {} -static actor_method_class l_daE_GOB_Method = { +static DUSK_CONST actor_method_class l_daE_GOB_Method = { (process_method_func)daE_GOB_Create, (process_method_func)daE_GOB_Delete, (process_method_func)daE_GOB_Execute, @@ -2402,7 +2402,7 @@ static actor_method_class l_daE_GOB_Method = { (process_method_func)daE_GOB_Draw, }; -actor_process_profile_definition g_profile_E_GOB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GOB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 16000f554b..9d19db469d 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -224,7 +224,7 @@ static int daE_GS_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_GS_Method = { +static DUSK_CONST actor_method_class l_daE_GS_Method = { (process_method_func)daE_GS_Create, (process_method_func)daE_GS_Delete, (process_method_func)daE_GS_Execute, @@ -232,7 +232,7 @@ static actor_method_class l_daE_GS_Method = { (process_method_func)daE_GS_Draw, }; -actor_process_profile_definition g_profile_E_GS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_GS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index 2b13b8a153..f0dfbda3a6 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -1533,7 +1533,7 @@ static int daE_HB_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_HB_Method = { +static DUSK_CONST actor_method_class l_daE_HB_Method = { (process_method_func)daE_HB_Create, (process_method_func)daE_HB_Delete, (process_method_func)daE_HB_Execute, @@ -1541,7 +1541,7 @@ static actor_method_class l_daE_HB_Method = { (process_method_func)daE_HB_Draw, }; -actor_process_profile_definition g_profile_E_HB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 99d45d6ea3..f4ebb64c6c 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -80,13 +80,13 @@ static int daE_HB_LEAF_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_HB_LEAF_Method = { +static DUSK_CONST actor_method_class l_daE_HB_LEAF_Method = { (process_method_func)daE_HB_LEAF_Create, (process_method_func)daE_HB_LEAF_Delete, (process_method_func)daE_HB_LEAF_Execute, (process_method_func)daE_HB_LEAF_IsDelete, (process_method_func)daE_HB_LEAF_Draw, }; -actor_process_profile_definition g_profile_E_HB_LEAF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HB_LEAF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 77641117ab..161966fc18 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -1594,7 +1594,7 @@ static int daE_HM_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES -static actor_method_class l_daE_HM_Method = { +static DUSK_CONST actor_method_class l_daE_HM_Method = { (process_method_func)daE_HM_Create, (process_method_func)daE_HM_Delete, (process_method_func)daE_HM_Execute, @@ -1602,7 +1602,7 @@ static actor_method_class l_daE_HM_Method = { (process_method_func)daE_HM_Draw, }; -actor_process_profile_definition g_profile_E_HM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 633795ab39..51ac16fcf3 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -1313,13 +1313,13 @@ static int daE_HP_Create(daE_HP_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_HP_Method = { +static DUSK_CONST actor_method_class l_daE_HP_Method = { (process_method_func)daE_HP_Create, (process_method_func)daE_HP_Delete, (process_method_func)daE_HP_Execute, (process_method_func)daE_HP_IsDelete, (process_method_func)daE_HP_Draw, }; -actor_process_profile_definition g_profile_E_HP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index f2fb7d12b8..b3db29b1c2 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -2104,13 +2104,13 @@ static int daE_HZ_Create(daE_HZ_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_HZ_Method = { +static DUSK_CONST actor_method_class l_daE_HZ_Method = { (process_method_func)daE_HZ_Create, (process_method_func)daE_HZ_Delete, (process_method_func)daE_HZ_Execute, (process_method_func)daE_HZ_IsDelete, (process_method_func)daE_HZ_Draw, }; -actor_process_profile_definition g_profile_E_HZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 4217e26781..7f8a4b3d23 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -1526,7 +1526,7 @@ static int daE_HZELDA_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_HZELDA_Method = { +static DUSK_CONST actor_method_class l_daE_HZELDA_Method = { (process_method_func)daE_HZELDA_Create, (process_method_func)daE_HZELDA_Delete, (process_method_func)daE_HZELDA_Execute, @@ -1534,7 +1534,7 @@ static actor_method_class l_daE_HZELDA_Method = { (process_method_func)daE_HZELDA_Draw, }; -actor_process_profile_definition g_profile_E_HZELDA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_HZELDA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 2e7764a352..27f8aee1aa 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -683,7 +683,7 @@ static int daE_IS_Create(fopAc_ac_c* i_this) { } // mSphAttr }; - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -746,7 +746,7 @@ static int daE_IS_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_IS_Method = { +static DUSK_CONST actor_method_class l_daE_IS_Method = { (process_method_func)daE_IS_Create, (process_method_func)daE_IS_Delete, (process_method_func)daE_IS_Execute, @@ -754,7 +754,7 @@ static actor_method_class l_daE_IS_Method = { (process_method_func)daE_IS_Draw, }; -actor_process_profile_definition g_profile_E_IS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_IS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index 013e330090..c5cbc354b5 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -735,7 +735,7 @@ static int daE_KG_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daE_KG_Method = { +static DUSK_CONST actor_method_class l_daE_KG_Method = { (process_method_func)daE_KG_Create, (process_method_func)daE_KG_Delete, (process_method_func)daE_KG_Execute, @@ -743,7 +743,7 @@ static actor_method_class l_daE_KG_Method = { (process_method_func)daE_KG_Draw, }; -actor_process_profile_definition g_profile_E_KG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_KG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index 6cc792428e..f2cd8f5cf2 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -1486,13 +1486,13 @@ static int daE_KK_Create(daE_KK_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_KK_Method = { +static DUSK_CONST actor_method_class l_daE_KK_Method = { (process_method_func)daE_KK_Create, (process_method_func)daE_KK_Delete, (process_method_func)daE_KK_Execute, (process_method_func)daE_KK_IsDelete, (process_method_func)daE_KK_Draw, }; -actor_process_profile_definition g_profile_E_KK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_KK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index f21c83b50a..13c343571f 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -2385,13 +2385,13 @@ static int daE_Kr_Create(fopAc_ac_c* i_this) { e_kr_class::e_kr_class() { } -static actor_method_class l_daE_Kr_Method = { +static DUSK_CONST actor_method_class l_daE_Kr_Method = { (process_method_func)daE_Kr_Create, (process_method_func)daE_Kr_Delete, (process_method_func)daE_Kr_Execute, (process_method_func)daE_Kr_IsDelete, (process_method_func)daE_Kr_Draw, }; -actor_process_profile_definition g_profile_E_KR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_KR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 31352f92cf..1fff337b33 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -763,7 +763,7 @@ static int daE_MB_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_MB_Method = { +static DUSK_CONST actor_method_class l_daE_MB_Method = { (process_method_func)daE_MB_Create, (process_method_func)daE_MB_Delete, (process_method_func)daE_MB_Execute, @@ -771,7 +771,7 @@ static actor_method_class l_daE_MB_Method = { (process_method_func)daE_MB_Draw, }; -actor_process_profile_definition g_profile_E_MB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 19baf66f5f..21fdf6fcf6 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -455,7 +455,7 @@ static int daE_MD_IsDelete(daE_MD_c* i_this) { return 1; } -static actor_method_class l_daE_MD_Method = { +static DUSK_CONST actor_method_class l_daE_MD_Method = { (process_method_func)daE_MD_Create, (process_method_func)daE_MD_Delete, (process_method_func)daE_MD_Execute, @@ -463,7 +463,7 @@ static actor_method_class l_daE_MD_Method = { (process_method_func)daE_MD_Draw, }; -actor_process_profile_definition g_profile_E_MD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 594b9aa2d8..dfc2363049 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -3272,7 +3272,7 @@ actor_method_class l_daE_MF_Method = { (process_method_func)daE_MF_Draw, }; -actor_process_profile_definition g_profile_E_MF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 8099419410..f507177f1d 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -2958,7 +2958,7 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) { AUDIO_INSTANCES -static actor_method_class l_daE_MK_Method = { +static DUSK_CONST actor_method_class l_daE_MK_Method = { (process_method_func)daE_MK_Create, (process_method_func)daE_MK_Delete, (process_method_func)daE_MK_Execute, @@ -2966,7 +2966,7 @@ static actor_method_class l_daE_MK_Method = { (process_method_func)daE_MK_Draw, }; -actor_process_profile_definition g_profile_E_MK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index e2a075134c..950d6cdc56 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -804,7 +804,7 @@ static int daE_MK_BO_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_MK_BO_Method = { +static DUSK_CONST actor_method_class l_daE_MK_BO_Method = { (process_method_func)daE_MK_BO_Create, (process_method_func)daE_MK_BO_Delete, (process_method_func)daE_MK_BO_Execute, @@ -812,7 +812,7 @@ static actor_method_class l_daE_MK_BO_Method = { (process_method_func)daE_MK_BO_Draw, }; -actor_process_profile_definition g_profile_E_MK_BO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MK_BO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index cfb7cf5491..ab6fc4a310 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -1131,7 +1131,7 @@ static int daE_MM_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daE_MM_Method = { +static DUSK_CONST actor_method_class l_daE_MM_Method = { (process_method_func)daE_MM_Create, (process_method_func)daE_MM_Delete, (process_method_func)daE_MM_Execute, @@ -1139,7 +1139,7 @@ static actor_method_class l_daE_MM_Method = { (process_method_func)daE_MM_Draw, }; -actor_process_profile_definition g_profile_E_MM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index 205cebab78..a3f57ddcf1 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -840,7 +840,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daE_MM_MT_Method = { +static DUSK_CONST actor_method_class l_daE_MM_MT_Method = { (process_method_func)daE_MM_MT_Create, (process_method_func)daE_MM_MT_Delete, (process_method_func)daE_MM_MT_Execute, @@ -848,7 +848,7 @@ static actor_method_class l_daE_MM_MT_Method = { (process_method_func)daE_MM_MT_Draw, }; -actor_process_profile_definition g_profile_E_MM_MT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MM_MT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index 5b43781d66..fbeca0cd6b 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -1056,13 +1056,13 @@ static int daE_MS_Create(fopAc_ac_c* actor) { return phase; } -static actor_method_class l_daE_MS_Method = { +static DUSK_CONST actor_method_class l_daE_MS_Method = { (process_method_func)daE_MS_Create, (process_method_func)daE_MS_Delete, (process_method_func)daE_MS_Execute, (process_method_func)daE_MS_IsDelete, (process_method_func)daE_MS_Draw, }; -actor_process_profile_definition g_profile_E_MS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_MS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 25055c4bd6..c86cd1bb5e 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -1028,7 +1028,7 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { }; _this->mCcSph.Set(cc_sph_src); _this->mCcSph.SetStts(&_this->mCcStts); - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x2020, 0x3}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1066,7 +1066,7 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daE_Nest_Method = { +static DUSK_CONST actor_method_class l_daE_Nest_Method = { (process_method_func)daE_Nest_Create, (process_method_func)daE_Nest_Delete, (process_method_func)daE_Nest_Execute, @@ -1074,7 +1074,7 @@ static actor_method_class l_daE_Nest_Method = { (process_method_func)daE_Nest_Draw, }; -actor_process_profile_definition g_profile_E_NEST = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_NEST = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index e9960c393d..c4044d5075 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -735,7 +735,7 @@ static int daE_NZ_Create(fopAc_ac_c* a_this) { AUDIO_INSTANCES -static actor_method_class l_daE_NZ_Method = { +static DUSK_CONST actor_method_class l_daE_NZ_Method = { (process_method_func)daE_NZ_Create, (process_method_func)daE_NZ_Delete, (process_method_func)daE_NZ_Execute, @@ -743,7 +743,7 @@ static actor_method_class l_daE_NZ_Method = { (process_method_func)daE_NZ_Draw, }; -actor_process_profile_definition g_profile_E_NZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_NZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 6f0a55f12a..fe7aa4c970 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -2837,7 +2837,7 @@ static int daE_OC_Create(daE_OC_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_OC_Method = { +static DUSK_CONST actor_method_class l_daE_OC_Method = { (process_method_func)daE_OC_Create, (process_method_func)daE_OC_Delete, (process_method_func)daE_OC_Execute, @@ -2845,7 +2845,7 @@ static actor_method_class l_daE_OC_Method = { (process_method_func)daE_OC_Draw, }; -actor_process_profile_definition g_profile_E_OC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_OC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index 94fa69596b..0a9cc280d4 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -884,7 +884,7 @@ static int daE_OctBg_IsDelete(daE_OctBg_c* i_this) { return 1; } -static actor_method_class l_daE_OctBg_Method = { +static DUSK_CONST actor_method_class l_daE_OctBg_Method = { (process_method_func)daE_OctBg_Create, (process_method_func)daE_OctBg_Delete, (process_method_func)daE_OctBg_Execute, @@ -892,7 +892,7 @@ static actor_method_class l_daE_OctBg_Method = { (process_method_func)daE_OctBg_Draw, }; -actor_process_profile_definition g_profile_E_OctBg = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_OctBg = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index 3debc44c44..7e1a26e199 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -829,7 +829,7 @@ static cPhs_Step daE_OT_Create(daE_OT_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_OT_Method = { +static DUSK_CONST actor_method_class l_daE_OT_Method = { (process_method_func)daE_OT_Create, (process_method_func)daE_OT_Delete, (process_method_func)daE_OT_Execute, @@ -837,7 +837,7 @@ static actor_method_class l_daE_OT_Method = { (process_method_func)daE_OT_Draw, }; -actor_process_profile_definition g_profile_E_OT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_OT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 3213c2716e..faf3ff1d6f 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -1303,13 +1303,13 @@ static int daE_PH_IsDelete(daE_PH_c* i_this) { return 1; } -static actor_method_class l_daE_PH_Method = { +static DUSK_CONST actor_method_class l_daE_PH_Method = { (process_method_func)daE_PH_Create, (process_method_func)daE_PH_Delete, (process_method_func)daE_PH_Execute, (process_method_func)daE_PH_IsDelete, (process_method_func)daE_PH_Draw, }; -actor_process_profile_definition g_profile_E_PH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_PH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 5820985ec1..8c68907f15 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -2870,7 +2870,7 @@ static cPhs_Step daE_PM_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_PM_Method = { +static DUSK_CONST actor_method_class l_daE_PM_Method = { (process_method_func)daE_PM_Create, (process_method_func)daE_PM_Delete, (process_method_func)daE_PM_Execute, @@ -2878,7 +2878,7 @@ static actor_method_class l_daE_PM_Method = { (process_method_func)daE_PM_Draw, }; -actor_process_profile_definition g_profile_E_PM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_PM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 4899fc0376..1c4e95fa61 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -2947,7 +2947,7 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) { i_this->mAcchCir.SetWall(80.0f, 100.0f); i_this->mColliderStts.Init(150, 0, i_act_this); - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}}, // mObj {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -3157,13 +3157,13 @@ e_po_class::e_po_class() { // empty method } -static actor_method_class l_daE_PO_Method = { +static DUSK_CONST actor_method_class l_daE_PO_Method = { (process_method_func)daE_PO_Create, (process_method_func)daE_PO_Delete, (process_method_func)daE_PO_Execute, (process_method_func)daE_PO_IsDelete, (process_method_func)daE_PO_Draw, }; -actor_process_profile_definition g_profile_E_PO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_PO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 6bc42128f5..7d95e7f64e 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -2648,7 +2648,7 @@ static int daE_PZ_Create(daE_PZ_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_PZ_Method = { +static DUSK_CONST actor_method_class l_daE_PZ_Method = { (process_method_func)daE_PZ_Create, (process_method_func)daE_PZ_Delete, (process_method_func)daE_PZ_Execute, @@ -2656,7 +2656,7 @@ static actor_method_class l_daE_PZ_Method = { (process_method_func)daE_PZ_Draw, }; -actor_process_profile_definition g_profile_E_PZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_PZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index 11d0b52863..5f3fe8c13b 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -861,7 +861,7 @@ static int daE_RB_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_RB_Method = { +static DUSK_CONST actor_method_class l_daE_RB_Method = { (process_method_func)daE_RB_Create, (process_method_func)daE_RB_Delete, (process_method_func)daE_RB_Execute, @@ -869,7 +869,7 @@ static actor_method_class l_daE_RB_Method = { (process_method_func)daE_RB_Draw, }; -actor_process_profile_definition g_profile_E_RB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_RB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 460bc9dd26..495dadc66c 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -7625,7 +7625,7 @@ e_rd_class::e_rd_class() {} AUDIO_INSTANCES -static actor_method_class l_daE_RD_Method = { +static DUSK_CONST actor_method_class l_daE_RD_Method = { (process_method_func)daE_RD_Create, (process_method_func)daE_RD_Delete, (process_method_func)daE_RD_Execute, @@ -7633,7 +7633,7 @@ static actor_method_class l_daE_RD_Method = { (process_method_func)daE_RD_Draw, }; -actor_process_profile_definition g_profile_E_RD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_RD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index d5348475cd..7eccf34ef5 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1801,7 +1801,7 @@ static int daE_RDB_Create(fopAc_ac_c* actor) { } // mSphAttr }; - static dCcD_SrcCyl co_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl co_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1914,13 +1914,13 @@ static s32 unused_bss_29c = 0; AUDIO_INSTANCES -static actor_method_class l_daE_RDB_Method = { +static DUSK_CONST actor_method_class l_daE_RDB_Method = { (process_method_func)daE_RDB_Create, (process_method_func)daE_RDB_Delete, (process_method_func)daE_RDB_Execute, (process_method_func)daE_RDB_IsDelete, (process_method_func)daE_RDB_Draw, }; -actor_process_profile_definition g_profile_E_RDB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_RDB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 305fc55efe..646f694f55 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -5070,7 +5070,7 @@ e_rdy_class::e_rdy_class() { AUDIO_INSTANCES -static actor_method_class l_daE_RDY_Method = { +static DUSK_CONST actor_method_class l_daE_RDY_Method = { (process_method_func)daE_RDY_Create, (process_method_func)daE_RDY_Delete, (process_method_func)daE_RDY_Execute, @@ -5078,7 +5078,7 @@ static actor_method_class l_daE_RDY_Method = { (process_method_func)daE_RDY_Draw, }; -actor_process_profile_definition g_profile_E_RDY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_RDY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index c4455f02d1..cd48a103e1 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -2292,13 +2292,13 @@ static int daE_S1_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_S1_Method = { +static DUSK_CONST actor_method_class l_daE_S1_Method = { (process_method_func)daE_S1_Create, (process_method_func)daE_S1_Delete, (process_method_func)daE_S1_Execute, (process_method_func)daE_S1_IsDelete, (process_method_func)daE_S1_Draw, }; -actor_process_profile_definition g_profile_E_S1 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_S1 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 59d5b87bfd..098b901133 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -1160,7 +1160,7 @@ static int daE_SB_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->Create(); } -static actor_method_class l_daE_SB_Method = { +static DUSK_CONST actor_method_class l_daE_SB_Method = { (process_method_func)daE_SB_Create, (process_method_func)daE_SB_Delete, (process_method_func)daE_SB_Execute, @@ -1168,7 +1168,7 @@ static actor_method_class l_daE_SB_Method = { (process_method_func)daE_SB_Draw, }; -actor_process_profile_definition g_profile_E_SB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 0dcc405b49..c75b74a471 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1876,7 +1876,7 @@ static cPhs_Step daE_SF_Create(fopAc_ac_c* a_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_SF_Method = { +static DUSK_CONST actor_method_class l_daE_SF_Method = { (process_method_func)daE_SF_Create, (process_method_func)daE_SF_Delete, (process_method_func)daE_SF_Execute, @@ -1884,7 +1884,7 @@ static actor_method_class l_daE_SF_Method = { (process_method_func)daE_SF_Draw, }; -actor_process_profile_definition g_profile_E_SF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index efec965a3e..e06b9fa9e9 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -1246,13 +1246,13 @@ static int daE_SG_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_SG_Method = { +static DUSK_CONST actor_method_class l_daE_SG_Method = { (process_method_func)daE_SG_Create, (process_method_func)daE_SG_Delete, (process_method_func)daE_SG_Execute, (process_method_func)daE_SG_IsDelete, (process_method_func)daE_SG_Draw, }; -actor_process_profile_definition g_profile_E_SG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index 8bd95fcf5d..73fb15c1fb 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1264,7 +1264,7 @@ static int daE_SH_Create(fopAc_ac_c* i_this) { return resLoadResult; } -static actor_method_class l_daE_SH_Method = { +static DUSK_CONST actor_method_class l_daE_SH_Method = { (process_method_func)daE_SH_Create, (process_method_func)daE_SH_Delete, (process_method_func)daE_SH_Execute, @@ -1272,7 +1272,7 @@ static actor_method_class l_daE_SH_Method = { (process_method_func)daE_SH_Draw, }; -actor_process_profile_definition g_profile_E_SH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index b85e22e640..a94225cf9b 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -2009,7 +2009,7 @@ daE_SM_c::daE_SM_c() {} AUDIO_INSTANCES; -static actor_method_class l_daE_SM_Method = { +static DUSK_CONST actor_method_class l_daE_SM_Method = { (process_method_func)daE_SM_Create, (process_method_func)daE_SM_Delete, (process_method_func)daE_SM_Execute, @@ -2017,7 +2017,7 @@ static actor_method_class l_daE_SM_Method = { (process_method_func)daE_SM_Draw, }; -actor_process_profile_definition g_profile_E_SM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index f55c4411cb..d9db6eb841 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1695,7 +1695,7 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_SM2_Method = { +static DUSK_CONST actor_method_class l_daE_SM2_Method = { (process_method_func)daE_SM2_Create, (process_method_func)daE_SM2_Delete, (process_method_func)daE_SM2_Execute, @@ -1703,7 +1703,7 @@ static actor_method_class l_daE_SM2_Method = { (process_method_func)daE_SM2_Draw, }; -actor_process_profile_definition g_profile_E_SM2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SM2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index fe12756de1..9a65bc98a3 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3127,7 +3127,7 @@ static cPhs_Step daE_ST_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - static dCcD_SrcCyl line_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl line_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -3198,7 +3198,7 @@ static cPhs_Step daE_ST_Create(fopAc_ac_c* a_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_ST_Method = { +static DUSK_CONST actor_method_class l_daE_ST_Method = { (process_method_func)daE_ST_Create, (process_method_func)daE_ST_Delete, (process_method_func)daE_ST_Execute, @@ -3206,7 +3206,7 @@ static actor_method_class l_daE_ST_Method = { (process_method_func)daE_ST_Draw, }; -actor_process_profile_definition g_profile_E_ST = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ST = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index eaed9eb259..d3339726f0 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -116,13 +116,13 @@ static int daE_ST_LINE_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_ST_LINE_Method = { +static DUSK_CONST actor_method_class l_daE_ST_LINE_Method = { (process_method_func)daE_ST_LINE_Create, (process_method_func)daE_ST_LINE_Delete, (process_method_func)daE_ST_LINE_Execute, (process_method_func)daE_ST_LINE_IsDelete, (process_method_func)daE_ST_LINE_Draw, }; -actor_process_profile_definition g_profile_E_ST_LINE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ST_LINE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index cab3337753..4e19ce617f 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1794,7 +1794,7 @@ void daE_SW_c::d_setAction(void (daE_SW_c::*action)()) { (this->*field_0xafc)(); } -static actor_method_class l_daE_SW_Method = { +static DUSK_CONST actor_method_class l_daE_SW_Method = { (process_method_func)daE_SW_Create, (process_method_func)daE_SW_Delete, (process_method_func)daE_SW_Execute, @@ -1802,7 +1802,7 @@ static actor_method_class l_daE_SW_Method = { (process_method_func)daE_SW_Draw, }; -actor_process_profile_definition g_profile_E_SW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_SW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 056e9f565e..58af2b4cfd 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -1313,7 +1313,7 @@ static int daE_TH_Create(fopAc_ac_c* a_this) { return phase_state; } -static actor_method_class l_daE_TH_Method = { +static DUSK_CONST actor_method_class l_daE_TH_Method = { (process_method_func)daE_TH_Create, (process_method_func)daE_TH_Delete, (process_method_func)daE_TH_Execute, @@ -1321,7 +1321,7 @@ static actor_method_class l_daE_TH_Method = { (process_method_func)daE_TH_Draw, }; -actor_process_profile_definition g_profile_E_TH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_TH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index 8e6c24f09c..e9be033af2 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -1115,7 +1115,7 @@ static int daE_TH_BALL_Create(fopAc_ac_c* a_this) { return phase_state; } -static actor_method_class l_daE_TH_BALL_Method = { +static DUSK_CONST actor_method_class l_daE_TH_BALL_Method = { (process_method_func)daE_TH_BALL_Create, (process_method_func)daE_TH_BALL_Delete, (process_method_func)daE_TH_BALL_Execute, @@ -1123,7 +1123,7 @@ static actor_method_class l_daE_TH_BALL_Method = { (process_method_func)daE_TH_BALL_Draw, }; -actor_process_profile_definition g_profile_E_TH_BALL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_TH_BALL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 040394acb5..6b6c51773f 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -806,13 +806,13 @@ static int daE_TK_Create(fopAc_ac_c* actor) { return phase; } -static actor_method_class l_daE_TK_Method = { +static DUSK_CONST actor_method_class l_daE_TK_Method = { (process_method_func)daE_TK_Create, (process_method_func)daE_TK_Delete, (process_method_func)daE_TK_Execute, (process_method_func)daE_TK_IsDelete, (process_method_func)daE_TK_Draw, }; -actor_process_profile_definition g_profile_E_TK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_TK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 30c0cce9df..c2a382a06b 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -608,13 +608,13 @@ static int daE_TK2_Create(fopAc_ac_c* actor) { return phase; } -static actor_method_class l_daE_TK2_Method = { +static DUSK_CONST actor_method_class l_daE_TK2_Method = { (process_method_func)daE_TK2_Create, (process_method_func)daE_TK2_Delete, (process_method_func)daE_TK2_Execute, (process_method_func)daE_TK2_IsDelete, (process_method_func)daE_TK2_Draw, }; -actor_process_profile_definition g_profile_E_TK2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_TK2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index 1ed6a0db0c..4714c492a2 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -470,13 +470,13 @@ static int daE_TK_BALL_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daE_TK_BALL_Method = { +static DUSK_CONST actor_method_class l_daE_TK_BALL_Method = { (process_method_func)daE_TK_BALL_Create, (process_method_func)daE_TK_BALL_Delete, (process_method_func)daE_TK_BALL_Execute, (process_method_func)daE_TK_BALL_IsDelete, (process_method_func)daE_TK_BALL_Draw, }; -actor_process_profile_definition g_profile_E_TK_BALL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_TK_BALL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index fb2a8bf8a5..aa618bba2f 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1313,13 +1313,13 @@ static int daE_TT_Create(daE_TT_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_TT_Method = { +static DUSK_CONST actor_method_class l_daE_TT_Method = { (process_method_func)daE_TT_Create, (process_method_func)daE_TT_Delete, (process_method_func)daE_TT_Execute, (process_method_func)daE_TT_IsDelete, (process_method_func)daE_TT_Draw, }; -actor_process_profile_definition g_profile_E_TT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_TT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 305e212401..f1afe17398 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3919,7 +3919,7 @@ static int daE_VA_Create(daE_VA_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_VA_Method = { +static DUSK_CONST actor_method_class l_daE_VA_Method = { (process_method_func)daE_VA_Create, (process_method_func)daE_VA_Delete, (process_method_func)daE_VA_Execute, @@ -3927,7 +3927,7 @@ static actor_method_class l_daE_VA_Method = { (process_method_func)daE_VA_Draw, }; -actor_process_profile_definition g_profile_E_VT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_VT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index d752b727a6..96e2c4e0ff 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -907,13 +907,13 @@ static int daE_Warpappear_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daE_Warpappear_Method = { +static DUSK_CONST actor_method_class l_daE_Warpappear_Method = { (process_method_func)daE_Warpappear_Create, (process_method_func)daE_Warpappear_Delete, (process_method_func)daE_Warpappear_Execute, (process_method_func)daE_Warpappear_IsDelete, (process_method_func)daE_Warpappear_Draw, }; -actor_process_profile_definition g_profile_E_WAP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_WAP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index a353ea3e87..b5a38eff65 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -603,8 +603,8 @@ static s8 gake_check(e_wb_class* i_this) { cXyz mae; cXyz ato; - static f32 chk_x[4] = {14257.0f, 34775.0f, -22864.0f, -11627.0f}; - static f32 chk_z[4] = {20075.0f, -16467.0f, 9823.0f, 22601.0f}; + static DUSK_CONSTEXPR f32 chk_x[4] = {14257.0f, 34775.0f, -22864.0f, -11627.0f}; + static DUSK_CONSTEXPR f32 chk_z[4] = {20075.0f, -16467.0f, 9823.0f, 22601.0f}; if (lbl_244_bss_46 != 0) { if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(actor) && @@ -743,8 +743,8 @@ static int e_wb_saku_check_sub(e_wb_class* i_this, s16 yaa) { static int e_wb_saku_check(e_wb_class* i_this) { e_wb_class* unused = i_this; int saku = false; - static s16 yaa[3] = {0, -4096, 4096}; - static u32 saku_bit[3] = {1, 2, 4}; + static DUSK_CONSTEXPR s16 yaa[3] = {0, -4096, 4096}; + static DUSK_CONSTEXPR u32 saku_bit[3] = {1, 2, 4}; for (int i = 0; i < 3; i++) { if (e_wb_saku_check_sub(i_this, yaa[i])) { @@ -1813,18 +1813,18 @@ static void e_wb_b_run(e_wb_class* i_this) { static void arrow_rd_set(e_wb_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - static cXyz arrow_rd_pos[1] = {cXyz(36460.0f, 1040.0f, -17020.0f)}; + static DUSK_CONSTEXPR cXyz arrow_rd_pos[1] = {cXyz(36460.0f, 1040.0f, -17020.0f)}; for (int i = 0; i < 1; i++) { fopAcM_create(fpcNm_E_RD_e, 0xff00a3ff, &arrow_rd_pos[i], fopAcM_GetRoomNo(actor), 0, 0, -1); } } -static cXyz saku_p(34800.0f, 0.0f, -14900.0f); +static DUSK_CONSTEXPR cXyz saku_p(34800.0f, 0.0f, -14900.0f); -static cXyz saku_p2(34800.0f, 0.0f, -37200.0f); +static DUSK_CONSTEXPR cXyz saku_p2(34800.0f, 0.0f, -37200.0f); static void e_wb_b_ikki(e_wb_class* i_this) { - static cXyz ikki_pos[2] = {cXyz(34789.0f, -290.0f, -36200.0f), + static DUSK_CONSTEXPR cXyz ikki_pos[2] = {cXyz(34789.0f, -290.0f, -36200.0f), cXyz(34789.0f, -290.0f, -16600.0f)}; fopAc_ac_c* actor = (fopAc_ac_c*)i_this; @@ -2036,18 +2036,18 @@ static void e_wb_b_ikki(e_wb_class* i_this) { if (i_this->saku_burn != 0) { if (i_this->saku_burn == 1) { - static cXyz f_pos[2] = {cXyz(34800.0f, -300.0f, -15150.0f), + static DUSK_CONSTEXPR cXyz f_pos[2] = {cXyz(34800.0f, -300.0f, -15150.0f), cXyz(34800.0f, -300.0f, -37200.0f)}; csXyz angl; for (int i = 0; i < 2; i++) { - static s16 f_ya[2] = { + static DUSK_CONSTEXPR s16 f_ya[2] = { -0x8000, 0x0000, }; angl.set(0, f_ya[i], 0); for (int j = 0; j < 2; j++) { - static u16 f_id[2] = { + static DUSK_CONSTEXPR u16 f_id[2] = { dPa_RM(ID_ZI_S_UMASAKU_BURN_A), dPa_RM(ID_ZI_S_UMASAKU_BURN_B), }; @@ -2089,7 +2089,7 @@ static void e_wb_b_ikki_end(e_wb_class* i_this) { } static void e_wb_b_ikki2(e_wb_class* i_this) { - static cXyz ikki2_pos[2] = {cXyz(-93620.0f, -5750.0f, 48944.0f), + static DUSK_CONSTEXPR cXyz ikki2_pos[2] = {cXyz(-93620.0f, -5750.0f, 48944.0f), cXyz(-93620.0f, -5750.0f, 28423.0f)}; fopAc_ac_c* actor = (fopAc_ac_c*)i_this; @@ -2960,12 +2960,12 @@ static void effect_set(e_wb_class* i_this) { J3DModel* model = i_this->anm_p->getModel(); int foot_idx = (i_this->counter & 2) >> 1; - static int footd[2] = { + static DUSK_CONSTEXPR int footd[2] = { 6, 10, }; - static int footd_B[2] = { + static DUSK_CONSTEXPR int footd_B[2] = { 6, 10, }; @@ -3076,13 +3076,13 @@ static void effect_set(e_wb_class* i_this) { cXyz scale(v, v, v); csXyz angle(0, 0, 0); - static u16 w_eff_name[3] = { + static DUSK_CONSTEXPR u16 w_eff_name[3] = { dPa_RM(ID_ZI_S_ENEMY_RUNWTRA_A), dPa_RM(ID_ZI_S_ENEMY_RUNWTRA_B), dPa_RM(ID_ZI_S_ENEMY_RUNWTRA_C), }; - static u16 w_eff_name2[3] = { + static DUSK_CONSTEXPR u16 w_eff_name2[3] = { dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_A), dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_B), dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_C), @@ -3100,10 +3100,10 @@ static void effect_set(e_wb_class* i_this) { } if (is_water && i_this->field_0x1721 != 0) { - static cXyz sc(4.0f, 4.0f, 4.0f); + static DUSK_CONSTEXPR cXyz sc(4.0f, 4.0f, 4.0f); for (int i = 0; i < 4; i++) { - static u16 w_eff_id[4] = { + static DUSK_CONSTEXPR u16 w_eff_id[4] = { ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, @@ -3339,13 +3339,13 @@ static s8 e_wb_c_run(e_wb_class* i_this) { if (!behind_obstacle) { - static cXyz sh_pos[3] = { + static DUSK_CONSTEXPR cXyz sh_pos[3] = { cXyz(400.0f, 200.0f, 200.0f), cXyz(-400.0f, 200.0f, 300.0f), cXyz(0.0f, 200.0f, -700.0f), }; - static cXyz sh_posH[3] = { + static DUSK_CONSTEXPR cXyz sh_posH[3] = { cXyz(150.0f, 200.0f, 200.0f), cXyz(-150.0f, 200.0f, 300.0f), cXyz(0.0f, 200.0f, -700.0f) @@ -4893,7 +4893,7 @@ static void demo_camera(e_wb_class* i_this) { } for (int i = 0; i < 2; i++) { - static u16 key_eno[2] = { + static DUSK_CONSTEXPR u16 key_eno[2] = { dPa_RM(ID_ZM_S_KEYLIGHT00), dPa_RM(ID_ZM_S_KEYLIGHT01), }; @@ -4924,7 +4924,7 @@ static void demo_camera(e_wb_class* i_this) { } break; case 94: { for (int i = 0; i < 2; i++) { - static u16 key_eno[2] = { + static DUSK_CONSTEXPR u16 key_eno[2] = { dPa_RM(ID_ZM_S_KEYLIGHT00), dPa_RM(ID_ZM_S_KEYLIGHT01), }; @@ -5482,8 +5482,8 @@ static int daE_WB_Execute(e_wb_class* i_this) { mae.set(0.0f, 0.0f, 0.0f); for (int i = 0; i < 4; i++) { - static int foot_no[4] = {5, 24, 9, 20}; - static int foot_no_B[4] = {5, 28, 9, 23}; + static DUSK_CONSTEXPR int foot_no[4] = {5, 24, 9, 20}; + static DUSK_CONSTEXPR int foot_no_B[4] = {5, 28, 9, 23}; if (i_this->leader != 0) { MTXCopy(model->getAnmMtx(foot_no_B[i]), *calc_mtx); @@ -5713,11 +5713,11 @@ static int daE_WB_Create(fopAc_ac_c* actor) { fopAcM_GetRoomNo(actor), 0, 0, -1, 0); } - static f32 pass_r[6] = { + static DUSK_CONSTEXPR f32 pass_r[6] = { 0.0f, 800.0f, 800.0f, -100.0f, -150.0f, -100.0f, }; - static f32 x_check_off[6] = { + static DUSK_CONSTEXPR f32 x_check_off[6] = { 600.0f, -800.0f, 800.0f, -300.0f, 0.0f, 300.0f, }; @@ -5768,7 +5768,7 @@ static int daE_WB_Create(fopAc_ac_c* actor) { } for (int i = 0; i <= 6; i++) { - static dCcD_SrcSph cc_sph_src = { + static DUSK_CONSTEXPR dCcD_SrcSph cc_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x486022, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -5789,7 +5789,7 @@ static int daE_WB_Create(fopAc_ac_c* actor) { } } - static dCcD_SrcSph at_sph_src = { + static DUSK_CONSTEXPR dCcD_SrcSph at_sph_src = { { {0x0, {{AT_TYPE_1000, 0x2, 0x1f}, {0x0, 0x0}, 0x0}}, // mObj {dCcD_SE_HARD_BODY, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -5863,13 +5863,13 @@ static int daE_WB_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daE_WB_Method = { +static DUSK_CONST actor_method_class l_daE_WB_Method = { (process_method_func)daE_WB_Create, (process_method_func)daE_WB_Delete, (process_method_func)daE_WB_Execute, (process_method_func)daE_WB_IsDelete, (process_method_func)daE_WB_Draw, }; -actor_process_profile_definition g_profile_E_WB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_WB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index bb5835776f..1bc16d4614 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -996,7 +996,7 @@ static int daE_WS_Create(daE_WS_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_WS_Method = { +static DUSK_CONST actor_method_class l_daE_WS_Method = { (process_method_func)daE_WS_Create, (process_method_func)daE_WS_Delete, (process_method_func)daE_WS_Execute, @@ -1004,7 +1004,7 @@ static actor_method_class l_daE_WS_Method = { (process_method_func)daE_WS_Draw, }; -actor_process_profile_definition g_profile_E_WS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_WS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 5f378b60f9..cc82b1e652 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -2297,7 +2297,7 @@ static int daE_WW_Create(daE_WW_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daE_WW_Method = { +static DUSK_CONST actor_method_class l_daE_WW_Method = { (process_method_func)daE_WW_Create, (process_method_func)daE_WW_Delete, (process_method_func)daE_WW_Execute, @@ -2305,7 +2305,7 @@ static actor_method_class l_daE_WW_Method = { (process_method_func)daE_WW_Draw, }; -actor_process_profile_definition g_profile_E_WW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_WW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index c14e710e47..dabd605919 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -826,7 +826,7 @@ static cPhs_Step daE_YC_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daE_YC_Method = { +static DUSK_CONST actor_method_class l_daE_YC_Method = { (process_method_func)daE_YC_Create, (process_method_func)daE_YC_Delete, (process_method_func)daE_YC_Execute, @@ -834,7 +834,7 @@ static actor_method_class l_daE_YC_Method = { (process_method_func)daE_YC_Draw, }; -actor_process_profile_definition g_profile_E_YC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index a10f47240c..52a5be7fdc 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1515,7 +1515,7 @@ static int daE_YD_Create(fopAc_ac_c* i_this) { return loadRv; } -static actor_method_class l_daE_YD_Method = { +static DUSK_CONST actor_method_class l_daE_YD_Method = { (process_method_func)daE_YD_Create, (process_method_func)daE_YD_Delete, (process_method_func)daE_YD_Execute, @@ -1523,7 +1523,7 @@ static actor_method_class l_daE_YD_Method = { (process_method_func)daE_YD_Draw, }; -actor_process_profile_definition g_profile_E_YD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index 750842e144..cf13e26a7c 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -88,13 +88,13 @@ static int daE_YD_LEAF_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daE_YD_LEAF_Method = { +static DUSK_CONST actor_method_class l_daE_YD_LEAF_Method = { (process_method_func)daE_YD_LEAF_Create, (process_method_func)daE_YD_LEAF_Delete, (process_method_func)daE_YD_LEAF_Execute, (process_method_func)daE_YD_LEAF_IsDelete, (process_method_func)daE_YD_LEAF_Draw, }; -actor_process_profile_definition g_profile_E_YD_LEAF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YD_LEAF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 9eae74b1af..71756d6f57 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -1508,7 +1508,7 @@ static cPhs_Step daE_YG_Create(fopAc_ac_c* actor) { AUDIO_INSTANCES; -static actor_method_class l_daE_YG_Method = { +static DUSK_CONST actor_method_class l_daE_YG_Method = { (process_method_func)daE_YG_Create, (process_method_func)daE_YG_Delete, (process_method_func)daE_YG_Execute, @@ -1516,7 +1516,7 @@ static actor_method_class l_daE_YG_Method = { (process_method_func)daE_YG_Draw, }; -actor_process_profile_definition g_profile_E_YG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index bf71e18818..fb00a4bab1 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2275,7 +2275,7 @@ static int daE_YH_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daE_YH_Method = { +static DUSK_CONST actor_method_class l_daE_YH_Method = { (process_method_func)daE_YH_Create, (process_method_func)daE_YH_Delete, (process_method_func)daE_YH_Execute, @@ -2283,7 +2283,7 @@ static actor_method_class l_daE_YH_Method = { (process_method_func)daE_YH_Draw, }; -actor_process_profile_definition g_profile_E_YH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index e42af49348..602e5a23d5 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -1549,7 +1549,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { return phase_step; } -static actor_method_class l_daE_YK_Method = { +static DUSK_CONST actor_method_class l_daE_YK_Method = { (process_method_func)daE_YK_Create, (process_method_func)daE_YK_Delete, (process_method_func)daE_YK_Execute, @@ -1557,7 +1557,7 @@ static actor_method_class l_daE_YK_Method = { (process_method_func)daE_YK_Draw, }; -actor_process_profile_definition g_profile_E_YK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 3f6bef6788..39c1e0d360 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3727,7 +3727,7 @@ static int daE_YM_Create(daE_YM_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_YM_Method = { +static DUSK_CONST actor_method_class l_daE_YM_Method = { (process_method_func)daE_YM_Create, (process_method_func)daE_YM_Delete, (process_method_func)daE_YM_Execute, @@ -3735,7 +3735,7 @@ static actor_method_class l_daE_YM_Method = { (process_method_func)daE_YM_Draw, }; -actor_process_profile_definition g_profile_E_YM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index 501c80bd3b..9c40adc47e 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -60,7 +60,7 @@ static int daE_YM_TAG_Create(daE_YM_TAG_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_YM_TAG_Method = { +static DUSK_CONST actor_method_class l_daE_YM_TAG_Method = { (process_method_func)daE_YM_TAG_Create, (process_method_func)daE_YM_TAG_Delete, (process_method_func)daE_YM_TAG_Execute, @@ -68,7 +68,7 @@ static actor_method_class l_daE_YM_TAG_Method = { (process_method_func)daE_YM_TAG_Draw }; -actor_process_profile_definition g_profile_E_YM_TAG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YM_TAG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 2604b06480..8f395bc741 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -3239,7 +3239,7 @@ static int daE_YMB_Create(daE_YMB_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_YMB_Method = { +static DUSK_CONST actor_method_class l_daE_YMB_Method = { (process_method_func)daE_YMB_Create, (process_method_func)daE_YMB_Delete, (process_method_func)daE_YMB_Execute, @@ -3247,7 +3247,7 @@ static actor_method_class l_daE_YMB_Method = { (process_method_func)daE_YMB_Draw, }; -actor_process_profile_definition g_profile_E_YMB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YMB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index dfd07b6797..6a2aba9ee5 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2560,7 +2560,7 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) { return loadResult; } -static actor_method_class l_daE_Yr_Method = { +static DUSK_CONST actor_method_class l_daE_Yr_Method = { (process_method_func)daE_Yr_Create, (process_method_func)daE_Yr_Delete, (process_method_func)daE_Yr_Execute, @@ -2568,7 +2568,7 @@ static actor_method_class l_daE_Yr_Method = { (process_method_func)daE_Yr_Draw, }; -actor_process_profile_definition g_profile_E_YR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_YR = { /* Layer ID */ (u32)fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 827a8fd36a..9ddc8a1b22 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -85,7 +85,7 @@ namespace { } }; - static dCcD_SrcCyl cc_zhCyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_zhCyl_src = { { {0, {{AT_TYPE_0, 0, 0}, {0xD84860BA, 3}, 0x15}}, {dCcD_SE_METAL, 0, 0, 0, 0}, @@ -99,7 +99,7 @@ namespace { } }; - static dCcD_SrcCyl cc_zhCyl_at_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_zhCyl_at_src = { { {0, {{AT_TYPE_CSTATUE_SWING, 4, 0xD}, {0, 0}, 0}}, {dCcD_SE_METAL, 0, 2, 0, 0}, @@ -2327,7 +2327,7 @@ static int daE_ZH_Create(daE_ZH_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daE_ZH_Method = { +static DUSK_CONST actor_method_class l_daE_ZH_Method = { (process_method_func)daE_ZH_Create, (process_method_func)daE_ZH_Delete, (process_method_func)daE_ZH_Execute, @@ -2335,7 +2335,7 @@ static actor_method_class l_daE_ZH_Method = { (process_method_func)daE_ZH_Draw, }; -actor_process_profile_definition g_profile_E_ZH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ZH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index dd7e0db5ba..72037a5254 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -70,7 +70,7 @@ static u8 hio_set; static daE_ZM_HIO_c l_HIO; namespace { - static dCcD_SrcCyl cc_zm_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_zm_src = { { {0, {{AT_TYPE_0, 0, 0}, {0xD8FBFDFF, 0x43}, 0x45}}, {dCcD_SE_13, 0, 0, 0, 0}, @@ -1025,7 +1025,7 @@ static int daE_ZM_Create(daE_ZM_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_ZM_Method = { +static DUSK_CONST actor_method_class l_daE_ZM_Method = { (process_method_func)daE_ZM_Create, (process_method_func)daE_ZM_Delete, (process_method_func)daE_ZM_Execute, @@ -1033,7 +1033,7 @@ static actor_method_class l_daE_ZM_Method = { (process_method_func)daE_ZM_Draw, }; -actor_process_profile_definition g_profile_E_ZM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ZM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index cd57ffdd51..cd85e35f4e 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -561,7 +561,7 @@ static int daE_ZS_Create(daE_ZS_c* i_this) { return i_this->create(); } -static actor_method_class l_daE_ZS_Method = { +static DUSK_CONST actor_method_class l_daE_ZS_Method = { (process_method_func)daE_ZS_Create, (process_method_func)daE_ZS_Delete, (process_method_func)daE_ZS_Execute, @@ -569,7 +569,7 @@ static actor_method_class l_daE_ZS_Method = { (process_method_func)daE_ZS_Draw, }; -actor_process_profile_definition g_profile_E_ZS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_E_ZS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index ea976d6ee9..2bd075c123 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -71,7 +71,7 @@ static int daEcont_Create(fopAc_ac_c* i_this) { } -static actor_method_class l_daEcont_Method = { +static DUSK_CONST actor_method_class l_daEcont_Method = { (process_method_func)daEcont_Create, (process_method_func)daEcont_Delete, (process_method_func)daEcont_Execute, @@ -79,7 +79,7 @@ static actor_method_class l_daEcont_Method = { (process_method_func)daEcont_Draw }; -actor_process_profile_definition g_profile_ECONT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ECONT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 312bd08ea4..51ef2e7675 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -390,7 +390,7 @@ static BOOL ep_switch_event_begin(ep_class* i_this) { } static int ep_switch_event_move(ep_class* i_this) { - static char* actions[2] = { + static DUSK_CONST char* actions[2] = { "WAIT", "FIRE", }; @@ -851,7 +851,7 @@ static int daEp_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - static dCcD_SrcCyl co_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl co_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdbf, 0x1f}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -948,7 +948,7 @@ static int daEp_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daEp_Method = { +static DUSK_CONST actor_method_class l_daEp_Method = { (process_method_func)daEp_Create, (process_method_func)daEp_Delete, (process_method_func)daEp_Execute, @@ -956,7 +956,7 @@ static actor_method_class l_daEp_Method = { (process_method_func)daEp_Draw, }; -actor_process_profile_definition g_profile_EP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_EP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index c4a9127627..3e625ebb07 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -386,7 +386,7 @@ void daFmtMng_c::create_init() { } } -static actor_method_class l_daFmtMng_Method = { +static DUSK_CONST actor_method_class l_daFmtMng_Method = { (process_method_func)daFmtMng_Create, (process_method_func)daFmtMng_Delete, (process_method_func)daFmtMng_Execute, @@ -394,7 +394,7 @@ static actor_method_class l_daFmtMng_Method = { (process_method_func)daFmtMng_Draw, }; -actor_process_profile_definition g_profile_FORMATION_MNG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_FORMATION_MNG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 9280a93013..4f0c161268 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -732,7 +732,7 @@ static int daFr_Create(fopAc_ac_c* a_this) { return phase_state; } -static actor_method_class l_daFr_Method = { +static DUSK_CONST actor_method_class l_daFr_Method = { (process_method_func)daFr_Create, (process_method_func)daFr_Delete, (process_method_func)daFr_Execute, @@ -740,7 +740,7 @@ static actor_method_class l_daFr_Method = { (process_method_func)daFr_Draw, }; -actor_process_profile_definition g_profile_FR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_FR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index f04d5cfcd2..e3f12f3300 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -391,7 +391,7 @@ static int daGrass_draw(daGrass_c* i_this) { return i_this->draw(); } -static actor_method_class daGrass_METHODS = { +static DUSK_CONST actor_method_class daGrass_METHODS = { (process_method_func)daGrass_create, (process_method_func)daGrass_Delete, (process_method_func)daGrass_execute, @@ -399,7 +399,7 @@ static actor_method_class daGrass_METHODS = { (process_method_func)daGrass_draw, }; -actor_process_profile_definition g_profile_GRASS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_GRASS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 11, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index 141b390c38..c982692975 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -59,14 +59,14 @@ static int daGuardMng_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daGuardMng_Method = { +static DUSK_CONST actor_method_class l_daGuardMng_Method = { (process_method_func)daGuardMng_Create, (process_method_func)daGuardMng_Delete, (process_method_func)daGuardMng_Execute, (process_method_func)daGuardMng_IsDelete }; -actor_process_profile_definition g_profile_GUARD_MNG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_GUARD_MNG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index d8f3aae581..fe54032d21 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -65,7 +65,7 @@ static int daHitobj_Create(fopAc_ac_c* i_this) { return ret; } -static actor_method_class l_daHitobj_Method = { +static DUSK_CONST actor_method_class l_daHitobj_Method = { (process_method_func)daHitobj_Create, (process_method_func)daHitobj_Delete, (process_method_func)daHitobj_Execute, @@ -73,7 +73,7 @@ static actor_method_class l_daHitobj_Method = { (process_method_func)daHitobj_Draw }; -actor_process_profile_definition g_profile_HITOBJ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_HITOBJ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 42f2c9b8ce..dbbd7f0fba 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -2264,12 +2264,12 @@ void daHorse_c::setRoomInfo(int param_0) { } } -static cXyz l_frontFootOffset(23.5f, -20.0f, 0.0f); +static DUSK_CONSTEXPR cXyz l_frontFootOffset(23.5f, -20.0f, 0.0f); -static cXyz l_backFootOffset(25.5f, 12.0f, 0.0f); +static DUSK_CONSTEXPR cXyz l_backFootOffset(25.5f, 12.0f, 0.0f); void daHorse_c::setBodyPart() { - static cXyz localEyePos(25.0f, -15.0f, 0.0f); + static DUSK_CONSTEXPR cXyz localEyePos(25.0f, -15.0f, 0.0f); mDoMtx_multVec(m_model->getAnmMtx(15), &localEyePos, &eyePos); mDoMtx_multVecZero(m_model->getAnmMtx(0), &m_bodyEyePos); @@ -2427,10 +2427,10 @@ void daHorse_c::setEffect() { speedF); } - static cXyz runScale(2.0f, 2.0f, 2.0f); - static cXyz landScale(1.5f, 1.5f, 1.5f); - static cXyz grassRunScale(1.8f, 1.8f, 1.8f); - static cXyz waterDirection(0.0f, 1.0f, -0.75f); + static DUSK_CONSTEXPR cXyz runScale(2.0f, 2.0f, 2.0f); + static DUSK_CONSTEXPR cXyz landScale(1.5f, 1.5f, 1.5f); + static DUSK_CONSTEXPR cXyz grassRunScale(1.8f, 1.8f, 1.8f); + static DUSK_CONSTEXPR cXyz waterDirection(0.0f, 1.0f, -0.75f); int j; int i; @@ -2942,10 +2942,10 @@ void daHorse_c::footBgCheck() { } void daHorse_c::setReinPosMoveInit(int param_0) { - static cXyz reinLeftStart(63.0f, 17.0f, 11.0f); - static cXyz reinRightStart(63.0f, 17.0f, -11.0f); - static cXyz localNeckLeft(10.0f, 10.0f, 35.0f); - static cXyz localNeckRight(10.0f, 10.0f, -35.0f); + static DUSK_CONSTEXPR cXyz reinLeftStart(63.0f, 17.0f, 11.0f); + static DUSK_CONSTEXPR cXyz reinRightStart(63.0f, 17.0f, -11.0f); + static DUSK_CONSTEXPR cXyz localNeckLeft(10.0f, 10.0f, 35.0f); + static DUSK_CONSTEXPR cXyz localNeckRight(10.0f, 10.0f, -35.0f); static const f32 sideOffset = 10.0f; static const f32 onHandSideOffset = 1.0f; @@ -3128,8 +3128,8 @@ void daHorse_c::setReinPosHandSubstance(int param_0) { } void daHorse_c::setReinPosNormalSubstance() { - static cXyz saddleLeft(29.0f, -2.0f, 30.0f); - static cXyz saddleRight(29.0f, 2.0f, 30.0f); + static DUSK_CONSTEXPR cXyz saddleLeft(29.0f, -2.0f, 30.0f); + static DUSK_CONSTEXPR cXyz saddleRight(29.0f, 2.0f, 30.0f); static const int sideCount = 24; if (!checkStateFlg0(FLG0_UNK_1) && getZeldaActor() != NULL) { @@ -3188,9 +3188,9 @@ void daHorse_c::lerpControlPoints(f32 alpha) { void daHorse_c::bgCheck() { if (m_procID != PROC_LARGE_DAMAGE_e) { - static cXyz localCenterPos(0.0f, 100.0f, 0.0f); - static cXyz localFrontPos(0.0f, 100.0f, 220.0f); - static cXyz localBackPos(0.0f, 100.0f, -170.0f); + static DUSK_CONSTEXPR cXyz localCenterPos(0.0f, 100.0f, 0.0f); + static DUSK_CONSTEXPR cXyz localFrontPos(0.0f, 100.0f, 220.0f); + static DUSK_CONSTEXPR cXyz localBackPos(0.0f, 100.0f, -170.0f); cXyz line_start; cXyz line_end; @@ -4750,7 +4750,7 @@ static int daHorse_Delete(daHorse_c* i_this) { return 1; } -static actor_method_class l_daHorse_Method = { +static DUSK_CONST actor_method_class l_daHorse_Method = { (process_method_func)daHorse_Create, (process_method_func)daHorse_Delete, (process_method_func)daHorse_Execute, @@ -4758,7 +4758,7 @@ static actor_method_class l_daHorse_Method = { (process_method_func)daHorse_Draw, }; -actor_process_profile_definition g_profile_HORSE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_HORSE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index 364654c1c1..34f8f3c9c9 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -930,7 +930,7 @@ static int daHoZelda_Draw(daHoZelda_c* i_this) { return i_this->draw(); } -static actor_method_class l_daHoZelda_Method = { +static DUSK_CONST actor_method_class l_daHoZelda_Method = { (process_method_func)daHoZelda_Create, (process_method_func)daHoZelda_Delete, (process_method_func)daHoZelda_Execute, @@ -938,7 +938,7 @@ static actor_method_class l_daHoZelda_Method = { (process_method_func)daHoZelda_Draw, }; -actor_process_profile_definition g_profile_HOZELDA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_HOZELDA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index d9e8b2a0dc..77ecab0ef6 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -35,7 +35,7 @@ static int daIzumiGate_Delete(daIzumiGate_c* i_this) { return 1; } -static char* l_arcName = "M_IzmGate"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_IzmGate"; int daIzumiGate_c::create() { fopAcM_ct(this, daIzumiGate_c); @@ -86,13 +86,13 @@ int daIzumiGate_c::Delete() { return 1; } -static actor_method_class l_daIzumiGate_Method = { +static DUSK_CONST actor_method_class l_daIzumiGate_Method = { (process_method_func)daIzumiGate_Create, (process_method_func)daIzumiGate_Delete, (process_method_func)daIzumiGate_Execute, (process_method_func)daIzumiGate_IsDelete, (process_method_func)daIzumiGate_Draw, }; -actor_process_profile_definition g_profile_Izumi_Gate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Izumi_Gate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index efdad44516..0b1954a4ed 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -3903,7 +3903,7 @@ static int daKago_Create(daKago_c* i_this) { return i_this->create(); } -static actor_method_class l_daKago_Method = { +static DUSK_CONST actor_method_class l_daKago_Method = { (process_method_func)daKago_Create, (process_method_func)daKago_Delete, (process_method_func)daKago_Execute, @@ -3911,7 +3911,7 @@ static actor_method_class l_daKago_Method = { (process_method_func)daKago_Draw, }; -actor_process_profile_definition g_profile_KAGO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KAGO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 31c21d28b2..0b04a7fecc 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -459,13 +459,13 @@ static int daKytag00_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag00_Method = { +static DUSK_CONST actor_method_class l_daKytag00_Method = { (process_method_func)daKytag00_Create, (process_method_func)daKytag00_Delete, (process_method_func)daKytag00_Execute, (process_method_func)daKytag00_IsDelete, (process_method_func)daKytag00_Draw, }; -actor_process_profile_definition g_profile_KYTAG00 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG00 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 33c14c373f..ccbdb19725 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -215,13 +215,13 @@ static int daKytag01_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag01_Method = { +static DUSK_CONST actor_method_class l_daKytag01_Method = { (process_method_func)daKytag01_Create, (process_method_func)daKytag01_Delete, (process_method_func)daKytag01_Execute, (process_method_func)daKytag01_IsDelete, (process_method_func)daKytag01_Draw, }; -actor_process_profile_definition g_profile_KYTAG01 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG01 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index cb2b05cf01..cdecaabdb1 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -130,13 +130,13 @@ static int daKytag02_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag02_Method = { +static DUSK_CONST actor_method_class l_daKytag02_Method = { (process_method_func)daKytag02_Create, (process_method_func)daKytag02_Delete, (process_method_func)daKytag02_Execute, (process_method_func)daKytag02_IsDelete, (process_method_func)daKytag02_Draw, }; -actor_process_profile_definition g_profile_KYTAG02 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG02 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 73a83b40cb..1437b1ca4c 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -455,13 +455,13 @@ static int daKytag03_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag03_Method = { +static DUSK_CONST actor_method_class l_daKytag03_Method = { (process_method_func)daKytag03_Create, (process_method_func)daKytag03_Delete, (process_method_func)daKytag03_Execute, (process_method_func)daKytag03_IsDelete, (process_method_func)daKytag03_Draw, }; -actor_process_profile_definition g_profile_KYTAG03 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG03 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 21f6d85b93..7efac7c2d5 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -354,13 +354,13 @@ static int daKytag04_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daKytag04_Method = { +static DUSK_CONST actor_method_class l_daKytag04_Method = { (process_method_func)daKytag04_Create, (process_method_func)daKytag04_Delete, (process_method_func)daKytag04_Execute, (process_method_func)daKytag04_IsDelete, (process_method_func)daKytag04_Draw, }; -actor_process_profile_definition g_profile_KYTAG04 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG04 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 1322057075..ec8cea1091 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -40,13 +40,13 @@ static int daKytag05_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag05_Method = { +static DUSK_CONST actor_method_class l_daKytag05_Method = { (process_method_func)daKytag05_Create, (process_method_func)daKytag05_Delete, (process_method_func)daKytag05_Execute, (process_method_func)daKytag05_IsDelete, (process_method_func)daKytag05_Draw, }; -actor_process_profile_definition g_profile_KYTAG05 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG05 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index bc7510c9d4..6441507642 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -1188,13 +1188,13 @@ static int daKytag06_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag06_Method = { +static DUSK_CONST actor_method_class l_daKytag06_Method = { (process_method_func)daKytag06_Create, (process_method_func)daKytag06_Delete, (process_method_func)daKytag06_Execute, (process_method_func)daKytag06_IsDelete, (process_method_func)daKytag06_Draw, }; -actor_process_profile_definition g_profile_KYTAG06 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG06 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 2895963994..60870b508c 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -62,12 +62,12 @@ static int daKytag07_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag07_Method = { +static DUSK_CONST actor_method_class l_daKytag07_Method = { (process_method_func)daKytag07_Create, (process_method_func)daKytag07_Delete, (process_method_func)daKytag07_Execute, (process_method_func)daKytag07_IsDelete, (process_method_func)daKytag07_Draw}; -actor_process_profile_definition g_profile_KYTAG07 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG07 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 44f4bf5f9a..7ac2605c8d 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -267,13 +267,13 @@ static int daKytag08_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daKytag08_Method = { +static DUSK_CONST actor_method_class l_daKytag08_Method = { (process_method_func)daKytag08_Create, (process_method_func)daKytag08_Delete, (process_method_func)daKytag08_Execute, (process_method_func)daKytag08_IsDelete, (process_method_func)daKytag08_Draw, }; -actor_process_profile_definition g_profile_KYTAG08 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG08 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index 2b2218e8ee..1c55b8d565 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -138,13 +138,13 @@ static int daKytag09_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daKytag09_Method = { +static DUSK_CONST actor_method_class l_daKytag09_Method = { (process_method_func)daKytag09_Create, (process_method_func)daKytag09_Delete, (process_method_func)daKytag09_Execute, (process_method_func)daKytag09_IsDelete, (process_method_func)daKytag09_Draw, }; -actor_process_profile_definition g_profile_KYTAG09 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG09 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index a63ff88c52..27c02c2df0 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -200,13 +200,13 @@ static int daKytag10_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag10_Method = { +static DUSK_CONST actor_method_class l_daKytag10_Method = { (process_method_func)daKytag10_Create, (process_method_func)daKytag10_Delete, (process_method_func)daKytag10_Execute, (process_method_func)daKytag10_IsDelete, (process_method_func)daKytag10_Draw, }; -actor_process_profile_definition g_profile_KYTAG10 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG10 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index b6b1d3fc63..7815bfc5e3 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -107,13 +107,13 @@ static int daKytag11_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag11_Method = { +static DUSK_CONST actor_method_class l_daKytag11_Method = { (process_method_func)daKytag11_Create, (process_method_func)daKytag11_Delete, (process_method_func)daKytag11_Execute, (process_method_func)daKytag11_IsDelete, (process_method_func)daKytag11_Draw, }; -actor_process_profile_definition g_profile_KYTAG11 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG11 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 58bd2963d9..dfc274cb85 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -1028,7 +1028,7 @@ static int daKytag12_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag12_Method = { +static DUSK_CONST actor_method_class l_daKytag12_Method = { (process_method_func)daKytag12_Create, (process_method_func)daKytag12_Delete, (process_method_func)daKytag12_Execute, @@ -1036,7 +1036,7 @@ static actor_method_class l_daKytag12_Method = { (process_method_func)daKytag12_Draw, }; -actor_process_profile_definition g_profile_KYTAG12 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG12 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index d54932c0fb..fcb206353d 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -380,7 +380,7 @@ static int daKytag13_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag13_Method = { +static DUSK_CONST actor_method_class l_daKytag13_Method = { (process_method_func)daKytag13_Create, (process_method_func)daKytag13_Delete, (process_method_func)daKytag13_Execute, @@ -388,7 +388,7 @@ static actor_method_class l_daKytag13_Method = { (process_method_func)daKytag13_Draw, }; -actor_process_profile_definition g_profile_KYTAG13 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG13 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index e179da4523..2aba9cf9fa 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -102,13 +102,13 @@ static int daKytag14_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag14_Method = { +static DUSK_CONST actor_method_class l_daKytag14_Method = { (process_method_func)daKytag14_Create, (process_method_func)daKytag14_Delete, (process_method_func)daKytag14_Execute, (process_method_func)daKytag14_IsDelete, (process_method_func)daKytag14_Draw, }; -actor_process_profile_definition g_profile_KYTAG14 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG14 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index 3287f45a6a..5c8f8dd5a8 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -123,13 +123,13 @@ static int daKytag15_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daKytag15_Method = { +static DUSK_CONST actor_method_class l_daKytag15_Method = { (process_method_func)daKytag15_Create, (process_method_func)daKytag15_Delete, (process_method_func)daKytag15_Execute, (process_method_func)daKytag15_IsDelete, (process_method_func)daKytag15_Draw, }; -actor_process_profile_definition g_profile_KYTAG15 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG15 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index addbc046fa..38f752649c 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -160,13 +160,13 @@ static int daKytag16_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag16_Method = { +static DUSK_CONST actor_method_class l_daKytag16_Method = { (process_method_func)daKytag16_Create, (process_method_func)daKytag16_Delete, (process_method_func)daKytag16_Execute, (process_method_func)daKytag16_IsDelete, (process_method_func)daKytag16_Draw, }; -actor_process_profile_definition g_profile_KYTAG16 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG16 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index 6f8eaabccc..f4fceee0f0 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -34,12 +34,12 @@ static int daKytag17_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daKytag17_Method = { +static DUSK_CONST actor_method_class l_daKytag17_Method = { (process_method_func)daKytag17_Create, (process_method_func)daKytag17_Delete, (process_method_func)daKytag17_Execute, (process_method_func)daKytag17_IsDelete, (process_method_func)daKytag17_Draw}; -actor_process_profile_definition g_profile_KYTAG17 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KYTAG17 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 6a559c0e1c..48e5554cd2 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -949,7 +949,7 @@ extern "C" void __ct__4cXyzFv() { /* empty function */ } -static actor_method_class l_daMant_Method = { +static DUSK_CONST actor_method_class l_daMant_Method = { (process_method_func)daMant_Create, (process_method_func)daMant_Delete, (process_method_func)daMant_Execute, @@ -957,7 +957,7 @@ static actor_method_class l_daMant_Method = { (process_method_func)daMant_Draw, }; -actor_process_profile_definition g_profile_MANT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MANT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 6791bcb61c..86d2552970 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3771,7 +3771,7 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) { } static int daMg_Fish_Create(fopAc_ac_c* i_this) { - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { { 0x0, { { 0x0, 0x0, 0x0 }, { 0x0, 0x0 }, 0x75 } }, // mObj { dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0 }, // mGObjAt @@ -4075,7 +4075,7 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) { return retval; } -static actor_method_class l_daMg_Fish_Method = { +static DUSK_CONST actor_method_class l_daMg_Fish_Method = { (process_method_func)daMg_Fish_Create, (process_method_func)daMg_Fish_Delete, (process_method_func)daMg_Fish_Execute, @@ -4083,7 +4083,7 @@ static actor_method_class l_daMg_Fish_Method = { (process_method_func)daMg_Fish_Draw, }; -actor_process_profile_definition g_profile_MG_FISH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MG_FISH = { /* Layer ID */ (u32)fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 0d5b6dd2c9..9e8eb3f357 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1818,7 +1818,7 @@ static int daFshop_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daFshop_Method = { +static DUSK_CONST actor_method_class l_daFshop_Method = { (process_method_func)daFshop_Create, (process_method_func)daFshop_Delete, (process_method_func)daFshop_Execute, @@ -1826,7 +1826,7 @@ static actor_method_class l_daFshop_Method = { (process_method_func)daFshop_Draw, }; -actor_process_profile_definition g_profile_FSHOP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_FSHOP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 3471cd342a..5299f57626 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -6464,7 +6464,7 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_dmg_rod_Method = { +static DUSK_CONST actor_method_class l_dmg_rod_Method = { (process_method_func)dmg_rod_Create, (process_method_func)dmg_rod_Delete, (process_method_func)dmg_rod_Execute, @@ -6472,7 +6472,7 @@ static actor_method_class l_dmg_rod_Method = { (process_method_func)dmg_rod_Draw, }; -actor_process_profile_definition g_profile_MG_ROD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MG_ROD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 3bc500991d..3082fc6a71 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3654,7 +3654,7 @@ static void dummy() { } template unsigned char cLib_calcTimer(unsigned char*); -static actor_method_class l_daMidna_Method = { +static DUSK_CONST actor_method_class l_daMidna_Method = { (process_method_func)daMidna_Create, (process_method_func)daMidna_Delete, (process_method_func)daMidna_Execute, @@ -3662,7 +3662,7 @@ static actor_method_class l_daMidna_Method = { (process_method_func)daMidna_Draw, }; -actor_process_profile_definition g_profile_MIDNA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MIDNA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 6, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 5c5218328e..86eaff0a8e 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -25,9 +25,9 @@ static BOOL daMirror_c_createHeap(fopAc_ac_c* i_this) { return ((daMirror_c*)i_this)->createHeap(); } -static char* l_arcName = "Mirror"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Mirror"; -static char* l_arcName2 = "MR-Table"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName2 = "MR-Table"; dMirror_packet_c::dMirror_packet_c() { #ifdef TARGET_PC @@ -646,13 +646,13 @@ int daMirror_c::entryModel(J3DModel* i_model) { return mPacket.entryModel(i_model); } -static actor_method_class daMirror_METHODS = { +static DUSK_CONST actor_method_class daMirror_METHODS = { (process_method_func)daMirror_create, (process_method_func)daMirror_Delete, (process_method_func)daMirror_execute, (process_method_func)NULL, (process_method_func)daMirror_draw, }; -actor_process_profile_definition g_profile_MIRROR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MIRROR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 1760fa713b..43117615e5 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -4566,7 +4566,7 @@ static int daMP_Callback_Dummy(daMP_c* i_this) { return 1; } -static actor_method_class daMP_METHODS = { +static DUSK_CONST actor_method_class daMP_METHODS = { (process_method_func)daMP_c::daMP_c_Callback_Init, (process_method_func)daMP_c::daMP_c_Callback_Finish, (process_method_func)daMP_c::daMP_c_Callback_Main, @@ -4574,7 +4574,7 @@ static actor_method_class daMP_METHODS = { (process_method_func)daMP_c::daMP_c_Callback_Draw, }; -actor_process_profile_definition g_profile_MOVIE_PLAYER = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MOVIE_PLAYER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 776f219f93..4b25ead19c 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -15,7 +15,7 @@ #include "d/d_s_play.h" #include -static daMyna_c::ProcFunc init_proc[] = { +static DUSK_CONSTEXPR daMyna_c::ProcFunc init_proc[] = { &daMyna_c::attack_wait_init, &daMyna_c::attack_before_talk_init, &daMyna_c::attack_fly_init, @@ -40,7 +40,7 @@ static daMyna_c::ProcFunc init_proc[] = { &daMyna_c::attack2_talk_init, }; -static daMyna_c::ProcFunc move_proc[] = { +static DUSK_CONSTEXPR daMyna_c::ProcFunc move_proc[] = { &daMyna_c::attack_wait_move, &daMyna_c::attack_before_talk_move, &daMyna_c::attack_fly_move, @@ -65,14 +65,14 @@ static daMyna_c::ProcFunc move_proc[] = { &daMyna_c::attack2_talk_move, }; -static char* l_bckFileNameTBL[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_bckFileNameTBL[] = { "MYNA_hovering.bck", "MYNA_wait_a.bck", "MYNA_pick_a.bck", "MYNA_pick_b.bck", "MYNA_jump.bck", "MYNA_sidestepL.bck", "MYNA_sidestepR.bck", "MYNA_lightup.bck", "MYNA_attack.bck", "MYNA_talk_a.bck", "MYNA_talk_b.bck", "MYNA_wait_b.bck", "MYNA_wait_c.bck", "MYNA_talk_c.bck", "MYNA_wait_d.bck", }; -static char* l_btpFileNameTBL[] = {"MYNA.btp"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_btpFileNameTBL[] = {"MYNA.btp"}; static int createHeapCallBack(fopAc_ac_c* i_this) { daMyna_c* a_this = static_cast(i_this); @@ -1475,7 +1475,7 @@ void daMyna_c::setBtpAnm(J3DAnmTexPattern* i_btk, J3DModelData* param_1, f32 i_r mBtpAnm.init(param_1, i_btk, 1, i_attribute, i_rate, 0, -1); } -J3DAnmTransformKey* daMyna_c::getTrnsfrmKeyAnm(char* i_resName) { +J3DAnmTransformKey* daMyna_c::getTrnsfrmKeyAnm(DUSK_CONST char* i_resName) { if (i_resName != NULL) { return static_cast(dComIfG_getObjectRes("Npc_myna", i_resName)); } else { @@ -1483,7 +1483,7 @@ J3DAnmTransformKey* daMyna_c::getTrnsfrmKeyAnm(char* i_resName) { } } -J3DAnmTexPattern* daMyna_c::getTexPtrnAnm(char* i_resName) { +J3DAnmTexPattern* daMyna_c::getTexPtrnAnm(DUSK_CONST char* i_resName) { if (i_resName != NULL) { return static_cast(dComIfG_getObjectRes("Npc_myna", i_resName)); } else { @@ -1820,13 +1820,13 @@ static int daMyna_IsDelete(void* i_this) { return 1; } -static actor_method_class daMyna_MethodTable = { +static DUSK_CONST actor_method_class daMyna_MethodTable = { (process_method_func)daMyna_Create, (process_method_func)daMyna_Delete, (process_method_func)daMyna_Execute, (process_method_func)daMyna_IsDelete, (process_method_func)daMyna_Draw, }; -actor_process_profile_definition g_profile_MYNA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MYNA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 4a185c9561..00d27306f3 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -1676,7 +1676,7 @@ AUDIO_INSTANCES; template<> JAUSectionHeap* JASGlobalInstance::sInstance; -static actor_method_class l_daNbombMethod = { +static DUSK_CONST actor_method_class l_daNbombMethod = { (process_method_func)daNbomb_Create, (process_method_func)daNbomb_Delete, (process_method_func)daNbomb_Execute, @@ -1684,7 +1684,7 @@ static actor_method_class l_daNbombMethod = { (process_method_func)daNbomb_Draw, }; -actor_process_profile_definition g_profile_NBOMB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NBOMB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index b569b28e04..cb53ae6030 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1994,7 +1994,7 @@ static int daNi_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daNi_Method = { +static DUSK_CONST actor_method_class l_daNi_Method = { (process_method_func)daNi_Create, (process_method_func)daNi_Delete, (process_method_func)daNi_Execute, @@ -2002,7 +2002,7 @@ static actor_method_class l_daNi_Method = { (process_method_func)daNi_Draw, }; -actor_process_profile_definition g_profile_NI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 3a2e788a96..c393db8d85 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -150,13 +150,13 @@ static int daNocrm_draw(daNocrm_c* i_this) { return 1; } -static actor_method_class daNocrm_METHODS = { +static DUSK_CONST actor_method_class daNocrm_METHODS = { (process_method_func)daNocrm_create, (process_method_func)daNocrm_Delete, (process_method_func)daNocrm_execute, (process_method_func)NULL, (process_method_func)daNocrm_draw, }; -actor_process_profile_definition g_profile_NO_CHG_ROOM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NO_CHG_ROOM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 123bf66800..8fd99f2cb4 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1335,7 +1335,7 @@ int daNpcT_c::setBpkAnm(J3DAnmColor* i_bpk, J3DModelData* i_modelData, f32 i_spe return mBpkAnm.init(i_modelData, i_bpk, TRUE, i_mode, i_speed, 0, -1); } -int daNpcT_c::loadRes(s8 const* i_resNoList, char const** i_resNameList) { +int daNpcT_c::loadRes(s8 const* i_resNoList, char const* DUSK_CONST* i_resNameList) { int phase_state; int resLoad_cnt = 0; for (int i = 0; i < 10; i++) { @@ -1359,7 +1359,7 @@ int daNpcT_c::loadRes(s8 const* i_resNoList, char const** i_resNameList) { return cPhs_INIT_e; } -void daNpcT_c::deleteRes(s8 const* i_resNoList, char const** i_resNameList) { +void daNpcT_c::deleteRes(s8 const* i_resNoList, char const* DUSK_CONST* i_resNameList) { for (int i = 0; i < 10 && i_resNoList[i] != -1; i++) { dComIfG_resDelete(&mPhase[i], i_resNameList[i_resNoList[i]]); } diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index f629c0b562..6bc5e7f08d 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -490,7 +490,7 @@ const char* daBaseNpc_c::getResName() { return NULL; } -J3DAnmTransform* daBaseNpc_c::getTrnsfrmKeyAnmP(char* i_arcName, int i_resIdx) { +J3DAnmTransform* daBaseNpc_c::getTrnsfrmKeyAnmP(char DUSK_CONST* i_arcName, int i_resIdx) { void* objectRes = dComIfG_getObjectRes(i_arcName, i_resIdx); return (J3DAnmTransform*)objectRes; } @@ -510,7 +510,7 @@ int daBaseNpc_c::setBckAnm(J3DAnmTransform* i_anm, f32 i_speed, int i_mode, int return mBck.init(i_anm, TRUE, i_mode, i_speed, start, end, i_modify); } -J3DAnmTransform* daBaseNpc_c::getTexPtrnAnmP(char* i_arcName, int i_resIdx) { +J3DAnmTransform* daBaseNpc_c::getTexPtrnAnmP(char DUSK_CONST* i_arcName, int i_resIdx) { void* objectRes = dComIfG_getObjectRes(i_arcName, i_resIdx); return (J3DAnmTransform*)objectRes; } @@ -540,7 +540,7 @@ void daBaseNpc_c::attnSttsOn(int param_0, int param_1) { void daBaseNpc_c::setParam() {} -void daBaseNpc_c::orderEvent(int param_0, char* i_evtName) { +void daBaseNpc_c::orderEvent(int param_0, char DUSK_CONST* i_evtName) { if (i_evtName != NULL) { mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, -1); fopAcM_orderOtherEventId(this, mEvtIdx, 0xFF, 0xFFFF, 0, 1); diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 858cf579d9..ef8b75fb19 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -891,22 +891,22 @@ void daNpcF_c::initialize() { field_0x9d2 = cM_rndF(0x10000); } -J3DAnmTransformKey* daNpcF_c::getTrnsfrmKeyAnmP(char* i_arcName, int i_resIdx) { +J3DAnmTransformKey* daNpcF_c::getTrnsfrmKeyAnmP(char DUSK_CONST* i_arcName, int i_resIdx) { J3DAnmTransformKey* key = (J3DAnmTransformKey*)dComIfG_getObjectRes(i_arcName, i_resIdx); return key; } -J3DAnmTexPattern* daNpcF_c::getTexPtrnAnmP(char* i_arcName, int i_resIdx) { +J3DAnmTexPattern* daNpcF_c::getTexPtrnAnmP(char DUSK_CONST* i_arcName, int i_resIdx) { J3DAnmTexPattern* pattern = (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_resIdx); return pattern; } -J3DAnmTextureSRTKey* daNpcF_c::getTexSRTKeyAnmP(char* i_arcName, int i_resIdx) { +J3DAnmTextureSRTKey* daNpcF_c::getTexSRTKeyAnmP(char DUSK_CONST* i_arcName, int i_resIdx) { J3DAnmTextureSRTKey* key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_resIdx); return key; } -J3DAnmTevRegKey* daNpcF_c::getTevRegKeyAnmP(char* i_arcName, int i_resIdx) { +J3DAnmTevRegKey* daNpcF_c::getTevRegKeyAnmP(char DUSK_CONST* i_arcName, int i_resIdx) { J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes(i_arcName, i_resIdx); return key; } @@ -1280,7 +1280,7 @@ int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2, return mMsgTimer; } -void daNpcF_c::orderEvent(int i_speak, char* i_evtName, u16 param_2, u16 i_priority, +void daNpcF_c::orderEvent(int i_speak, DUSK_CONST char* i_evtName, u16 param_2, u16 i_priority, u8 i_mapToolID, u16 i_flag) { if (i_evtName != NULL) { @@ -1302,7 +1302,7 @@ void daNpcF_c::orderEvent(int i_speak, char* i_evtName, u16 param_2, u16 i_prior } } -void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 param_3) { +void daNpcF_c::changeEvent(DUSK_CONST char* i_arcName, DUSK_CONST char* i_evtName, u16 param_2, u16 param_3) { if (i_arcName != NULL) { eventInfo.setArchiveName(i_arcName); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index a730afa9cd..8e6018873c 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -244,11 +244,11 @@ void daNpc_Aru_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_ARU, ARU}, }; -static daNpcT_evtData_c l_evtList[12] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[12] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -263,26 +263,26 @@ static daNpcT_evtData_c l_evtList[12] = { {"NO_ENTRANCE", 2}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Aru", "Aru1", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { ARU, -1 }; -static s8 l_loadResPtrn9[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[3] = { ARU, ARU1, -1, }; -static s8* l_loadResPtrnList[6] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[6] = { l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[13] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[13] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_ARU, J3DFrameCtrl::EMode_LOOP, ARU, 1}, {BCK_ARU_F_NORMAL, J3DFrameCtrl::EMode_NONE, ARU, BTP_ARU, J3DFrameCtrl::EMode_LOOP, ARU, 1}, {BCK_ARU_F_GRUMPY, J3DFrameCtrl::EMode_NONE, ARU1, BTP_ARU_F_GRUMPY, J3DFrameCtrl::EMode_NONE, ARU1, 0}, @@ -298,7 +298,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[13] = { {BCK_ARU_FH_NORMAL, J3DFrameCtrl::EMode_LOOP, ARU, BTP_ARU_FH_NORMAL, J3DFrameCtrl::EMode_LOOP, ARU, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[13] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[13] = { {BCK_ARU_WAIT_A, J3DFrameCtrl::EMode_LOOP, ARU, BTK_ARU,J3DFrameCtrl::EMode_NONE, ARU, 1, 0}, {BCK_ARU_WAIT_C, J3DFrameCtrl::EMode_LOOP, ARU1, BTK_ARU, J3DFrameCtrl::EMode_NONE, ARU, 1, 0}, {BCK_ARU_WAIT_D, J3DFrameCtrl::EMode_LOOP, ARU1, BTK_ARU, J3DFrameCtrl::EMode_NONE, ARU, 1, 0}, @@ -314,7 +314,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[13] = { {BCK_ARU_RUN, J3DFrameCtrl::EMode_LOOP, ARU1, BTK_ARU, J3DFrameCtrl::EMode_NONE, ARU, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[52] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[52] = { {1, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {8, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -330,7 +330,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[52] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[48] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[48] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -345,7 +345,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[48] = { {11, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Aru_c::mCutNameList[7] = { +char DUSK_CONST* DUSK_CONST daNpc_Aru_c::mCutNameList[7] = { "", "RIDEON_HORSE", "GOTO_BULLRUNNING_STAGE", @@ -355,7 +355,7 @@ char* daNpc_Aru_c::mCutNameList[7] = { "NO_ENTRANCE", }; -daNpc_Aru_c::cutFunc daNpc_Aru_c::mCutList[7] = { +daNpc_Aru_c::cutFunc DUSK_CONST daNpc_Aru_c::mCutList[7] = { NULL, &daNpc_Aru_c::cutRideOnHorse, &daNpc_Aru_c::cutGotoBullRunningStage, @@ -2206,7 +2206,7 @@ static int daNpc_Aru_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_Aru_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Aru_MethodTable = { (process_method_func)daNpc_Aru_Create, (process_method_func)daNpc_Aru_Delete, (process_method_func)daNpc_Aru_Execute, @@ -2214,7 +2214,7 @@ static actor_method_class daNpc_Aru_MethodTable = { (process_method_func)daNpc_Aru_Draw, }; -actor_process_profile_definition g_profile_NPC_ARU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ARU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 4bb33c5352..e209fbf4ce 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -135,7 +135,7 @@ bool daNpcAsh_c::step(s16 i_angY, bool i_animate) { return mTurnMode > 1; } -static daNpc_GetParam2 l_bckGetParamList[18] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[18] = { {-1, 2, 0}, // {7, 0, 0}, // ash_f_talk_a {12, 0, 1}, // ash_f_talk_b @@ -156,38 +156,38 @@ static daNpc_GetParam2 l_bckGetParamList[18] = { {4, 2, 2}, // ash_bowrun }; -static daNpc_GetParam2 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[1] = { {17, 2, 0}, // ash }; -static daNpc_GetParam2 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[1] = { {14, 2, 0}, // ash }; -static int l_loadRes_ASH0[3] = { +static DUSK_CONSTEXPR int l_loadRes_ASH0[3] = { 0, 1, -1, }; -static int l_loadRes_ASH1[3] = { +static DUSK_CONSTEXPR int l_loadRes_ASH1[3] = { 0, 2, -1, }; -static int* l_loadRes_list[2] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[2] = { l_loadRes_ASH0, l_loadRes_ASH1, }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "Ash", "Ash1", "Ash2", }; -static char* l_evtNames[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[6] = { "", "THE_INTRODUCTION", "RESIST_MEETING", @@ -196,7 +196,7 @@ static char* l_evtNames[6] = { "RESIST_WIRETAP_RAFREL", }; -static char* l_myName = "Ash"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Ash"; daNpcAsh_c::EventFn daNpcAsh_c::mEvtSeqList[6] = { NULL, @@ -1329,13 +1329,13 @@ BOOL daNpcAsh_c::drawDbgInfo() { return false; } -static actor_method_class daNpcAsh_MethodTable = { +static DUSK_CONST actor_method_class daNpcAsh_MethodTable = { (process_method_func)daNpcAsh_Create, (process_method_func)daNpcAsh_Delete, (process_method_func)daNpcAsh_Execute, (process_method_func)daNpcAsh_IsDelete, (process_method_func)daNpcAsh_Draw, }; -actor_process_profile_definition g_profile_NPC_ASH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ASH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 25194fb71e..216f2c10cb 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -49,20 +49,20 @@ const daNpcAshB_HIOParam daNpcAshB_Param_c::m = { static NPC_ASHB_HIO_CLASS l_HIO; -static daNpc_GetParam2 l_bckGetParamList[21] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[21] = { {-1, 2, 0}, {13, 0, 0}, {14, 0, 0}, {11, 0, 0}, {10, 0, 0}, {9, 0, 0}, {12, 0, 0}, {24, 2, 0}, {25, 2, 0}, {24, 2, 0}, {21, 0, 0}, {22, 0, 0}, {20, 0, 0}, {23, 0, 0}, {7, 0, 0}, {8, 0, 0}, {18, 0, 0}, {15, 0, 0}, {16, 0, 0}, {17, 2, 0}, {19, 0, 0}, }; -static daNpc_GetParam2 l_btpGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[4] = { {38, 2, 0}, {41, 0, 0}, {40, 0, 0}, {39, 0, 0}, }; -static daNpc_GetParam2 l_btkGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[4] = { {32, 2, 0}, {34, 0, 0}, {33, 0, 0}, @@ -70,16 +70,16 @@ static daNpc_GetParam2 l_btkGetParamList[4] = { }; -static char* l_arcNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[1] = { "AshB", }; -static char* l_evtNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = { NULL, "ASHB_APPEAR", }; -static char* l_myName = "AshB"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "AshB"; #if DEBUG daNpcAshB_HIO_c::daNpcAshB_HIO_c() { @@ -93,7 +93,7 @@ void daNpcAshB_HIO_c::genMessage(JORMContext* ctext) { } #endif -daNpcAshB_c::EventFn daNpcAshB_c::mEvtSeqList[2] = { +daNpcAshB_c::EventFn DUSK_CONST daNpcAshB_c::mEvtSeqList[2] = { NULL, &daNpcAshB_c::EvCut_Appear, }; @@ -1187,13 +1187,13 @@ BOOL daNpcAshB_c::drawDbgInfo() { return false; } -static actor_method_class daNpcAshB_MethodTable = { +static DUSK_CONST actor_method_class daNpcAshB_MethodTable = { (process_method_func)daNpcAshB_Create, (process_method_func)daNpcAshB_Delete, (process_method_func)daNpcAshB_Execute, (process_method_func)daNpcAshB_IsDelete, (process_method_func)daNpcAshB_Draw, }; -actor_process_profile_definition g_profile_NPC_ASHB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ASHB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index e2d3eedad7..1755c46cfd 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -219,14 +219,14 @@ void daNpc_Bans_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[4][2] = { +static DUSK_CONSTEXPR int l_bmdData[4][2] = { {BMDE_BANS, BANS}, {BMDR_BANS_TW, BANS_TW}, {BMDR_BANS_SCOOP, BANS2}, {BMDR_BANS_TUB, BANS2}, }; -static daNpcT_evtData_c l_evtList[9] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[9] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -238,7 +238,7 @@ static daNpcT_evtData_c l_evtList[9] = { {"GOBACK", 3}, }; -static char* l_resNameList[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[6] = { "", "Bans", "Bans_TW", @@ -247,32 +247,32 @@ static char* l_resNameList[6] = { "Len1", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { BANS, BANS1, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { BANS, BANS2, -1, }; -static s8 l_loadResPtrn2[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[2] = { BANS_TW, -1, }; -static s8 l_loadResPtrn3[4] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[4] = { BANS, BANS1, BANS2, -1, }; -static s8 l_loadResPtrn4[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn4[5] = { BANS, BANS_TW, BANS1, BANS2, -1, }; -static s8* l_loadResPtrnList[6] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[6] = { l_loadResPtrn3, l_loadResPtrn2, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn4, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_BANS, J3DFrameCtrl::EMode_LOOP, BANS, TRUE}, {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, NONE, FALSE}, {BCK_BANS_F_TALK_A, J3DFrameCtrl::EMode_NONE, BANS, BTP_BANS, J3DFrameCtrl::EMode_LOOP, BANS, TRUE}, @@ -280,7 +280,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {BCK_BANS_FH_TALK_B, J3DFrameCtrl::EMode_LOOP, BANS, BTP_BANS, J3DFrameCtrl::EMode_LOOP, BANS, TRUE}, }; -static daNpcT_motionAnmData_c l_motionAnmData[20] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[20] = { {BCK_BANS_WAIT_A, J3DFrameCtrl::EMode_LOOP, BANS, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 1, 0}, {BCK_BANS_WAIT_B, J3DFrameCtrl::EMode_LOOP, BANS1, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 1, 0}, {BCK_BANS_WAIT_C, J3DFrameCtrl::EMode_LOOP, BANS1, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 1, 0}, @@ -303,7 +303,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[20] = { {BCK_BANS_FAINT, J3DFrameCtrl::EMode_LOOP, BANS2, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -311,7 +311,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[84] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[84] = { {0, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, 0, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -335,14 +335,14 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[84] = { {9, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Bans_c::mCutNameList[4] = { +char DUSK_CONST* DUSK_CONST daNpc_Bans_c::mCutNameList[4] = { "", "ANGER", "PURCHASE", "GO_BACK", }; -daNpc_Bans_c::cutFunc daNpc_Bans_c::mCutList[4] = { +daNpc_Bans_c::cutFunc DUSK_CONST daNpc_Bans_c::mCutList[4] = { NULL, &daNpc_Bans_c::cutAnger, &daNpc_Bans_c::cutPurchase, @@ -1852,7 +1852,7 @@ static int daNpc_Bans_IsDelete(void*) { return 1; } -static actor_method_class daNpc_Bans_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Bans_MethodTable = { (process_method_func)daNpc_Bans_Create, (process_method_func)daNpc_Bans_Delete, (process_method_func)daNpc_Bans_Execute, @@ -1860,7 +1860,7 @@ static actor_method_class daNpc_Bans_MethodTable = { (process_method_func)daNpc_Bans_Draw, }; -actor_process_profile_definition g_profile_NPC_BANS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_BANS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index ea52cd896a..b3f5fef623 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -369,7 +369,7 @@ void daNpc_Besu_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[6][2] = { +static DUSK_CONSTEXPR int l_bmdData[6][2] = { {3, 1}, {11, 2}, {37, 5}, @@ -378,7 +378,7 @@ static int l_bmdData[6][2] = { {38, 5}, }; -static daNpcT_evtData_c l_evtList[13] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[13] = { {"", 0}, {"NO_RESPONSE", 0}, {"CONVERSATION_ABOUT_SARU01", 11}, @@ -394,7 +394,7 @@ static daNpcT_evtData_c l_evtList[13] = { {"CONVERSATION_ABOUT_ZORA", 5}, }; -static char* l_resNameList[12] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[12] = { "", "Besu", "Besu_TW", @@ -409,33 +409,33 @@ static char* l_resNameList[12] = { "Sera", }; -static s8 l_loadResPtrn0[4] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = { 1, 3, 4, -1 }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { 3, 2, -1, }; -static s8 l_loadResPtrn2[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = { 3, 5, -1, }; -static s8 l_loadResPtrn3[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[3] = { 3, 6, -1, }; -static s8 l_loadResPtrn4[4] = {3, 4, 6, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn4[4] = {3, 4, 6, -1}; -static s8 l_loadResPtrn5[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn5[3] = { 1, 7, -1, }; -static s8 l_loadResPtrn9[7] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[7] = { 1, 2, 3, 4, 5, 6, -1, }; -static s8* l_loadResPtrnList[19] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[19] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn4, l_loadResPtrn0, l_loadResPtrn3, l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, @@ -443,7 +443,7 @@ static s8* l_loadResPtrnList[19] = { l_loadResPtrn0, l_loadResPtrn5, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_BESU, J3DFrameCtrl::EMode_LOOP, BESU0, 1}, {BCK_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, BTP_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, 0}, {BCK_BESU_F_TALK_B, J3DFrameCtrl::EMode_NONE, BESU1, BTP_BESU_F_TALK_B, J3DFrameCtrl::EMode_NONE, BESU1, 0}, @@ -476,7 +476,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {BCK_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, BTP_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[33] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[33] = { {BCK_BESU_WAIT_A, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, {BCK_BESU_WAIT_B, J3DFrameCtrl::EMode_LOOP, BESU1, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, {BCK_BESU_WAIT_C, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, @@ -512,7 +512,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[33] = { {BCK_BESU_BODY_WAIT, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] = { {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -544,7 +544,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -577,7 +577,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { {9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Besu_c::mCutNameList[15] = { +char DUSK_CONST* DUSK_CONST daNpc_Besu_c::mCutNameList[15] = { "", "CONVERSATION_ABOUT_SARU", "CONVERSATION_ABOUT_PACHINKO", @@ -595,7 +595,7 @@ char* daNpc_Besu_c::mCutNameList[15] = { "THANK_YOU", }; -daNpc_Besu_c::cutFunc daNpc_Besu_c::mCutList[15] = { +daNpc_Besu_c::cutFunc DUSK_CONST daNpc_Besu_c::mCutList[15] = { NULL, &daNpc_Besu_c::cutConversationAboutSaru, &daNpc_Besu_c::cutConversationAboutPachinko, @@ -3060,7 +3060,7 @@ static int daNpc_Besu_IsDelete(void*) { return true; } -static actor_method_class daNpc_Besu_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Besu_MethodTable = { (process_method_func)daNpc_Besu_Create, (process_method_func)daNpc_Besu_Delete, (process_method_func)daNpc_Besu_Execute, @@ -3068,7 +3068,7 @@ static actor_method_class daNpc_Besu_MethodTable = { (process_method_func)daNpc_Besu_Draw, }; -actor_process_profile_definition g_profile_NPC_BESU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_BESU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 1a90f4542d..c2f1e2563d 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_npc_yamid.h" #include "d/actor/d_a_npc_yamit.h" -static daNpc_GetParam2 l_bckGetParamList[9] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[9] = { {11, 2, 0}, {12, 2, 0}, {13, 2, 0}, @@ -23,9 +23,9 @@ static daNpc_GetParam2 l_bckGetParamList[9] = { {7, 0, 0}, }; -static char* l_arcNames[1] = {"Blue_NS"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[1] = {"Blue_NS"}; -static char* l_evtNames[7] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[7] = { NULL, "CHG_YAMI_CHIBI", "CHG_YAMI_DEBU", @@ -35,11 +35,11 @@ static char* l_evtNames[7] = { "CHG_YAMI_NOPPO_STOPPER", }; -static char* l_myName = "Blue_NS"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Blue_NS"; static NPC_BLUE_NS_HIO_CLASS l_HIO; -daNpcBlueNS_c::EventFn daNpcBlueNS_c::mEvtSeqList[] = { +daNpcBlueNS_c::EventFn DUSK_CONST daNpcBlueNS_c::mEvtSeqList[] = { NULL, &daNpcBlueNS_c::_Evt_ChgYami_Chibi, &daNpcBlueNS_c::_Evt_ChgYami_Debu, @@ -1419,7 +1419,7 @@ static int daNpcBlueNS_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcBlueNS_MethodTable = { +static DUSK_CONST actor_method_class daNpcBlueNS_MethodTable = { (process_method_func)daNpcBlueNS_Create, (process_method_func)daNpcBlueNS_Delete, (process_method_func)daNpcBlueNS_Execute, @@ -1427,7 +1427,7 @@ static actor_method_class daNpcBlueNS_MethodTable = { (process_method_func)daNpcBlueNS_Draw, }; -actor_process_profile_definition g_profile_NPC_BLUENS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_BLUENS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 775bfd7c4c..0d4d34b206 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -13,11 +13,11 @@ #include "d/d_meter2_info.h" #include -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {11, 1}, }; -static daNpcT_evtData_c l_evtList[11] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[11] = { {"", 0}, {"NO_RESPONSE", 0}, {"WILDGOAT", 2}, @@ -31,7 +31,7 @@ static daNpcT_evtData_c l_evtList[11] = { {"MEETING_AGAIN_NEAR", 4}, }; -static char* l_resNameList[7] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[7] = { "", "Bou", "Bou1", @@ -41,22 +41,22 @@ static char* l_resNameList[7] = { "Jagar2" }; -static s8 l_loadResPtrn0[4] = {1, 2, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = {1, 2, 4, -1}; -static s8 l_loadResPtrn1[3] = {1, 3, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = {1, 3, -1}; -static s8 l_loadResPtrn2[3] = {1, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = {1, 4, -1}; -static s8 l_loadResPtrn3[3] = {1, 5, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn3[3] = {1, 5, -1}; -static s8 l_loadResPtrn9[5] = {1, 2, 3, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = {1, 2, 3, 4, -1}; -static s8* l_loadResPtrnList[6] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[6] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn2, l_loadResPtrn3, l_loadResPtrn0, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[11] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[11] = { {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 17, 2, 1, 1}, {4, 0, 2, 17, 2, 1, 1}, @@ -70,7 +70,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[11] = { {10, 0, 4, 27, 0, 4, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[23] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[23] = { {8, 2, 1, 14, 0, 1, 1, 0}, {5, 0, 2, 14, 0, 1, 1, 0}, {7, 2, 3, 14, 0, 1, 1, 0}, @@ -96,7 +96,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[23] = { {18, 2, 4, 14, 0, 1, 1, 0} }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[44] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[44] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, 0, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 1}, {8, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -105,7 +105,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[44] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[88] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[88] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, 0, 1}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -119,7 +119,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[88] = { {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Bou_c::mCutNameList[9] = { +char DUSK_CONST* DUSK_CONST daNpc_Bou_c::mCutNameList[9] = { "", "WILDGOAT", "WILDGOAT_SUCCESS", @@ -131,7 +131,7 @@ char* daNpc_Bou_c::mCutNameList[9] = { "MEETING_AGAIN" }; -daNpc_Bou_c::cutFunc daNpc_Bou_c::mCutList[9] = { +daNpc_Bou_c::cutFunc DUSK_CONST daNpc_Bou_c::mCutList[9] = { NULL, &daNpc_Bou_c::cutWildGoat, &daNpc_Bou_c::cutWildGoatSuccess, @@ -185,7 +185,7 @@ void daNpc_Bou_HIO_c::genMessage(JORMContext* ctx) { #endif int daNpc_Bou_c::create() { - static int const heapSize[6] = {15696, 15696, 15696, 15696, 15696, 0}; + static DUSK_CONSTEXPR int const heapSize[6] = {15696, 15696, 15696, 15696, 15696, 0}; daNpcT_ct(this, daNpc_Bou_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList @@ -1665,7 +1665,7 @@ static int daNpc_Bou_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Bou_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Bou_MethodTable = { (process_method_func)daNpc_Bou_Create, (process_method_func)daNpc_Bou_Delete, (process_method_func)daNpc_Bou_Execute, @@ -1673,7 +1673,7 @@ static actor_method_class daNpc_Bou_MethodTable = { (process_method_func)daNpc_Bou_Draw, }; -actor_process_profile_definition g_profile_NPC_BOU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_BOU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 66a1cf02bc..0180b100cc 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -165,7 +165,7 @@ enum Event { /* 0x3 */ EVENT_INTRO_SUMO3, }; -static daNpc_GetParam2 l_bckGetParamList[23] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[23] = { {-1, J3DFrameCtrl::EMode_LOOP, BOU}, {BCK_BOU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BOU}, {BCK_BOU4_F_TALK_A, J3DFrameCtrl::EMode_NONE, BOU4}, @@ -191,7 +191,7 @@ static daNpc_GetParam2 l_bckGetParamList[23] = { {BCK_BOU4_THINKING_B, J3DFrameCtrl::EMode_LOOP, BOU4}, }; -static daNpc_GetParam2 l_btpGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[5] = { {BTP_BOU, J3DFrameCtrl::EMode_LOOP, BOU}, {BTP_BOU4_F_CONSIDER, J3DFrameCtrl::EMode_NONE, BOU4}, {BTP_BOU4_F_CONSIDERING, J3DFrameCtrl::EMode_LOOP, BOU4}, @@ -199,25 +199,25 @@ static daNpc_GetParam2 l_btpGetParamList[5] = { {BTP_BOU4_FH_TALK_B, J3DFrameCtrl::EMode_LOOP, BOU4}, }; -static daNpc_GetParam2 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[1] = { {BTK_BOU, J3DFrameCtrl::EMode_LOOP, BOU}, }; -static char* l_arcNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[2] = { "Bou", "Bou4", }; -static char* l_evtNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = { NULL, "BOUS_INTRO_SUMO1", "BOUS_INTRO_SUMO2", "BOUS_INTRO_SUMO3", }; -static char* l_myName = "BouS"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "BouS"; -static cXyz l_createPos(1000000000.0f, 1000000000.0f, 1000000000.0f); +static DUSK_CONSTEXPR cXyz l_createPos(1000000000.0f, 1000000000.0f, 1000000000.0f); static NPC_BOUS_HIO_CLASS l_HIO; @@ -1616,7 +1616,7 @@ inline void daNpcBouS_c::drawOtherMdls() {} AUDIO_INSTANCES; -static actor_method_class daNpcBouS_MethodTable = { +static DUSK_CONST actor_method_class daNpcBouS_MethodTable = { (process_method_func)daNpcBouS_Create, (process_method_func)daNpcBouS_Delete, (process_method_func)daNpcBouS_Execute, @@ -1624,7 +1624,7 @@ static actor_method_class daNpcBouS_MethodTable = { (process_method_func)daNpcBouS_Draw, }; -actor_process_profile_definition g_profile_NPC_BOU_S = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_BOU_S = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 3b008b73e7..29f5021fae 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -15,128 +15,128 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { return 1; } -static char* const l_resMANa[6] = { +static DUSK_CONST char* const l_resMANa[6] = { "MAN_a_L", "MAN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMADa[6] = { +static DUSK_CONST char* const l_resMADa[6] = { "MAD_a_L", "MAD_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMCNa[6] = { +static DUSK_CONST char* const l_resMCNa[6] = { "MCN_a_L", "MCN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMONa[6] = { +static DUSK_CONST char* const l_resMONa[6] = { "MON_a_L", "MON_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMANb[6] = { +static DUSK_CONST char* const l_resMANb[6] = { "MAN_b_L", "MAN_b_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMANc[6] = { +static DUSK_CONST char* const l_resMANc[6] = { "MAN_c_L", "MAN_c_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMASa[6] = { +static DUSK_CONST char* const l_resMASa[6] = { "MAS_a_L", "MAS_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMBNa[6] = { +static DUSK_CONST char* const l_resMBNa[6] = { "MBN_a_L", "MBN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMANa2[6] = { +static DUSK_CONST char* const l_resMANa2[6] = { "MAN_a2_L", "MAN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMADa2[6] = { +static DUSK_CONST char* const l_resMADa2[6] = { "MAD_a2_L", "MAD_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMCNa2[6] = { +static DUSK_CONST char* const l_resMCNa2[6] = { "MCN_a2_L", "MCN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMONa2[6] = { +static DUSK_CONST char* const l_resMONa2[6] = { "MON_a2_L", "MON_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMANb2[6] = { +static DUSK_CONST char* const l_resMANb2[6] = { "MAN_b2_L", "MAN_b2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMANc2[6] = { +static DUSK_CONST char* const l_resMANc2[6] = { "MAN_c2_L", "MAN_c2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMASa2[6] = { +static DUSK_CONST char* const l_resMASa2[6] = { "MAS_a2_L", "MAS_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resMBNa2[6] = { +static DUSK_CONST char* const l_resMBNa2[6] = { "MBN_a2_L", "MBN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW", }; -static char* const l_resWANa[6] = { +static DUSK_CONST char* const l_resWANa[6] = { "WAN_a_L", "WAN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWADa[6] = { +static DUSK_CONST char* const l_resWADa[6] = { "WAD_a_L", "WAD_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resMATa[6] = { +static DUSK_CONST char* const l_resMATa[6] = { "MAT_a_L", "MAT_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWCNa[6] = { +static DUSK_CONST char* const l_resWCNa[6] = { "WCN_a_L", "WCN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWONa[6] = { +static DUSK_CONST char* const l_resWONa[6] = { "WON_a_L", "WON_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWGNa[6] = { +static DUSK_CONST char* const l_resWGNa[6] = { "WGN_a_L", "WGN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWANb[6] = { +static DUSK_CONST char* const l_resWANb[6] = { "WAN_b_L", "WAN_b_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWANa2[6] = { +static DUSK_CONST char* const l_resWANa2[6] = { "WAN_a2_L", "WAN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWADa2[6] = { +static DUSK_CONST char* const l_resWADa2[6] = { "WAD_a2_L", "WAD_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resMATa2[6] = { +static DUSK_CONST char* const l_resMATa2[6] = { "MAT_a2_L", "MAT_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWCNa2[6] = { +static DUSK_CONST char* const l_resWCNa2[6] = { "WCN_a2_L", "WCN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWONa2[6] = { +static DUSK_CONST char* const l_resWONa2[6] = { "WON_a2_L", "WON_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWGNa2[6] = { +static DUSK_CONST char* const l_resWGNa2[6] = { "WGN_a2_L", "WGN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; -static char* const l_resWANb2[6] = { +static DUSK_CONST char* const l_resWANb2[6] = { "WAN_b2_L", "WAN_b2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW", }; struct anmTblPrm { - char* arc_name; + DUSK_CONST char* arc_name; int resource_index; }; @@ -317,7 +317,7 @@ J3DAnmTransform* daNpcCd_c::getAnmP(int param_1, int param_2) { return (J3DAnmTransform*)dComIfG_getObjectRes(anmTbl.arc_name, anmTbl.resource_index); } -static char* const* l_resNameTbl[30] = { +static DUSK_CONST char* const* l_resNameTbl[30] = { l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index cf3f07ef10..87e5258901 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -14,128 +14,128 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { return 1; } -static char* const l_resMANa[6] = { +static DUSK_CONST char* const l_resMANa[6] = { "MAN_a", "MAN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMADa[6] = { +static DUSK_CONST char* const l_resMADa[6] = { "MAD_a", "MAD_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMCNa[6] = { +static DUSK_CONST char* const l_resMCNa[6] = { "MCN_a", "MCN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMONa[6] = { +static DUSK_CONST char* const l_resMONa[6] = { "MON_a", "MON_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMANb[6] = { +static DUSK_CONST char* const l_resMANb[6] = { "MAN_b", "MAN_b_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMANc[6] = { +static DUSK_CONST char* const l_resMANc[6] = { "MAN_c", "MAN_c_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMASa[6] = { +static DUSK_CONST char* const l_resMASa[6] = { "MAS_a", "MAS_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMBNa[6] = { +static DUSK_CONST char* const l_resMBNa[6] = { "MBN_a", "MBN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMANa2[6] = { +static DUSK_CONST char* const l_resMANa2[6] = { "MAN_a2", "MAN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMADa2[6] = { +static DUSK_CONST char* const l_resMADa2[6] = { "MAD_a2", "MAD_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMCNa2[6] = { +static DUSK_CONST char* const l_resMCNa2[6] = { "MCN_a2", "MCN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMONa2[6] = { +static DUSK_CONST char* const l_resMONa2[6] = { "MON_a2", "MON_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMANb2[6] = { +static DUSK_CONST char* const l_resMANb2[6] = { "MAN_b2", "MAN_b2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMANc2[6] = { +static DUSK_CONST char* const l_resMANc2[6] = { "MAN_c2", "MAN_c2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMASa2[6] = { +static DUSK_CONST char* const l_resMASa2[6] = { "MAS_a2", "MAS_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resMBNa2[6] = { +static DUSK_CONST char* const l_resMBNa2[6] = { "MBN_a2", "MBN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW", }; -static char* const l_resWANa[6] = { +static DUSK_CONST char* const l_resWANa[6] = { "WAN_a", "WAN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWADa[6] = { +static DUSK_CONST char* const l_resWADa[6] = { "WAD_a", "WAD_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resMATa[6] = { +static DUSK_CONST char* const l_resMATa[6] = { "MAT_a", "MAT_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWCNa[6] = { +static DUSK_CONST char* const l_resWCNa[6] = { "WCN_a", "WCN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWONa[6] = { +static DUSK_CONST char* const l_resWONa[6] = { "WON_a", "WON_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWGNa[6] = { +static DUSK_CONST char* const l_resWGNa[6] = { "WGN_a", "WGN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWANb[6] = { +static DUSK_CONST char* const l_resWANb[6] = { "WAN_b", "WAN_b_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWANa2[6] = { +static DUSK_CONST char* const l_resWANa2[6] = { "WAN_a2", "WAN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWADa2[6] = { +static DUSK_CONST char* const l_resWADa2[6] = { "WAD_a2", "WAD_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resMATa2[6] = { +static DUSK_CONST char* const l_resMATa2[6] = { "MAT_a2", "MAT_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWCNa2[6] = { +static DUSK_CONST char* const l_resWCNa2[6] = { "WCN_a2", "WCN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWONa2[6] = { +static DUSK_CONST char* const l_resWONa2[6] = { "WON_a2", "WON_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWGNa2[6] = { +static DUSK_CONST char* const l_resWGNa2[6] = { "WGN_a2", "WGN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -static char* const l_resWANb2[6] = { +static DUSK_CONST char* const l_resWANb2[6] = { "WAN_b2", "WAN_b2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; struct anmTblPrm { - char* name; + DUSK_CONST char* name; int index; }; @@ -195,7 +195,7 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = { } }; -static char* const* l_resNameTbl[30] = { +static DUSK_CONST char* const* l_resNameTbl[30] = { l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 8d63fa1347..e1767b1e50 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -1747,7 +1747,7 @@ static int daNpcCdn3_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcCdn3_METHODS = { +static DUSK_CONST actor_method_class daNpcCdn3_METHODS = { (process_method_func)daNpcCdn3_Create, (process_method_func)daNpcCdn3_Delete, (process_method_func)daNpcCdn3_Execute, @@ -1755,7 +1755,7 @@ static actor_method_class daNpcCdn3_METHODS = { (process_method_func)daNpcCdn3_Draw, }; -actor_process_profile_definition g_profile_NPC_CD3 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_CD3 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 39ebb0313c..d39f139281 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -795,7 +795,7 @@ enum Type { /* 0x1D */ MdlWANb2_e, }; -static char* const l_resMANa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMANa[6] = { "MAN_a", "MAN_a_TW", "Mgeneral", @@ -804,7 +804,7 @@ static char* const l_resMANa[6] = { "objectTW", }; -static char* const l_resMADa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMADa[6] = { "MAD_a", "MAD_a_TW", "Mgeneral", @@ -813,7 +813,7 @@ static char* const l_resMADa[6] = { "objectTW", }; -static char* const l_resMCNa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMCNa[6] = { "MCN_a", "MCN_a_TW", "Mgeneral", @@ -822,7 +822,7 @@ static char* const l_resMCNa[6] = { "objectTW", }; -static char* const l_resMONa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMONa[6] = { "MON_a", "MON_a_TW", "Mgeneral", @@ -831,7 +831,7 @@ static char* const l_resMONa[6] = { "objectTW", }; -static char* const l_resMANb[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMANb[6] = { "MAN_b", "MAN_b_TW", "Mgeneral", @@ -840,7 +840,7 @@ static char* const l_resMANb[6] = { "objectTW", }; -static char* const l_resMANc[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMANc[6] = { "MAN_c", "MAN_c_TW", "Mgeneral", @@ -849,7 +849,7 @@ static char* const l_resMANc[6] = { "objectTW", }; -static char* const l_resMASa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMASa[6] = { "MAS_a", "MAS_a_TW", "Mgeneral", @@ -858,7 +858,7 @@ static char* const l_resMASa[6] = { "objectTW", }; -static char* const l_resMBNa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMBNa[6] = { "MBN_a", "MBN_a_TW", "Mgeneral", @@ -867,7 +867,7 @@ static char* const l_resMBNa[6] = { "objectTW", }; -static char* const l_resMANa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMANa2[6] = { "MAN_a2", "MAN_a2_TW", "Mgeneral", @@ -876,7 +876,7 @@ static char* const l_resMANa2[6] = { "objectTW", }; -static char* const l_resMADa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMADa2[6] = { "MAD_a2", "MAD_a2_TW", "Mgeneral", @@ -885,7 +885,7 @@ static char* const l_resMADa2[6] = { "objectTW", }; -static char* const l_resMCNa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMCNa2[6] = { "MCN_a2", "MCN_a2_TW", "Mgeneral", @@ -894,7 +894,7 @@ static char* const l_resMCNa2[6] = { "objectTW", }; -static char* const l_resMONa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMONa2[6] = { "MON_a2", "MON_a2_TW", "Mgeneral", @@ -903,7 +903,7 @@ static char* const l_resMONa2[6] = { "objectTW", }; -static char* const l_resMANb2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMANb2[6] = { "MAN_b2", "MAN_b2_TW", "Mgeneral", @@ -912,7 +912,7 @@ static char* const l_resMANb2[6] = { "objectTW", }; -static char* const l_resMANc2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMANc2[6] = { "MAN_c2", "MAN_c2_TW", "Mgeneral", @@ -921,7 +921,7 @@ static char* const l_resMANc2[6] = { "objectTW", }; -static char* const l_resMASa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMASa2[6] = { "MAS_a2", "MAS_a2_TW", "Mgeneral", @@ -930,7 +930,7 @@ static char* const l_resMASa2[6] = { "objectTW", }; -static char* const l_resMBNa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMBNa2[6] = { "MBN_a2", "MBN_a2_TW", "Mgeneral", @@ -939,7 +939,7 @@ static char* const l_resMBNa2[6] = { "objectTW", }; -static char* const l_resWANa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWANa[6] = { "WAN_a", "WAN_a_TW", "Wgeneral", @@ -948,7 +948,7 @@ static char* const l_resWANa[6] = { "objectTW", }; -static char* const l_resWADa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWADa[6] = { "WAD_a", "WAD_a_TW", "Wgeneral", @@ -957,7 +957,7 @@ static char* const l_resWADa[6] = { "objectTW", }; -static char* const l_resMATa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMATa[6] = { "MAT_a", "MAT_a_TW", "Wgeneral", @@ -966,7 +966,7 @@ static char* const l_resMATa[6] = { "objectTW", }; -static char* const l_resWCNa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWCNa[6] = { "WCN_a", "WCN_a_TW", "Wgeneral", @@ -975,7 +975,7 @@ static char* const l_resWCNa[6] = { "objectTW", }; -static char* const l_resWONa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWONa[6] = { "WON_a", "WON_a_TW", "Wgeneral", @@ -984,7 +984,7 @@ static char* const l_resWONa[6] = { "objectTW", }; -static char* const l_resWGNa[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWGNa[6] = { "WGN_a", "WGN_a_TW", "Wgeneral", @@ -993,7 +993,7 @@ static char* const l_resWGNa[6] = { "objectTW", }; -static char* const l_resWANb[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWANb[6] = { "WAN_b", "WAN_b_TW", "Wgeneral", @@ -1002,7 +1002,7 @@ static char* const l_resWANb[6] = { "objectTW", }; -static char* const l_resWANa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWANa2[6] = { "WAN_a2", "WAN_a2_TW", "Wgeneral", @@ -1011,7 +1011,7 @@ static char* const l_resWANa2[6] = { "objectTW", }; -static char* const l_resWADa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWADa2[6] = { "WAD_a2", "WAD_a2_TW", "Wgeneral", @@ -1020,7 +1020,7 @@ static char* const l_resWADa2[6] = { "objectTW", }; -static char* const l_resMATa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resMATa2[6] = { "MAT_a2", "MAT_a2_TW", "Wgeneral", @@ -1029,7 +1029,7 @@ static char* const l_resMATa2[6] = { "objectTW", }; -static char* const l_resWCNa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWCNa2[6] = { "WCN_a2", "WCN_a2_TW", "Wgeneral", @@ -1038,7 +1038,7 @@ static char* const l_resWCNa2[6] = { "objectTW", }; -static char* const l_resWONa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWONa2[6] = { "WON_a2", "WON_a2_TW", "Wgeneral", @@ -1047,7 +1047,7 @@ static char* const l_resWONa2[6] = { "objectTW", }; -static char* const l_resWGNa2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWGNa2[6] = { "WGN_a2", "WGN_a2_TW", "Wgeneral", @@ -1056,7 +1056,7 @@ static char* const l_resWGNa2[6] = { "objectTW", }; -static char* const l_resWANb2[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* const l_resWANb2[6] = { "WAN_b2", "WAN_b2_TW", "Wgeneral", @@ -1065,7 +1065,7 @@ static char* const l_resWANb2[6] = { "objectTW", }; -static char* const* l_resNameTbl[30] = { +static DUSK_CONSTEXPR char DUSK_CONST* const* l_resNameTbl[30] = { l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, @@ -1077,11 +1077,11 @@ static char* const* l_resNameTbl[30] = { }; struct anmTblPrm { - char* arc_name; + DUSK_CONST char* arc_name; int resource_index; }; - static anmTblPrm l_bmdTbl[30] = { + static DUSK_CONSTEXPR anmTblPrm l_bmdTbl[30] = { l_resMANa[0], BMDR_MAN_A, l_resMADa[0], BMDR_MAD_A, l_resMCNa[0], BMDR_MCN_A, @@ -1114,7 +1114,7 @@ struct anmTblPrm { l_resWANb2[0], BMDR_WAN_B2, }; -static anmTblPrm l_bmdTWTbl[30] = { +static DUSK_CONSTEXPR anmTblPrm l_bmdTWTbl[30] = { l_resMANa[1], BMDR_MAN_A_TW, l_resMADa[1], BMDR_MAD_A_TW, l_resMCNa[1], BMDR_MCN_A_TW, @@ -1147,7 +1147,7 @@ static anmTblPrm l_bmdTWTbl[30] = { l_resWANb2[1], BMDR_WAN_B2_TW, }; -static anmTblPrm l_btpTbl[30] = { +static DUSK_CONSTEXPR anmTblPrm l_btpTbl[30] = { l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], BTP_MCN_A, @@ -1180,7 +1180,7 @@ static anmTblPrm l_btpTbl[30] = { l_resWANb2[0], BTP_WAN_B2, }; -static anmTblPrm l_btpTWTbl[30] = { +static DUSK_CONSTEXPR anmTblPrm l_btpTWTbl[30] = { l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], BTP_MCN_A_TW, @@ -1213,7 +1213,7 @@ static anmTblPrm l_btpTWTbl[30] = { l_resWANb2[1], BTP_WAN_B2_TW, }; -static anmTblPrm l_bckTbl_M[54] = { +static DUSK_CONSTEXPR anmTblPrm l_bckTbl_M[54] = { {"Mgeneral", BCK_M_WAIT_A}, {"Mgeneral", BCK_M_WAIT_B}, {"Mgeneral", BCK_M_WALK_A}, @@ -1270,7 +1270,7 @@ static anmTblPrm l_bckTbl_M[54] = { {"Mgeneral", BCK_M_SING}, }; -static anmTblPrm l_bckTbl_W[54] = { +static DUSK_CONSTEXPR anmTblPrm l_bckTbl_W[54] = { {"Wgeneral", BCK_W_WAIT_A}, {"Wgeneral", BCK_W_WAIT_B}, {"Wgeneral", BCK_W_WALK_A}, @@ -1342,7 +1342,7 @@ struct jntTblWPrm { /* 0x0 */ jnt jntPrm[21]; }; -static jntTblMPrm a_jntTbl_M[16] = { +static DUSK_CONSTEXPR jntTblMPrm a_jntTbl_M[16] = { { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1712,7 +1712,7 @@ struct prmTbl { /* 0x3C */ f32 field_0x3c; }; -static prmTbl a_prmTbl_M[16] = { +static DUSK_CONSTEXPR prmTbl a_prmTbl_M[16] = { -852593.0f, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 1.0f, 0xC8, 0x00, 0x00, 1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 30.0f, 50.1f, 35.0f, @@ -1778,7 +1778,7 @@ static prmTbl a_prmTbl_M[16] = { 1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 30.0f, 50.1f, 35.0f, }; -static jntTblWPrm a_jntTbl_W[14] = { +static DUSK_CONSTEXPR jntTblWPrm a_jntTbl_W[14] = { { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2116,7 +2116,7 @@ static jntTblWPrm a_jntTbl_W[14] = { }, }; -static prmTbl a_prmTbl_W[14] = { +static DUSK_CONSTEXPR prmTbl a_prmTbl_W[14] = { -852593.0f, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 1.0f, 0xC8, 0x00, 0x00, 1.4f, 1.5f, 10.0f, 4.0f, 180.0f, 30.0f, 50.1f, 35.0f, @@ -2174,19 +2174,19 @@ static prmTbl a_prmTbl_W[14] = { 1.5f, 1.6f, 10.0f, 4.4f, 180.0f, 30.0f, 50.1f, 35.0f, }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL, }; -static char* l_myName = "Chat"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Chat"; static NPC_CHAT_HIO_CLASS l_HIO; -daNpcChat_c::eventFunc daNpcChat_c::mEvtSeqList[1] = { +daNpcChat_c::eventFunc DUSK_CONST daNpcChat_c::mEvtSeqList[1] = { NULL, }; -static anmTblPrm const l_objTbl[13] = { +static DUSK_CONSTEXPR anmTblPrm const l_objTbl[13] = { {"object", BMDR_B_TUBO}, {"object", BMDR_B_TUBO}, {"object", BMDR_B_SPEAR}, @@ -2202,7 +2202,7 @@ static anmTblPrm const l_objTbl[13] = { {"object", BMDR_MARO_BAG_W}, }; -static anmTblPrm const l_objTWTbl[13] = { +static DUSK_CONSTEXPR anmTblPrm const l_objTWTbl[13] = { {"objectTW", BMDR_B_TUBO_TW}, {"objectTW", BMDR_B_TUBO_TW}, {"objectTW", BMDR_B_SPEAR_TW}, @@ -3448,7 +3448,7 @@ void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) { } int resIdx; - char* arcName; + DUSK_CONST char* arcName; if (isM_()) { arcName = l_bckTbl_M[index].arc_name; resIdx = l_bckTbl_M[index].resource_index; @@ -4135,7 +4135,7 @@ static int daNpcChat_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpcChat_MethodTable = { +static DUSK_CONST actor_method_class daNpcChat_MethodTable = { (process_method_func)daNpcChat_Create, (process_method_func)daNpcChat_Delete, (process_method_func)daNpcChat_Execute, @@ -4143,7 +4143,7 @@ static actor_method_class daNpcChat_MethodTable = { (process_method_func)daNpcChat_Draw, }; -actor_process_profile_definition g_profile_NPC_CHAT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_CHAT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index bd1a4731d4..463efb8c9d 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -37,7 +37,7 @@ daNpcChin_HIOParam const daNpcChin_Param_c::m = { FALSE, FALSE, }; -static daNpc_GetParam2 l_bckGetParamList[33] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[33] = { {-1, 2, 0}, {8, 0, 0}, {7, 0, 0}, @@ -73,7 +73,7 @@ static daNpc_GetParam2 l_bckGetParamList[33] = { {29, 2, 1}, }; -static daNpc_GetParam2 l_btpGetParamList[15] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[15] = { {18, 2, 0}, {20, 0, 0}, {19, 0, 0}, @@ -91,7 +91,7 @@ static daNpc_GetParam2 l_btpGetParamList[15] = { {50, 2, 1}, }; -static daNpc_GetParam2 l_btkGetParamList[9] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[9] = { {13, 2, 0}, {14, 0, 0}, {15, 2, 0}, @@ -103,7 +103,7 @@ static daNpc_GetParam2 l_btkGetParamList[9] = { {7, 2, 5}, }; -static char* l_arcNames[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[6] = { "Chin", "chin1", "chin_mdl", @@ -117,7 +117,7 @@ static s16* sLoadResInfo[2] = { (s16*)sLoadResPat_Tw, }; -static char* l_evtNames[8] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[8] = { NULL, "GAME_START", "GAME_FAILED", @@ -143,7 +143,7 @@ daNpcChin_c::eventFunc daNpcChin_c::mEvtSeqList[8] = { static NPC_CHIN_HIO_CLASS l_HIO; -static char* l_myName = "chin"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "chin"; #if DEBUG daNpcChin_HIO_c::daNpcChin_HIO_c() { @@ -2114,7 +2114,7 @@ static int daNpcChin_IsDelete(void* param_0) { return TRUE; } -static actor_method_class daNpcChin_MethodTable = { +static DUSK_CONST actor_method_class daNpcChin_MethodTable = { (process_method_func)daNpcChin_Create, (process_method_func)daNpcChin_Delete, (process_method_func)daNpcChin_Execute, @@ -2122,7 +2122,7 @@ static actor_method_class daNpcChin_MethodTable = { (process_method_func)daNpcChin_Draw, }; -actor_process_profile_definition g_profile_NPC_CHIN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_CHIN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index b127f591c4..3232afc7f7 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -69,55 +69,55 @@ void daNpc_clerkA_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {19, 1}, }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "clerkA", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {-1, 0, 0, 25, 2, 1, 1}, {6, 0, 1, 26, 0, 1, 0}, {7, 0, 1, 27, 0, 1, 0}, {8, 0, 1, 28, 0, 1, 0}, {9, 2, 1, 29, 2, 1, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[7] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[7] = { {15, 2, 1, 22, 0, 1, 1, 0}, {16, 2, 1, 22, 0, 1, 1, 0}, {10, 0, 1, 22, 0, 1, 1, 0}, {11, 0, 1, 22, 0, 1, 1, 0}, {12, 0, 1, 22, 0, 1, 1, 0}, {13, 0, 1, 22, 0, 1, 1, 0}, {14, 0, 1, 22, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[28] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[28] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -9, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_clerkA_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_clerkA_c::mCutNameList[1] = {""}; -daNpc_clerkA_c::cutFunc daNpc_clerkA_c::mCutList[1] = {NULL}; +daNpc_clerkA_c::cutFunc DUSK_CONST daNpc_clerkA_c::mCutList[1] = {NULL}; daNpc_clerkA_c::~daNpc_clerkA_c() { deleteObject(); @@ -783,13 +783,13 @@ static int daNpc_clerkA_IsDelete(void* i_this) { static NPC_CLERKA_HIO_CLASS l_HIO; -static actor_method_class daNpc_clerkA_MethodTable = { +static DUSK_CONST actor_method_class daNpc_clerkA_MethodTable = { (process_method_func)daNpc_clerkA_Create, (process_method_func)daNpc_clerkA_Delete, (process_method_func)daNpc_clerkA_Execute, (process_method_func)daNpc_clerkA_IsDelete, (process_method_func)daNpc_clerkA_Draw, }; -actor_process_profile_definition g_profile_NPC_CLERKA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_CLERKA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 8b3f89aba6..fdf4ec9ace 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -70,41 +70,41 @@ void daNpc_clerkB_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {26, 1}, }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "clerkB", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = { {-1, 0, 0, 35, 2, 1, 1}, {12, 0, 1, 40, 0, 1, 0}, {8, 0, 1, 36, 0, 1, 0}, {10, 0, 1, 38, 0, 1, 0}, {11, 0, 1, 39, 0, 1, 0}, {9, 0, 1, 37, 0, 1, 0}, {14, 2, 1, 42, 2, 1, 0}, {15, 2, 1, 43, 2, 1, 0}, {13, 2, 1, 35, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[9] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[9] = { {23, 2, 1, 32, 0, 1, 1, 0}, {22, 2, 1, 32, 0, 1, 1, 0}, {20, 2, 1, 32, 0, 1, 1, 0}, {7, 0, 1, 32, 0, 1, 1, 0}, {21, 0, 1, 32, 0, 1, 1, 0}, {17, 2, 1, 32, 0, 1, 1, 0}, {16, 2, 1, 32, 0, 1, 1, 0}, {19, 0, 1, 32, 0, 1, 1, 0}, {18, 0, 1, 32, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {8, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -112,7 +112,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {0, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, 0, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -120,9 +120,9 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {8, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_clerkB_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_clerkB_c::mCutNameList[1] = {""}; -daNpc_clerkB_c::cutFunc daNpc_clerkB_c::mCutList[1] = {NULL}; +daNpc_clerkB_c::cutFunc DUSK_CONST daNpc_clerkB_c::mCutList[1] = {NULL}; daNpc_clerkB_c::~daNpc_clerkB_c() { deleteObject(); @@ -935,13 +935,13 @@ static int daNpc_clerkB_IsDelete(void* i_this) { static NPC_CLERKB_HIO_CLASS l_HIO; -static actor_method_class daNpc_clerkB_MethodTable = { +static DUSK_CONST actor_method_class daNpc_clerkB_MethodTable = { (process_method_func)daNpc_clerkB_Create, (process_method_func)daNpc_clerkB_Delete, (process_method_func)daNpc_clerkB_Execute, (process_method_func)daNpc_clerkB_IsDelete, (process_method_func)daNpc_clerkB_Draw, }; -actor_process_profile_definition g_profile_NPC_CLERKB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_CLERKB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index b15322a6e2..4d8d90aa29 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -67,50 +67,50 @@ void daNpcClerkt_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {12, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"DEFAULT_GETITEM", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Tkj", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, 0, 0, 18, 2, 1, 1}, {6, 0, 1, 18, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {9, 2, 1, 15, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpcClerkT_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpcClerkT_c::mCutNameList[1] = {""}; -daNpcClerkT_c::cutFunc daNpcClerkT_c::mCutList[1] = {NULL}; +daNpcClerkT_c::cutFunc DUSK_CONST daNpcClerkT_c::mCutList[1] = {NULL}; daNpcClerkT_c::~daNpcClerkT_c() { deleteObject(); @@ -696,13 +696,13 @@ void daNpcClerkT_c::setCollision() { static NPC_CLERKT_HIO_CLASS l_HIO; -static actor_method_class daNpcClerkt_MethodTable = { +static DUSK_CONST actor_method_class daNpcClerkt_MethodTable = { (process_method_func)daNpcClerkt_Create, (process_method_func)daNpcClerkt_Delete, (process_method_func)daNpcClerkt_Execute, (process_method_func)daNpcClerkt_IsDelete, (process_method_func)daNpcClerkt_Draw, }; -actor_process_profile_definition g_profile_NPC_CLERKT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_CLERKT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 51a5019088..30bab6e34b 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -423,7 +423,7 @@ static void* s_sub(void* i_actor, void* i_data) { } void daNpcCoach_c::initCollision() { - static dCcD_SrcCyl const ccCylSrc = { + static DUSK_CONSTEXPR dCcD_SrcCyl const ccCylSrc = { { {0, {{0, 0, 0}, {0x2420, 0x11}, 0x79}}, {dCcD_SE_NONE, 0, 0, 0, 0}, @@ -437,7 +437,7 @@ void daNpcCoach_c::initCollision() { } }; - static dCcD_SrcSph const ccSphSrc = { + static DUSK_CONSTEXPR dCcD_SrcSph const ccSphSrc = { { {0, {{0, 0, 0}, {0x10000, 0x11}, 0}}, {dCcD_SE_NONE, 0, 0, 0, 0}, @@ -570,9 +570,9 @@ static int createSolidHeap(fopAc_ac_c* a_this) { return i_this->createHeap(); } -static char* l_arcName = "Coach"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Coach"; -static struct { +static DUSK_CONSTEXPR struct { int field_0x0; f32 field_0x4; f32 field_0x8; @@ -2166,7 +2166,7 @@ void daNpcCoach_c::initCoachBlazing() { daNpcCoach_c::daNpcCoach_c() {} -static actor_method_class l_daNpcCoach_Method = { +static DUSK_CONST actor_method_class l_daNpcCoach_Method = { (process_method_func)daNpcCoach_Create, (process_method_func)daNpcCoach_Delete, (process_method_func)daNpcCoach_Execute, @@ -2174,7 +2174,7 @@ static actor_method_class l_daNpcCoach_Method = { (process_method_func)daNpcCoach_Draw, }; -actor_process_profile_definition g_profile_NPC_COACH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_COACH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 545cb04ff1..dc3d44eaef 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -413,7 +413,7 @@ static cPhs_Step daNpc_Df_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daNpc_Df_Method = { +static DUSK_CONST actor_method_class l_daNpc_Df_Method = { (process_method_func)daNpc_Df_Create, (process_method_func)daNpc_Df_Delete, (process_method_func)daNpc_Df_Execute, @@ -421,7 +421,7 @@ static actor_method_class l_daNpc_Df_Method = { (process_method_func)daNpc_Df_Draw, }; -actor_process_profile_definition g_profile_NPC_DF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_DF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index c752b5f4c5..cd05d05835 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -9,34 +9,34 @@ #include "Z2AudioLib/Z2Instances.h" #include -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {14, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Doc", "Doc1", }; -static s8 l_loadResPtrn0[] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[] = { 1, 2, -1, }; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, 0, 0, 20, 2, 1, 1}, {6, 0, 1, 20, 2, 1, 1}, {9, 0, 2, 34, 0, 2, 0}, @@ -49,7 +49,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {8, 2, 2, 20, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[14] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[14] = { {11, 2, 1, 17, 0, 1, 1, 0}, {8, 0, 1, 17, 0, 1, 1, 0}, {7, 0, 1, 17, 0, 1, 1, 0}, @@ -66,7 +66,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[14] = { {6, 2, 2, 25, 2, 2, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -74,7 +74,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 1}, {10, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -84,9 +84,9 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = { {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Doc_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_Doc_c::mCutNameList[1] = {""}; -daNpc_Doc_c::cutFunc daNpc_Doc_c::mCutList[1] = { +daNpc_Doc_c::cutFunc DUSK_CONST daNpc_Doc_c::mCutList[1] = { NULL, }; @@ -865,7 +865,7 @@ static int daNpc_Doc_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Doc_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Doc_MethodTable = { (process_method_func)daNpc_Doc_Create, (process_method_func)daNpc_Doc_Delete, (process_method_func)daNpc_Doc_Execute, @@ -873,7 +873,7 @@ static actor_method_class daNpc_Doc_MethodTable = { (process_method_func)daNpc_Doc_Draw, }; -actor_process_profile_definition g_profile_NPC_DOC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_DOC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index 17ba417cd5..4203faa054 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -93,7 +93,7 @@ enum Motion { /* 0xB */ MOT_SIT_TO_WOLF_A, }; -static daNpc_GetParam2 l_bckGetParamList[6] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[6] = { {BCK_M_WAIT_A, J3DFrameCtrl::EMode_LOOP, MGENERAL}, {BCK_M_TALK_A, J3DFrameCtrl::EMode_LOOP, MGENERAL}, {BCK_M_TALK_B, J3DFrameCtrl::EMode_LOOP, MGENERAL}, @@ -102,22 +102,22 @@ static daNpc_GetParam2 l_bckGetParamList[6] = { {BCK_M_SIT_TO_WOLF_A, J3DFrameCtrl::EMode_LOOP, MGENERAL}, }; -static daNpc_GetParam2 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[1] = { {BTP_DOORBOY, J3DFrameCtrl::EMode_LOOP, DOORBOY}, }; -static char* l_arcNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[2] = { "DoorBoy", "Mgeneral", }; -static char* l_evtNames[1] = {NULL}; +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {NULL}; -static char* l_myName = "DoorBoy"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "DoorBoy"; static NPC_DOORBOY_HIO_CLASS l_HIO; -daNpcDoorBoy_c::EventFn daNpcDoorBoy_c::mEvtSeqList[1] = { +daNpcDoorBoy_c::EventFn DUSK_CONST daNpcDoorBoy_c::mEvtSeqList[1] = { NULL }; @@ -877,7 +877,7 @@ BOOL daNpcDoorBoy_c::drawDbgInfo() { return FALSE; } -static actor_method_class daNpcDoorBoy_MethodTable = { +static DUSK_CONST actor_method_class daNpcDoorBoy_MethodTable = { (process_method_func)daNpcDoorBoy_Create, (process_method_func)daNpcDoorBoy_Delete, (process_method_func)daNpcDoorBoy_Execute, @@ -885,7 +885,7 @@ static actor_method_class daNpcDoorBoy_MethodTable = { (process_method_func)daNpcDoorBoy_Draw, }; -actor_process_profile_definition g_profile_NPC_DOORBOY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_DOORBOY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index 84fe3c9ca1..9e1cb1d277 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -8,17 +8,17 @@ #include "d/actor/d_a_npc_drainSol.h" #include "d/actor/d_a_npc.h" -static int l_bmdGetParamList[] = { +static DUSK_CONSTEXPR int l_bmdGetParamList[] = { 9, 7 }; -static daNpc_GetParam3 l_bckGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_bckGetParamList[] = { {5, 2}, {4, 2}, {4, 0}, }; -static char* l_arcNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[2] = { "DrainSol1", "DrainSol2", }; @@ -453,11 +453,11 @@ BOOL daNpcDrSol_c::drawDbgInfo() { return false; } -static char* dummyString() { +static DUSK_CONSTEXPR char DUSK_CONST* dummyString() { return "Shoe"; }; -static actor_method_class daNpcDrSol_MethodTable = { +static DUSK_CONST actor_method_class daNpcDrSol_MethodTable = { (process_method_func)daNpcDrSol_Create, (process_method_func)daNpcDrSol_Delete, (process_method_func)daNpcDrSol_Execute, @@ -465,7 +465,7 @@ static actor_method_class daNpcDrSol_MethodTable = { (process_method_func)daNpcDrSol_Draw, }; -actor_process_profile_definition g_profile_NPC_DRSOL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_DRSOL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 3d2574604a..7b077b7b39 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -696,7 +696,7 @@ static cPhs_Step daNpc_Du_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daNpc_Du_Method = { +static DUSK_CONST actor_method_class l_daNpc_Du_Method = { (process_method_func)daNpc_Du_Create, (process_method_func)daNpc_Du_Delete, (process_method_func)daNpc_Du_Execute, @@ -704,7 +704,7 @@ static actor_method_class l_daNpc_Du_Method = { (process_method_func)daNpc_Du_Draw, }; -actor_process_profile_definition g_profile_NPC_DU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_DU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index c228d969d5..9f4dbbfd1a 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -251,25 +251,25 @@ BOOL _Fairy_Feather_c::create() { return TRUE; } -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "fairy", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[5] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[5] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDV_FAIRY, FAIRY}, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {-1, J3DFrameCtrl::EMode_NONE, NONE,BTP_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1}, {BCK_FAIRY_F_SAD, J3DFrameCtrl::EMode_LOOP, FAIRY, BTP_FAIRY_F_SAD, J3DFrameCtrl::EMode_LOOP, FAIRY, 1}, {BCK_FAIRY_F_SMILE, J3DFrameCtrl::EMode_NONE, FAIRY, BTP_FAIRY_F_SMILE, J3DFrameCtrl::EMode_NONE, FAIRY, 1}, @@ -277,7 +277,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {BCK_FAIRY_FH_SMILE, J3DFrameCtrl::EMode_LOOP, FAIRY, BTP_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[12] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[12] = { {BCK_FAIRY_WAIT, J3DFrameCtrl::EMode_LOOP, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0}, {BCK_FAIRY_GO, J3DFrameCtrl::EMode_NONE, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0}, {BCK_FAIRY_GOWAIT, J3DFrameCtrl::EMode_LOOP, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0}, @@ -292,7 +292,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[12] = { {BCK_FAIRY_HOPPE_WAIT, J3DFrameCtrl::EMode_LOOP, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -300,7 +300,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -351,7 +351,7 @@ BOOL _Fairy_Feather_c::setAnm(int i_idx) { return TRUE; } - static daNpc_GetParam2 const sBckPrm[6] = { + static DUSK_CONSTEXPR daNpc_GetParam2 const sBckPrm[6] = { {BCK_FAIRY_HANE_NON, J3DFrameCtrl::EMode_LOOP, FAIRY}, {BCK_FAIRY_HANE_SYUTU, J3DFrameCtrl::EMode_NONE, FAIRY}, {BCK_FAIRY_HANE_SITWAIT, J3DFrameCtrl::EMode_LOOP, FAIRY}, @@ -383,7 +383,7 @@ BOOL _Fairy_Feather_c::setAnm(int i_idx) { } BOOL _Fairy_Feather_c::setBrk(int i_idx) { - static daNpc_GetParam2 const sBrkPrm[1] = { + static DUSK_CONSTEXPR daNpc_GetParam2 const sBrkPrm[1] = { {BRK_FAIRY_FEATHER_GT, J3DFrameCtrl::EMode_LOOP, FAIRY}, }; @@ -397,7 +397,7 @@ BOOL _Fairy_Feather_c::setBrk(int i_idx) { } BOOL _Fairy_Feather_c::setBtk(int i_idx) { - static daNpc_GetParam2 const sBtkPrm[1] = { + static DUSK_CONSTEXPR daNpc_GetParam2 const sBtkPrm[1] = { {BTK_FAIRY_FEATHER_GT, J3DFrameCtrl::EMode_LOOP, FAIRY}, }; @@ -438,7 +438,7 @@ void _Fairy_Feather_c::draw(daNpc_Fairy_c* i_this) { mBtkAnm.remove(mdlData_p); } -static daNpcT_evtData_c l_evtList[18] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[18] = { {"", 0}, {"APPEAR_10F_01", 1}, {"APPEAR_10F_02", 1}, @@ -459,7 +459,7 @@ static daNpcT_evtData_c l_evtList[18] = { {"RETURN_CANCEL", 1}, }; -char* daNpc_Fairy_c::mCutNameList[18] = { +char DUSK_CONST* DUSK_CONST daNpc_Fairy_c::mCutNameList[18] = { "", "APPEAR_10F_01", "APPEAR_10F_02", @@ -480,7 +480,7 @@ char* daNpc_Fairy_c::mCutNameList[18] = { "RETURN_CANCEL", }; -daNpc_Fairy_c::cutFunc daNpc_Fairy_c::mCutList[18] = { +daNpc_Fairy_c::cutFunc DUSK_CONST daNpc_Fairy_c::mCutList[18] = { NULL, &daNpc_Fairy_c::cutAppear_10F_01, &daNpc_Fairy_c::cutAppear_10F_02, @@ -3051,7 +3051,7 @@ static int daNpc_Fairy_IsDelete(void* i_this) { return true; } -static actor_method_class daNpc_Fairy_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Fairy_MethodTable = { (process_method_func)daNpc_Fairy_Create, (process_method_func)daNpc_Fairy_Delete, (process_method_func)daNpc_Fairy_Execute, @@ -3059,7 +3059,7 @@ static actor_method_class daNpc_Fairy_MethodTable = { (process_method_func)daNpc_Fairy_Draw, }; -actor_process_profile_definition g_profile_NPC_FAIRY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_FAIRY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index f6c91551dd..4681234346 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -10,54 +10,54 @@ #include -static daNpcT_evtData_c l_evtList[1] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[1] = { {"", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONST char* l_resNameList[2] = { "", NULL, }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[4] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { -1, 0, 0, -1, 0, 0, 0, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {-1, 0, 0, -1, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_FairySeirei_c::mCutNameList[1] = { +DUSK_CONST char* daNpc_FairySeirei_c::mCutNameList[1] = { "", }; -daNpc_FairySeirei_c::cutFunc daNpc_FairySeirei_c::mCutList[1] = { +DUSK_CONST daNpc_FairySeirei_c::cutFunc daNpc_FairySeirei_c::mCutList[1] = { NULL, }; @@ -412,12 +412,12 @@ static int daNpc_FairySeirei_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_FairySeirei_MethodTable = { +static DUSK_CONST actor_method_class daNpc_FairySeirei_MethodTable = { daNpc_FairySeirei_Create, daNpc_FairySeirei_Delete, daNpc_FairySeirei_Execute, daNpc_FairySeirei_IsDelete, daNpc_FairySeirei_Draw, }; -actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_FAIRY_SEIREI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 5b75b2a91c..8fab9e7b22 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -200,7 +200,7 @@ static int daNpcFgd_IsDelete(void* pa_this) { return 1; } -static actor_method_class daNpcFgd_METHODS = { +static DUSK_CONST actor_method_class daNpcFgd_METHODS = { (process_method_func)daNpcFgd_Create, (process_method_func)daNpcFgd_Delete, (process_method_func)daNpcFgd_Execute, @@ -208,7 +208,7 @@ static actor_method_class daNpcFgd_METHODS = { (process_method_func)daNpcFgd_Draw, }; -actor_process_profile_definition g_profile_NPC_FGUARD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_FGUARD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 4113fd3289..316fa65481 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -146,13 +146,13 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { return 5; } -static actor_method_class l_daNpc_Fish_Method = { +static DUSK_CONST actor_method_class l_daNpc_Fish_Method = { (process_method_func)daNpc_Fish_Create, (process_method_func)daNpc_Fish_Delete, (process_method_func)daNpc_Fish_Execute, (process_method_func)daNpc_Fish_IsDelete, (process_method_func)daNpc_Fish_Draw, }; -actor_process_profile_definition g_profile_NPC_FISH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_FISH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index 10a20a179e..d4f0e84fc0 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -8,50 +8,50 @@ #include "d/actor/d_a_npc_gnd.h" #include -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {11, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Gnd", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0 }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, 0, 0, 23, 2, 1, 1} }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {8, 2, 1, 20, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -char* daNpc_Gnd_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_Gnd_c::mCutNameList[1] = {""}; -daNpc_Gnd_c::cutFunc daNpc_Gnd_c::mCutList[1] = {NULL}; +daNpc_Gnd_c::cutFunc DUSK_CONST daNpc_Gnd_c::mCutList[1] = {NULL}; const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = { 280.0f, @@ -676,7 +676,7 @@ static int daNpc_Gnd_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Gnd_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Gnd_MethodTable = { (process_method_func)daNpc_Gnd_Create, (process_method_func)daNpc_Gnd_Delete, (process_method_func)daNpc_Gnd_Execute, @@ -684,7 +684,7 @@ static actor_method_class daNpc_Gnd_MethodTable = { (process_method_func)daNpc_Gnd_Draw, }; -actor_process_profile_definition g_profile_NPC_GND = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GND = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index e1db3b4568..b1cf3a3d01 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -27,7 +27,7 @@ const daNpc_grA_HIOParam daNpc_grA_Param_c::m = { 1.35f, }; -static int l_bmdGetParamList[][2] = { +static DUSK_CONSTEXPR int l_bmdGetParamList[][2] = { 3, 1, 3, 2, 3, 12, @@ -35,7 +35,7 @@ static int l_bmdGetParamList[][2] = { 11, 15, }; -static int l_bckGetParamList[][2] = { +static DUSK_CONSTEXPR int l_bckGetParamList[][2] = { 0x0E, 0x00, 0x0C, 0x00, 0x0D, 0x00, @@ -89,7 +89,7 @@ static int l_bckGetParamList[][2] = { 0x07, 0x0F, }; -static int l_btpGetParamList[][2] = { +static DUSK_CONSTEXPR int l_btpGetParamList[][2] = { 0x1C, 0x00, 0x1F, 0x00, 0x20, 0x00, @@ -108,9 +108,9 @@ static int l_btpGetParamList[][2] = { 0x1D, 0x00, }; -static int l_btkGetParamList[][2] = {-1, 0}; +static DUSK_CONSTEXPR int l_btkGetParamList[][2] = {-1, 0}; -static int l_evtGetParamList[][2] = { +static DUSK_CONSTEXPR int l_evtGetParamList[][2] = { 0x00, 0x00, 0x01, 0x03, 0x02, 0x05, @@ -132,7 +132,7 @@ daNpc_grA_HIO_c::daNpc_grA_HIO_c() { static NPC_GRA_HIO_CLASS l_HIO; -static char* l_evtNames[11] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[11] = { NULL, "TALK_SPA", "TEACH_ELV", @@ -146,59 +146,59 @@ static char* l_evtNames[11] = { "ROLL_ROCK_CRASH", }; -static int l_loadRes_GRAa[] = { +static DUSK_CONSTEXPR int l_loadRes_GRAa[] = { 0, 1, -1, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA_Tw[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_Tw[] = { 0, 2, -1, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA_Spa[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_Spa[] = { 0, 1, 3, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA_SDEMO[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_SDEMO[] = { 0, 1, 4, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA_GATE[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_GATE[] = { 0, 1, 4, 5, -1, -1, -1, -1, }; -static int l_loadRes_GRA_KICKOUT[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_KICKOUT[] = { 0, 1, 6, 10, -1, -1, -1, -1, }; -static int l_loadRes_GRA_ROCK[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_ROCK[] = { 0, 1, 7, 8, -1, -1, -1, -1, }; -static int l_loadRes_GRA_SPAWATER[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_SPAWATER[] = { 0, 1, 3, 9, 10, 11, 12, -1, }; -static int l_loadRes_GRA_SPABUYER[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_SPABUYER[] = { 0, 1, 15, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA_SPABUYER_TW[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_SPABUYER_TW[] = { 0, 2, 15, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA_ROCKCRASHER[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_ROCKCRASHER[] = { 0, 1, 13, 11, 14, -1, -1, -1, }; -static int l_loadRes_GRA_BUYER[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA_BUYER[] = { 0, 1, 4, -1, -1, -1, -1, -1, }; -static int l_loadRes_GRA0[] = { +static DUSK_CONSTEXPR int l_loadRes_GRA0[] = { 0, 1, -1, -1, -1, -1, -1, -1, }; -static int* l_loadRes_list[13] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[13] = { l_loadRes_GRAa, l_loadRes_GRA_Tw, l_loadRes_GRA_Spa, @@ -214,7 +214,7 @@ static int* l_loadRes_list[13] = { l_loadRes_GRA0, }; -static char* l_resNames[16] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[16] = { "grA_base", "grA_mdl", "grA_TW", @@ -233,7 +233,7 @@ static char* l_resNames[16] = { "grA_town", }; -static char* l_myName[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_myName[3] = { "grA", "grA_spa", "grA_Elv", @@ -288,7 +288,7 @@ void daNpc_grA_HIO_c::genMessage(JORMContext* context) { } #endif -char* daNpc_grA_c::mEvtCutNameList[12] = { +char DUSK_CONST* DUSK_CONST daNpc_grA_c::mEvtCutNameList[12] = { "", "TALK_SPA", "GRDS_ROLL", @@ -303,7 +303,7 @@ char* daNpc_grA_c::mEvtCutNameList[12] = { "ROLL_ROCK_CRASH", }; -daNpc_grA_c::cut_type daNpc_grA_c::mEvtCutList[] = { +daNpc_grA_c::cut_type DUSK_CONST daNpc_grA_c::mEvtCutList[] = { NULL, &daNpc_grA_c::ECut_talkSpa, &daNpc_grA_c::ECut_grDSRoll, @@ -4101,7 +4101,7 @@ static BOOL daNpc_grA_IsDelete(void* i_this) { return true; } -static actor_method_class daNpc_grA_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grA_MethodTable = { (process_method_func)daNpc_grA_Create, (process_method_func)daNpc_grA_Delete, (process_method_func)daNpc_grA_Execute, @@ -4109,7 +4109,7 @@ static actor_method_class daNpc_grA_MethodTable = { (process_method_func)daNpc_grA_Draw, }; -actor_process_profile_definition g_profile_NPC_GRA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index f41578bcaa..d5b3bb4cc9 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -156,12 +156,12 @@ enum Event_Cut_Nums { static NPC_GRC_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[2] = { {BMDR_GRC_A, GRC_MDL}, {BMDR_GRC_TW, GRC_TW}, }; -static daNpc_GetParam1 l_bckGetParamList[19] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[19] = { {-1, GRC}, {BCK_GRC_F_WAIT_A, 0}, {BCK_GRC_GRUMPY, GRC}, @@ -183,7 +183,7 @@ static daNpc_GetParam1 l_bckGetParamList[19] = { {BCK_GRC_STEP, GRC}, }; -static daNpc_GetParam1 l_btpGetParamList[6] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[6] = { {BTP_GRC_A, GRC}, {BTP_GRC_F_CHEERFUL_T, GRC}, {BTP_GRC_F_GRUMPY_T, GRC}, @@ -192,47 +192,47 @@ static daNpc_GetParam1 l_btpGetParamList[6] = { {BTP_GRC_FH_CLOSEEYE, GRC}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {-1, GRC}, }; -static daNpc_GetParam1 l_evtGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[1] = { {0, GRC}, }; -static int l_loadRes_GRCa[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRCa[3] = { GRC, GRC_MDL, -1, }; -static int l_loadRes_GRCa_TW[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRCa_TW[3] = { GRC, GRC_TW, -1, }; -static int l_loadRes_GRC0[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRC0[3] = { GRC, GRC_MDL, -1, }; -static int* l_loadRes_list[7] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[7] = { l_loadRes_GRCa, l_loadRes_GRCa_TW, l_loadRes_GRCa, l_loadRes_GRCa, l_loadRes_GRCa, l_loadRes_GRCa, l_loadRes_GRC0, }; -static char* l_resNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[3] = { "grC", "grC_Mdl", "grC_TW", }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL }; -static char* l_myName = "grC"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grC"; -char* daNpc_grC_c::mEvtCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_grC_c::mEvtCutNameList = ""; -daNpc_grC_c::EventFn daNpc_grC_c::mEvtCutList[1] = {NULL}; +daNpc_grC_c::EventFn DUSK_CONST daNpc_grC_c::mEvtCutList[1] = {NULL}; daNpc_grC_HIOParam const daNpc_grC_Param_c::m = { 40.0f, @@ -1568,7 +1568,7 @@ static int daNpc_grC_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_grC_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grC_MethodTable = { (process_method_func)daNpc_grC_Create, (process_method_func)daNpc_grC_Delete, (process_method_func)daNpc_grC_Execute, @@ -1576,7 +1576,7 @@ static actor_method_class daNpc_grC_MethodTable = { (process_method_func)daNpc_grC_Draw, }; -actor_process_profile_definition g_profile_NPC_GRC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 8f006bf4cf..5278729e03 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -50,71 +50,71 @@ enum Type { static NPC_GRD_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[1] = { {11, 0}, }; -static daNpc_GetParam1 l_bckGetParamList[12] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[12] = { {-1, 0}, {6, 0}, {5, 1}, {6, 1}, {4, 1}, {8, 0}, {7, 0}, {10, 1}, {11, 1}, {8, 1}, {7, 1}, {9, 1}, }; -static daNpc_GetParam1 l_btpGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[4] = { {17, 0}, {15, 1}, {16, 1}, {14, 1}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {14, 0}, }; -static daNpc_GetParam1 l_evtGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[1] = { {0, 0}, }; -static int l_loadRes_GRD_YELIA[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRD_YELIA[3] = { 0, 1, -1, }; -static int l_loadRes_GRDa[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRDa[3] = { 0, 1, -1, }; -static int l_loadRes_GRD0[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRD0[3] = { 0, -1, -1, }; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_GRD_YELIA, l_loadRes_GRDa, l_loadRes_GRD0, }; -static char* l_resNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[2] = { "grD", "grD1", }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL, }; -static char* l_myName = "grD"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grD"; -char* daNpc_Grd_c::mEvtCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_Grd_c::mEvtCutNameList[2] = { "", "NOD_TO_GRZ", }; -daNpc_Grd_c::cutFunc daNpc_Grd_c::mEvtCutList[2] = { +daNpc_Grd_c::cutFunc DUSK_CONST daNpc_Grd_c::mEvtCutList[2] = { NULL, &daNpc_Grd_c::ECut_nodToGrz, }; @@ -1245,13 +1245,13 @@ static int daNpc_Grd_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Grd_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Grd_MethodTable = { (process_method_func)daNpc_Grd_Create, (process_method_func)daNpc_Grd_Delete, (process_method_func)daNpc_Grd_Execute, (process_method_func)daNpc_Grd_IsDelete, (process_method_func)daNpc_Grd_Draw, }; -actor_process_profile_definition g_profile_NPC_GRD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 4869ef254b..25182af4cb 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -51,27 +51,27 @@ enum RES_Name { /* 0x2 */ GRA_MDL, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_GRA_A, GRA_MDL}, }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {NULL, 0}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "grA_base", "grA_mdl", }; -static s8 l_loadResPtrn0[3] = {2, 1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = {2, 1, -1}; -static s8* l_loadResPtrnList[1] = {l_loadResPtrn0}; +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[1] = {l_loadResPtrn0}; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_GRA_A, J3DFrameCtrl::EMode_LOOP, GRA_BASE, TRUE}, {BCK_GRA_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRA_BASE, BTP_GRA_A, J3DFrameCtrl::EMode_LOOP, GRA_BASE, TRUE}, @@ -101,7 +101,7 @@ enum Motion { /* 0x4 */ MOT_TALK_B, }; -static daNpcT_motionAnmData_c l_motionAnmData[3] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[3] = { {BCK_GRA_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRA_BASE, BTK_GRA_A, J3DFrameCtrl::EMode_NONE, GRA_BASE, 0, 0}, {BCK_GRA_TALK_A, J3DFrameCtrl::EMode_NONE, GRA_BASE, BTK_GRA_A, J3DFrameCtrl::EMode_NONE, @@ -110,24 +110,24 @@ static daNpcT_motionAnmData_c l_motionAnmData[3] = { GRA_BASE, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { {2, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[20] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[20] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_grM_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_grM_c::mCutNameList[2] = { "", "TALK_SPA", }; -daNpc_grM_c::cutFunc daNpc_grM_c::mCutList[2] = { +daNpc_grM_c::cutFunc DUSK_CONST daNpc_grM_c::mCutList[2] = { NULL, &daNpc_grM_c::cutTalkSpa, }; @@ -812,13 +812,13 @@ static BOOL daNpc_grM_IsDelete(void* param_0) { return TRUE; } -static actor_method_class daNpc_grM_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grM_MethodTable = { (process_method_func)daNpc_grM_Create, (process_method_func)daNpc_grM_Delete, (process_method_func)daNpc_grM_Execute, (process_method_func)daNpc_grM_IsDelete, (process_method_func)daNpc_grM_Draw, }; -actor_process_profile_definition g_profile_NPC_GRM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 71a1f62ebd..1d5ed0d29a 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -75,28 +75,28 @@ enum Motion { /* 0x8 */ MOT_SAD_WAIT = 0x8, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_GRC_A, GRC_MDL}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"DEFAULT_GETITEM", 0}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "grC", "grC_Mdl", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { 1, 2, -1, }; -static s8* l_loadResPtrnList[1] = {l_loadResPtrn0}; +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[1] = {l_loadResPtrn0}; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = { {-1, 0, J3DFrameCtrl::EMode_NONE, BTP_GRC_A, J3DFrameCtrl::EMode_LOOP, GRC, 1}, {BCK_GRC_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRC, BTP_GRC_A, J3DFrameCtrl::EMode_LOOP, GRC, 1}, {BCK_GRC_GRUMPY, J3DFrameCtrl::EMode_LOOP, GRC, BTP_GRC_A, J3DFrameCtrl::EMode_LOOP, GRC, 1}, @@ -108,7 +108,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = { {BCK_GRC_F_SAD_TALK, J3DFrameCtrl::EMode_NONE, GRC, BTP_GRC_F_SAD_TALK, J3DFrameCtrl::EMode_NONE, GRC, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[9] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[9] = { {BCK_GRC_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0}, {BCK_GRC_TALK_A, J3DFrameCtrl::EMode_LOOP, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0}, {BCK_GRC_TALK_B, J3DFrameCtrl::EMode_LOOP, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0}, @@ -120,7 +120,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[9] = { {BCK_GRC_STEP, J3DFrameCtrl::EMode_NONE, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { {5, -1, 1}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -137,7 +137,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -149,9 +149,9 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_grMC_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_grMC_c::mCutNameList = ""; -daNpc_grMC_c::cutFunc daNpc_grMC_c::mCutList[1] = { +daNpc_grMC_c::cutFunc DUSK_CONST daNpc_grMC_c::mCutList[1] = { NULL, }; @@ -802,7 +802,7 @@ static int daNpc_grMC_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpc_grMC_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grMC_MethodTable = { (process_method_func)daNpc_grMC_Create, (process_method_func)daNpc_grMC_Delete, (process_method_func)daNpc_grMC_Execute, @@ -810,7 +810,7 @@ static actor_method_class daNpc_grMC_MethodTable = { (process_method_func)daNpc_grMC_Draw, }; -actor_process_profile_definition g_profile_NPC_GRMC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRMC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 785136559f..e98fe7f8c0 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -193,17 +193,17 @@ enum Mode { static NPC_GRO_HIO_CLASS l_HIO; -static daNpc_Maro_c::actionFunc dummy_lit_3931() { +static DUSK_CONSTEXPR daNpc_Maro_c::actionFunc dummy_lit_3931() { return &daNpc_Maro_c::choccai; } -static daNpc_GetParam1 l_bmdGetParamList[3] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[3] = { {BMDR_GRO_A, GRO}, {BMDR_GRO_PIPE, GRO}, {BMDR_MARO_BOKIN, GRO1}, }; -static daNpc_GetParam1 l_bckGetParamList[23] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[23] = { {-1, GRO}, {BCK_GRO_F_WAIT_A, GRO}, {BCK_GRO_F_WALK_A, GRO}, @@ -229,7 +229,7 @@ static daNpc_GetParam1 l_bckGetParamList[23] = { {BCK_GRO_SWING, GRO1}, }; -static daNpc_GetParam1 l_btpGetParamList[6] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[6] = { {BTP_GRO_A, GRO}, {BTP_GRO_F_TALK_B, GRO}, {BTP_GRO_F_CALL, GRO1}, @@ -238,57 +238,57 @@ static daNpc_GetParam1 l_btpGetParamList[6] = { {BTP_GRO_F_BOW, GRO1}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {BTK_GRO_A, GRO}, }; -static daNpc_GetParam1 l_evtGetParamList[3] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[3] = { {0, GRO}, {1, GRO1D}, {2, GRO}, }; -static int l_loadRes_GROa[4] = { +static DUSK_CONSTEXPR int l_loadRes_GROa[4] = { GRO, -1, -1, -1, }; -static int l_loadRes_GRO_BOKIN[4] = { +static DUSK_CONSTEXPR int l_loadRes_GRO_BOKIN[4] = { GRO, GRO1, GRO1D, -1, }; -static int l_loadRes_GRO_MARO[4] = { +static DUSK_CONSTEXPR int l_loadRes_GRO_MARO[4] = { GRO, GRO1, -1, -1, }; -static int l_loadRes_GRO0[4] = { +static DUSK_CONSTEXPR int l_loadRes_GRO0[4] = { GRO, -1, -1, -1, }; -static int* l_loadRes_list[4] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[4] = { l_loadRes_GROa, l_loadRes_GRO_BOKIN, l_loadRes_GRO_MARO, l_loadRes_GRO0, }; -static int l_loadObj_list[2][2] = { +static DUSK_CONSTEXPR int l_loadObj_list[2][2] = { {1, 2}, {-1, 1}, }; -static char* l_resNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[3] = { "grO", "grO1", "grO1D", }; -static char* l_evtNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[3] = { NULL, "BOKIN_FINISH", "PUSHOUT", }; -static char* l_myName = "grO"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grO"; #if DEBUG daNpc_grO_HIO_c::daNpc_grO_HIO_c() { @@ -325,13 +325,13 @@ void daNpc_grO_HIO_c::genMessage(JORMContext* ctx) { } #endif -char* daNpc_grO_c::mEvtCutNameList[3] = { +char DUSK_CONST* DUSK_CONST daNpc_grO_c::mEvtCutNameList[3] = { "", "BOKIN_FINISH", "PUSHOUT", }; -daNpc_grO_c::cutFunc daNpc_grO_c::mEvtCutList[3] = { +daNpc_grO_c::cutFunc DUSK_CONST daNpc_grO_c::mEvtCutList[3] = { NULL, &daNpc_grO_c::ECut_bokinFinish, &daNpc_grO_c::cutPushOut, @@ -1907,7 +1907,7 @@ static int daNpc_grO_IsDelete(void* i_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_grO_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grO_MethodTable = { (process_method_func)daNpc_grO_Create, (process_method_func)daNpc_grO_Delete, (process_method_func)daNpc_grO_Execute, @@ -1915,7 +1915,7 @@ static actor_method_class daNpc_grO_MethodTable = { (process_method_func)daNpc_grO_Draw, }; -actor_process_profile_definition g_profile_NPC_GRO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 39689144f4..4eac7a5930 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -124,11 +124,11 @@ enum Event_Cut_Nums { static NPC_GRR_HIO_CLASS l_HIO; -static int l_bmdGetParamList[1][2] = { +static DUSK_CONSTEXPR int l_bmdGetParamList[1][2] = { {BMDR_GRR, GRR}, }; -static daNpc_GetParam1 l_bckGetParamList[19] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[19] = { {-1, GRR}, {BCK_GRR_F_TALK_A, GRR}, {BCK_GRR_F_LAUGH, GRR}, @@ -150,7 +150,7 @@ static daNpc_GetParam1 l_bckGetParamList[19] = { {BCK_GRR_SWING, GRR1}, }; -static daNpc_GetParam1 l_btpGetParamList[6] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[6] = { {BTP_GRR, GRR}, {BTP_GRR_F_LAUGH, GRR}, {BTP_GRR_F_KEEE, GRR}, @@ -159,49 +159,49 @@ static daNpc_GetParam1 l_btpGetParamList[6] = { {BTP_GRR_FH_LAUGH, GRR}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {BTK_GRR, GRR}, }; -static daNpc_GetParam1 l_evtGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[1] = { {0, GRR}, }; -static int l_loadRes_GRRa[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRRa[3] = { GRR, -1, -1, }; -static int l_loadRes_GRR_SPAWATER[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRR_SPAWATER[3] = { GRR, GRR1, -1, }; -static int l_loadRes_GRR_MARO[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRR_MARO[3] = { GRR, GRR1, -1, }; -static int l_loadRes_GRR0[3] = { +static DUSK_CONSTEXPR int l_loadRes_GRR0[3] = { GRR, -1, -1, }; -static int* l_loadRes_list[4] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[4] = { l_loadRes_GRRa, l_loadRes_GRR_SPAWATER, l_loadRes_GRR_MARO, l_loadRes_GRR0, }; -static char* l_resNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[2] = { "grR", "grR1", }; -static char* l_evtNames[1] = {NULL}; +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {NULL}; -static char* l_myName = "grR"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grR"; -char* daNpc_grR_c::mEvtCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_grR_c::mEvtCutNameList = ""; -daNpc_grR_c::cutFunc daNpc_grR_c::mEvtCutList[1] = { +daNpc_grR_c::cutFunc DUSK_CONST daNpc_grR_c::mEvtCutList[1] = { NULL, }; @@ -1434,7 +1434,7 @@ static int daNpc_grR_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_grR_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grR_MethodTable = { (process_method_func)daNpc_grR_Create, (process_method_func)daNpc_grR_Delete, (process_method_func)daNpc_grR_Execute, @@ -1442,7 +1442,7 @@ static actor_method_class daNpc_grR_MethodTable = { (process_method_func)daNpc_grR_Draw, }; -actor_process_profile_definition g_profile_NPC_GRR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 401634d2ab..bdac5ebf1c 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -35,12 +35,12 @@ enum LookMode { /* 0x04 */ LOOK_MODE_UNK_4, }; -static daNpc_GetParam1 l_bmdGetParamList[2] = { +DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[2] = { {16, 0}, {17, 0}, }; -static daNpc_GetParam1 l_bckGetParamList[8] = { +DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[8] = { {-1, 0}, {8, 0}, {7, 0}, @@ -51,49 +51,54 @@ static daNpc_GetParam1 l_bckGetParamList[8] = { {10, 0}, }; -static daNpc_GetParam1 l_btpGetParamList[3] = { +DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[3] = { {23, 0}, {24, 0}, {25, 0}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {20, 0}, }; -static daNpc_GetParam1 l_evtGetParamList[2] = { +DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[2] = { {0, 0}, {1, 0}, }; -static int l_loadRes_GRSa[3] = {0, -1, -1}; +DUSK_CONSTEXPR int l_loadRes_GRSa[3] = {0, -1, -1}; -static int l_loadRes_GRS0[3] = {0, -1, -1}; +DUSK_CONSTEXPR int l_loadRes_GRS0[3] = {0, -1, -1}; -static int* l_loadRes_list[2] = { - (int*)&l_loadRes_GRSa, - (int*)&l_loadRes_GRS0, +DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[2] = { +#if TARGET_PC + l_loadRes_GRSa, + l_loadRes_GRS0, +#else + (int DUSK_CONST*)&l_loadRes_GRSa, + (int DUSK_CONST*)&l_loadRes_GRS0, +#endif }; -static char* l_resNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[1] = { "grS", }; -static char* l_evtNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = { NULL, "PUSHOUT", }; -static char* l_myName = "grS"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grS"; static NPC_GRS_HIO_CLASS l_HIO; -char* daNpc_grS_c::mEvtCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_grS_c::mEvtCutNameList[2] = { "", "PUSHOUT", }; -daNpc_grS_c::cutFunc daNpc_grS_c::mEvtCutList[2] = { +daNpc_grS_c::cutFunc DUSK_CONST daNpc_grS_c::mEvtCutList[2] = { NULL, &daNpc_grS_c::cutPushOut, }; @@ -1294,7 +1299,7 @@ static int daNpc_grS_IsDelete(void* i_this) { return TRUE; } -static actor_method_class daNpc_grS_MethodTable = { +static DUSK_CONST actor_method_class daNpc_grS_MethodTable = { (process_method_func)daNpc_grS_Create, (process_method_func)daNpc_grS_Delete, (process_method_func)daNpc_grS_Execute, @@ -1302,7 +1307,7 @@ static actor_method_class daNpc_grS_MethodTable = { (process_method_func)daNpc_grS_Draw, }; -actor_process_profile_definition g_profile_NPC_GRS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 104c0c4756..3cbd23f9ac 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -244,11 +244,11 @@ enum Event_Cut_Nums { static NPC_GRZ_HIO_CLASS l_HIO; -static int l_bmdGetParamList[1][2] = { +static DUSK_CONSTEXPR int l_bmdGetParamList[1][2] = { {BMDR_GRZ, GRZ}, }; -static daNpc_GetParam1 l_bckGetParamList[34] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[34] = { {-1, GRZ}, {BCK_GRZ_F_MUKIDASHI, GRZ}, {BCK_GRZ_F_RECOVER, GRZ3}, @@ -285,7 +285,7 @@ static daNpc_GetParam1 l_bckGetParamList[34] = { {BCK_GRZ_PUNCH, GRZ3}, }; -static daNpc_GetParam1 l_btpGetParamList[10] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[10] = { {BTP_GRZ, GRZ}, {BTP_GRZ_F_LIEDOWN, GRZ1}, {BTP_GRZ_F_GETUP, GRZ1}, @@ -298,52 +298,52 @@ static daNpc_GetParam1 l_btpGetParamList[10] = { {BTP_GRZ_F_RECOVER, GRZ3}, }; -static daNpc_GetParam1 l_btkGetParamList[3] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[3] = { {BTK_GRZ, GRZ}, {BTK_GRZ_GETUP, GRZ1}, {BTK_GRZ_SNIFF, GRZ2}, }; -static daNpc_GetParam1 l_evtGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[4] = { {0, GRZ}, {1, GRZD1}, {2, GRZD3}, {3, GRZD3}, }; -static char* l_evtNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = { NULL, "TALK_STAND", "STONE_SMASH", "STONE_SMASH_SKIP", }; -static int l_loadRes_YELIA[5] = { +static DUSK_CONSTEXPR int l_loadRes_YELIA[5] = { GRZ, GRZ2, -1, -1, -1, }; -static int l_loadRes_LieDown[5] = { +static DUSK_CONSTEXPR int l_loadRes_LieDown[5] = { GRZ, GRZ1, GRZD1, -1, -1, }; -static int l_loadRes_Smash[5] = { +static DUSK_CONSTEXPR int l_loadRes_Smash[5] = { GRZ, GRZ2, GRZ3, GRZD3, -1, }; -static int l_loadRes_GRZa[5] = { +static DUSK_CONSTEXPR int l_loadRes_GRZa[5] = { GRZ, GRZ2, -1, -1, -1, }; -static int l_loadRes_GRZ0[5] = { +static DUSK_CONSTEXPR int l_loadRes_GRZ0[5] = { GRZ, -1, -1, -1, -1, }; -static int* l_loadRes_list[5] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[5] = { l_loadRes_YELIA, l_loadRes_LieDown, l_loadRes_Smash, l_loadRes_GRZa, l_loadRes_GRZ0, }; -static char* l_resNames[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[6] = { "grZ", "grZ1", "grZ2", @@ -352,9 +352,9 @@ static char* l_resNames[6] = { "grZD3", }; -static char* l_myName = "grZ"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "grZ"; -char* daNpc_Grz_c::mEvtCutNameList[7] = { +char DUSK_CONST* DUSK_CONST daNpc_Grz_c::mEvtCutNameList[7] = { "", "WAIT", "REBIRTH", @@ -364,7 +364,7 @@ char* daNpc_Grz_c::mEvtCutNameList[7] = { "STONE_SMASH_SKIP", }; -daNpc_Grz_c::cutFunc daNpc_Grz_c::mEvtCutList[7] = { +daNpc_Grz_c::cutFunc DUSK_CONST daNpc_Grz_c::mEvtCutList[7] = { NULL, &daNpc_Grz_c::doWaitCut, &daNpc_Grz_c::doRebirthCut, @@ -2539,7 +2539,7 @@ static int daNpc_Grz_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_Grz_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Grz_MethodTable = { (process_method_func)daNpc_Grz_Create, (process_method_func)daNpc_Grz_Delete, (process_method_func)daNpc_Grz_Execute, @@ -2547,7 +2547,7 @@ static actor_method_class daNpc_Grz_MethodTable = { (process_method_func)daNpc_Grz_Draw, }; -actor_process_profile_definition g_profile_NPC_GRZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GRZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 60c6597cd9..b0836bd6d1 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -603,13 +603,13 @@ static int daNpcGuard_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcGuard_METHODS = { +static DUSK_CONST actor_method_class daNpcGuard_METHODS = { (process_method_func)daNpcGuard_Create, (process_method_func)daNpcGuard_Delete, (process_method_func)daNpcGuard_Execute, (process_method_func)daNpcGuard_IsDelete, (process_method_func)daNpcGuard_Draw, }; -actor_process_profile_definition g_profile_NPC_GUARD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GUARD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 9956468e41..b0fd2d3838 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -89,11 +89,11 @@ enum Motion { static NPC_GWOLF_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[1] = { {BMDR_GW, GWOLF}, }; -static daNpc_GetParam1 l_bckGetParamList[12] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[12] = { {-1, GWOLF}, {-1, GWOLF}, {BCK_WL_WAITSIT, GWOLF}, @@ -108,15 +108,15 @@ static daNpc_GetParam1 l_bckGetParamList[12] = { {BCK_WL_DASHA, GWOLF}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {BTK_GW, GWOLF}, }; -static daNpc_GetParam1 l_brkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_brkGetParamList[1] = { {BRK_GW, GWOLF}, }; -static daNpc_GetParam1 l_evtGetParamList[15] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[15] = { {EVT_NONE, GWOLF}, {EVT_ATTACK_WARP, GWOLF}, {EVT_ATTACK_WARP_HORSE, GWOLF}, @@ -134,7 +134,7 @@ static daNpc_GetParam1 l_evtGetParamList[15] = { {EVT_MEET_GWOLFF, GWOLF}, }; -static char* l_evtNames[15] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[15] = { NULL, "ATTACK_WARP", "ATTACK_WARP_HORSE", @@ -152,26 +152,26 @@ static char* l_evtNames[15] = { "MEET_GWOLFF", }; -static int l_loadRes_GWOLFa[3] = { +static DUSK_CONSTEXPR int l_loadRes_GWOLFa[3] = { GWOLF, -1, -1, }; -static int l_loadRes_GWOLF0[3] = { +static DUSK_CONSTEXPR int l_loadRes_GWOLF0[3] = { GWOLF, -1, -1, }; -static int* l_loadRes_list[4] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[4] = { l_loadRes_GWOLFa, l_loadRes_GWOLFa, l_loadRes_GWOLFa, l_loadRes_GWOLF0, }; -static char* l_resNames[1] = {"GWolf"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[1] = {"GWolf"}; -static char* l_myName = "GWolf"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "GWolf"; -static s16 l_appearTmpFlag[7] = { +static DUSK_CONSTEXPR s16 l_appearTmpFlag[7] = { -1, 0x005C, // dSv_event_tmp_flag_c::T_0092 - Hero's spirit - Gold wolf identification 2 0x005D, // dSv_event_tmp_flag_c::T_0093 - Hero's spirit - Gold wolf identification 3 @@ -181,7 +181,7 @@ static s16 l_appearTmpFlag[7] = { 0x0061, // dSv_event_tmp_flag_c::T_0097 - Hero's spirit - Gold wolf identification 7 }; -static s16 l_warpAppearFlag[7] = { +static DUSK_CONSTEXPR s16 l_warpAppearFlag[7] = { -1, 0x01D8, // dSv_event_flag_c::F_0472 - Secret techniques - Distant howling complete (for secret technique 2) 0x01D9, // dSv_event_flag_c::F_0473 - Secret techniques - Distant howling complete (for secret technique 3) @@ -191,7 +191,7 @@ static s16 l_warpAppearFlag[7] = { 0x01DD, // dSv_event_flag_c::F_0477 - Secret techniques - Distant howling complete (for secret technique 7) }; -char* daNpc_GWolf_c::mEvtCutNameList[5] = { +char DUSK_CONST* DUSK_CONST daNpc_GWolf_c::mEvtCutNameList[5] = { "", "ATTACK_WARP", "ATTACK_WARP_HORSE", @@ -199,7 +199,7 @@ char* daNpc_GWolf_c::mEvtCutNameList[5] = { "MEET_GWOLFA", }; -daNpc_GWolf_c::cutFunc daNpc_GWolf_c::mEvtCutList[5] = { +daNpc_GWolf_c::cutFunc DUSK_CONST daNpc_GWolf_c::mEvtCutList[5] = { NULL, &daNpc_GWolf_c::ECut_attackWarp, &daNpc_GWolf_c::ECut_attackWarpHorse, @@ -1916,7 +1916,7 @@ static int daNpc_GWolf_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_GWolf_MethodTable = { +static DUSK_CONST actor_method_class daNpc_GWolf_MethodTable = { (process_method_func)daNpc_GWolf_Create, (process_method_func)daNpc_GWolf_Delete, (process_method_func)daNpc_GWolf_Execute, @@ -1924,7 +1924,7 @@ static actor_method_class daNpc_GWolf_MethodTable = { (process_method_func)daNpc_GWolf_Draw, }; -actor_process_profile_definition g_profile_NPC_GWOLF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_GWOLF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 175bee3d1e..c1bb5d72c1 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -17,12 +17,12 @@ #include "dusk/string.hpp" -static int l_bmdData[4][2] = { +static DUSK_CONSTEXPR int l_bmdData[4][2] = { {14, 1}, {26, 2}, {25, 2}, {3, 4}, }; -static daNpcT_evtData_c l_evtList[11] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[11] = { {"", 0}, {"NO_RESPONSE", 0}, {"CONVERSATION_ABOUT_SARU01", 5}, @@ -38,7 +38,7 @@ static daNpcT_evtData_c l_evtList[11] = { -static char* l_resNameList[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[6] = { "", "Hanjo", "Hanjo1", @@ -47,13 +47,13 @@ static char* l_resNameList[6] = { "Sera", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { 1, 2, -1, }; -static s8 l_loadResPtrn1[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[5] = { 1, 2, 3, @@ -61,11 +61,11 @@ static s8 l_loadResPtrn1[5] = { -1, }; -static s8 l_loadResPtrn2[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[2] = { 1, -1 }; -static s8 l_loadResPtrn9[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = { 1, 2, 3, @@ -73,12 +73,12 @@ static s8 l_loadResPtrn9[5] = { -1, }; -static s8* l_loadResPtrnList[5] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[5] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn2, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, 0, 0, 20, 2, 1, 1}, {7, 0, 1, 20, 2, 1, 1}, {7, 0, 2, 34, 0, 2, 0}, @@ -91,7 +91,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { { 11, 2, 2, 38, 2, 2, 0}, }; -static int l_motionAnmData[161] = { +static DUSK_CONSTEXPR int l_motionAnmData[161] = { 11, 2, 1, 17, 0, 1, 65536, 22, 2, 2, 17, 0, 1, 65536, 16, 2, 2, 17, 0, 1, 65536, 13, 2, 2, 17, 0, 1, 65536, 21, 2, 2, 31, 2, 2, 0, 20, 0, 2, 30, 0, 2, 0, 14, 0, 2, 29, 0, 2, 0, 8, 2, 1, 17, 0, 1, 65536, 6, 0, 1, 17, 0, 1, 65536, @@ -101,13 +101,13 @@ static int l_motionAnmData[161] = { 10, 0, 3, 17, 0, 1, 65536, 9, 0, 1, 17, 0, 1, 65536, 11, 0, 3, 17, 0, 1, 65536, 10, 0, 1, 17, 0, 1, 65536, -1, 0, 0, 17, 0, 1, 65536}; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}}; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {21, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {12, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, @@ -121,7 +121,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { {-1, 0, 0}, {-1, 0, 0}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}}; -char* daNpc_Hanjo_c::mCutNameList[6] = { +char DUSK_CONST* DUSK_CONST daNpc_Hanjo_c::mCutNameList[6] = { "", "CONVERSATION_ABOUT_SARU", "CONVERSATION", @@ -130,7 +130,7 @@ char* daNpc_Hanjo_c::mCutNameList[6] = { "DIVE", }; -daNpc_Hanjo_c::cutFunc daNpc_Hanjo_c::mCutList[6] = { +daNpc_Hanjo_c::cutFunc DUSK_CONST daNpc_Hanjo_c::mCutList[6] = { NULL, &daNpc_Hanjo_c::cutConversationAboutSaru, &daNpc_Hanjo_c::cutConversation, @@ -139,7 +139,7 @@ daNpc_Hanjo_c::cutFunc daNpc_Hanjo_c::mCutList[6] = { &daNpc_Hanjo_c::cutDive, }; -dCcD_SrcSph daNpc_Hanjo_c::mStoneCcDSph = { +dCcD_SrcSph DUSK_CONST daNpc_Hanjo_c::mStoneCcDSph = { daNpc_Hanjo_c::mStoneCcDObjInfo, {} }; @@ -1953,7 +1953,7 @@ static int daNpc_Hanjo_IsDelete(void* i_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_Hanjo_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Hanjo_MethodTable = { (process_method_func)daNpc_Hanjo_Create, (process_method_func)daNpc_Hanjo_Delete, (process_method_func)daNpc_Hanjo_Execute, @@ -1961,7 +1961,7 @@ static actor_method_class daNpc_Hanjo_MethodTable = { (process_method_func)daNpc_Hanjo_Draw, }; -actor_process_profile_definition g_profile_NPC_HANJO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_HANJO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 40dd9b3091..dc02aeb08d 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -2850,13 +2850,13 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { return loadResult; } -static actor_method_class l_daNpc_Henna_Method = { +static DUSK_CONST actor_method_class l_daNpc_Henna_Method = { (process_method_func)daNpc_Henna_Create, (process_method_func)daNpc_Henna_Delete, (process_method_func)daNpc_Henna_Execute, (process_method_func)daNpc_Henna_IsDelete, (process_method_func)daNpc_Henna_Draw, }; -actor_process_profile_definition g_profile_NPC_HENNA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_HENNA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 2c9b53fe3f..199e0b2ca5 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_henna0.h" -actor_process_profile_definition g_profile_NPC_HENNA0 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_HENNA0 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index e8d537c9fe..012112f266 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -11,12 +11,12 @@ #include "d/d_meter2_info.h" #include -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {13, 1}, {3, 2}, }; -static daNpcT_evtData_c l_evtList[9] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[9] = { {"", 0}, {"BOAT_RACE", 1}, {"BOAT_RACE_RETURN", 1}, @@ -28,7 +28,7 @@ static daNpcT_evtData_c l_evtList[9] = { {"TALK_BREAK", 1}, }; -static char* l_resNameList[7] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[7] = { "", "Hoz", "Hoz_TW", @@ -38,7 +38,7 @@ static char* l_resNameList[7] = { "Hoz2_3", }; -static s8 l_loadResPtrn0[] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[] = { 1, 2, -1, @@ -46,7 +46,7 @@ static s8 l_loadResPtrn0[] = { static s8 l_loadResPtrnTW[] = {1, 2, 3, -1}; -static s8 l_loadResPtrn1[] = {1, 4, 6, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[] = {1, 4, 6, -1}; static s8 l_loadResPtrnBattle[] = { 1, @@ -56,13 +56,13 @@ static s8 l_loadResPtrnBattle[] = { -1, }; -static s8* l_loadResPtrnList[7] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[7] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrnBattle, l_loadResPtrnTW, l_loadResPtrn1, l_loadResPtrnTW, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[39] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[39] = { {-1, 0, 0, 19, 2, 1, 1}, {8, 0, 1, 19, 2, 1, 1}, {7, 2, 1, 19, 2, 1, 1}, @@ -104,7 +104,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[39] = { {22, 2, 4, 19, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[39] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[39] = { {10, 2, 1, 16, 0, 1, 1, 0}, {9, 0, 1, 16, 0, 1, 1, 0}, {19, 2, 3, 16, 0, 1, 1, 0}, @@ -146,7 +146,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[39] = { {7, 2, 4, 16, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[140] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[140] = { {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -167,7 +167,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[140] {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[144] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[144] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -188,7 +188,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[144] = { {29, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Hoz_c::mCutNameList[8] = { +char DUSK_CONST* DUSK_CONST daNpc_Hoz_c::mCutNameList[8] = { "", "BOAT_RACE", "BEFORE_BATTLE", @@ -199,7 +199,7 @@ char* daNpc_Hoz_c::mCutNameList[8] = { "TALK_BREAK", }; -daNpc_Hoz_c::cutFunc daNpc_Hoz_c::mCutList[] = { +daNpc_Hoz_c::cutFunc DUSK_CONST daNpc_Hoz_c::mCutList[] = { NULL, &daNpc_Hoz_c::ECut_boatRace, &daNpc_Hoz_c::ECut_beforeBattle, @@ -1686,7 +1686,7 @@ static int daNpc_Hoz_IsDelete(void* i_this) { return true; } -static actor_method_class daNpc_Hoz_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Hoz_MethodTable = { (process_method_func)daNpc_Hoz_Create, (process_method_func)daNpc_Hoz_Delete, (process_method_func)daNpc_Hoz_Execute, @@ -1694,7 +1694,7 @@ static actor_method_class daNpc_Hoz_MethodTable = { (process_method_func)daNpc_Hoz_Draw, }; -actor_process_profile_definition g_profile_NPC_HOZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_HOZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 3b9a14f524..d08a81b8ce 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -48,36 +48,36 @@ daNpcImpal_HIOParam const daNpcImpal_Param_c::m = { static NPC_IMPAL_HIO_CLASS l_HIO; -static daNpc_GetParam2 l_bckGetParamList[18] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[18] = { {-1, 2, 0}, {14, 0, 0}, {8, 0, 0}, {7, 2, 0}, {11, 0, 0}, {13, 0, 0}, {12, 0, 0}, {15, 2, 0}, {17, 2, 0}, {16, 2, 0}, {22, 2, 0}, {19, 2, 0}, {23, 2, 0}, {18, 0, 0}, {21, 0, 0}, {20, 0, 0}, {10, 0, 0}, {9, 2, 0}, }; -static daNpc_GetParam2 l_btpGetParamList[10] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[10] = { {35, 2, 0}, {41, 2, 0}, {37, 0, 0}, {36, 2, 0}, {38, 2, 0}, {40, 2, 0}, {39, 0, 0}, {42, 2, 0}, {44, 2, 0}, {43, 2, 0}, }; -static daNpc_GetParam2 l_btkGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[4] = { {29, 2, 0}, {32, 2, 0}, {31, 0, 0}, {30, 2, 0}, }; -static char* l_arcNames[1] = {"impal"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[1] = {"impal"}; -static char* l_evtNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = { NULL, "IMPAL_APPEAR1", "IMPAL_APPEAR2", "IMPAL_COPYROD", }; -static Vec l_resetPos = {2536.763671875f, 99.99166107177734f, -1154.2318115234375f}; +static DUSK_CONSTEXPR Vec l_resetPos = {2536.763671875f, 99.99166107177734f, -1154.2318115234375f}; -static char* l_myName = "impal"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "impal"; #if DEBUG daNpcImpal_HIO_c::daNpcImpal_HIO_c() { @@ -1231,13 +1231,13 @@ BOOL daNpcImpal_c::drawDbgInfo() { return FALSE; } -static actor_method_class daNpcImpal_MethodTable = { +static DUSK_CONST actor_method_class daNpcImpal_MethodTable = { (process_method_func)daNpcImpal_Create, (process_method_func)daNpcImpal_Delete, (process_method_func)daNpcImpal_Execute, (process_method_func)daNpcImpal_IsDelete, (process_method_func)daNpcImpal_Draw, }; -actor_process_profile_definition g_profile_NPC_IMPAL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_IMPAL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index 4d55a31f8e..0dd4645156 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -484,7 +484,7 @@ static int daNpc_Inko_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daNpc_Inko_Method = { +static DUSK_CONST actor_method_class l_daNpc_Inko_Method = { (process_method_func)daNpc_Inko_Create, (process_method_func)daNpc_Inko_Delete, (process_method_func)daNpc_Inko_Execute, @@ -492,7 +492,7 @@ static actor_method_class l_daNpc_Inko_Method = { (process_method_func)daNpc_Inko_Draw, }; -actor_process_profile_definition g_profile_NPC_INKO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_INKO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index f3636747b6..0600e01222 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -215,7 +215,7 @@ enum Type { static NPC_INS_HIO_CLASS l_HIO; -static daNpc_GetParam2 l_bckGetParamList[24] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[24] = { {-1, J3DFrameCtrl::EMode_LOOP, INS}, {BCK_INS_F_TALK_A, J3DFrameCtrl::EMode_NONE, INS}, {BCK_INS_F_SNIFF, J3DFrameCtrl::EMode_NONE, INS}, @@ -242,7 +242,7 @@ static daNpc_GetParam2 l_bckGetParamList[24] = { {BCK_INS_K_STEP, J3DFrameCtrl::EMode_NONE, INS2}, }; -static daNpc_GetParam2 l_btpGetParamList[8] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[8] = { {BTP_INS, J3DFrameCtrl::EMode_LOOP, INS}, {BTP_INS_F_SNIFF, J3DFrameCtrl::EMode_NONE, INS}, {BTP_INS_F_SURPRISED, J3DFrameCtrl::EMode_NONE, INS}, @@ -253,7 +253,7 @@ static daNpc_GetParam2 l_btpGetParamList[8] = { {BTP_INS_FH_MAD, J3DFrameCtrl::EMode_LOOP, INS}, }; -static daNpc_GetParam2 l_btkGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[2] = { {BTK_INS, J3DFrameCtrl::EMode_LOOP, INS}, {BTK_INS_SNIFF, J3DFrameCtrl::EMode_NONE, INS1}, }; @@ -270,23 +270,23 @@ static int l_loadRes_INS2[3] = { INS, INS2, -1, }; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_INS0, l_loadRes_INS1, l_loadRes_INS2, }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "Ins", "Ins1", "Ins2", }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL, }; -static char* l_myName = "ins"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "ins"; daNpcIns_c::eventFunc daNpcIns_c::mEvtSeqList[1] = { NULL, @@ -1803,7 +1803,7 @@ static int daNpcIns_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpcIns_MethodTable = { +static DUSK_CONST actor_method_class daNpcIns_MethodTable = { (process_method_func)daNpcIns_Create, (process_method_func)daNpcIns_Delete, (process_method_func)daNpcIns_Execute, @@ -1811,7 +1811,7 @@ static actor_method_class daNpcIns_MethodTable = { (process_method_func)daNpcIns_Draw, }; -actor_process_profile_definition g_profile_NPC_INS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_INS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 29902a3e3e..a0782d8d30 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -176,11 +176,11 @@ void daNpc_Jagar_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_JAGAR, 1}, }; -static daNpcT_evtData_c l_evtList[9] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[9] = { {"", 0}, {"NO_RESPONSE", 0}, {"CLIMBUP", 2}, @@ -192,7 +192,7 @@ static daNpcT_evtData_c l_evtList[9] = { {"FIND_WOLF_VER2", 3}, }; -static char* l_resNameList[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[5] = { "", "Jagar", "Jagar1", @@ -200,26 +200,26 @@ static char* l_resNameList[5] = { "Jagar3", }; -static s8 l_loadResPtrn0[4] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = { 1, 2, 4, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { 1, 3, -1 }; -static s8 l_loadResPtrn9[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = { 1, 2, 3, 4, -1 }; -static s8* l_loadResPtrnList[4] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn9, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_JAGA, J3DFrameCtrl::EMode_LOOP, Jagar, 1}, {BCK_JAGA_F_TALK_A, J3DFrameCtrl::EMode_NONE, Jagar, @@ -242,7 +242,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { BTP_JAGA_F_SURPRISE_WAIT, J3DFrameCtrl::EMode_LOOP, Jagar2, 0}, }; -daNpcT_motionAnmData_c l_motionAnmData[18] = { +DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[18] = { {BCK_JAGAR_WAIT_A, J3DFrameCtrl::EMode_LOOP, Jagar, BTK_JAGA, J3DFrameCtrl::EMode_NONE, Jagar, 1, 0}, {BCK_JAGA_CHU, J3DFrameCtrl::EMode_LOOP, Jagar1, @@ -281,7 +281,7 @@ daNpcT_motionAnmData_c l_motionAnmData[18] = { BTK_JAGA, J3DFrameCtrl::EMode_NONE, Jagar, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = { {1, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -293,7 +293,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -315,7 +315,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { {13, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Jagar_c::mCutNameList[7] = { +char DUSK_CONST* DUSK_CONST daNpc_Jagar_c::mCutNameList[7] = { "", "CLIMBUP", "NEED_YOUR_HELP", @@ -325,7 +325,7 @@ char* daNpc_Jagar_c::mCutNameList[7] = { "FIND_WOLF", }; -daNpc_Jagar_c::cutFunc daNpc_Jagar_c::mCutList[7] = { +daNpc_Jagar_c::cutFunc DUSK_CONST daNpc_Jagar_c::mCutList[7] = { NULL, &daNpc_Jagar_c::cutClimbUp, &daNpc_Jagar_c::cutNeedYourHelp, @@ -1783,7 +1783,7 @@ static int daNpc_Jagar_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Jagar_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Jagar_MethodTable = { (process_method_func)daNpc_Jagar_Create, (process_method_func)daNpc_Jagar_Delete, (process_method_func)daNpc_Jagar_Execute, @@ -1791,7 +1791,7 @@ static actor_method_class daNpc_Jagar_MethodTable = { (process_method_func)daNpc_Jagar_Draw, }; -actor_process_profile_definition g_profile_NPC_JAGAR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_JAGAR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index a285c41b98..4a15be8dca 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -11,13 +11,13 @@ #include "Z2AudioLib/Z2Instances.h" #include -static int l_bmdData[3][2] = { +static DUSK_CONSTEXPR int l_bmdData[3][2] = { {10, 1}, {8, 1}, {9, 1}, }; -static daNpcT_evtData_c l_evtList[21] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[21] = { {"", 0}, {"NO_RESPONSE", 0}, {"MAROS_WHISPER", 1}, @@ -41,48 +41,48 @@ static daNpcT_evtData_c l_evtList[21] = { {"SWDTUTORIAL_JUMPGIRI_CLEAR2", 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Kakashi", }; -static s8 l_loadResPtrn0[] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[] = {1, -1}; -static s8* l_loadResPtrnList[6] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[6] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, NULL, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, 0, 0, -1, 0, 0, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {-1, 0, 0, -1, 0, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Kakashi_c::mCutNameList[4] = { +char DUSK_CONST* DUSK_CONST daNpc_Kakashi_c::mCutNameList[4] = { "", "SWDTUTORIAL", "GET_WOODSWD", "MAROS_WHISPER", }; -int (daNpc_Kakashi_c::*daNpc_Kakashi_c::mCutList[])(int) = { +int (daNpc_Kakashi_c::* DUSK_CONST daNpc_Kakashi_c::mCutList[])(int) = { NULL, &daNpc_Kakashi_c::cutSwdTutorial, &daNpc_Kakashi_c::cutGetWoodSwd, @@ -1163,7 +1163,7 @@ static int daNpc_Kakashi_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Kakashi_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Kakashi_MethodTable = { (process_method_func)daNpc_Kakashi_Create, (process_method_func)daNpc_Kakashi_Delete, (process_method_func)daNpc_Kakashi_Execute, @@ -1171,7 +1171,7 @@ static actor_method_class daNpc_Kakashi_MethodTable = { (process_method_func)daNpc_Kakashi_Draw, }; -actor_process_profile_definition g_profile_NPC_KAKASHI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KAKASHI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 9d2ff8b8b5..a1c33ba3e1 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -518,7 +518,7 @@ void daNpcKasi_Mng_c::chgWeightLight() { } } -static daNpc_GetParam2 l_bckGetParamList[15] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[15] = { {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_A, J3DFrameCtrl::EMode_LOOP, GIRLS}, @@ -536,17 +536,17 @@ static daNpc_GetParam2 l_bckGetParamList[15] = { {BCK_W_2NORMALTALK_B, J3DFrameCtrl::EMode_NONE, WGENERAL}, }; -static daNpc_GetParam2 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[1] = { {BTP_HANA, J3DFrameCtrl::EMode_LOOP, KASI_HANA}, }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "kasi_hana", "girls", "Wgeneral", }; -static char* l_evtNames[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[6] = { NULL, "KASIMASI_APPEAR", "KASIMASI_TALK", @@ -555,7 +555,7 @@ static char* l_evtNames[6] = { "KASIMASI_CHEER2", }; -static char* l_myName = "kasi_hana"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "kasi_hana"; daNpcKasiHana_HIOParam const daNpcKasiHana_Param_c::m = { 55.0f, @@ -2301,7 +2301,7 @@ static int daNpcKasiHana_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpcKasiHana_MethodTable = { +static DUSK_CONST actor_method_class daNpcKasiHana_MethodTable = { (process_method_func)daNpcKasiHana_Create, (process_method_func)daNpcKasiHana_Delete, (process_method_func)daNpcKasiHana_Execute, @@ -2309,7 +2309,7 @@ static actor_method_class daNpcKasiHana_MethodTable = { (process_method_func)daNpcKasiHana_Draw, }; -actor_process_profile_definition g_profile_NPC_KASIHANA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KASIHANA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index d3d3782a3f..0d034155c5 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -105,7 +105,7 @@ enum Motion { static NPC_KASI_KYU_HIO_CLASS l_HIO; -static daNpc_GetParam2 l_bckGetParamList[16] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[16] = { {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_A, J3DFrameCtrl::EMode_LOOP, GIRLS}, @@ -124,23 +124,23 @@ static daNpc_GetParam2 l_bckGetParamList[16] = { {BCK_W_2NORMALTALK_A, J3DFrameCtrl::EMode_NONE, WGENERAL}, }; -static daNpc_GetParam2 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[1] = { {BTP_KYU, J3DFrameCtrl::EMode_LOOP, KASI_KYU}, }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "kasi_kyu", "girls", "Wgeneral", }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL, }; -static char* l_myName = "kasi_kyu"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "kasi_kyu"; -daNpcKasiKyu_c::EventFn daNpcKasiKyu_c::mEvtSeqList[1] = { +daNpcKasiKyu_c::EventFn DUSK_CONST daNpcKasiKyu_c::mEvtSeqList[1] = { NULL }; @@ -1416,7 +1416,7 @@ static int daNpcKasiKyu_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpcKasiKyu_MethodTable = { +static DUSK_CONST actor_method_class daNpcKasiKyu_MethodTable = { (process_method_func)daNpcKasiKyu_Create, (process_method_func)daNpcKasiKyu_Delete, (process_method_func)daNpcKasiKyu_Execute, @@ -1424,7 +1424,7 @@ static actor_method_class daNpcKasiKyu_MethodTable = { (process_method_func)daNpcKasiKyu_Draw, }; -actor_process_profile_definition g_profile_NPC_KASIKYU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KASIKYU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index a050bffc01..a1565dac53 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -105,7 +105,7 @@ enum Motion { static NPC_KASI_MICH_HIO_CLASS l_HIO; -static daNpc_GetParam2 l_bckGetParamList[16] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[16] = { {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_A, J3DFrameCtrl::EMode_LOOP, GIRLS}, @@ -124,23 +124,23 @@ static daNpc_GetParam2 l_bckGetParamList[16] = { {BCK_W_2NORMALTALK_B, J3DFrameCtrl::EMode_NONE, WGENERAL}, }; -static daNpc_GetParam2 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[1] = { {BTP_MICH, J3DFrameCtrl::EMode_LOOP, KASI_MICH}, }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "kasi_mich", "girls", "Wgeneral", }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL }; -static char* l_myName = "kasi_mich"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "kasi_mich"; -daNpcKasiMich_c::EventFn daNpcKasiMich_c::mEvtSeqList[1] = { +daNpcKasiMich_c::EventFn DUSK_CONST daNpcKasiMich_c::mEvtSeqList[1] = { NULL }; @@ -1403,7 +1403,7 @@ static int daNpcKasiMich_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpcKasiMich_MethodTable = { +static DUSK_CONST actor_method_class daNpcKasiMich_MethodTable = { (process_method_func)daNpcKasiMich_Create, (process_method_func)daNpcKasiMich_Delete, (process_method_func)daNpcKasiMich_Execute, @@ -1411,7 +1411,7 @@ static actor_method_class daNpcKasiMich_MethodTable = { (process_method_func)daNpcKasiMich_Draw, }; -actor_process_profile_definition g_profile_NPC_KASIMICH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KASIMICH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 0cbae54ae3..51736d173c 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_npc_kdk.h" -actor_process_profile_definition g_profile_NPC_KDK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KDK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index e4687ac2c2..2b37ee81f1 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -9,12 +9,12 @@ #include "d/actor/d_a_e_ym.h" #include -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {35, 1}, {18, 2}, }; -static daNpcT_evtData_c l_evtList[5] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[5] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -22,23 +22,23 @@ static daNpcT_evtData_c l_evtList[5] = { {"YM_LOOK", 2}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Kkri", "Kkri_TW", }; -static s8 l_loadResPtrn0[] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[] = {1, -1}; -static s8 l_loadResPtrn1[] = {1, 2, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[] = {1, 2, -1}; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = { {-1, 0, 0, 44, 2, 1, 1}, {13, 0, 1, 44, 2, 1, 1}, {11, 0, 1, 50, 0, 1, 0}, @@ -56,7 +56,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = { {8, 0, 2, 26, 0, 2, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[21] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[21] = { {30, 2, 1, 38, 0, 1, 1, 0}, {31, 2, 1, 38, 0, 1, 1, 0}, {28, 2, 1, 38, 0, 1, 1, 0}, @@ -80,7 +80,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[21] = { {13, 0, 2, 38, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, @@ -143,7 +143,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -222,13 +222,13 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { {-1, 0, 0}, }; -char* daNpc_Kkri_c::mCutNameList[3] = { +char DUSK_CONST* DUSK_CONST daNpc_Kkri_c::mCutNameList[3] = { "", "CONVERSATION_ABOUT_SOUP", "YM_LOOK", }; -int (daNpc_Kkri_c::*daNpc_Kkri_c::mCutList[])(int) = { +int (daNpc_Kkri_c::* DUSK_CONST daNpc_Kkri_c::mCutList[])(int) = { NULL, &daNpc_Kkri_c::cutConversationAboutSoup, &daNpc_Kkri_c::cutYmLook, @@ -1237,7 +1237,7 @@ static int daNpc_Kkri_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Kkri_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Kkri_MethodTable = { (process_method_func)daNpc_Kkri_Create, (process_method_func)daNpc_Kkri_Delete, (process_method_func)daNpc_Kkri_Execute, @@ -1245,7 +1245,7 @@ static actor_method_class daNpc_Kkri_MethodTable = { (process_method_func)daNpc_Kkri_Draw, }; -actor_process_profile_definition g_profile_NPC_KKRI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KKRI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 63db584cda..3f221e55c4 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -200,13 +200,13 @@ void daNpc_Kn_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[3][2] = { +static DUSK_CONSTEXPR int l_bmdData[3][2] = { {47, 1}, {48, 1}, {49, 1}, }; -static daNpcT_evtData_c l_evtList[26] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[26] = { {"", 0}, {"NONE_EQUIP_CHANGE_TALK", 1}, {"NONE_EQUIP_CHANGE_TALK_WAIT", 1}, @@ -235,7 +235,7 @@ static daNpcT_evtData_c l_evtList[26] = { {"SEVENTH_SKILL_GET_STAND", 8}, }; -static char* l_resNameList[9] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[9] = { "", "KN_a", "KN_tch01D", "KN_tch02D", "KN_tch03D", "KN_tch04D", "KN_tch05D", "KN_tch06D", "KN_tch07D", }; @@ -287,17 +287,17 @@ static s8 l_loadResPtrnTeach07[3] = { -1, }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[8] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[8] = { l_loadResPtrnTeach01, l_loadResPtrnTeach02, l_loadResPtrnTeach03, l_loadResPtrnTeach04, l_loadResPtrnTeach05, l_loadResPtrnTeach06, l_loadResPtrnTeach07, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, 0, 0, -1, 0, 0, 0}, {21, 0, 1, -1, 0, 0, 0}, }; @@ -322,7 +322,7 @@ static int l_podBckData[5][2] = { {32, 1}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -333,7 +333,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -468,7 +468,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = { {-1, 0, 0}, }; -char* daNpc_Kn_c::mCutNameList[21] = { +char DUSK_CONST* DUSK_CONST daNpc_Kn_c::mCutNameList[21] = { "", "NONE_EQUIP_CHANGE_TALK", "NO_EQ_CHNGE_TLK_STD", @@ -492,7 +492,7 @@ char* daNpc_Kn_c::mCutNameList[21] = { "SEVENTH_SKILL_GET", }; -daNpc_Kn_c::cutFunc daNpc_Kn_c::mCutList[21] = { +daNpc_Kn_c::cutFunc DUSK_CONST daNpc_Kn_c::mCutList[21] = { NULL, &daNpc_Kn_c::ECut_noneEquipChangeTalk, &daNpc_Kn_c::ECut_noneEquipChangeTalkStand, @@ -783,10 +783,10 @@ u8 daNpc_Kn_c::getPath() { } BOOL daNpc_Kn_c::isDelete() { - static s16 l_appearFlag[7] = { + static DUSK_CONSTEXPR s16 l_appearFlag[7] = { -1, 0x0153, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157, }; - static s16 l_delFlag[7] = { + static DUSK_CONSTEXPR s16 l_delFlag[7] = { 0x0153, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157, 0x0158, }; @@ -1224,7 +1224,7 @@ void daNpc_Kn_c::setCollision() { } void daNpc_Kn_c::setCollisionSword() { - static f32 l_swordOffset[2] = {60.0f, 120.0f}; + static DUSK_CONSTEXPR f32 l_swordOffset[2] = {60.0f, 120.0f}; if (mMotionSeqMngr.getNo() == 0x19 && mMotionSeqMngr.getStepNo() == 0 && mMotionSeqMngr.checkEntryNewMotion() == 0) @@ -5035,8 +5035,8 @@ void daNpc_Kn_c::setSwordChargePtcl() { { f32 frame = mpModelMorf[0]->getFrame(); if (frame >= 17.0f && frame < 37.0f) { - static cXyz lightAParticleScale(1.5223f, 1.3f, 1.3f); - static cXyz lightALocalTrans(88.399994f, 0.0f, 0.0f); + static DUSK_CONSTEXPR cXyz lightAParticleScale(1.5223f, 1.3f, 1.3f); + static DUSK_CONSTEXPR cXyz lightALocalTrans(88.399994f, 0.0f, 0.0f); f32 temp_f29 = 156.0f; f32 var_f30 = frame; @@ -5258,13 +5258,13 @@ static int daNpc_Kn_IsDelete(void* i_this) { #include "d/actor/d_a_npc_kn_teach02.inc" -static actor_method_class daNpc_Kn_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Kn_MethodTable = { (process_method_func)daNpc_Kn_Create, (process_method_func)daNpc_Kn_Delete, (process_method_func)daNpc_Kn_Execute, (process_method_func)daNpc_Kn_IsDelete, (process_method_func)daNpc_Kn_Draw, }; -actor_process_profile_definition g_profile_NPC_KN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index 79e8349c3b..28f4b8fba7 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -65,7 +65,7 @@ BOOL daNpc_Kn_c::setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData return mBtkAnm.init(i_modelData, i_btk, TRUE, i_mode, i_speed, 0, -1); } -int daNpc_Kn_c::loadRes(const s8* i_ptrn_list, const char** i_arcname_list) { +int daNpc_Kn_c::loadRes(const s8* i_ptrn_list, const char* DUSK_CONST* i_arcname_list) { int phase; int resLoad_cnt = 0; @@ -91,7 +91,7 @@ int daNpc_Kn_c::loadRes(const s8* i_ptrn_list, const char** i_arcname_list) { return cPhs_INIT_e; } -void daNpc_Kn_c::deleteRes(const s8* i_ptrn_list, const char** i_arcname_list) { +void daNpc_Kn_c::deleteRes(const s8* i_ptrn_list, const char* DUSK_CONST* i_arcname_list) { for (int i = 0; i < 8 && i_ptrn_list[i] != -1; i++) { dComIfG_resDelete(&mPhase[i], i_arcname_list[i_ptrn_list[i]]); } diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index d92f09b170..52b922955d 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -83,51 +83,51 @@ enum Motion { /* 0x00 */ MOT_UNK_0 = 0, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {9, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Knj", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[6] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[6] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, 0, 0, -1, 0, 0, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {6, 2, 1, -1, 0, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Knj_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_Knj_c::mCutNameList[1] = {""}; -daNpc_Knj_c::cutFunc daNpc_Knj_c::mCutList[1] = { +daNpc_Knj_c::cutFunc DUSK_CONST daNpc_Knj_c::mCutList[1] = { NULL, }; @@ -527,13 +527,13 @@ static int daNpc_Knj_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Knj_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Knj_MethodTable = { (process_method_func)daNpc_Knj_Create, (process_method_func)daNpc_Knj_Delete, (process_method_func)daNpc_Knj_Execute, (process_method_func)daNpc_Knj_IsDelete, (process_method_func)daNpc_Knj_Draw, }; -actor_process_profile_definition g_profile_NPC_KNJ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KNJ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index a7dd470d2b..09fc2d12ff 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -167,13 +167,13 @@ enum Event { /* 0x8 */ EVENT_CLOTH_TRY, }; -static int l_bmdData[3][2] = { +static DUSK_CONSTEXPR int l_bmdData[3][2] = { {BMDR_KOLIN, KOLIN}, {BMDR_KOLIN_TW, KOLIN_TW}, {BMDR_KOLIN_CLOTH, KOLIN2}, }; -static daNpcT_evtData_c l_evtList[9] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[9] = { {"", 0}, {"NO_RESPONSE", 0}, {"NO_RIDE_L", 3}, @@ -185,7 +185,7 @@ static daNpcT_evtData_c l_evtList[9] = { {"CLOTH_TRY", 3}, }; -static char* l_resNameList[8] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[8] = { "", "Kolin", "Kolin_TW", @@ -196,38 +196,38 @@ static char* l_resNameList[8] = { "Taro1", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { KOLIN, KOLIN1, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { KOLIN, KOLIN_TW, -1, }; -static s8 l_loadResPtrn2[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = { KOLIN, KOLIN2, -1, }; -static s8 l_loadResPtrn3[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[5] = { KOLIN, KOLIN1, KOLIN2, KOLIN_TW, -1, }; -static s8 l_loadResPtrn4[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn4[3] = { KOLIN, KOLIN_P1, -1, }; -static s8 l_loadResPtrn9[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = { KOLIN, KOLIN1, KOLIN2, KOLIN_TW, -1, }; -static s8* l_loadResPtrnList[15] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[15] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn3, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn4, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_KOLIN, J3DFrameCtrl::EMode_LOOP, KOLIN, 1}, {BCK_KOLIN_F_WALK_A, J3DFrameCtrl::EMode_LOOP, KOLIN1, BTP_KOLIN_F_WALK_A, J3DFrameCtrl::EMode_LOOP, KOLIN1, 0}, {BCK_KOLIN_F_STONE, J3DFrameCtrl::EMode_NONE, KOLIN1, BTP_KOLIN_F_STONE, J3DFrameCtrl::EMode_NONE, KOLIN1, 0}, @@ -244,7 +244,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {BCK_KOLIN_F_CLUP, J3DFrameCtrl::EMode_NONE, KOLIN1, BTP_KOLIN_F_CLUP, J3DFrameCtrl::EMode_NONE, KOLIN1, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[21] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[21] = { {BCK_KOLIN_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLIN, BTK_KOLIN, J3DFrameCtrl::EMode_NONE, KOLIN, 1, 0}, {BCK_KOLIN_WAIT_B, J3DFrameCtrl::EMode_LOOP, KOLIN1, BTK_KOLIN, J3DFrameCtrl::EMode_NONE, KOLIN, 1, 0}, {BCK_KOLIN_WAIT_C, J3DFrameCtrl::EMode_LOOP, KOLIN1, BTK_KOLIN, J3DFrameCtrl::EMode_NONE, KOLIN, 1, 0}, @@ -268,7 +268,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[21] = { {BCK_KOLIN_CLOTH_TRY, J3DFrameCtrl::EMode_NONE, KOLIN2, BTK_KOLIN_CLOTH_TRY, J3DFrameCtrl::EMode_NONE, KOLIN2, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { {10, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -285,7 +285,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -308,7 +308,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { {20, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Kolin_c::mCutNameList[11] = { +char DUSK_CONST* DUSK_CONST daNpc_Kolin_c::mCutNameList[11] = { "", "NO_RIDE", "HAIL", @@ -322,7 +322,7 @@ char* daNpc_Kolin_c::mCutNameList[11] = { "THANK_YOU", }; -daNpc_Kolin_c::cutFunc daNpc_Kolin_c::mCutList[11] = { +daNpc_Kolin_c::cutFunc DUSK_CONST daNpc_Kolin_c::mCutList[11] = { NULL, &daNpc_Kolin_c::cutNoRide, &daNpc_Kolin_c::cutHail, @@ -2243,7 +2243,7 @@ static int daNpc_Kolin_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_Kolin_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Kolin_MethodTable = { (process_method_func)daNpc_Kolin_Create, (process_method_func)daNpc_Kolin_Delete, (process_method_func)daNpc_Kolin_Execute, @@ -2251,7 +2251,7 @@ static actor_method_class daNpc_Kolin_MethodTable = { (process_method_func)daNpc_Kolin_Draw, }; -actor_process_profile_definition g_profile_NPC_KOLIN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KOLIN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index fa76592483..bf0d78e0fa 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -98,38 +98,38 @@ enum TYPE { /* 0x3 */ TYPE_3, }; -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {BMDR_KOLINB, KOLINB}, {BMDR_SRCB, ZRCB}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"", 0}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Kolinb", "zrCb", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { KOLINB, -1 }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { KOLINB, ZRCB, -1, }; -static s8* l_loadResPtrnList[4] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, NULL, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_KOLINB, J3DFrameCtrl::EMode_LOOP, KOLINB, 1}, {BCK_KOLINB_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTP_KOLINB_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLINB, 0}, {BCK_KOLINB_F_SUFFER_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTP_KOLINB_F_SUFFER_A, J3DFrameCtrl::EMode_LOOP, KOLINB, 0}, @@ -142,7 +142,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {BCK_ZRCB_F_SUFFER_B, J3DFrameCtrl::EMode_LOOP, ZRCB, BTP_ZRCB_F_SUFFER_B, J3DFrameCtrl::EMode_LOOP, ZRCB, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[9] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[9] = { {BCK_KOLINB_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTK_KOLINB, J3DFrameCtrl::EMode_NONE, KOLINB, 0, 0}, {BCK_KOLINB_SUFFER_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTK_KOLINB, J3DFrameCtrl::EMode_NONE, KOLINB, 0, 0}, {BCK_KOLINB_SUFFER_B, J3DFrameCtrl::EMode_LOOP, KOLINB, BTK_KOLINB, J3DFrameCtrl::EMode_NONE, KOLINB, 0, 0}, @@ -154,7 +154,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[9] = { {BCK_ZRCB_SUFFER_B, J3DFrameCtrl::EMode_LOOP, ZRCB, -1, J3DFrameCtrl::EMode_NONE, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -166,7 +166,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {5, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -177,7 +177,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = { {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Kolinb_c::mCutNameList[7] = { +char DUSK_CONST* DUSK_CONST daNpc_Kolinb_c::mCutNameList[7] = { "", "CONVERSATION_IN_HOTEL", "CONVERSATION_ABOUT_DEATHMT", @@ -187,7 +187,7 @@ char* daNpc_Kolinb_c::mCutNameList[7] = { "THANK_YOU", }; -daNpc_Kolinb_c::cutFunc daNpc_Kolinb_c::mCutList[7] = { +daNpc_Kolinb_c::cutFunc DUSK_CONST daNpc_Kolinb_c::mCutList[7] = { NULL, &daNpc_Kolinb_c::cutConversationInHotel, &daNpc_Kolinb_c::cutConversationAboutDeathMt, @@ -935,7 +935,7 @@ static int daNpc_Kolinb_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpc_Kolinb_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Kolinb_MethodTable = { (process_method_func)daNpc_Kolinb_Create, (process_method_func)daNpc_Kolinb_Delete, (process_method_func)daNpc_Kolinb_Execute, @@ -943,7 +943,7 @@ static actor_method_class daNpc_Kolinb_MethodTable = { (process_method_func)daNpc_Kolinb_Draw, }; -actor_process_profile_definition g_profile_NPC_KOLINB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KOLINB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 1d60f5a10a..e84d4b7bad 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -7315,7 +7315,7 @@ static void* s_check_sub(void* i_actor, void* i_data) { } static int daNpc_Ks_Create(fopAc_ac_c* actor) { - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fafd3f, 0x3}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -7455,7 +7455,7 @@ static int daNpc_Ks_Create(fopAc_ac_c* actor) { AUDIO_INSTANCES; -static actor_method_class l_daNpc_Ks_Method = { +static DUSK_CONST actor_method_class l_daNpc_Ks_Method = { (process_method_func)daNpc_Ks_Create, (process_method_func)daNpc_Ks_Delete, (process_method_func)daNpc_Ks_Execute, @@ -7463,7 +7463,7 @@ static actor_method_class l_daNpc_Ks_Method = { (process_method_func)daNpc_Ks_Draw, }; -actor_process_profile_definition g_profile_NPC_KS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 2ca6652468..429249bbfc 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -52,40 +52,40 @@ const daNpc_Kyury_HIOParam daNpc_Kyury_Param_c::m = { 0.0f, // box_offset }; -static int l_bmdData[3][2] = { +static DUSK_CONSTEXPR int l_bmdData[3][2] = { {41, 1}, {42, 1}, {43, 1}, }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"NO_RESPONSE", 0}, {"FIRST_CONVERSATION", 2}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Kyury", "Kyury1", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8 l_loadResPtrn9[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[3] = { 1, 2, -1, }; -static s8* l_loadResPtrnList[4] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[17] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[17] = { {-1, 0, 0, 50, 2, 1, 1}, {22, 0, 1, 50, 2, 1, 1}, {23, 0, 1, 56, 0, 1, 0}, {24, 0, 1, 57, 0, 1, 0}, {19, 0, 1, 53, 0, 1, 0}, {21, 0, 1, 55, 0, 1, 0}, {25, 2, 1, 50, 2, 1, 1}, {27, 2, 1, 59, 2, 1, 0}, {11, 2, 1, 50, 2, 1, 1}, @@ -94,7 +94,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[17] = { {20, 0, 1, 54, 0, 1, 0}, {26, 2, 1, 58, 2, 1, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[16] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[16] = { {36, 2, 1, 46, 0, 1, 1, 0}, {37, 2, 1, 46, 0, 1, 1, 0}, {33, 0, 1, 46, 0, 1, 1, 0}, {34, 0, 1, 46, 0, 1, 1, 0}, {35, 0, 1, 46, 0, 1, 1, 0}, {38, 2, 1, 46, 0, 1, 1, 0}, {28, 0, 1, 46, 0, 1, 1, 0}, {29, 0, 1, 46, 0, 1, 1, 0}, {18, 2, 1, 46, 0, 1, 1, 0}, @@ -103,7 +103,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[16] = { {31, 0, 1, 46, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {15, -1, 1}, @@ -116,7 +116,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, @@ -127,12 +127,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Kyury_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_Kyury_c::mCutNameList[2] = { "", "CONVERSATION", }; -daNpc_Kyury_c::cutFunc daNpc_Kyury_c::mCutList[2] = { +daNpc_Kyury_c::cutFunc DUSK_CONST daNpc_Kyury_c::mCutList[2] = { NULL, &daNpc_Kyury_c::cutConversation, }; @@ -884,13 +884,13 @@ static int daNpc_Kyury_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Kyury_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Kyury_MethodTable = { (process_method_func)daNpc_Kyury_Create, (process_method_func)daNpc_Kyury_Delete, (process_method_func)daNpc_Kyury_Execute, (process_method_func)daNpc_Kyury_IsDelete, (process_method_func)daNpc_Kyury_Draw, }; -actor_process_profile_definition g_profile_NPC_KYURY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_KYURY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index f61784592a..35b8c33dd2 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -65,12 +65,12 @@ void daNpc_Len_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {11, 1}, {13, 2}, }; -static daNpcT_evtData_c l_evtList[7] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[7] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -80,27 +80,27 @@ static daNpcT_evtData_c l_evtList[7] = { {"CONVERSATION_IN_HOTEL2", 3}, }; -static char* l_resNameList[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[4] = { "", "Len", "Len_TW", "Len1", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { 1, 3, -1, }; -static s8 l_loadResPtrn1[4] = {1, 2, 3, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[4] = {1, 2, 3, -1}; -static s8* l_loadResPtrnList[10] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[10] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[21] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[21] = { {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 17, 2, 1, 1}, {16, 0, 3, 46, 0, 3, 0}, {24, 2, 3, 49, 2, 3, 0}, {18, 0, 3, 47, 0, 3, 0}, {25, 2, 3, 50, 2, 3, 0}, {17, 2, 3, 17, 2, 1, 1}, {19, 2, 3, 17, 2, 1, 1}, {14, 2, 3, 17, 2, 1, 1}, @@ -110,7 +110,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[21] = { {9, 2, 2, 21, 2, 2, 0}, {8, 0, 2, 20, 0, 2, 0}, {10, 2, 2, 22, 2, 2, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[18] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[18] = { {8, 2, 1, 14, 0, 1, 1, 0}, {27, 0, 3, 14, 0, 1, 1, 0}, {34, 2, 3, 14, 0, 1, 1, 0}, {29, 2, 3, 14, 0, 1, 1, 0}, {31, 2, 3, 14, 0, 1, 1, 0}, {30, 0, 3, 14, 0, 1, 1, 0}, {32, 2, 3, 14, 0, 1, 1, 0}, {33, 0, 3, 14, 0, 1, 1, 0}, {28, 0, 3, 14, 0, 1, 1, 0}, @@ -119,7 +119,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[18] = { {7, 2, 2, 17, 2, 2, 0, 0}, {6, 2, 2, 16, 2, 2, 0, 0}, {7, 0, 1, 14, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {5, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {13, -1, 1}, {14, 0, 1}, {15, 0, 0}, {-1, 0, 0}, {16, -1, 1}, @@ -133,7 +133,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[56] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[56] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 1}, {10, 0, 1}, {11, 0, 0}, {-1, 0, 0}, {12, -1, 1}, @@ -144,14 +144,14 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[56] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {17, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Len_c::mCutNameList[4] = { +char DUSK_CONST* DUSK_CONST daNpc_Len_c::mCutNameList[4] = { "", "HURRY", "CONVERSATION_IN_HOTEL", "TAKE_WOODSTATUE", }; -daNpc_Len_c::cutFunc daNpc_Len_c::mCutList[4] = { +daNpc_Len_c::cutFunc DUSK_CONST daNpc_Len_c::mCutList[4] = { NULL, &daNpc_Len_c::cutHurry, &daNpc_Len_c::cutConversationInHotel, @@ -1290,13 +1290,13 @@ static int daNpc_Len_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Len_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Len_MethodTable = { (process_method_func)daNpc_Len_Create, (process_method_func)daNpc_Len_Delete, (process_method_func)daNpc_Len_Execute, (process_method_func)daNpc_Len_IsDelete, (process_method_func)daNpc_Len_Draw, }; -actor_process_profile_definition g_profile_NPC_LEN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_LEN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index 30b83fda7a..cca956e2e6 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -324,7 +324,7 @@ lf_s::lf_s() {} daNPC_LF_HIO_c::~daNPC_LF_HIO_c() {} -static actor_method_class l_daNPC_LF_Method = { +static DUSK_CONST actor_method_class l_daNPC_LF_Method = { (process_method_func)daNPC_LF_Create, (process_method_func)daNPC_LF_Delete, (process_method_func)daNPC_LF_Execute, @@ -332,7 +332,7 @@ static actor_method_class l_daNPC_LF_Method = { (process_method_func)daNPC_LF_Draw, }; -actor_process_profile_definition g_profile_NPC_LF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_LF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index cd15d60d22..38632d9a5d 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -123,47 +123,47 @@ enum Motion { /* 0x13 */ MOT_UNK_19 = 19, }; -static int l_bmdData[5][2] = { +static DUSK_CONSTEXPR int l_bmdData[5][2] = { {11, 1}, {11, 2}, {39, 4}, {40, 4}, {38, 4}, }; -static daNpcT_evtData_c l_evtList[6] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[6] = { {"", 0}, {"NO_RESPONSE", 0}, {"DEMO13_STB", 0}, {"CONVERSATION_ABOUT_GORON", 4}, {"NURSE", 4}, {"GO_AHEAD", 4}, }; -static char* l_resNameList[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[6] = { "", "Lud", "Lud_TW", "Lud1", "Lud2", "Len1", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { 1, 3, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { 1, 2, -1, }; -static s8 l_loadResPtrn2[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = { 1, 4, -1, }; -s8 l_loadResPtrn9[5] = { +DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = { 1, 2, 3, 4, -1, }; -static s8* l_loadResPtrnList[9] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[9] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = { {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 17, 2, 1, 1}, {18, 2, 4, 51, 2, 4, 0}, {15, 0, 4, 48, 0, 4, 0}, {16, 2, 4, 49, 2, 4, 0}, {17, 0, 4, 50, 0, 4, 0}, {21, 0, 4, 54, 0, 4, 0}, {22, 0, 4, 55, 0, 4, 0}, {24, 2, 4, 57, 2, 4, 0}, @@ -173,7 +173,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = { {8, 2, 2, 15, 2, 2, 0}, {7, 2, 2, 14, 2, 2, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[21] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[21] = { {8, 2, 1, 14, 0, 1, 1, 0}, {6, 0, 3, 14, 0, 1, 1, 0}, {7, 0, 3, 14, 0, 1, 1, 0}, {7, 0, 1, 14, 0, 1, 1, 0}, {30, 2, 4, 14, 0, 1, 1, 0}, {33, 0, 4, 14, 0, 1, 1, 0}, {34, 2, 4, 14, 0, 1, 1, 0}, {35, 0, 4, 14, 0, 1, 1, 0}, {25, 0, 4, 14, 0, 1, 0, 0}, @@ -183,7 +183,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[21] = { {5, 2, 3, 14, 0, 1, 0, 0}, {6, 2, 2, -1, 0, 0, 0, 0}, {5, 2, 2, -1, 0, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[76] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[76] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {15, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, {5, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, @@ -197,7 +197,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[76] = {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {16, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, @@ -212,7 +212,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Lud_c::mCutNameList[8] = { +char DUSK_CONST* DUSK_CONST daNpc_Lud_c::mCutNameList[8] = { "", "HURRY", "CONVERSATION_IN_HOTEL", @@ -223,7 +223,7 @@ char* daNpc_Lud_c::mCutNameList[8] = { "THANK_YOU", }; -daNpc_Lud_c::cutFunc daNpc_Lud_c::mCutList[8] = { +daNpc_Lud_c::cutFunc DUSK_CONST daNpc_Lud_c::mCutList[8] = { NULL, &daNpc_Lud_c::cutHurry, &daNpc_Lud_c::cutConversationInHotel, @@ -1506,13 +1506,13 @@ static int daNpc_Lud_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Lud_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Lud_MethodTable = { (process_method_func)daNpc_Lud_Create, (process_method_func)daNpc_Lud_Delete, (process_method_func)daNpc_Lud_Execute, (process_method_func)daNpc_Lud_IsDelete, (process_method_func)daNpc_Lud_Draw, }; -actor_process_profile_definition g_profile_NPC_LUD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_LUD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 7b2166a1a1..040849ec2e 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -113,11 +113,11 @@ void daNpc_Maro_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {11, 1}, {5, 2}, }; -static daNpcT_evtData_c l_evtList[15] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[15] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -135,7 +135,7 @@ static daNpcT_evtData_c l_evtList[15] = { {"TALK_TO_KAKASHI", 3}, }; -static char* l_resNameList[10] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[10] = { "", "Maro", "Maro_TW", @@ -148,15 +148,15 @@ static char* l_resNameList[10] = { "Besu1", }; -static s8 l_loadResPtrn0[3] = {1, 3, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = {1, 3, -1}; -static s8 l_loadResPtrn1[3] = {1, 2, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = {1, 2, -1}; -static s8 l_loadResPtrn2[4] = {1, 3, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn2[4] = {1, 3, 4, -1}; -static s8 l_loadResPtrn3[5] = {1, 2, 3, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn3[5] = {1, 2, 3, 4, -1}; -static s8* l_loadResPtrnList[17] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[17] = { l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn2, l_loadResPtrn2, @@ -164,7 +164,7 @@ static s8* l_loadResPtrnList[17] = { l_loadResPtrn3, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 18, 0, 1, 0}, {7, 0, 3, 22, 0, 3, 0}, @@ -177,7 +177,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {7, 2, 5, 11, 2, 5, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[10] = { {8, 2, 1, 14, 0, 1, 1, 0}, {5, 2, 4, 14, 0, 1, 1, 0}, {5, 2, 5, 14, 0, 1, 1, 0}, @@ -190,7 +190,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[10] = { {10, 2, 3, 14, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -198,7 +198,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -206,7 +206,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Maro_c::mCutNameList[17] = { +char DUSK_CONST* DUSK_CONST daNpc_Maro_c::mCutNameList[17] = { "", "CONVERSATION_ABOUT_PACHINKO", "CONVERSATION_ABOUT_WOODSWD", @@ -226,7 +226,7 @@ char* daNpc_Maro_c::mCutNameList[17] = { "TALK_TO_KAKASHI", }; -daNpc_Maro_c::cutFunc daNpc_Maro_c::mCutList[17] = { +daNpc_Maro_c::cutFunc DUSK_CONST daNpc_Maro_c::mCutList[17] = { NULL, &daNpc_Maro_c::cutConversationAboutPachinko, &daNpc_Maro_c::cutConversationAboutWoodSwd, @@ -3507,7 +3507,7 @@ static int daNpc_Maro_IsDelete(void*) { return 1; } -static actor_method_class daNpc_Maro_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Maro_MethodTable = { (process_method_func)daNpc_Maro_Create, (process_method_func)daNpc_Maro_Delete, (process_method_func)daNpc_Maro_Execute, @@ -3515,7 +3515,7 @@ static actor_method_class daNpc_Maro_MethodTable = { (process_method_func)daNpc_Maro_Draw, }; -actor_process_profile_definition g_profile_NPC_MARO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_MARO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 4c11c71b75..1500ca6963 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -22,49 +22,49 @@ enum midP_RES_File_ID { /* 0xF */ BTP_MIDP = 0xF, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_MIDP, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "midP" }; -static s8 l_loadResPtrn0[1 + 1 /* padding */] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[1 + 1 /* padding */] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { -1, 0, 0, 15, 2, 1, 1 }; -static daNpcT_motionAnmData_c l_motionAnmData = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData = { 6, 2, 1, 12, 0, 1, 1, 0 }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -char* daNpc_midP_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_midP_c::mCutNameList = ""; -daNpc_midP_c::cutFunc daNpc_midP_c::mCutList[1] = { 0 }; +daNpc_midP_c::cutFunc DUSK_CONST daNpc_midP_c::mCutList[1] = { 0 }; daNpc_midP_HIOParam const daNpc_midP_Param_c::m = { 210.0f, @@ -638,7 +638,7 @@ static int daNpc_midP_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_midP_MethodTable = { +static DUSK_CONST actor_method_class daNpc_midP_MethodTable = { (process_method_func)daNpc_midP_Create, (process_method_func)daNpc_midP_Delete, (process_method_func)daNpc_midP_Execute, @@ -646,7 +646,7 @@ static actor_method_class daNpc_midP_MethodTable = { (process_method_func)daNpc_midP_Draw, }; -actor_process_profile_definition g_profile_NPC_MIDP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_MIDP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 9782fa54f9..282a9a2f41 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -27,7 +27,7 @@ static BOOL daNpc_Mk_IsDelete(void* param_0) { return TRUE; } -static actor_method_class daNpc_Mk_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Mk_MethodTable = { (process_method_func)daNpc_Mk_Create, (process_method_func)daNpc_Mk_Delete, (process_method_func)daNpc_Mk_Execute, @@ -35,7 +35,7 @@ static actor_method_class daNpc_Mk_MethodTable = { (process_method_func)daNpc_Mk_Draw, }; -actor_process_profile_definition g_profile_NPC_MK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_MK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index c0101e4114..5a76e70c3a 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -86,56 +86,56 @@ void daNpc_Moi_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[8][2] = { +static DUSK_CONSTEXPR int l_bmdData[8][2] = { {11, 1}, {29, 3}, {30, 3}, {31, 3}, {13, 1}, {33, 3}, {12, 1}, {32, 3}, }; -static daNpcT_evtData_c l_evtList[4] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[4] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, {"DELIVERED_SW", 2}, }; -static char* l_resNameList[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[6] = { "", "Moi", "Moi1", "Moi2", "Moi3", "Moi_p1", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { 1, 2, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { 1, 3, -1, }; -static s8 l_loadResPtrn3[4] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[4] = { 1, 3, 4, -1, }; -static s8 l_loadResPtrn4[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn4[3] = { 1, 5, -1, }; -static s8 l_loadResPtrn9[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = { 1, 2, 3, 4, -1, }; -static s8* l_loadResPtrnList[7] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[7] = { l_loadResPtrn0, l_loadResPtrn4, l_loadResPtrn1, l_loadResPtrn3, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = { {-1, 0, 0, 19, 2, 1, TRUE}, {6, 0, 1, 19, 2, 1, TRUE}, {9, 0, 2, 41, 0, 2, FALSE}, {10, 0, 2, 42, 0, 2, FALSE}, {8, 0, 2, 40, 0, 2, FALSE}, {7, 0, 2, 39, 0, 2, FALSE}, {11, 0, 2, 43, 0, 2, FALSE}, {7, 0, 3, 40, 0, 3, FALSE}, {8, 0, 3, 41, 0, 3, FALSE}, @@ -145,7 +145,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = { {6, 2, 3, 39, 2, 3, FALSE}, {18, 0, 2, 49, 0, 2, FALSE}, }; -static daNpcT_motionAnmData_c l_motionAnmData[35] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[35] = { {8, 2, 1, 16, 0, 1, 1, 0}, {29, 2, 2, 16, 0, 1, 1, 0}, {30, 2, 2, 16, 0, 1, 1, 0}, {6, 0, 2, 16, 0, 1, 1, 0}, {17, 2, 2, 35, 2, 2, 0, 0}, {31, 2, 2, 16, 0, 1, 1, 0}, {23, 0, 2, 16, 0, 1, 1, 0}, {28, 0, 2, 16, 0, 1, 1, 0}, {24, 0, 2, 16, 0, 1, 1, 0}, @@ -160,7 +160,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[35] = { {3, 2, 4, 16, 0, 1, 1, 0}, {21, 2, 3, 16, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[88] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[88] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {13, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {14, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, @@ -176,7 +176,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[88] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[196] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[196] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 1}, @@ -207,11 +207,11 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[196] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {18, 4, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Moi_c::mCutNameList[5] = { +char DUSK_CONST* DUSK_CONST daNpc_Moi_c::mCutNameList[5] = { "", "DELIVERED_SW", "APPEARANCE_MOI", "CONVERSATION_WITH_URI", "FIND_WOLF", }; -daNpc_Moi_c::cutFunc daNpc_Moi_c::mCutList[5] = { +daNpc_Moi_c::cutFunc DUSK_CONST daNpc_Moi_c::mCutList[5] = { NULL, &daNpc_Moi_c::cutDeliveredSw, &daNpc_Moi_c::cutAppearanceMoi, @@ -1984,13 +1984,13 @@ static int daNpc_Moi_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Moi_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Moi_MethodTable = { (process_method_func)daNpc_Moi_Create, (process_method_func)daNpc_Moi_Delete, (process_method_func)daNpc_Moi_Execute, (process_method_func)daNpc_Moi_IsDelete, (process_method_func)daNpc_Moi_Draw, }; -actor_process_profile_definition g_profile_NPC_MOI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_MOI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index dde4a7c3bf..f3a6d29ba1 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -122,7 +122,7 @@ enum Joint { /* 0x19 */ JNT_FOOTR }; -static daNpc_GetParam2 l_bckGetParamList[39] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[39] = { {-1, J3DFrameCtrl::EMode_NONE, MoiR}, {BCK_MOIR_F_TALK_A, J3DFrameCtrl::EMode_NONE, MoiR}, {BCK_MOIR_F_HOLD_S, J3DFrameCtrl::EMode_NONE, MoiR}, @@ -164,48 +164,48 @@ static daNpc_GetParam2 l_bckGetParamList[39] = { {BCK_MOIR_RUN, J3DFrameCtrl::EMode_LOOP, MoiR3}, }; -static daNpc_GetParam2 l_btpGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[2] = { {BTP_MOIR, J3DFrameCtrl::EMode_LOOP, MoiR}, {BTP_MOIR_FH_SERIOUS, J3DFrameCtrl::EMode_LOOP, MoiR}, }; -static daNpc_GetParam2 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[1] = { {BTK_MOIR, J3DFrameCtrl::EMode_LOOP, MoiR}, }; -static int l_loadRes_MOIR0[3] = { +static DUSK_CONSTEXPR int l_loadRes_MOIR0[3] = { 0, 1, -1, }; -static int l_loadRes_MOIR1[3] = { +static DUSK_CONSTEXPR int l_loadRes_MOIR1[3] = { 0, 2, -1, }; -static int l_loadRes_MOIR2[3] = { +static DUSK_CONSTEXPR int l_loadRes_MOIR2[3] = { 0, 3, -1, }; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_MOIR0, l_loadRes_MOIR1, l_loadRes_MOIR2, }; -static char* l_arcNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[4] = { "MoiR", "MoiR1", "MoiR2", "MoiR3", }; -static char* l_evtNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = { "", "THE_INTRODUCTION", "MOIR_APPEAR", "MOIR_APPEAR2", }; -static char* l_myName = "MoiR"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "MoiR"; daNpcMoiR_HIOParam const daNpcMoiR_Param_c::m = { 35.0f, @@ -2011,7 +2011,7 @@ BOOL daNpcMoiR_c::drawDbgInfo() { return FALSE; } -static actor_method_class daNpcMoiR_MethodTable = { +static DUSK_CONST actor_method_class daNpcMoiR_MethodTable = { (process_method_func)daNpcMoiR_Create, (process_method_func)daNpcMoiR_Delete, (process_method_func)daNpcMoiR_Execute, @@ -2019,7 +2019,7 @@ static actor_method_class daNpcMoiR_MethodTable = { (process_method_func)daNpcMoiR_Draw, }; -actor_process_profile_definition g_profile_NPC_MOIR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_MOIR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index d78b94fc5f..5a3cb09240 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -17,11 +17,11 @@ enum { static NPC_MYNA2_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[] = { {0x17, 0}, }; -static daNpc_GetParam1 l_bckGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[] = { {17, 0}, {10, 0}, {11, 0}, @@ -39,11 +39,11 @@ static daNpc_GetParam1 l_bckGetParamList[] = { {20, 0}, }; -static daNpc_GetParam1 l_btpGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[] = { {26, 0}, }; -static daNpc_GetParam1 l_evtGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[] = { {0, 0}, {1, 0}, {2, 1}, @@ -51,7 +51,7 @@ static daNpc_GetParam1 l_evtGetParamList[] = { {4, 2}, }; -static char* l_evtNames[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[5] = { NULL, "FIRST_TALK", "GAME_FAILURE", @@ -59,23 +59,23 @@ static char* l_evtNames[5] = { "GAME_GOAL_SUCCESS", }; -static int l_loadRes_MYNA2a[] = { +static DUSK_CONSTEXPR int l_loadRes_MYNA2a[] = { 0, -1, -1, }; -static int l_loadRes_MYNA2_GAME_FAILURE[] = { +static DUSK_CONSTEXPR int l_loadRes_MYNA2_GAME_FAILURE[] = { 0, 1, -1, }; -static int l_loadRes_MYNA2_GAME_GOAL[] = { +static DUSK_CONSTEXPR int l_loadRes_MYNA2_GAME_GOAL[] = { 0, 2, -1, }; -static int l_loadRes_MYNA20[] = { +static DUSK_CONSTEXPR int l_loadRes_MYNA20[] = { 0, -1, -1, }; -static int* l_loadRes_list[5] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[5] = { l_loadRes_MYNA2a, l_loadRes_MYNA2a, l_loadRes_MYNA2_GAME_FAILURE, @@ -83,15 +83,15 @@ static int* l_loadRes_list[5] = { l_loadRes_MYNA20, }; -static char* l_resNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[3] = { "MYNA_b", "MYNA_b_f", "MYNA_b_g", }; -static char* l_myName = "myna2"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "myna2"; -char* daNpc_myna2_c::mEvtCutNameList[5] = { +char DUSK_CONST* DUSK_CONST daNpc_myna2_c::mEvtCutNameList[5] = { "", "FIRST_TALK", "GAME_FAILURE", @@ -99,7 +99,7 @@ char* daNpc_myna2_c::mEvtCutNameList[5] = { "GAME_GOAL_SUCCESS", }; -daNpc_myna2_c::EventFn daNpc_myna2_c::mEvtCutList[] = { +daNpc_myna2_c::EventFn DUSK_CONST daNpc_myna2_c::mEvtCutList[] = { NULL, &daNpc_myna2_c::ECut_firstTalk, &daNpc_myna2_c::ECut_gameFailure, @@ -1356,7 +1356,7 @@ static int daNpc_myna2_IsDelete(void* i_this) { return TRUE; } -static actor_method_class daNpc_myna2_MethodTable = { +static DUSK_CONST actor_method_class daNpc_myna2_MethodTable = { (process_method_func)daNpc_myna2_Create, (process_method_func)daNpc_myna2_Delete, (process_method_func)daNpc_myna2_Execute, @@ -1364,7 +1364,7 @@ static actor_method_class daNpc_myna2_MethodTable = { (process_method_func)daNpc_myna2_Draw, }; -actor_process_profile_definition g_profile_MYNA2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_MYNA2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 90e33adea5..edce270a2c 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -3311,7 +3311,7 @@ npc_ne_class::npc_ne_class() { /* empty function */ } -static actor_method_class l_daNpc_Ne_Method = { +static DUSK_CONST actor_method_class l_daNpc_Ne_Method = { (process_method_func)daNpc_Ne_Create, (process_method_func)daNpc_Ne_Delete, (process_method_func)daNpc_Ne_Execute, @@ -3319,7 +3319,7 @@ static actor_method_class l_daNpc_Ne_Method = { (process_method_func)daNpc_Ne_Draw, }; -actor_process_profile_definition g_profile_NPC_NE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_NE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index c2dfdf711f..11c1d21fce 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -27,7 +27,7 @@ static BOOL daNpc_P2IsDelete(void* param_0) { return TRUE; } -static actor_method_class daNpc_P2MethodTable = { +static DUSK_CONST actor_method_class daNpc_P2MethodTable = { (process_method_func)daNpc_P2Create, (process_method_func)daNpc_P2Delete, (process_method_func)daNpc_P2Execute, @@ -35,7 +35,7 @@ static actor_method_class daNpc_P2MethodTable = { (process_method_func)daNpc_P2Draw, }; -actor_process_profile_definition g_profile_NPC_P2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_P2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 73a7c91027..096c745555 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -257,7 +257,7 @@ enum Event { /* 0x1 */ EVT_TUTRIAL_TALK2, }; -static int l_bmdData[6][2] = { +static DUSK_CONSTEXPR int l_bmdData[6][2] = { {BMDR_BESU, BESU}, {BMDR_BESU_TW, BESU_TW}, {BMDR_BESU_CLOTH, BESU2}, @@ -266,12 +266,12 @@ static int l_bmdData[6][2] = { {BMDR_BESU_CUP, BESU2}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"TUTRIAL_TALK2", 7}, }; -static char* l_resNameList[8] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[8] = { "", "Besu", "Besu_TW", @@ -282,32 +282,32 @@ static char* l_resNameList[8] = { "evt_pachi", }; -static s8 l_loadResPtrn0[6] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[6] = { BESU, BESU0, BESU2, BESU1, EVT_PACHI, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { BESU0, BESU_TW, -1, }; -static s8 l_loadResPtrn2[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = { BESU2, BESU0, -1, }; -static s8 l_loadResPtrn3[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[3] = { BESU0, BESU3, -1, }; -static s8 l_loadResPtrn4[7] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn4[7] = { BESU, BESU_TW, BESU0, BESU1, BESU2, BESU3, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn4, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, 25, J3DFrameCtrl::EMode_LOOP, BESU0, 1}, {BCK_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, BTP_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, 0}, {BCK_BESU_F_TALK_B, J3DFrameCtrl::EMode_NONE, BESU1, BTP_BESU_F_TALK_B, J3DFrameCtrl::EMode_NONE, BESU1, 0}, @@ -340,7 +340,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {BCK_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, BTP_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[33] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[33] = { {BCK_BESU_WAIT_A, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, {BCK_BESU_WAIT_B, J3DFrameCtrl::EMode_LOOP, BESU1, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, {BCK_BESU_WAIT_C, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, @@ -376,7 +376,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[33] = { {BCK_BESU_BODY_WAIT, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] = { {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -408,7 +408,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -441,7 +441,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { {9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Pachi_Besu_c::mCutNameList[11] = { +char DUSK_CONST* DUSK_CONST daNpc_Pachi_Besu_c::mCutNameList[11] = { "", "TUTRIAL_BEGIN", "TUTRIAL_BEGIN_SKIP", @@ -455,7 +455,7 @@ char* daNpc_Pachi_Besu_c::mCutNameList[11] = { "TUTRIAL_CAUTION", }; -daNpc_Pachi_Besu_c::cutFunc daNpc_Pachi_Besu_c::mCutList[11] = { +daNpc_Pachi_Besu_c::cutFunc DUSK_CONST daNpc_Pachi_Besu_c::mCutList[11] = { NULL, &daNpc_Pachi_Besu_c::cutTutrialBegin, &daNpc_Pachi_Besu_c::cutTutrialBegin_Skip, @@ -1554,7 +1554,7 @@ static int daNpc_Pachi_Besu_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_Pachi_Besu_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Pachi_Besu_MethodTable = { (process_method_func)daNpc_Pachi_Besu_Create, (process_method_func)daNpc_Pachi_Besu_Delete, (process_method_func)daNpc_Pachi_Besu_Execute, @@ -1562,7 +1562,7 @@ static actor_method_class daNpc_Pachi_Besu_MethodTable = { (process_method_func)daNpc_Pachi_Besu_Draw, }; -actor_process_profile_definition g_profile_NPC_PACHI_BESU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_PACHI_BESU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 9631bd42ba..9b469866f8 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -364,17 +364,17 @@ void daNpc_Pachi_Maro_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {11, 1}, {5, 2}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"TUTRIAL_TALK", 10}, }; -static char* l_resNameList[11] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[11] = { "", "Maro", "Maro_TW", @@ -388,28 +388,28 @@ static char* l_resNameList[11] = { "evt_pachi", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { MARO, MARO1, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { MARO, MARO_TW, -1, }; -static s8 l_loadResPtrn2[6] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[6] = { MARO, MARO1, MARO2, MARO3, EVT_PACHI, -1, }; -static s8 l_loadResPtrn3[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[5] = { MARO, MARO_TW, MARO1, MARO2, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn2, l_loadResPtrn3, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_MARO, J3DFrameCtrl::EMode_LOOP, MARO, 1}, {BCK_MARO_F_TALK_A, J3DFrameCtrl::EMode_NONE, MARO, BTP_MARO_F_TALK_A, J3DFrameCtrl::EMode_NONE, MARO, 0}, {BCK_MARO_F_TALK_B, J3DFrameCtrl::EMode_NONE, MARO1, BTP_MARO_F_TALK_B, J3DFrameCtrl::EMode_NONE, MARO1, 0}, @@ -422,7 +422,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {BCK_MARO_FH_BESUTALK, J3DFrameCtrl::EMode_LOOP, MARO3, BTP_MARO_FH_BESUTALK, J3DFrameCtrl::EMode_LOOP, MARO3, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[10] = { {BCK_MARO_WAIT_A, J3DFrameCtrl::EMode_LOOP, MARO, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0}, {BCK_MARO_CROUCH, J3DFrameCtrl::EMode_LOOP, MARO2, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0}, {BCK_MARO_ASKING, J3DFrameCtrl::EMode_LOOP, MARO3, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0}, @@ -435,7 +435,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[10] = { {BCK_MARO_RUN, J3DFrameCtrl::EMode_LOOP, MARO1, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { {FACE_MOT_ANM_TALK_A, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {FACE_MOT_ANM_SURPRISE, -1, 1}, {FACE_MOT_ANM_H_SURPRISE, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {FACE_MOT_ANM_TALK_B, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -448,7 +448,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {FACE_MOT_ANM_NONE, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {MOT_ANM_WAIT_A, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {MOT_ANM_TALK_A, -1, 1}, {MOT_ANM_WAIT_A, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {MOT_ANM_CROUCH, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -460,7 +460,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {MOT_ANM_RUN, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Pachi_Maro_c::mCutNameList[11] = { +char DUSK_CONST* DUSK_CONST daNpc_Pachi_Maro_c::mCutNameList[11] = { "", "TUTRIAL_BEGIN", "TUTRIAL_BEGIN_SKIP", @@ -474,7 +474,7 @@ char* daNpc_Pachi_Maro_c::mCutNameList[11] = { "TUTRIAL_CAUTION", }; -daNpc_Pachi_Maro_c::cutFunc daNpc_Pachi_Maro_c::mCutList[11] = { +daNpc_Pachi_Maro_c::cutFunc DUSK_CONST daNpc_Pachi_Maro_c::mCutList[11] = { NULL, &daNpc_Pachi_Maro_c::cutTutrialBegin, &daNpc_Pachi_Maro_c::cutTutrialBegin_Skip, @@ -1668,7 +1668,7 @@ static int daNpc_Pachi_Maro_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Pachi_Maro_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Pachi_Maro_MethodTable = { (process_method_func)daNpc_Pachi_Maro_Create, (process_method_func)daNpc_Pachi_Maro_Delete, (process_method_func)daNpc_Pachi_Maro_Execute, @@ -1676,7 +1676,7 @@ static actor_method_class daNpc_Pachi_Maro_MethodTable = { (process_method_func)daNpc_Pachi_Maro_Draw, }; -actor_process_profile_definition g_profile_NPC_PACHI_MARO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_PACHI_MARO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 1da06ded50..647b954ed9 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -482,7 +482,7 @@ void daNpc_Pachi_Taro_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[5][2] = { +static DUSK_CONSTEXPR int l_bmdData[5][2] = { {BMDR_TARO, TARO}, {BMDR_TARO_STICK_A, TARO1}, {BMDR_TARO_SWB, TARO1}, @@ -490,7 +490,7 @@ static int l_bmdData[5][2] = { {BMDR_GM_TARO, TAROB}, }; -static daNpcT_evtData_c l_evtList[11] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[11] = { {"", NONE}, {"TUTRIAL_BEGIN", EVT_PACHI}, {"TUTRIAL_BEGIN_SKIP", EVT_PACHI}, @@ -504,7 +504,7 @@ static daNpcT_evtData_c l_evtList[11] = { {"TUTRIAL_CAUTION", EVT_PACHI}, }; -static char* l_resNameList[12] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[12] = { "", "Taro", "Taro_TW", @@ -519,20 +519,20 @@ static char* l_resNameList[12] = { "evt_pachi", }; -static s8 l_loadResPtrn0[7] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[7] = { TARO, TARO0, TARO1, TARO2, TARO3, EVT_PACHI, -1, }; -static s8 l_loadResPtrn4[8] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn4[8] = { TARO, TARO_TW, TARO0, TARO1, TARO2, TARO3, TARO4, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn4, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_TARO_F_NORMAL, J3DFrameCtrl::EMode_LOOP, TARO, 1}, {BCK_TARO_F_NORMAL, J3DFrameCtrl::EMode_NONE, TARO0,BTP_TARO_F_NORMAL, J3DFrameCtrl::EMode_LOOP, TARO, 1}, {BCK_TARO_F_SAD, J3DFrameCtrl::EMode_NONE, TARO1, BTP_TARO_F_SAD, J3DFrameCtrl::EMode_NONE, TARO1, 0}, @@ -565,7 +565,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {BCK_TARO_F_CRY, J3DFrameCtrl::EMode_LOOP, TARO5, BTP_TARO_F_CRY, J3DFrameCtrl::EMode_LOOP, TARO5, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[41] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[41] = { {BCK_TARO_WAIT_A, J3DFrameCtrl::EMode_LOOP, TARO0,BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0}, {BCK_TARO_WAIT_B, J3DFrameCtrl::EMode_LOOP, TARO1, BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0}, {BCK_TARO_WAIT_C, J3DFrameCtrl::EMode_LOOP, TARO3, BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0}, @@ -609,7 +609,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[41] = { {BCK_TAROB_SAVED, J3DFrameCtrl::EMode_NONE, TARO5, BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = { {FACE_MOT_ANM_NORMAL, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {FACE_MOT_ANM_SAD, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {FACE_MOT_ANM_SMILE, -1, 1}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -644,7 +644,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] {FACE_MOT_ANM_NONE, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[164] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[164] = { {MOT_ANM_WAIT_A, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {MOT_ANM_CALL, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {MOT_ANM_WAVE, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -688,7 +688,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[164] = { {MOT_ANM_SAVED, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Pachi_Taro_c::mCutNameList[11] = { +char DUSK_CONST* DUSK_CONST daNpc_Pachi_Taro_c::mCutNameList[11] = { "", "TUTRIAL_BEGIN", "TUTRIAL_BEGIN_SKIP", @@ -702,7 +702,7 @@ char* daNpc_Pachi_Taro_c::mCutNameList[11] = { "TUTRIAL_CAUTION", }; -daNpc_Pachi_Taro_c::cutFunc daNpc_Pachi_Taro_c::mCutList[11] = { +daNpc_Pachi_Taro_c::cutFunc DUSK_CONST daNpc_Pachi_Taro_c::mCutList[11] = { NULL, &daNpc_Pachi_Taro_c::cutTutrialBegin, &daNpc_Pachi_Taro_c::cutTutrialBegin_Skip, @@ -1970,7 +1970,7 @@ BOOL daNpc_Pachi_Taro_c::cutTalk(int i_staffId) { return TRUE; } - char* mesNos[5] = { + DUSK_CONSTEXPR char DUSK_CONST* mesNos[5] = { "MesNo0", "MesNo1", "MesNo2", @@ -2085,7 +2085,7 @@ BOOL daNpc_Pachi_Taro_c::cutTalk2(int i_staffId) { return TRUE; } - char* mesNos[5] = { + DUSK_CONSTEXPR char DUSK_CONST* mesNos[5] = { "MesNo0", "MesNo1", "MesNo2", @@ -2550,7 +2550,7 @@ static int daNpc_Pachi_Taro_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Pachi_Taro_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Pachi_Taro_MethodTable = { (process_method_func)daNpc_Pachi_Taro_Create, (process_method_func)daNpc_Pachi_Taro_Delete, (process_method_func)daNpc_Pachi_Taro_Execute, @@ -2558,7 +2558,7 @@ static actor_method_class daNpc_Pachi_Taro_MethodTable = { (process_method_func)daNpc_Pachi_Taro_Draw, }; -actor_process_profile_definition g_profile_NPC_PACHI_TARO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_PACHI_TARO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index b7df633f4f..9fe0fcbd6a 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -1151,7 +1151,7 @@ static int daNpcPasser_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcPasser_METHODS = { +static DUSK_CONST actor_method_class daNpcPasser_METHODS = { (process_method_func)daNpcPasser_Create, (process_method_func)daNpcPasser_Delete, (process_method_func)daNpcPasser_Execute, @@ -1159,7 +1159,7 @@ static actor_method_class daNpcPasser_METHODS = { (process_method_func)daNpcPasser_Draw, }; -actor_process_profile_definition g_profile_NPC_PASSER = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_PASSER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index ea4aae6db5..cc95c9e9a7 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -370,7 +370,7 @@ static int daNpcPasser2_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcPasser2_METHODS = { +static DUSK_CONST actor_method_class daNpcPasser2_METHODS = { (process_method_func)daNpcPasser2_Create, (process_method_func)daNpcPasser2_Delete, (process_method_func)daNpcPasser2_Execute, @@ -378,7 +378,7 @@ static actor_method_class daNpcPasser2_METHODS = { (process_method_func)daNpcPasser2_Draw, }; -actor_process_profile_definition g_profile_NPC_PASSER2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_PASSER2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index e47d4c3e13..747ccd34c7 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -247,14 +247,14 @@ void daNpc_Post_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[4][2] = { +static DUSK_CONSTEXPR int l_bmdData[4][2] = { {BMDR_POST, POST}, {BMDR_POST_FLAG, POST}, {BMDR_POST_LETTER, POST}, {BMDR_POST_LETTER_B, POST2}, }; -static daNpcT_evtData_c l_evtList[5] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[5] = { {"", 0}, {"NO_RESPONSE", 0}, {"DELIVER", 2}, @@ -262,33 +262,33 @@ static daNpcT_evtData_c l_evtList[5] = { {"DELIVERTO_WOLF", 2}, }; -static char* l_resNameList[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[4] = { "", "post", "post1", "post2", }; -static s8 l_loadResPtrn0[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = { POST, POST1, -1 }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { POST, POST2, -1, }; -static s8 l_loadResPtrn9[4] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[4] = { POST, POST1, POST2, -1, }; -static s8* l_loadResPtrnList[4] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_POST, J3DFrameCtrl::EMode_LOOP, POST, 1}, {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_POST_RUN, J3DFrameCtrl::EMode_LOOP, POST1, 0}, {BCK_POST_F_TALK_A, J3DFrameCtrl::EMode_NONE, POST, BTP_POST_F_TALK_A, J3DFrameCtrl::EMode_NONE, POST, 0}, @@ -306,7 +306,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = { {BCK_POST_FH_ANGRY, J3DFrameCtrl::EMode_LOOP, POST2, BTP_POST_FH_ANGRY, J3DFrameCtrl::EMode_LOOP, POST2, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[13] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[13] = { {BCK_POST_WAIT_A, J3DFrameCtrl::EMode_LOOP, POST, BTK_POST, J3DFrameCtrl::EMode_NONE, POST, 1, 0}, {BCK_POST_RUN, J3DFrameCtrl::EMode_LOOP, POST1, BTK_POST_RUN, J3DFrameCtrl::EMode_LOOP, POST1, 0, 0}, {BCK_POST_STEP, J3DFrameCtrl::EMode_NONE, POST, BTK_POST, J3DFrameCtrl::EMode_NONE, POST, 1, 0}, @@ -322,7 +322,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[13] = { {BCK_POST_SIT_NOD, J3DFrameCtrl::EMode_NONE, POST2, BTK_POST_SIT_NOD, J3DFrameCtrl::EMode_NONE, POST2, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = { {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -340,7 +340,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -354,12 +354,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { {2, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Post_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_Post_c::mCutNameList[2] = { "", "DELIVER", }; -daNpc_Post_c::cutFunc daNpc_Post_c::mCutList[2] = { +daNpc_Post_c::cutFunc DUSK_CONST daNpc_Post_c::mCutList[2] = { NULL, &daNpc_Post_c::cutDeliver, }; @@ -988,7 +988,7 @@ void daNpc_Post_c::drawOtherMdl() { } bool daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) { - static daNpc_GetParam1 flagAnmData[13] = { + static DUSK_CONSTEXPR daNpc_GetParam1 flagAnmData[13] = { {BCK_POST_FLAG_WAIT_A, POST}, {BCK_POST_FLAG_RUN, POST1}, {BCK_POST_FLAG_STEP, POST}, @@ -1558,7 +1558,7 @@ static int daNpc_Post_IsDelete(void* i_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_Post_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Post_MethodTable = { (process_method_func)daNpc_Post_Create, (process_method_func)daNpc_Post_Delete, (process_method_func)daNpc_Post_Execute, @@ -1566,7 +1566,7 @@ static actor_method_class daNpc_Post_MethodTable = { (process_method_func)daNpc_Post_Draw, }; -actor_process_profile_definition g_profile_NPC_POST = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_POST = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 23f9cb490b..4d463bc91f 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -66,13 +66,13 @@ void daNpc_Pouya_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[3][2] = { +static DUSK_CONSTEXPR int l_bmdData[3][2] = { {26, 1}, {23, 1}, {34, 2}, }; -static daNpcT_evtData_c l_evtList[9] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[9] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -84,21 +84,21 @@ static daNpcT_evtData_c l_evtList[9] = { {"RETURN_FAVOR_2_02", 2}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "pouyaA", "pouyaB", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8 l_loadResPtrn1[2] = {2, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[2] = {2, -1}; -static s8* l_loadResPtrnList[6] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[6] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { {-1, 0, 0, -1, 0, 0, 0}, {11, 0, 1, -1, 0, 0, 0}, {8, 2, 1, -1, 0, 0, 0}, {9, 0, 1, -1, 0, 0, 0}, {10, 0, 1, -1, 0, 0, 0}, {12, 2, 1, -1, 0, 0, 0}, {14, 2, 2, 47, 2, 2, 0}, {10, 0, 2, 43, 0, 2, 0}, {16, 2, 2, 49, 2, 2, 0}, @@ -107,7 +107,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { {18, 2, 2, 51, 2, 2, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[26] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[26] = { {18, 2, 1, 36, 2, 1, 0, 0}, {19, 2, 1, 36, 2, 1, 0, 0}, {20, 2, 1, 36, 2, 1, 0, 0}, {13, 0, 1, 36, 2, 1, 0, 0}, {16, 0, 1, 36, 2, 1, 0, 0}, {17, 2, 1, 36, 2, 1, 0, 0}, {14, 0, 1, 36, 2, 1, 0, 0}, {15, 2, 1, 36, 2, 1, 0, 0}, {16, 0, 1, 36, 2, 1, 0, 0}, @@ -119,7 +119,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[26] = { {26, 0, 2, 37, 0, 2, 1, 0}, {23, 0, 2, 37, 0, 2, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, @@ -133,7 +133,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {5, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, @@ -147,13 +147,13 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = { {-1, 0, 0}, {-1, 0, 0}, {25, -1, 1}, {10, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Pouya_c::mCutNameList[3] = { +char DUSK_CONST* DUSK_CONST daNpc_Pouya_c::mCutNameList[3] = { "", "HAVE_FAVORTO_ASK", "RETURN_FAVOR", }; -daNpc_Pouya_c::cutFunc daNpc_Pouya_c::mCutList[3] = { +daNpc_Pouya_c::cutFunc DUSK_CONST daNpc_Pouya_c::mCutList[3] = { NULL, &daNpc_Pouya_c::cutHaveFavorToAsk, &daNpc_Pouya_c::cutHaveFavorToAsk, @@ -1192,13 +1192,13 @@ static BOOL daNpc_Pouya_IsDelete(void* i_this) { static NPC_POUYA_HIO_CLASS l_HIO; -static actor_method_class daNpc_Pouya_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Pouya_MethodTable = { (process_method_func)daNpc_Pouya_Create, (process_method_func)daNpc_Pouya_Delete, (process_method_func)daNpc_Pouya_Execute, (process_method_func)daNpc_Pouya_IsDelete, (process_method_func)daNpc_Pouya_Draw, }; -actor_process_profile_definition g_profile_NPC_POUYA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_POUYA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 7233ccc683..146c73cef6 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -10,7 +10,7 @@ static NPC_PRAY_HIO_CLASS l_HIO; -static struct { +static DUSK_CONSTEXPR struct { int resIdx; int anmMode; int arcnameIdx; @@ -30,19 +30,19 @@ enum daNpcPray_MOTION_e { MOTION_WOLF_e, }; -static char* l_arcNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[2] = { "Prayer", "Wgeneral", }; -static char* l_evtNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = { NULL, "GET_HEART", }; -static char* l_myName = "Prayer"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Prayer"; -daNpcPray_c::EvtSeq daNpcPray_c::mEvtSeqList[] = { +daNpcPray_c::EvtSeq DUSK_CONST daNpcPray_c::mEvtSeqList[] = { NULL, &daNpcPray_c::_Evt_GetHeart, }; @@ -837,7 +837,7 @@ static int daNpcPray_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcPray_MethodTable = { +static DUSK_CONST actor_method_class daNpcPray_MethodTable = { (process_method_func)daNpcPray_Create, (process_method_func)daNpcPray_Delete, (process_method_func)daNpcPray_Execute, @@ -845,7 +845,7 @@ static actor_method_class daNpcPray_MethodTable = { (process_method_func)daNpcPray_Draw, }; -actor_process_profile_definition g_profile_NPC_PRAYER = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_PRAYER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 1db4dff86c..71f367c693 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -80,30 +80,30 @@ enum Type { /* 0x1 */ TYPE_1, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_RACA, RACA}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Raca", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, 32, J3DFrameCtrl::EMode_LOOP, RACA, 1}, {BCK_RACA_F_TALK_A, J3DFrameCtrl::EMode_NONE, RACA, BTP_RACA, J3DFrameCtrl::EMode_LOOP, RACA, 1}, {BCK_RACA_F_TALK_B, J3DFrameCtrl::EMode_NONE, RACA, BTP_RACA_F_TALK_B, J3DFrameCtrl::EMode_NONE, RACA, 0}, @@ -114,7 +114,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = { {BCK_RACA_FH_BITTERSMILE, J3DFrameCtrl::EMode_LOOP, RACA, BTP_RACA_FH_BITTERSMILE, J3DFrameCtrl::EMode_LOOP, RACA, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[10] = { {BCK_RACA_WAIT_A, J3DFrameCtrl::EMode_LOOP, RACA, BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0}, {BCK_RACA_GIVEME, J3DFrameCtrl::EMode_LOOP, RACA, BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0}, {BCK_RACA_TALK_A, J3DFrameCtrl::EMode_NONE, RACA, BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0}, @@ -127,7 +127,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[10] = { {BCK_RACA_STEP, J3DFrameCtrl::EMode_NONE, RACA,BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {5, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -138,7 +138,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -150,9 +150,9 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = { {9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Raca_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_Raca_c::mCutNameList = ""; -daNpc_Raca_c::cutFunc daNpc_Raca_c::mCutList[1] = { +daNpc_Raca_c::cutFunc DUSK_CONST daNpc_Raca_c::mCutList[1] = { NULL, }; @@ -843,7 +843,7 @@ static int daNpc_Raca_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpc_Raca_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Raca_MethodTable = { (process_method_func)daNpc_Raca_Create, (process_method_func)daNpc_Raca_Delete, (process_method_func)daNpc_Raca_Execute, @@ -851,7 +851,7 @@ static actor_method_class daNpc_Raca_MethodTable = { (process_method_func)daNpc_Raca_Draw, }; -actor_process_profile_definition g_profile_NPC_RACA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_RACA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index dfc6e912fe..2ed3cd3a21 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -10,7 +10,7 @@ #include "d/d_debug_viewer.h" #include -static daNpc_GetParam2 l_bckGetParamList[29] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[29] = { {-1, 2, 0}, {9, 0, 0}, {7, 0, 0}, @@ -42,13 +42,13 @@ static daNpc_GetParam2 l_bckGetParamList[29] = { {5, 2, 3}, }; -static daNpc_GetParam2 l_btpGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[4] = { {23, 2, 0}, {24, 0, 0}, {25, 2, 0}, {30, 2, 0}, }; -static daNpc_GetParam2 l_btkGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[5] = { {20, 2, 0}, {24, 0, 1}, {25, 2, 1}, @@ -56,38 +56,38 @@ static daNpc_GetParam2 l_btkGetParamList[5] = { {27, 2, 1}, }; -static int l_loadRes_RAFREL0[] = { +static DUSK_CONSTEXPR int l_loadRes_RAFREL0[] = { 0, 2, -1, }; -static int l_loadRes_RAFREL1[] = { +static DUSK_CONSTEXPR int l_loadRes_RAFREL1[] = { 0, 1, -1, }; -static int l_loadRes_RAFREL2[] = { +static DUSK_CONSTEXPR int l_loadRes_RAFREL2[] = { 0, 3, -1, }; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_RAFREL0, l_loadRes_RAFREL1, l_loadRes_RAFREL2, }; -static char* l_arcNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[4] = { "Rafrel", "Rafrel1", "Rafrel2", "Rafrel3", }; -static char* l_evtNames[7] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[7] = { "", "THE_INTRODUCTION", "RESIST_MEETING", @@ -135,7 +135,7 @@ const daNpcRafrel_HIOParam daNpcRafrel_Param_c::m = { 0, }; -static char* l_myName = "Rafrel"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Rafrel"; #if DEBUG daNpcRafrel_HIO_c::daNpcRafrel_HIO_c() { @@ -1749,7 +1749,7 @@ static int daNpcRafrel_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcRafrel_MethodTable = { +static DUSK_CONST actor_method_class daNpcRafrel_MethodTable = { (process_method_func)daNpcRafrel_Create, (process_method_func)daNpcRafrel_Delete, (process_method_func)daNpcRafrel_Execute, @@ -1757,7 +1757,7 @@ static actor_method_class daNpcRafrel_MethodTable = { (process_method_func)daNpcRafrel_Draw, }; -actor_process_profile_definition g_profile_NPC_RAFREL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_RAFREL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 366ed865a8..efd8bf097a 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -63,37 +63,37 @@ enum Material { /* 0x2 */ MAT_SARU_FACE_M, }; -static int l_bmdData[4][2] = { +static DUSK_CONSTEXPR int l_bmdData[4][2] = { { npc_ks_class::BMDR_SARU, 1 }, { BMDR_SARU_TW, 2 }, { npc_ks_class::BMDR_SARU_BARA, 1 }, { BMDR_SARU_BARA_TW, 2 }, }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"NO_RESPONSE", 0}, {"YM_LOOK", 2}, }; -static char* l_resNameList[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[4] = { "", "Npc_ks", "saru_TW", "saru" }; -static s8 l_loadResPtrn0[4] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = { NPC_KS, SARU_TW, SARU, -1, }; -static s8* l_loadResPtrnList[4] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0 }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, J3DFrameCtrl::EMode_NONE, 0, npc_ks_class::BTP_SARU, J3DFrameCtrl::EMode_LOOP, NPC_KS, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[51] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[51] = { {npc_ks_class::BCK_SARU_WAIT_A, J3DFrameCtrl::EMode_LOOP, NPC_KS, -1, J3DFrameCtrl::EMode_NONE, 0, 0, 0}, {npc_ks_class::BCK_SARU_WAIT_B, J3DFrameCtrl::EMode_LOOP, NPC_KS, @@ -198,11 +198,11 @@ static daNpcT_motionAnmData_c l_motionAnmData[51] = { -1, J3DFrameCtrl::EMode_NONE, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -216,14 +216,14 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = { {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Saru_c::mCutNameList[4] = { +char DUSK_CONST* DUSK_CONST daNpc_Saru_c::mCutNameList[4] = { "", "FIND_MONKEY", "HELP_ME", "YM_LOOK", }; -daNpc_Saru_c::cutFunc daNpc_Saru_c::mCutList[4] = { +daNpc_Saru_c::cutFunc DUSK_CONST daNpc_Saru_c::mCutList[4] = { NULL, &daNpc_Saru_c::cutFindMonkey, &daNpc_Saru_c::cutHelpMe, @@ -1225,7 +1225,7 @@ static int daNpc_Saru_IsDelete(void* param_1) { return 1; } -static actor_method_class daNpc_Saru_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Saru_MethodTable = { (process_method_func)daNpc_Saru_Create, (process_method_func)daNpc_Saru_Delete, (process_method_func)daNpc_Saru_Execute, @@ -1233,7 +1233,7 @@ static actor_method_class daNpc_Saru_MethodTable = { (process_method_func)daNpc_Saru_Draw, }; -actor_process_profile_definition g_profile_NPC_SARU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SARU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index b87793ea82..a022821d4b 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -8,47 +8,47 @@ #include "d/actor/d_a_npc_seib.h" #include -static int l_bmdData[2][1] = {12, 1}; +static DUSK_CONSTEXPR int l_bmdData[2][1] = {12, 1}; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = {"", "seiB"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = {"", "seiB"}; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {-1, 0, 0, -1, 0, 0, 0}; +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {-1, 0, 0, -1, 0, 0, 0}; -static daNpcT_motionAnmData_c l_motionAnmData[4] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[4] = { {9, 2, 1, -1, 0, 0, 0, 0}, {7, 0, 1, -1, 0, 0, 0, 0}, {6, 2, 1, -1, 0, 0, 0, 0}, {8, 0, 1, -1, 0, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[16] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[16] = { {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_seiB_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_seiB_c::mCutNameList = ""; -daNpc_seiB_c::cutFunc daNpc_seiB_c::mCutList[1] = { +daNpc_seiB_c::cutFunc DUSK_CONST daNpc_seiB_c::mCutList[1] = { 0, }; @@ -558,13 +558,13 @@ static int daNpc_seiB_IsDelete(void* param_1) { return 1; } -static actor_method_class daNpc_seiB_MethodTable = { +static DUSK_CONST actor_method_class daNpc_seiB_MethodTable = { (process_method_func)daNpc_seiB_Create, (process_method_func)daNpc_seiB_Delete, (process_method_func)daNpc_seiB_Execute, (process_method_func)daNpc_seiB_IsDelete, (process_method_func)daNpc_seiB_Draw, }; -actor_process_profile_definition g_profile_NPC_SEIB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index a31eb09d73..5525c52d57 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -9,49 +9,49 @@ #include "SSystem/SComponent/c_counter.h" #include -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {9, 1} }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE",0 } }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "seiC" }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { -1, 0, 0, -1, 0, 0, 0 }; -static daNpcT_motionAnmData_c l_motionAnmData = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData = { 6, 2, 1, -1, 0, 0, 0, 0 }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_seiC_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_seiC_c::mCutNameList = ""; -daNpc_seiC_c::cutFunc daNpc_seiC_c::mCutList[1] = { +daNpc_seiC_c::cutFunc DUSK_CONST daNpc_seiC_c::mCutList[1] = { 0 }; @@ -499,7 +499,7 @@ static int daNpc_seiC_IsDelete(void* param_1) { return 1; } -static actor_method_class daNpc_seiC_MethodTable = { +static DUSK_CONST actor_method_class daNpc_seiC_MethodTable = { (process_method_func)daNpc_seiC_Create, (process_method_func)daNpc_seiC_Delete, (process_method_func)daNpc_seiC_Execute, @@ -507,7 +507,7 @@ static actor_method_class daNpc_seiC_MethodTable = { (process_method_func)daNpc_seiC_Draw, }; -actor_process_profile_definition g_profile_NPC_SEIC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 74ee8801cf..4e71129e00 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -9,49 +9,49 @@ #include "SSystem/SComponent/c_counter.h" #include -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {5, 1} }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE",0 } }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "seiD", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, 0, 0, -1, 0, 0, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {-1, 2, 0, -1, 0, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_seiD_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_seiD_c::mCutNameList = ""; -daNpc_seiD_c::cutFunc daNpc_seiD_c::mCutList[1] = { +daNpc_seiD_c::cutFunc DUSK_CONST daNpc_seiD_c::mCutList[1] = { 0 }; @@ -497,7 +497,7 @@ static int daNpc_seiD_IsDelete(void* param_1) { return 1; } -static actor_method_class daNpc_seiD_MethodTable = { +static DUSK_CONST actor_method_class daNpc_seiD_MethodTable = { (process_method_func)daNpc_seiD_Create, (process_method_func)daNpc_seiD_Delete, (process_method_func)daNpc_seiD_Execute, @@ -505,7 +505,7 @@ static actor_method_class daNpc_seiD_MethodTable = { (process_method_func)daNpc_seiD_Draw, }; -actor_process_profile_definition g_profile_NPC_SEID = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SEID = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index 12cbd6464f..e43eaad3bd 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -10,19 +10,19 @@ #include -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {4, 3}, {17, 2}, }; -static daNpcT_evtData_c l_evtList[4] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[4] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"CONVERSATION_ABOUT_SARU01", 3}, {"CONVERSATION_ABOUT_SARU02", 3}, }; -static char* l_resNameList[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[5] = { "", "Seira", "SeraBtl", @@ -30,16 +30,16 @@ static char* l_resNameList[5] = { "Seira_p1", }; -static s8 l_loadResPtrn0[4] = {3, 1, 2, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = {3, 1, 2, -1}; -static s8 l_loadResPtrn1[3] = {3, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = {3, 4, -1}; -static s8* l_loadResPtrnList[7] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[7] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {-1, 0, 0, 67, 2, 1, 1}, {14, 0, 1, 67, 2, 1, 1}, {11, 0, 1, 75, 0, 1, 0}, @@ -56,7 +56,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {18, 2, 1, 81, 2, 1, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[26] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[26] = { {42, 2, 1, 45, 0, 1, 1, 12}, {37, 2, 1, 55, 0, 1, 0, 12}, {41, 2, 1, 45, 0, 1, 1, 12}, @@ -85,7 +85,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[26] = { {38, 0, 1, 45, 0, 1, 1, 12}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -95,7 +95,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {13, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[104] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[104] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -111,12 +111,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[104] = { {25, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Seira_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_Seira_c::mCutNameList[2] = { "", "CONVERSATION_ABOUT_SARU", }; -daNpc_Seira_c::cutFunc daNpc_Seira_c::mCutList[2] = { +daNpc_Seira_c::cutFunc DUSK_CONST daNpc_Seira_c::mCutList[2] = { NULL, &daNpc_Seira_c::cutConversationAboutSaru, }; @@ -1401,7 +1401,7 @@ static int daNpc_Seira_IsDelete(void* param_0) { return 1; } -static actor_method_class daNpc_Seira_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Seira_MethodTable = { (process_method_func)daNpc_Seira_Create, (process_method_func)daNpc_Seira_Delete, (process_method_func)daNpc_Seira_Execute, @@ -1409,7 +1409,7 @@ static actor_method_class daNpc_Seira_MethodTable = { (process_method_func)daNpc_Seira_Draw, }; -actor_process_profile_definition g_profile_NPC_SEIRA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIRA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 73e7ff44d3..720b1d395b 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -8,31 +8,31 @@ #include "d/actor/d_a_npc_seira2.h" #include -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { {4, 3}, {17, 2}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"DEFAULT_GETITEM", 0}, }; -static char* l_resNameList[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[4] = { "", "Seira", "SeraBtl", "Sera", }; -static s8 l_loadResPtrn0[4] = {3, 1, 2, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = {3, 1, 2, -1}; -static s8* l_loadResPtrnList[7] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[7] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {-1, 0, 0, 67, 2, 1, 1}, {14, 0, 1, 67, 2, 1, 1}, {11, 0, 1, 75, 0, 1, 0}, @@ -49,7 +49,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {18, 2, 1, 81, 2, 1, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[25] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[25] = { {42, 2, 1, 45, 0, 1, 1, 12}, {37, 2, 1, 55, 0, 1, 0, 12}, {41, 2, 1, 45, 0, 1, 1, 12}, @@ -77,7 +77,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[25] = { {38, 0, 1, 45, 0, 1, 1, 12}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -87,7 +87,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {13, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -103,9 +103,9 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = { {24, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Seira2_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_Seira2_c::mCutNameList[1] = {""}; -daNpc_Seira2_c::cutFunc daNpc_Seira2_c::mCutList[1] = { NULL }; +daNpc_Seira2_c::cutFunc DUSK_CONST daNpc_Seira2_c::mCutList[1] = { NULL }; static NPC_SEIRA2_HIO_CLASS l_HIO; @@ -1116,7 +1116,7 @@ static int daNpc_Seira2_IsDelete(void*) { return 1; } -static actor_method_class daNpc_Seira2_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Seira2_MethodTable = { (process_method_func)daNpc_Seira2_Create, (process_method_func)daNpc_Seira2_Delete, (process_method_func)daNpc_Seira2_Execute, @@ -1124,7 +1124,7 @@ static actor_method_class daNpc_Seira2_MethodTable = { (process_method_func)daNpc_Seira2_Draw, }; -actor_process_profile_definition g_profile_NPC_SERA2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SERA2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 806118cf9f..a957d51e67 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -90,63 +90,63 @@ enum Type { /* 0x3 */ TYPE_3, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDE_SEIA, SEIREI}, }; -static daNpcT_evtData_c l_evtList[4] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[4] = { {"", 0}, {"CONVERSATION_ABOUT_YM", 2}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Seirei", "Seirei1", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { SEIREI, -1, }; -static s8 l_loadResPtrn1[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[2] = { SEIREI1, -1, }; - static s8* l_loadResPtrnList[4] = { + static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[4] = { l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, NONE, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[2] = { {BCK_SEIA_WAIT_A, J3DFrameCtrl::EMode_LOOP, SEIREI, -1, J3DFrameCtrl::EMode_NONE, NONE, 0, 0}, {BCK_SEIA_WAIT_B, J3DFrameCtrl::EMode_NONE, SEIREI, -1, J3DFrameCtrl::EMode_NONE, NONE, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = { {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Seirei_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_Seirei_c::mCutNameList[2] = { "", "CONVERSATION", }; -daNpc_Seirei_c::cutFunc daNpc_Seirei_c::mCutList[2] = { +daNpc_Seirei_c::cutFunc DUSK_CONST daNpc_Seirei_c::mCutList[2] = { NULL, &daNpc_Seirei_c::cutConversation, }; @@ -815,7 +815,7 @@ static int daNpc_Seirei_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpc_Seirei_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Seirei_MethodTable = { (process_method_func)daNpc_Seirei_Create, (process_method_func)daNpc_Seirei_Delete, (process_method_func)daNpc_Seirei_Execute, @@ -823,7 +823,7 @@ static actor_method_class daNpc_Seirei_MethodTable = { (process_method_func)daNpc_Seirei_Draw, }; -actor_process_profile_definition g_profile_NPC_SEIREI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SEIREI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 3b58c47650..99707fdf05 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -186,7 +186,7 @@ enum Joint { /* 0x1E */ JNT_FOOTR, }; -static daNpc_GetParam2 l_bckGetParamList[36] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[36] = { {-1, J3DFrameCtrl::EMode_LOOP, SHAD}, {BCK_SHAD_F_TALK_A, J3DFrameCtrl::EMode_NONE, SHAD}, {BCK_SHAD_F_HAPPY, J3DFrameCtrl::EMode_NONE, SHAD}, @@ -225,7 +225,7 @@ static daNpc_GetParam2 l_bckGetParamList[36] = { {BCK_SHAD_SURPRISE_WAIT, J3DFrameCtrl::EMode_LOOP, SHAD1}, }; -static daNpc_GetParam2 l_btpGetParamList[11] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[11] = { {BTP_SHAD, J3DFrameCtrl::EMode_LOOP, SHAD}, {BTP_SHAD_F_ANGER, J3DFrameCtrl::EMode_NONE, SHAD1}, {BTP_SHAD_F_DISCOURAGED, J3DFrameCtrl::EMode_NONE, SHAD}, @@ -239,7 +239,7 @@ static daNpc_GetParam2 l_btpGetParamList[11] = { {BTP_SHAD_FH_HAPPY, J3DFrameCtrl::EMode_LOOP, SHAD}, }; -static daNpc_GetParam2 l_btkGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btkGetParamList[5] = { {BTK_SHAD, J3DFrameCtrl::EMode_LOOP, SHAD}, {BTK_SHAD_DISCOURAGED, J3DFrameCtrl::EMode_NONE, SHAD1}, {BTK_SHAD_DISCOURAGED_WAIT, J3DFrameCtrl::EMode_LOOP, SHAD1}, @@ -259,20 +259,20 @@ static int l_loadRes_SHAD2[3] = { 0, 3, -1, }; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_SHAD0, l_loadRes_SHAD1, l_loadRes_SHAD2, }; -static char* l_arcNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[4] = { "Shad", "Shad1", "Shad2", "Shad3", }; -static char* l_evtNames[14] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[14] = { "", "THE_INTRODUCTION", "RESIST_MEETING", @@ -289,7 +289,7 @@ static char* l_evtNames[14] = { "RESIST_WIRETAP_RAFREL" }; -static char* l_evtArcs[14] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtArcs[14] = { NULL, NULL, NULL, @@ -306,11 +306,11 @@ static char* l_evtArcs[14] = { NULL, }; -static char* l_myName = "Shad"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Shad"; static NPC_SHAD_HIO_CLASS l_HIO; -daNpcShad_c::EventFn daNpcShad_c::mEvtSeqList[14] = { +daNpcShad_c::EventFn DUSK_CONST daNpcShad_c::mEvtSeqList[14] = { NULL, &daNpcShad_c::EvCut_Introduction, &daNpcShad_c::EvCut_Meeting, @@ -1204,7 +1204,7 @@ bool daNpcShad_c::wait_type0(void* param_1) { eventInfo.setArchiveName(l_evtArcs[mOrderEvtNo]); } - char* event; + char DUSK_CONST* event; if (mOrderEvtNo != 0) { event = l_evtNames[mOrderEvtNo]; } else { @@ -1376,7 +1376,7 @@ bool daNpcShad_c::wait_type1(void* param_1) { eventInfo.setArchiveName(l_evtArcs[mOrderEvtNo]); } - char* event; + char DUSK_CONST* event; if (mOrderEvtNo != 0) { event = l_evtNames[mOrderEvtNo]; } else { @@ -2638,7 +2638,7 @@ inline BOOL daNpcShad_c::drawDbgInfo() { return FALSE; } -static actor_method_class daNpcShad_MethodTable = { +static DUSK_CONST actor_method_class daNpcShad_MethodTable = { (process_method_func)daNpcShad_Create, (process_method_func)daNpcShad_Delete, (process_method_func)daNpcShad_Execute, @@ -2646,7 +2646,7 @@ static actor_method_class daNpcShad_MethodTable = { (process_method_func)daNpcShad_Draw, }; -actor_process_profile_definition g_profile_NPC_SHAD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SHAD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 76b6acb69f..f5b32b7184 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -89,11 +89,11 @@ enum RES_Name { /* 0x1 */ SHA, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_SHA, SHA}, }; -static daNpcT_evtData_c l_evtList[6] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[6] = { {"", 0}, {"NO_RESPONSE", 0}, {"PERFORM_AUGURY", 1}, @@ -102,22 +102,22 @@ static daNpcT_evtData_c l_evtList[6] = { {"RETURN", 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Sha", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { SHA, -1, }; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, 32, J3DFrameCtrl::EMode_LOOP, SHA, 1}, {10, J3DFrameCtrl::EMode_NONE, SHA, 32, J3DFrameCtrl::EMode_LOOP, SHA, 1}, {9, J3DFrameCtrl::EMode_NONE, SHA, 35, J3DFrameCtrl::EMode_NONE, SHA, 0}, @@ -130,7 +130,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = { {13, J3DFrameCtrl::EMode_LOOP, SHA, 38, J3DFrameCtrl::EMode_LOOP, SHA, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[8] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[8] = { {23, J3DFrameCtrl::EMode_LOOP, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0}, {19, J3DFrameCtrl::EMode_NONE, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0}, {21, J3DFrameCtrl::EMode_NONE, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0}, @@ -141,7 +141,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[8] = { {20, J3DFrameCtrl::EMode_NONE, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, {8, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -154,7 +154,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -165,12 +165,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = { {7, 0, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Sha_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_Sha_c::mCutNameList[2] = { "", "PERFORM_AUGURY", }; -daNpc_Sha_c::cutFunc daNpc_Sha_c::mCutList[2] = { +daNpc_Sha_c::cutFunc DUSK_CONST daNpc_Sha_c::mCutList[2] = { NULL, &daNpc_Sha_c::cutPerformAugury, }; @@ -1242,7 +1242,7 @@ static int daNpc_Sha_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Sha_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Sha_MethodTable = { (process_method_func)daNpc_Sha_Create, (process_method_func)daNpc_Sha_Delete, (process_method_func)daNpc_Sha_Execute, @@ -1250,7 +1250,7 @@ static actor_method_class daNpc_Sha_MethodTable = { (process_method_func)daNpc_Sha_Draw, }; -actor_process_profile_definition g_profile_NPC_SHAMAN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SHAMAN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index bf3a2b383c..1fef7437a0 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -82,7 +82,7 @@ bool daNpcShoe_c::chkFindPlayer() { return ret; } -static daNpc_GetParam2 l_bckGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_bckGetParamList[5] = { {17, 2, 1}, // m_sitwait_a {13, 0, 1}, // m_sittalk_a {14, 0, 1}, // m_sittalk_a_b @@ -90,21 +90,21 @@ static daNpc_GetParam2 l_bckGetParamList[5] = { {11, 2, 1} // m_sit_to_wolf_a }; -static daNpc_GetParam2 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_btpGetParamList[1] = { {12, 2, 0}, // shoe }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "shoe", "Mgeneral", "object", }; -static char* l_evtNames[1] = {NULL}; +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = {NULL}; -static char* l_myName = "Shoe"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Shoe"; -daNpcShoe_c::EventFn daNpcShoe_c::mEvtSeqList[1] = {NULL}; +daNpcShoe_c::EventFn DUSK_CONST daNpcShoe_c::mEvtSeqList[1] = {NULL}; daNpcShoe_c::daNpcShoe_c() {} @@ -736,13 +736,13 @@ BOOL daNpcShoe_c::drawDbgInfo() { return FALSE; } -static actor_method_class daNpcShoe_MethodTable = { +static DUSK_CONST actor_method_class daNpcShoe_MethodTable = { (process_method_func)daNpcShoe_Create, (process_method_func)daNpcShoe_Delete, (process_method_func)daNpcShoe_Execute, (process_method_func)daNpcShoe_IsDelete, (process_method_func)daNpcShoe_Draw, }; -actor_process_profile_definition g_profile_NPC_SHOE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SHOE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 6743a1b859..3612cd846e 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -14,11 +14,11 @@ static int createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_resName = "Shop0"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resName = "Shop0"; -static char* l_bmdFileName = "grA_a.bmd"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bmdFileName = "grA_a.bmd"; -static char* l_bckFileNameTBL = "grA_wait_a"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bckFileNameTBL = "grA_wait_a"; daNpc_Shop0_c::~daNpc_Shop0_c() { dComIfG_resLoad(&mPhaseReq, getResName()); @@ -135,7 +135,7 @@ int daNpc_Shop0_c::draw() { return 1; } -char* daNpc_Shop0_c::getResName() { +char DUSK_CONST* daNpc_Shop0_c::getResName() { return l_resName; } @@ -185,7 +185,7 @@ int daNpc_Shop0_c::init() { static char l_fileName[21]; -J3DAnmTransform* daNpc_Shop0_c::getTrnsfrmAnmP(int i_fileIndex, char** i_fileName) { +J3DAnmTransform* daNpc_Shop0_c::getTrnsfrmAnmP(int i_fileIndex, char DUSK_CONST* DUSK_CONST* i_fileName) { SAFE_STRCPY(l_fileName, i_fileName[i_fileIndex]); SAFE_STRCAT(l_fileName, ".bck"); return (J3DAnmTransform*) dComIfG_getObjectRes(getResName(), l_fileName); @@ -348,11 +348,11 @@ static int daNpc_Shop0_IsDelete(void*) { return true; } -static actor_method_class daNpc_Shop0_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Shop0_MethodTable = { daNpc_Shop0_Create, daNpc_Shop0_Delete, daNpc_Shop0_Execute, daNpc_Shop0_IsDelete, daNpc_Shop0_Draw, }; -actor_process_profile_definition g_profile_NPC_SHOP0 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SHOP0 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index d113c06855..334d46b839 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -33,7 +33,7 @@ int daNpc_shopMaro_c::create() { return cPhs_ERROR_e; } -static actor_method_class daNpc_shopMaro_MethodTable = { +static DUSK_CONST actor_method_class daNpc_shopMaro_MethodTable = { (process_method_func)daNpc_shopMaro_Create, (process_method_func)daNpc_shopMaro_Delete, (process_method_func)daNpc_shopMaro_Execute, @@ -41,7 +41,7 @@ static actor_method_class daNpc_shopMaro_MethodTable = { (process_method_func)daNpc_shopMaro_Draw, }; -actor_process_profile_definition g_profile_NPC_SMARO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SMARO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index a8fb79593c..093a1cbee6 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -20,49 +20,49 @@ enum RES_Name { /* 0x1 */ SOLA, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_SOLA, SOLA}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "solA", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[1] = {l_loadResPtrn0}; +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[1] = {l_loadResPtrn0}; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, NONE, FALSE}, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {BCK_SOLA_WAIT_A, J3DFrameCtrl::EMode_LOOP, SOLA, -1, J3DFrameCtrl::EMode_NONE, NONE, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_solA_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_solA_c::mCutNameList[1] = {""}; -daNpc_solA_c::cutFunc daNpc_solA_c::mCutList[1] = { +daNpc_solA_c::cutFunc DUSK_CONST daNpc_solA_c::mCutList[1] = { NULL, }; @@ -488,13 +488,13 @@ static int daNpc_solA_IsDelete(void* param_0) { return 1; } -static actor_method_class daNpc_solA_MethodTable = { +static DUSK_CONST actor_method_class daNpc_solA_MethodTable = { (process_method_func)daNpc_solA_Create, (process_method_func)daNpc_solA_Delete, (process_method_func)daNpc_solA_Execute, (process_method_func)daNpc_solA_IsDelete, (process_method_func)daNpc_solA_Draw, }; -actor_process_profile_definition g_profile_NPC_SOLA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SOLA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 14e188e4a8..d3baf97440 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -89,12 +89,12 @@ enum Event_Cut_Nums { static NPC_SOLDIERA_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[2] = { {BMDR_SOLA_TW, CHTSOLA}, {BMDR_SOLA_SPEAR, CHTSOLA}, }; -static daNpc_GetParam1 l_bckGetParamList[7] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[7] = { {-1, CHTSOLA}, {BCK_SOLA_WAIT_A, CHTSOLA}, {BCK_SOLA_FEAR_WAIT, CHTSOLA}, @@ -104,42 +104,42 @@ static daNpc_GetParam1 l_bckGetParamList[7] = { {BCK_SOLA_TALK_B, CHTSOLA}, }; -static daNpc_GetParam1 l_evtGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[2] = { {0, CHTSOLA}, {1, CHTSOLA}, }; -static char* l_evtNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = { NULL, "TALK_LAKE", }; -static int l_loadRes_SOLDIERaa[3] = { +static DUSK_CONSTEXPR int l_loadRes_SOLDIERaa[3] = { CHTSOLA, -1, -1, }; -static int l_loadRes_SOLDIERa0[3] = { +static DUSK_CONSTEXPR int l_loadRes_SOLDIERa0[3] = { CHTSOLA, -1, -1, }; -static int* l_loadRes_list[4] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[4] = { l_loadRes_SOLDIERaa, l_loadRes_SOLDIERaa, l_loadRes_SOLDIERaa, l_loadRes_SOLDIERa0, }; -static char* l_resNames[1] = {"chtSolA"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[1] = {"chtSolA"}; -static char* l_myName = "chtSolA"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "chtSolA"; -char* daNpc_SoldierA_c::mEvtCutNameList[3] = { +char DUSK_CONST* DUSK_CONST daNpc_SoldierA_c::mEvtCutNameList[3] = { "", "TALK_LAKE", "LISTEN_LAKE", }; -daNpc_SoldierA_c::cutFunc daNpc_SoldierA_c::mEvtCutList[3] = { +daNpc_SoldierA_c::cutFunc DUSK_CONST daNpc_SoldierA_c::mEvtCutList[3] = { NULL, &daNpc_SoldierA_c::ECut_talkLake, &daNpc_SoldierA_c::ECut_listenLake, @@ -1144,7 +1144,7 @@ static int daNpc_SoldierA_IsDelete(void* i_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_SoldierA_MethodTable = { +static DUSK_CONST actor_method_class daNpc_SoldierA_MethodTable = { (process_method_func)daNpc_SoldierA_Create, (process_method_func)daNpc_SoldierA_Delete, (process_method_func)daNpc_SoldierA_Execute, @@ -1152,7 +1152,7 @@ static actor_method_class daNpc_SoldierA_MethodTable = { (process_method_func)daNpc_SoldierA_Draw, }; -actor_process_profile_definition g_profile_NPC_SOLDIERa = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SOLDIERa = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 8ee1762ca4..e867c2b660 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -68,50 +68,50 @@ enum Event_Cut_Nums { static NPC_SOLDIERB_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[2] = {{10, 0}, {9, 0}}; +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[2] = {{10, 0}, {9, 0}}; -static daNpc_GetParam1 l_bckGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[4] = { {-1, 0}, {4, 0}, {6, 0}, {5, 0}, }; -static daNpc_GetParam1 l_evtGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[1] = { {0, 0}, }; -static char* l_evtNames[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[1] = { NULL, }; -static int l_loadRes_SOLDIERba[3] = { +static DUSK_CONSTEXPR int l_loadRes_SOLDIERba[3] = { 0, -1, -1, }; -static int l_loadRes_SOLDIERb0[3] = { +static DUSK_CONSTEXPR int l_loadRes_SOLDIERb0[3] = { 0, -1, -1, }; -static int* l_loadRes_list[2] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[2] = { l_loadRes_SOLDIERba, l_loadRes_SOLDIERb0, }; -static char* l_resNames[1] = {"chtSolB"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[1] = {"chtSolB"}; -static char* l_myName = "chtSolB"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "chtSolB"; -char* daNpc_SoldierB_c::mEvtCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_SoldierB_c::mEvtCutNameList[2] = { "", "LISTEN_LAKE", }; -daNpc_SoldierB_c::cutFunc daNpc_SoldierB_c::mEvtCutList[2] = { +daNpc_SoldierB_c::cutFunc DUSK_CONST daNpc_SoldierB_c::mEvtCutList[2] = { NULL, &daNpc_SoldierB_c::ECut_listenLake, }; @@ -974,13 +974,13 @@ static int daNpc_SoldierB_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_SoldierB_MethodTable = { +static DUSK_CONST actor_method_class daNpc_SoldierB_MethodTable = { (process_method_func)daNpc_SoldierB_Create, (process_method_func)daNpc_SoldierB_Delete, (process_method_func)daNpc_SoldierB_Execute, (process_method_func)daNpc_SoldierB_IsDelete, (process_method_func)daNpc_SoldierB_Draw, }; -actor_process_profile_definition g_profile_NPC_SOLDIERb = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SOLDIERb = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index 796e682ca1..9dbf078c53 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -381,7 +381,7 @@ static cPhs_Step daNpc_Sq_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daNpc_Sq_Method = { +static DUSK_CONST actor_method_class l_daNpc_Sq_Method = { (process_method_func)daNpc_Sq_Create, (process_method_func)daNpc_Sq_Delete, (process_method_func)daNpc_Sq_Execute, @@ -389,7 +389,7 @@ static actor_method_class l_daNpc_Sq_Method = { (process_method_func)daNpc_Sq_Draw, }; -actor_process_profile_definition g_profile_NPC_SQ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_SQ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 1461dc6dba..efb3cddf4b 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -31,11 +31,11 @@ enum TaroEvent { /* 0x18 */ EVENT_18 = 0x18, }; -static int l_bmdData[5][2] = { +static DUSK_CONSTEXPR int l_bmdData[5][2] = { 4, 1, 31, 4, 32, 4, 10, 2, 4, 9, }; -static daNpcT_evtData_c l_evtList[27] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[27] = { {"", 0}, {"NO_RESPONSE", 0}, {"HAIL", 4}, @@ -65,39 +65,39 @@ static daNpcT_evtData_c l_evtList[27] = { {"TAG_PUSH4", 4}, }; -static char* l_resNameList[11] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[11] = { "", "Taro", "Taro_TW", "Taro0", "Taro1", "Taro2", "Taro3", "Taro4", "Taro5", "TaroB", "Len1", }; -static s8 l_loadResPtrn0[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[5] = { 0x01, 0x03, 0x04, 0x06, -1, }; -static s8 l_loadResPtrn1[4] = {0x01, 0x03, 0x02, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[4] = {0x01, 0x03, 0x02, -1}; -static s8 l_loadResPtrn2[6] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[6] = { 0x01, 0x03, 0x05, 0x06, 0x07, -1, }; -static s8 l_loadResPtrn3[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[5] = { 0x01, 0x03, 0x04, 0x07, -1, }; -static s8 l_loadResPtrn4[4] = {0x01, 0x03, 0x08, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn4[4] = {0x01, 0x03, 0x08, -1}; -static s8 l_loadResPtrn5[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn5[5] = { 0x09, 0x03, 0x04, 0x08, -1, }; -static s8 l_loadResPtrn6[6] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn6[6] = { 0x01, 0x03, 0x04, 0x05, 0x06, -1, }; -static s8 l_loadResPtrn9[9] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[9] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, -1, }; -static s8* l_loadResPtrnList[17] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[17] = { l_loadResPtrn6, l_loadResPtrn6, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn3, l_loadResPtrn6, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn6, l_loadResPtrn6, @@ -105,7 +105,7 @@ static s8* l_loadResPtrnList[17] = { l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {-1, 0, 0, 7, 2, 1, 1}, {7, 0, 3, 7, 2, 1, 1}, {11, 0, 4, 43, 0, 4, 0}, @@ -138,7 +138,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = { {7, 2, 8, 25, 2, 8, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[42] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[42] = { 9, 2, 3, 12, 0, 3, 1, 0, 25, 2, 4, 12, 0, 3, 1, 0, 10, 2, 6, 12, 0, 3, 1, 0, 26, 2, 4, 12, 0, 3, 1, 0, 27, 2, 4, 12, 0, 3, 1, 0, 28, 2, 4, 12, 0, 3, 1, 0, 8, 0, 6, 12, 0, 3, 1, 0, -1, 0, 0, -1, 0, 0, 0, 0, 17, 2, 4, 12, 0, 3, 1, 0, @@ -155,7 +155,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[42] = { 6, 2, 8, 22, 2, 8, 0, 0, 17, 0, 8, 12, 0, 3, 1, 0, 18, 2, 8, 12, 0, 3, 1, 0, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {11, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {12, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -174,7 +174,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] {29, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[168] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[168] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {21, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {22, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {17, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {24, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -198,7 +198,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[168] = { {40, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {40, -1, 1}, {41, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Taro_c::mCutNameList[17] = { +char DUSK_CONST* DUSK_CONST daNpc_Taro_c::mCutNameList[17] = { "", "CONVERSATION_ABOUT_PACHINKO", "CONVERSATION_ABOUT_WOODSWD", @@ -218,7 +218,7 @@ char* daNpc_Taro_c::mCutNameList[17] = { "TAG_PUSH4", }; -daNpc_Taro_c::cutFunc daNpc_Taro_c::mCutList[17] = { +daNpc_Taro_c::cutFunc DUSK_CONST daNpc_Taro_c::mCutList[17] = { NULL, &daNpc_Taro_c::cutConversationAboutPachinko, &daNpc_Taro_c::cutConversationAboutWoodSwd, @@ -3389,7 +3389,7 @@ static int daNpc_Taro_IsDelete(void* i_this) { AUDIO_INSTANCES -static actor_method_class daNpc_Taro_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Taro_MethodTable = { (process_method_func)daNpc_Taro_Create, (process_method_func)daNpc_Taro_Delete, (process_method_func)daNpc_Taro_Execute, @@ -3397,7 +3397,7 @@ static actor_method_class daNpc_Taro_MethodTable = { (process_method_func)daNpc_Taro_Draw, }; -actor_process_profile_definition g_profile_NPC_TARO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TARO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 4e3fd39366..8a1a23d122 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -64,12 +64,12 @@ void daNpcThe_HIO_c::genMessage(JORMContext* ctext) { static NPC_THE_HIO_CLASS l_HIO; -static daNpc_GetParam1 l_bmdGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[2] = { {23, 0}, // the {24, 0}, // the_tw }; -static daNpc_GetParam1 l_bckGetParamList[27] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[27] = { {-1, 0}, // {10, 0}, // the_f_talk_a {9, 0}, // the_f_smile @@ -99,7 +99,7 @@ static daNpc_GetParam1 l_bckGetParamList[27] = { {3, 2}, // the_kune_shishi }; -static daNpc_GetParam1 l_btpGetParamList[14] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[14] = { {30, 0}, // the {34, 0}, // the_f_talk_a {33, 0}, // the_f_smile @@ -116,53 +116,53 @@ static daNpc_GetParam1 l_btpGetParamList[14] = { {43, 0}, // the_fh_talk_r }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {27, 0}, // the }; -static int l_loadRes_THE0[3] = {0, 1, -1}; +static DUSK_CONSTEXPR int l_loadRes_THE0[3] = {0, 1, -1}; -static int l_loadRes_THE1[3] = {0, 1, -1}; +static DUSK_CONSTEXPR int l_loadRes_THE1[3] = {0, 1, -1}; -static int l_loadRes_THE2[3] = {0, 2, -1}; +static DUSK_CONSTEXPR int l_loadRes_THE2[3] = {0, 2, -1}; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_THE0, l_loadRes_THE1, l_loadRes_THE2, }; -static char* l_resNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[4] = { "The", "The1", "The2", "yelB_TW", }; -static int l_evtGetParamList[4] = { +static DUSK_CONSTEXPR int l_evtGetParamList[4] = { 0, 3, 3, 0, }; -static char* l_evtNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = { NULL, "TW_RESISTANCE1", "TW_RESISTANCE2", "THE_INTRODUCTION", }; -static char* l_myName = "The"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "The"; -char* daNpcThe_c::mEvtCutNameList[4] = { +char DUSK_CONST* DUSK_CONST daNpcThe_c::mEvtCutNameList[4] = { "", "TW_RESISTANCE", "TW_RESISTANCE", "THE_INTRODUCTION", }; -daNpcThe_c::EventFn daNpcThe_c::mEvtCutList[4] = { +daNpcThe_c::EventFn DUSK_CONST daNpcThe_c::mEvtCutList[4] = { NULL, &daNpcThe_c::EvCut_TwResistance, &daNpcThe_c::EvCut_TwResistance, @@ -1336,13 +1336,13 @@ BOOL daNpcThe_c::drawDbgInfo() { return false; } -static actor_method_class daNpcThe_MethodTable = { +static DUSK_CONST actor_method_class daNpcThe_MethodTable = { (process_method_func)daNpcThe_Create, (process_method_func)daNpcThe_Delete, (process_method_func)daNpcThe_Execute, (process_method_func)daNpcThe_IsDelete, (process_method_func)daNpcThe_Draw, }; -actor_process_profile_definition g_profile_NPC_THE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_THE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 901c495543..efee49d934 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -101,7 +101,7 @@ static u16 l_bmdGetParamList[1][2] = { {0, BMDR_THEB}, }; -static daNpc_GetParam1 l_bckGetParamList[14] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[14] = { {-1, J3DFrameCtrl::EMode_LOOP}, {BCK_THEB_F_TALK_A, J3DFrameCtrl::EMode_NONE}, {BCK_THEB_F_TALK_B, J3DFrameCtrl::EMode_NONE}, @@ -118,15 +118,15 @@ static daNpc_GetParam1 l_bckGetParamList[14] = { {BCK_THEB_BEND_TURN, J3DFrameCtrl::EMode_NONE}, }; -static daNpc_GetParam1 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[1] = { {BTP_THEB, J3DFrameCtrl::EMode_LOOP}, }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {BTK_THEB, J3DFrameCtrl::EMode_LOOP}, }; -static char* l_evtNames[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[6] = { NULL, "PERSONAL_COMBAT_INTRO", "PERSONAL_COMBAT_REVENGE", @@ -135,9 +135,9 @@ static char* l_evtNames[6] = { "COACH_GUARD_GAMEOVER", }; -static char* l_arcName = "Coach"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Coach"; -static char* l_myName = "TheB"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "TheB"; #if DEBUG daNpcTheB_HIO_c::daNpcTheB_HIO_c() { @@ -1581,7 +1581,7 @@ static int daNpcTheB_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcTheB_MethodTable = { +static DUSK_CONST actor_method_class daNpcTheB_MethodTable = { (process_method_func)daNpcTheB_Create, (process_method_func)daNpcTheB_Delete, (process_method_func)daNpcTheB_Execute, @@ -1589,7 +1589,7 @@ static actor_method_class daNpcTheB_MethodTable = { (process_method_func)daNpcTheB_Draw, }; -actor_process_profile_definition g_profile_NPC_THEB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_THEB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 0349f8ebc0..046386e6d6 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -679,14 +679,14 @@ bool daNPC_TK_c::executePerchDemo(int param_0) { } void daNPC_TK_c::executePerch() { - static char* action_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[4] = { "Wait", "Circle", "Nearly", "Land", }; - static char* action_table_w[2] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table_w[2] = { "Wait", "Circle", }; @@ -3302,13 +3302,13 @@ static int daNPC_TK_Create(daNPC_TK_c* i_this) { return i_this->create(); } -static actor_method_class l_daNPC_TK_Method = { +static DUSK_CONST actor_method_class l_daNPC_TK_Method = { (process_method_func)daNPC_TK_Create, (process_method_func)daNPC_TK_Delete, (process_method_func)daNPC_TK_Execute, (process_method_func)daNPC_TK_IsDelete, (process_method_func)daNPC_TK_Draw, }; -actor_process_profile_definition g_profile_NPC_TK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 6, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index bcd5afedb8..e05fb64024 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -99,30 +99,30 @@ void daNpcTkc_HIO_c::genMessage(JORMContext* ctx) { } #endif -static daNpc_GetParam3 l_bckGetParamList[3] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_bckGetParamList[3] = { {-1, J3DFrameCtrl::EMode_LOOP}, {BCK_TKC_F_TALK_A, J3DFrameCtrl::EMode_NONE}, {BCK_TKC_FLY, J3DFrameCtrl::EMode_LOOP}, }; -static daNpc_GetParam3 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_btpGetParamList[1] = { {BTP_TKC, J3DFrameCtrl::EMode_LOOP}, }; -static daNpc_GetParam3 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_btkGetParamList[1] = { {BTK_TKC, J3DFrameCtrl::EMode_LOOP}, }; -static char* l_evtNames[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[4] = { "", "TKS_SECRET", "TKS_WARP", "TKC_WARP", }; -static char* l_arcName = "Tkc"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Tkc"; -static char* l_myName = "Tkc"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Tkc"; static NPC_TKC_HIO_CLASS l_HIO; @@ -1380,7 +1380,7 @@ static int daNpcTkc_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpcTkc_MethodTable = { +static DUSK_CONST actor_method_class daNpcTkc_MethodTable = { (process_method_func)daNpcTkc_Create, (process_method_func)daNpcTkc_Delete, (process_method_func)daNpcTkc_Execute, @@ -1388,7 +1388,7 @@ static actor_method_class daNpcTkc_MethodTable = { (process_method_func)daNpcTkc_Draw, }; -actor_process_profile_definition g_profile_NPC_TKC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TKC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index af8eaf3d6c..4a798bcb4d 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -9,40 +9,40 @@ #include "d/actor/d_a_npc4.h" #include -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {12, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"DEFAULT_GETITEM", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Tkj", }; -static s8 l_loadResPtrn0[] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[] = { 1, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, 0, 0, 18, 2, 1, 1}, {6, 0, 1, 18, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[2] = { {9, 2, 1, 15, 0, 1, 0, 0}, {8, 2, 1, 15, 0, 1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -53,7 +53,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -64,12 +64,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { {-1, 0, 0}, }; -char* daNpcTkj_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpcTkj_c::mCutNameList[2] = { "", "LV7_FIRST_START", }; -int (daNpcTkj_c::*daNpcTkj_c::mCutList[])(int) = { +int (daNpcTkj_c::* DUSK_CONST daNpcTkj_c::mCutList[])(int) = { NULL, &daNpcTkj_c::cutLv7Start, }; @@ -682,7 +682,7 @@ void daNpcTkj_c::beforeMove() { } } -static actor_method_class daNpc_Tkj_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Tkj_MethodTable = { (process_method_func)daNpc_Tkj_Create, (process_method_func)daNpc_Tkj_Delete, (process_method_func)daNpc_Tkj_Execute, @@ -690,7 +690,7 @@ static actor_method_class daNpc_Tkj_MethodTable = { (process_method_func)daNpc_Tkj_Draw, }; -actor_process_profile_definition g_profile_NPC_TKJ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TKJ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 38e510d6c0..6d96e44a43 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1198,7 +1198,7 @@ static cPhs_Step daNpc_Tkj2_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daNpc_Tkj2_Method = { +static DUSK_CONST actor_method_class l_daNpc_Tkj2_Method = { (process_method_func)daNpc_Tkj2_Create, (process_method_func)daNpc_Tkj2_Delete, (process_method_func)daNpc_Tkj2_Execute, @@ -1206,7 +1206,7 @@ static actor_method_class l_daNpc_Tkj2_Method = { (process_method_func)daNpc_Tkj2_Draw, }; -actor_process_profile_definition g_profile_NPC_TKJ2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TKJ2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 9b0ee4af70..0399b36dd6 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -136,7 +136,7 @@ enum RES_Name { static NPC_TKS_HIO_CLASS l_HIO; -static daNpc_GetParam3 l_bckGetParamList[22] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_bckGetParamList[22] = { {-1, J3DFrameCtrl::EMode_LOOP}, {BCK_TKS_F_TALK_A, J3DFrameCtrl::EMode_NONE}, {BCK_TKS_WAIT_A, J3DFrameCtrl::EMode_LOOP}, @@ -161,46 +161,46 @@ static daNpc_GetParam3 l_bckGetParamList[22] = { {BCK_TKS_SWIM, J3DFrameCtrl::EMode_LOOP}, }; -static daNpc_GetParam3 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_btpGetParamList[1] = { {BTP_TKS, J3DFrameCtrl::EMode_LOOP}, }; -static daNpc_GetParam3 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam3 l_btkGetParamList[1] = { {BTK_TKS, J3DFrameCtrl::EMode_LOOP}, }; -static int l_loadRes_TKS0[3] = { +static DUSK_CONSTEXPR int l_loadRes_TKS0[3] = { TKS, J_TUBO_00, -1, }; -static int l_loadRes_TKS1[3] = { +static DUSK_CONSTEXPR int l_loadRes_TKS1[3] = { TKS, K_TUBO02, -1, }; -static int l_loadRes_TKS2[3] = { +static DUSK_CONSTEXPR int l_loadRes_TKS2[3] = { TKS, -1, -1, }; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_TKS0, l_loadRes_TKS1, l_loadRes_TKS2, }; -static char* l_arcNames[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcNames[3] = { "TKS", "J_tubo_00", "K_tubo02", }; -static char* l_evtNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = { NULL, "TKS_ENCOUNTER", }; -static char* l_arcName = "TKS"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "TKS"; -static char* l_myName = "Tks"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Tks"; daNpcTks_HIOParam const daNpcTks_Param_c::m = { 90.0f, @@ -3047,7 +3047,7 @@ void daNpcTks_c::drawOtherMdls() { } } -static actor_method_class daNpcTks_MethodTable = { +static DUSK_CONST actor_method_class daNpcTks_MethodTable = { (process_method_func)daNpcTks_Create, (process_method_func)daNpcTks_Delete, (process_method_func)daNpcTks_Execute, @@ -3055,7 +3055,7 @@ static actor_method_class daNpcTks_MethodTable = { (process_method_func)daNpcTks_Draw, }; -actor_process_profile_definition g_profile_NPC_TKS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TKS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index d175d199b7..78b6b08dee 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -121,13 +121,13 @@ void daNpc_Toby_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[3][2] = { +static DUSK_CONSTEXPR int l_bmdData[3][2] = { {3, 1}, {3, 2}, {9, 6}, }; -static daNpcT_evtData_c l_evtList[7] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[7] = { {"", 0}, {"NO_RESPONSE", 0}, {"TALKTO_ONESELF", 5}, @@ -137,7 +137,7 @@ static daNpcT_evtData_c l_evtList[7] = { {"CONVERSATION_ABOUT_ZRA", 4}, }; -static char* l_resNameList[9] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[9] = { "", "Toby", "Toby_TW", @@ -149,20 +149,20 @@ static char* l_resNameList[9] = { "Toby5", }; -static s8 l_loadResPtrn0[6] = {1, 3, 4, 7, 8, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[6] = {1, 3, 4, 7, 8, -1}; -static s8 l_loadResPtrn1[6] = {2, 3, 5, 7, 8, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[6] = {2, 3, 5, 7, 8, -1}; -static s8 l_loadResPtrn2[5] = {1, 3, 6, 7, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn2[5] = {1, 3, 6, 7, -1}; -static s8 l_loadResPtrn3[8] = {1, 2, 3, 4, 5, 7, 8, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn3[8] = {1, 2, 3, 4, 5, 7, 8, -1}; -static s8* l_loadResPtrnList[7] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[7] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn3, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { {-1, 0, 0, 13, 2, 3, 1}, {5, 0, 3, 14, 0, 3, 0}, {12, 0, 4, 29, 0, 4, 0}, @@ -181,7 +181,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { {8, 2, 5, 22, 2, 5, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[25] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[25] = { {7, 2, 3, 10, 0, 3, 1, 0}, {15, 2, 4, 10, 0, 3, 1, 0}, {20, 2, 4, 10, 0, 3, 1, 0}, @@ -209,7 +209,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[25] = { {10, 0, 8, 10, 0, 3, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[68] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[68] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {15, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 1}, {13, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 1}, {14, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -221,7 +221,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[68] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {12, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {13, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -247,7 +247,7 @@ enum NPC_TOBY_CUTS { CUT_CONVERSATION_ABOUT_ZRA = 6, }; -char* daNpc_Toby_c::mCutNameList[7] = { +char DUSK_CONST* DUSK_CONST daNpc_Toby_c::mCutNameList[7] = { "", "TOBY_HOUSE_FIRE", "TALKTO_ONESELF", @@ -257,7 +257,7 @@ char* daNpc_Toby_c::mCutNameList[7] = { "CONVERSATION_ABOUT_ZRA", }; -daNpc_Toby_c::cutFunc daNpc_Toby_c::mCutList[7] = { +daNpc_Toby_c::cutFunc DUSK_CONST daNpc_Toby_c::mCutList[7] = { NULL, &daNpc_Toby_c::cutTobyHouseFire, &daNpc_Toby_c::cutTalkToOneself, @@ -2199,7 +2199,7 @@ static int daNpc_Toby_IsDelete(void*) { return true; } -static actor_method_class daNpc_Toby_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Toby_MethodTable = { (process_method_func)daNpc_Toby_Create, (process_method_func)daNpc_Toby_Delete, (process_method_func)daNpc_Toby_Execute, @@ -2207,7 +2207,7 @@ static actor_method_class daNpc_Toby_MethodTable = { (process_method_func)daNpc_Toby_Draw, }; -actor_process_profile_definition g_profile_NPC_TOBY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TOBY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index 3331b7cd2b..300b079e1c 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -247,13 +247,13 @@ static int daNPC_TR_Create(fopAc_ac_c* i_this) { daNPC_TR_HIO_c::~daNPC_TR_HIO_c() {} -static actor_method_class l_daNPC_TR_Method = { +static DUSK_CONST actor_method_class l_daNPC_TR_Method = { (process_method_func)daNPC_TR_Create, (process_method_func)daNPC_TR_Delete, (process_method_func)daNPC_TR_Execute, (process_method_func)daNPC_TR_IsDelete, (process_method_func)daNPC_TR_Draw, }; -actor_process_profile_definition g_profile_NPC_TR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_TR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index bb0a561d26..f28ac6109e 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -79,9 +79,9 @@ void daNpc_Uri_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[2][2] = {{12, 1}, {33, 2}}; +static DUSK_CONSTEXPR int l_bmdData[2][2] = {{12, 1}, {33, 2}}; -static daNpcT_evtData_c l_evtList[11] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[11] = { {"", 0}, {"DEFAULT_GETITEM", 2}, {"NO_RESPONSE", 0}, @@ -95,42 +95,42 @@ static daNpcT_evtData_c l_evtList[11] = { {"MEETING_AGAIN", 4}, }; -static char* l_resNameList[6] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[6] = { "", "Uri", "Uri1", "Uri2", "Uri3", "Uri_P1", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { 1, 2, -1, }; -static s8 l_loadResPtrn2[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = { 1, 3, -1, }; -static s8 l_loadResPtrn3[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn3[5] = { 1, 2, 3, 4, -1, }; -static s8 l_loadResPtrn4[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn4[3] = { 1, 5, -1, }; -static s8 l_loadResPtrn9[5] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = { 1, 2, 3, 4, -1, }; -static s8* l_loadResPtrnList[7] = {l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn2, +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[7] = {l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn2, l_loadResPtrn3, l_loadResPtrn4, l_loadResPtrn9}; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[19] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[19] = { {-1, 0, 0, 18, 2, 1, TRUE}, {-1, 0, 0, -1, 0, 0, FALSE}, {6, 0, 1, 18, 2, 1, TRUE}, {10, 0, 2, 43, 0, 2, FALSE}, {11, 0, 2, 44, 0, 2, FALSE}, {9, 0, 2, 42, 0, 2, FALSE}, {12, 0, 2, 45, 0, 2, FALSE}, {6, 0, 3, 21, 0, 3, FALSE}, {8, 0, 3, 23, 0, 3, FALSE}, @@ -140,7 +140,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[19] = { {8, 2, 1, 21, 2, 1, FALSE}, }; -static daNpcT_motionAnmData_c l_motionAnmData[34] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[34] = { {9, 2, 1, 15, 0, 1, 1, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {9, 2, 3, 18, 2, 3, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {30, 0, 2, 15, 0, 1, 1, 0}, @@ -155,7 +155,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[34] = { {19, 0, 2, 15, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = { {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {14, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {11, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {12, -1, 0}, @@ -169,7 +169,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {28, -1, 1}, {29, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {30, -1, 1}, {26, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {31, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {32, -1, 1}, {31, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, @@ -200,7 +200,7 @@ const char* daNpc_Uri_c::mCutNameList[7] = { "MEETING_AGAIN", }; -daNpc_Uri_c::cutFunc daNpc_Uri_c::mCutList[7] = { +daNpc_Uri_c::cutFunc DUSK_CONST daNpc_Uri_c::mCutList[7] = { NULL, &daNpc_Uri_c::cutConversation, &daNpc_Uri_c::cutStartCarryTutorial, @@ -1913,13 +1913,13 @@ static int daNpc_Uri_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Uri_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Uri_MethodTable = { (process_method_func)daNpc_Uri_Create, (process_method_func)daNpc_Uri_Delete, (process_method_func)daNpc_Uri_Execute, (process_method_func)daNpc_Uri_IsDelete, (process_method_func)daNpc_Uri_Draw, }; -actor_process_profile_definition g_profile_NPC_URI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_URI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 4c8e31d56c..66a1a38d40 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -392,7 +392,7 @@ static int daNPC_WORM_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daNPC_WORM_Method = { +static DUSK_CONST actor_method_class l_daNPC_WORM_Method = { (process_method_func)daNPC_WORM_Create, (process_method_func)daNPC_WORM_Delete, (process_method_func)daNPC_WORM_Execute, @@ -400,7 +400,7 @@ static actor_method_class l_daNPC_WORM_Method = { (process_method_func)daNPC_WORM_Draw, }; -actor_process_profile_definition g_profile_NPC_WORM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_WORM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 81b50c8338..e31404e1da 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -244,9 +244,9 @@ enum Bou3_Joint { /* 0x24 */ JNT_OBIR, }; -static char* l_resALink = "alSumou"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resALink = "alSumou"; -static char* l_resName[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resName[5] = { "Bou3", "grDS", NULL, @@ -254,11 +254,11 @@ static char* l_resName[5] = { NULL, }; -static int l_bmdGetParamList[5] = { +static DUSK_CONSTEXPR int l_bmdGetParamList[5] = { BMDR_BOUS, BMDR_GRD, 0, 0, 0, }; -static daNpc_GetParam1 l_BouBckParamList[63] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_BouBckParamList[63] = { {-1, 2}, {BCK_BOUS_F_DOWN, 2}, {BCK_BOUS_F_HEAD_UP, 0}, {BCK_BOUS_F_LOSE, 0}, {BCK_BOUS_F_LOSE2, 0}, {BCK_BOUS_F_PULLBACK, 0}, {BCK_BOUS_F_PUNCH, 0}, {BCK_BOUS_F_PUNCH_SHOCK, 0}, {BCK_BOUS_F_PUNCHMISS_TACKLESHOCK, 0}, @@ -282,7 +282,7 @@ static daNpc_GetParam1 l_BouBckParamList[63] = { {-1, 2}, {-1, 2}, {-1, 2}, }; -static daNpc_GetParam2 l_BouFaceParamList[23] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_BouFaceParamList[23] = { {-1, 0x44, 2}, {7, 0x45, 2}, {8, 0x46, 0}, {9, 0x47, 0}, {10, 0x48, 0}, {11, 0x49, 0}, {12, 0x4A, 0}, {13, 0x4B, 0}, {14, 0x4C, 0}, @@ -293,7 +293,7 @@ static daNpc_GetParam2 l_BouFaceParamList[23] = { {27, 0x58, 0}, {28, 0x59, 0}, }; -static daNpc_GetParam1 l_BouBtpParamList[23] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_BouBtpParamList[23] = { {BTP_BOUS, 2}, {BTP_BOUS_F_DOWN, 0}, {BTP_BOUS_F_HEAD_UP, 0}, {BTP_BOUS_F_LOSE, 0}, {BTP_BOUS_F_LOSE2, 0}, {BTP_BOUS_F_PULLBACK, 0}, @@ -308,18 +308,18 @@ static daNpc_GetParam1 l_BouBtpParamList[23] = { {BTP_BOUS_F_WIN_POSE, 0}, }; -static daNpc_GetParam1 l_BouBtkParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_BouBtkParamList[1] = { {BTK_BOUS, 2}, }; -static WrestlerParamList l_BouAnmParamList = { +static DUSK_CONSTEXPR WrestlerParamList l_BouAnmParamList = { l_BouBckParamList, l_BouFaceParamList, l_BouBtpParamList, l_BouBtkParamList, }; -static daNpc_GetParam1 l_GrdBckParamList[63] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_GrdBckParamList[63] = { {-1, 2}, {8, 2}, {9, 0}, {10, 0}, {0x0B, 0}, {0x0D, 0}, {0x0E, 0}, {0x0F, 0}, {0x10, 0}, {0x11, 0}, {0x12, 0}, {0x14, 2}, @@ -338,7 +338,7 @@ static daNpc_GetParam1 l_GrdBckParamList[63] = { {0x3C, 0}, {0x3D, 0}, {0x42, 2}, }; -static daNpc_GetParam2 l_GrdFaceParamList[23] = { +static DUSK_CONSTEXPR daNpc_GetParam2 l_GrdFaceParamList[23] = { {-1, 0x4D, 2}, {8, 0x4E, 2}, {9, 0x4F, 0}, {0x0A, 0x50, 0}, {0x0B, 0x51, 0}, {0x0D, 0x52, 0}, {0x0E, -1, 0}, {0x0F, 0x53, 0}, {0x10, 0x54, 0}, @@ -349,7 +349,7 @@ static daNpc_GetParam2 l_GrdFaceParamList[23] = { {0x1E, 0x5F, 0}, {0x1F, -1, 0}, }; -static daNpc_GetParam1 l_GrdBtpParamList[23] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_GrdBtpParamList[23] = { {0x4D, 2}, {0x4E, 2}, {0x4F, 0}, {0x50, 0}, {0x51, 0}, {0x52, 0}, {-1, 0}, {0x53, 0}, {0x54, 0}, {0x55, 0}, {0x56, 0}, {0x57, 2}, @@ -358,23 +358,23 @@ static daNpc_GetParam1 l_GrdBtpParamList[23] = { {0x5E, 2}, {0x5F, 0}, {-1, 0}, }; -static daNpc_GetParam1 l_GrdBtkParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_GrdBtkParamList[1] = { {0x4A, 2}, }; -static WrestlerParamList l_GrdAnmParamList = { +static DUSK_CONSTEXPR WrestlerParamList l_GrdAnmParamList = { l_GrdBckParamList, l_GrdFaceParamList, l_GrdBtpParamList, l_GrdBtkParamList, }; -static WrestlerParamList* l_anmList[2] = { +static DUSK_CONSTEXPR WrestlerParamList DUSK_CONST* l_anmList[2] = { &l_BouAnmParamList, &l_GrdAnmParamList, }; -static char* l_evtNames[7] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[7] = { NULL, "GRDS_ENTRY", "GRDS_ENTRY2", @@ -384,7 +384,7 @@ static char* l_evtNames[7] = { "GRDS_LOSE", }; -static char* l_myName = "Wrestler"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "Wrestler"; static NPC_WRESTLER_HIO_CLASS l_HIO; @@ -646,7 +646,7 @@ void daNpcWrestler_HIO_c::genMessage(JORMContext* ctext) { } #endif -daNpcWrestler_c::EventFn daNpcWrestler_c::mEvtSeqList[7] = { +daNpcWrestler_c::EventFn DUSK_CONST daNpcWrestler_c::mEvtSeqList[7] = { NULL, &daNpcWrestler_c::EvCut_grDSEntry, &daNpcWrestler_c::EvCut_grDSEntry2, @@ -5212,7 +5212,7 @@ void daNpcWrestler_c::drawOtherMdls() { /* empty function */ } -static actor_method_class daNpcWrestler_MethodTable = { +static DUSK_CONST actor_method_class daNpcWrestler_MethodTable = { (process_method_func)daNpcWrestler_Create, (process_method_func)daNpcWrestler_Delete, (process_method_func)daNpcWrestler_Execute, @@ -5220,7 +5220,7 @@ static actor_method_class daNpcWrestler_MethodTable = { (process_method_func)daNpcWrestler_Draw, }; -actor_process_profile_definition g_profile_NPC_WRESTLER = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_WRESTLER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index 42668a8342..4593ee2946 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -77,56 +77,56 @@ void daNpc_yamiD_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_YAMID, YAMID}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"STOPPER", 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "yamiD", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_YAMID, J3DFrameCtrl::EMode_LOOP, YAMID, 1}, {BCK_YAMID_F_TALK_A, J3DFrameCtrl::EMode_NONE, YAMID, BTP_YAMID, J3DFrameCtrl::EMode_LOOP, YAMID, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[2] = { {BCK_YAMID_WAIT_A, J3DFrameCtrl::EMode_LOOP, YAMID, BTK_YAMID, J3DFrameCtrl::EMode_NONE, YAMID, 1, 0}, {BCK_YAMID_STEP, J3DFrameCtrl::EMode_NONE, YAMID, BTK_YAMID, J3DFrameCtrl::EMode_NONE, YAMID, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_yamiD_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_yamiD_c::mCutNameList[2] = { "", "STOPPER", }; -daNpc_yamiD_c::cutFunc daNpc_yamiD_c::mCutList[2] = { +daNpc_yamiD_c::cutFunc DUSK_CONST daNpc_yamiD_c::mCutList[2] = { NULL, &daNpc_yamiD_c::cutStopper, }; @@ -787,7 +787,7 @@ static int daNpc_yamiD_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_yamiD_MethodTable = { +static DUSK_CONST actor_method_class daNpc_yamiD_MethodTable = { (process_method_func)daNpc_yamiD_Create, (process_method_func)daNpc_yamiD_Delete, (process_method_func)daNpc_yamiD_Execute, @@ -795,7 +795,7 @@ static actor_method_class daNpc_yamiD_MethodTable = { (process_method_func)daNpc_yamiD_Draw, }; -actor_process_profile_definition g_profile_NPC_YAMID = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_YAMID = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 51ef99e7f4..24272132fb 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -37,52 +37,52 @@ void daNpc_yamiS_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {12, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"STOPPER", 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "yamiS", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, 0, 0, 18, 2, 1, 1}, {7, 0, 1, 18, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[2] = { {9, 2, 1, 15, 0, 1, 1, 0}, {8, 0, 1, 15, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_yamiS_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_yamiS_c::mCutNameList[2] = { "", "STOPPER", }; -daNpc_yamiS_c::cutFunc daNpc_yamiS_c::mCutList[2] = { +daNpc_yamiS_c::cutFunc DUSK_CONST daNpc_yamiS_c::mCutList[2] = { NULL, &daNpc_yamiS_c::cutStopper, }; @@ -720,13 +720,13 @@ static int daNpc_yamiS_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_yamiS_MethodTable = { +static DUSK_CONST actor_method_class daNpc_yamiS_MethodTable = { (process_method_func)daNpc_yamiS_Create, (process_method_func)daNpc_yamiS_Delete, (process_method_func)daNpc_yamiS_Execute, (process_method_func)daNpc_yamiS_IsDelete, (process_method_func)daNpc_yamiS_Draw, }; -actor_process_profile_definition g_profile_NPC_YAMIS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_YAMIS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index ffedc646f4..1c6b25740d 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -38,54 +38,54 @@ void daNpc_yamiT_HIO_c::genMessage(JORMContext* ctext) { } #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {12, 1}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"STOPPER", 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "yamiT", }; -static s8 l_loadResPtrn0[2] = {1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {1, -1}; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, 0, 0, 15, 2, 1, 1}, {6, 0, 1, 15, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[3] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[3] = { {9, 2, 1, -1, 0, 0, 0, 0}, {8, 0, 1, -1, 0, 0, 0, 0}, {7, 0, 1, -1, 0, 0, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_yamiT_c::mCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_yamiT_c::mCutNameList[2] = { "", "STOPPER", }; -daNpc_yamiT_c::cutFunc daNpc_yamiT_c::mCutList[2] = { +daNpc_yamiT_c::cutFunc DUSK_CONST daNpc_yamiT_c::mCutList[2] = { NULL, &daNpc_yamiT_c::cutStopper, }; @@ -749,13 +749,13 @@ static int daNpc_yamiT_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_yamiT_MethodTable = { +static DUSK_CONST actor_method_class daNpc_yamiT_MethodTable = { (process_method_func)daNpc_yamiT_Create, (process_method_func)daNpc_yamiT_Delete, (process_method_func)daNpc_yamiT_Execute, (process_method_func)daNpc_yamiT_IsDelete, (process_method_func)daNpc_yamiT_Draw, }; -actor_process_profile_definition g_profile_NPC_YAMIT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_YAMIT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 80d6df02a6..25aa37d896 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -11,13 +11,13 @@ #include "dusk/string.hpp" -static daNpc_GetParam1 l_bmdData[3] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdData[3] = { {3, 1}, {3, 4}, {8, 7}, }; -static daNpcT_evtData_c l_evtList[6] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[6] = { {"", 0}, {"NO_RESPONSE", 0}, {"TW_RESISTANCE1", 7}, @@ -26,7 +26,7 @@ static daNpcT_evtData_c l_evtList[6] = { {"THANK_YOU", 6}, }; -static char* l_resNameList[8] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[8] = { "", "Yelia", "Yelia0", @@ -37,26 +37,26 @@ static char* l_resNameList[8] = { "yelB_TW", }; -static s8 l_loadResPtrn0[4] = {1, 2, 3, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[4] = {1, 2, 3, -1}; -static s8 l_loadResPtrn1[3] = {2, 4, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = {2, 4, -1}; -static s8 l_loadResPtrn2[4] = {1, 2, 5, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn2[4] = {1, 2, 5, -1}; -static s8 l_loadResPtrn3[4] = {2, 4, 6, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn3[4] = {2, 4, 6, -1}; -static s8 l_loadResPtrn4[4] = {2, 7, 6, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn4[4] = {2, 7, 6, -1}; -static s8 l_loadResPtrn5[5] = {2, 4, 7, 6, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn5[5] = {2, 4, 7, 6, -1}; -static s8 l_loadResPtrn9[8] = {1, 2, 3, 4, 5, 6, 7, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn9[8] = {1, 2, 3, 4, 5, 6, 7, -1}; -static s8* l_loadResPtrnList[10] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[10] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn2, l_loadResPtrn3, l_loadResPtrn4, l_loadResPtrn5, l_loadResPtrn3, l_loadResPtrn3, l_loadResPtrn9, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[] = { {-1, J3DFrameCtrl::EMode_NONE, 0, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE}, {7, J3DFrameCtrl::EMode_NONE, 2, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE}, {-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE}, @@ -87,7 +87,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[] = { {9, J3DFrameCtrl::EMode_LOOP, 2, 23, J3DFrameCtrl::EMode_LOOP, 2, FALSE}, }; -static daNpcT_motionAnmData_c l_motionAnmData[] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[] = { {13, J3DFrameCtrl::EMode_LOOP, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE}, {-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE}, {-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE}, @@ -125,7 +125,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[] = { {11, J3DFrameCtrl::EMode_NONE, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -155,7 +155,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -192,7 +192,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[] = { {32, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_Yelia_c::mCutNameList[6] = { +char DUSK_CONST* DUSK_CONST daNpc_Yelia_c::mCutNameList[6] = { "", "CONVERSATION_ABOUT_LOOPHOLE", "TW_RESISTANCE", @@ -1582,7 +1582,7 @@ static int daNpc_Yelia_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Yelia_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Yelia_MethodTable = { (process_method_func)daNpc_Yelia_Create, (process_method_func)daNpc_Yelia_Delete, (process_method_func)daNpc_Yelia_Execute, @@ -1590,7 +1590,7 @@ static actor_method_class daNpc_Yelia_MethodTable = { (process_method_func)daNpc_Yelia_Draw, }; -actor_process_profile_definition g_profile_NPC_YELIA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_YELIA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 1cdba0d9a5..65beb46e4e 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -317,7 +317,7 @@ void daNpc_ykM_HIO_c::genMessage(JORMContext* ctx) { } #endif -static int l_bmdData[6][2] = { +static DUSK_CONSTEXPR int l_bmdData[6][2] = { {BMDR_YKM, YKM}, {BMDR_YKM_TOMATO, YKM1}, {BMDR_YKM_LEAF, YKM2}, @@ -335,7 +335,7 @@ enum BmdIndex { BMD_INDEX_LEAF, }; -static daNpcT_evtData_c l_evtList[10] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[10] = { {"", 0}, {"NO_RESPONSE", 0}, {"SLIDEDOWN", 4}, @@ -348,7 +348,7 @@ static daNpcT_evtData_c l_evtList[10] = { {"HUG", 2}, }; -static char* l_resNameList[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[5] = { "", "ykM", "ykM1", @@ -356,20 +356,20 @@ static char* l_resNameList[5] = { "ykM3", }; -static s8 l_loadResPtrn0[3] = {YKM, YKM1, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn0[3] = {YKM, YKM1, -1}; -static s8 l_loadResPtrn1[3] = {YKM, YKM2, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = {YKM, YKM2, -1}; -static s8 l_loadResPtrn2[5] = {YKM, YKM1, YKM2, YKM3, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn2[5] = {YKM, YKM1, YKM2, YKM3, -1}; -static s8 l_loadResPtrn9[5] = {YKM, YKM1, YKM2, YKM3, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn9[5] = {YKM, YKM1, YKM2, YKM3, -1}; -static s8* l_loadResPtrnList[8] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[8] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_YKM, J3DFrameCtrl::EMode_LOOP, YKM, TRUE}, {BCK_YKM_F_TALK_A, J3DFrameCtrl::EMode_NONE, YKM, BTP_YKM, J3DFrameCtrl::EMode_LOOP, YKM, TRUE}, {BCK_YKM_F_TALK_B, J3DFrameCtrl::EMode_NONE, YKM, BTP_YKM, J3DFrameCtrl::EMode_LOOP, YKM, TRUE}, @@ -388,7 +388,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = { {BCK_YKM_FH_HAPPY, J3DFrameCtrl::EMode_LOOP, YKM1, BTP_YKM_FH_HAPPY, J3DFrameCtrl::EMode_LOOP, YKM1, FALSE}, }; -static daNpcT_motionAnmData_c l_motionAnmData[51] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[51] = { {BCK_YKM_WAIT_A, J3DFrameCtrl::EMode_LOOP, YKM, BTK_YKM, J3DFrameCtrl::EMode_NONE, YKM, 1, 0}, {BCK_YKM_WAIT_B, J3DFrameCtrl::EMode_LOOP, YKM1, BTK_YKM_WAIT_B, J3DFrameCtrl::EMode_NONE, YKM1, 0, 0}, {BCK_YKM_WAIT_C, J3DFrameCtrl::EMode_LOOP, YKM1, BTK_YKM, J3DFrameCtrl::EMode_NONE, YKM, 1, 0}, @@ -442,7 +442,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[51] = { {BCK_YKM_WAITHOLD_B_B, J3DFrameCtrl::EMode_LOOP, YKM1, BTK_YKM, J3DFrameCtrl::EMode_NONE, YKM, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -461,7 +461,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = { {0, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -511,7 +511,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = { {0x27, -1, 1}, {0x28, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_ykM_c::mCutNameList[10] = { +char DUSK_CONST* DUSK_CONST daNpc_ykM_c::mCutNameList[10] = { "", "SLIDEDOWN", "MEETING_AGAIN", @@ -524,7 +524,7 @@ char* daNpc_ykM_c::mCutNameList[10] = { "HUG" }; -daNpc_ykM_c::cutFunc daNpc_ykM_c::mCutList[10] = { +daNpc_ykM_c::cutFunc DUSK_CONST daNpc_ykM_c::mCutList[10] = { NULL, &daNpc_ykM_c::cutSlideDown, &daNpc_ykM_c::cutMeetingAgain, @@ -3727,7 +3727,7 @@ static int daNpc_ykM_IsDelete(void* a_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_ykM_MethodTable = { +static DUSK_CONST actor_method_class daNpc_ykM_MethodTable = { (process_method_func)daNpc_ykM_Create, (process_method_func)daNpc_ykM_Delete, (process_method_func)daNpc_ykM_Execute, @@ -3735,7 +3735,7 @@ static actor_method_class daNpc_ykM_MethodTable = { (process_method_func)daNpc_ykM_Draw, }; -actor_process_profile_definition g_profile_NPC_YKM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_YKM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 468445063a..f2e195087d 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -38,11 +38,11 @@ public: }; #endif -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {11, 1}, }; -static daNpcT_evtData_c l_evtList[10] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[10] = { {"", 0}, {"DEFAULT_GETITEM", 0}, {"NO_RESPONSE", 0}, @@ -63,16 +63,16 @@ static const char* l_resNameList[5] = { "ykM2", }; -static s8 l_loadResPtrn0[2] = {0x01, -1}; -static s8 l_loadResPtrn1[3] = {0x01, 0x02, -1}; -static s8 l_loadResPtrn2[3] = {0x01, 0x03, -1}; -static s8 l_loadResPtrn9[4] = {0x01, 0x02, 0x03, -1}; -static s8* l_loadResPtrnList[8] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = {0x01, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = {0x01, 0x02, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn2[3] = {0x01, 0x03, -1}; +static DUSK_CONSTEXPR s8 l_loadResPtrn9[4] = {0x01, 0x02, 0x03, -1}; +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[8] = { l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn2, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn9, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 17, 2, 1, 1}, {9, 0, 2, 37, 0, 2, 0}, @@ -89,7 +89,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = { {-1, 0, 0, 41, 2, 2, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[35] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[35] = { {8, 2, 1, 14, 0, 1, 1, 0}, {22, 2, 2, 14, 0, 1, 1, 0}, {14, 2, 3, 14, 0, 1, 1, 0}, @@ -127,7 +127,7 @@ static daNpcT_motionAnmData_c l_motionAnmData[35] = { {26, 0, 3, 29, 0, 3, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -137,7 +137,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {13, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {25, -1, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {29, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {30, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -168,7 +168,7 @@ const char* daNpc_ykW_c::mCutNameList[8] = { "HUG", }; -daNpc_ykW_c::cutFunc daNpc_ykW_c::mCutList[8] = { +daNpc_ykW_c::cutFunc DUSK_CONST daNpc_ykW_c::mCutList[8] = { NULL, &daNpc_ykW_c::cutShowDoor, &daNpc_ykW_c::cutGoIntoBossRoom, @@ -3021,7 +3021,7 @@ static int daNpc_ykW_IsDelete(void* i_this) { AUDIO_INSTANCES -static actor_method_class daNpc_ykW_MethodTable = { +static DUSK_CONST actor_method_class daNpc_ykW_MethodTable = { (process_method_func)daNpc_ykW_Create, (process_method_func)daNpc_ykW_Delete, (process_method_func)daNpc_ykW_Execute, @@ -3029,7 +3029,7 @@ static actor_method_class daNpc_ykW_MethodTable = { (process_method_func)daNpc_ykW_Draw, }; -actor_process_profile_definition g_profile_NPC_YKW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_YKW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 9e4213695e..9bbcb9d71b 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -34,48 +34,48 @@ enum Motion { /* 0x1 */ MOT_SIT, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {9, ZANB}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "zanB", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, 0, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[2] = { {BCK_ZANB_WAIT_A, J3DFrameCtrl::EMode_LOOP, ZANB, BTK_ZANB, J3DFrameCtrl::EMode_NONE, ZANB, 1, 0}, {BCK_ZANB_SIT, J3DFrameCtrl::EMode_LOOP, ZANB, BTK_ZANB, J3DFrameCtrl::EMode_NONE, ZANB, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_zanB_c::mCutNameList[1] = {""}; +char DUSK_CONST* DUSK_CONST daNpc_zanB_c::mCutNameList[1] = {""}; -daNpc_zanB_c::cutFunc daNpc_zanB_c::mCutList[1] = {NULL}; +daNpc_zanB_c::cutFunc DUSK_CONST daNpc_zanB_c::mCutList[1] = {NULL}; daNpc_zanB_c::~daNpc_zanB_c() { OS_REPORT("|%06d:%x|daNpc_zanB_c -> デストラクト\n", g_Counter.mCounter0, this); @@ -697,7 +697,7 @@ static int daNpc_zanB_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_zanB_MethodTable = { +static DUSK_CONST actor_method_class daNpc_zanB_MethodTable = { (process_method_func)daNpc_zanB_Create, (process_method_func)daNpc_zanB_Delete, (process_method_func)daNpc_zanB_Execute, @@ -705,7 +705,7 @@ static actor_method_class daNpc_zanB_MethodTable = { (process_method_func)daNpc_zanB_Draw, }; -actor_process_profile_definition g_profile_NPC_ZANB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZANB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 9dd8839367..a63c13bf6c 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -11,49 +11,49 @@ #include "SSystem/SComponent/c_counter.h" #include -static int l_bmdData[2] = { +static DUSK_CONSTEXPR int l_bmdData[2] = { 7, 1 }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0} }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Zant", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { -1, 0, 0, -1, 0, 0, 0 }; -static daNpcT_motionAnmData_c l_motionAnmData = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData = { 4, 2, 1, -1, 0, 0, 0 }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -char* daNpc_Zant_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_Zant_c::mCutNameList = ""; -daNpc_Zant_c::cutFunc daNpc_Zant_c::mCutList[1] = { +daNpc_Zant_c::cutFunc DUSK_CONST daNpc_Zant_c::mCutList[1] = { NULL }; @@ -551,7 +551,7 @@ static int daNpc_Zant_IsDelete(void* i_this) { return 1; } -static actor_method_class daNpc_Zant_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Zant_MethodTable = { (process_method_func)daNpc_Zant_Create, (process_method_func)daNpc_Zant_Delete, (process_method_func)daNpc_Zant_Execute, @@ -559,7 +559,7 @@ static actor_method_class daNpc_Zant_MethodTable = { (process_method_func)daNpc_Zant_Draw, }; -actor_process_profile_definition g_profile_NPC_ZANT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZANT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 9e8bc00ee9..25c63aea38 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -13,51 +13,51 @@ enum RES_Name { /* 0x1 */ ZELRF, }; -static daNpc_GetParam1 l_bmdData[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdData[1] = { {10, 1} }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0} }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "zelRf" }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, 0, 0, 16, 2, 1, 1}, {6, 0, 1, 16, 2, 1, 1} }; -static daNpcT_motionAnmData_c l_motionAnmData = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData = { 7, 2, 1, 13, 0, 1, 1, 0 }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0} }; -char* daNpc_ZelR_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_ZelR_c::mCutNameList = ""; daNpc_ZelR_c::EventFn daNpc_ZelR_c::mCutList[1] = { NULL @@ -623,7 +623,7 @@ static int daNpc_ZelR_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpc_ZelR_MethodTable = { +static DUSK_CONST actor_method_class daNpc_ZelR_MethodTable = { (process_method_func)daNpc_ZelR_Create, (process_method_func)daNpc_ZelR_Delete, (process_method_func)daNpc_ZelR_Execute, @@ -631,7 +631,7 @@ static actor_method_class daNpc_ZelR_MethodTable = { (process_method_func)daNpc_ZelR_Draw, }; -actor_process_profile_definition g_profile_NPC_ZELR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZELR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 2732eea27b..3cf7d29f2a 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -42,50 +42,50 @@ enum Type { /* 0x1 */ TYPE_1, }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {BMDR_ZELRO, ZELRO}, }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "zelRo", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1 }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = { {-1, J3DFrameCtrl::EMode_NONE, NONE, 16, J3DFrameCtrl::EMode_LOOP, ZELRO, 1}, {BCK_ZELRO_F_TALK_A, J3DFrameCtrl::EMode_NONE, ZELRO, 16, J3DFrameCtrl::EMode_LOOP, ZELRO, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[1] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[1] = { {BCK_ZELRO_WAIT_A, J3DFrameCtrl::EMode_LOOP, ZELRO, BTK_ZELRO, J3DFrameCtrl::EMode_NONE, ZELRO, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -char* daNpc_ZelRo_c::mCutNameList = ""; +char DUSK_CONST* DUSK_CONST daNpc_ZelRo_c::mCutNameList = ""; -daNpc_ZelRo_c::cutFunc daNpc_ZelRo_c::mCutList[1] = { +daNpc_ZelRo_c::cutFunc DUSK_CONST daNpc_ZelRo_c::mCutList[1] = { NULL }; @@ -673,7 +673,7 @@ static int daNpc_ZelRo_IsDelete(void* a_this) { return 1; } -static actor_method_class daNpc_ZelRo_MethodTable = { +static DUSK_CONST actor_method_class daNpc_ZelRo_MethodTable = { (process_method_func)daNpc_ZelRo_Create, (process_method_func)daNpc_ZelRo_Delete, (process_method_func)daNpc_ZelRo_Execute, @@ -681,7 +681,7 @@ static actor_method_class daNpc_ZelRo_MethodTable = { (process_method_func)daNpc_ZelRo_Draw, }; -actor_process_profile_definition g_profile_NPC_ZELRO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZELRO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 121d97bb39..b40ff46be3 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -14,47 +14,47 @@ static u32 l_bmdData[2] = { 11, 1 }; -static daNpcT_evtData_c l_evtList[2] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[2] = { {"", 0}, {"NO_RESPONSE", 0}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Zelda" }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[2] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[2] = { &l_loadResPtrn0[0], &l_loadResPtrn0[0], }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[3] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[3] = { {-1, 0, 0, 17, 2, 1, 1}, {-1, 0, 0, 18, 2, 1, 0}, {6, 0, 1, 17, 2, 1, 1}, }; -static daNpcT_motionAnmData_c l_motionAnmData[2] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[2] = { {8, 2, 1, 14, 0, 1, 1, 0}, {7, 2, 1, 14, 0, 1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[12] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[12] = { {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; const char* daNpc_Zelda_c::mCutNameList = ""; -daNpc_Zelda_c::cutFunc daNpc_Zelda_c::mCutList[1] = { 0 }; +daNpc_Zelda_c::cutFunc DUSK_CONST daNpc_Zelda_c::mCutList[1] = { 0 }; static NPC_ZELDA_HIO_CLASS l_HIO; @@ -778,7 +778,7 @@ static int daNpc_Zelda_IsDelete(void* param_0) { return 1; } -static actor_method_class daNpc_Zelda_MethodTable = { +static DUSK_CONST actor_method_class daNpc_Zelda_MethodTable = { (process_method_func)daNpc_Zelda_Create, (process_method_func)daNpc_Zelda_Delete, (process_method_func)daNpc_Zelda_Execute, @@ -786,7 +786,7 @@ static actor_method_class daNpc_Zelda_MethodTable = { (process_method_func)daNpc_Zelda_Draw, }; -actor_process_profile_definition g_profile_NPC_ZELDA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZELDA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 15ed62157e..a33e32feef 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -227,7 +227,7 @@ f32 daNpc_zrA_Path_c::chkPassDst(u16 i_idx, cXyz i_pos) { } } -static daNpc_GetParam1 l_bmdGetParamList[6] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[6] = { {3, 4}, // zra {13, 5}, // zra_tw {3, 7}, // zra_met @@ -236,7 +236,7 @@ static daNpc_GetParam1 l_bmdGetParamList[6] = { {4, 10}, // zra_sp_tw }; -static daNpc_GetParam1 l_bckGetParamList[63] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[63] = { {-1, 0}, {8, 0}, // zra_f_talk_a {9, 0}, // zra_f_talk_a_sp @@ -302,7 +302,7 @@ static daNpc_GetParam1 l_bckGetParamList[63] = { {12, 3}, // zra_step_sp }; -static daNpc_GetParam1 l_btpGetParamList[8] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[8] = { {34, 0}, // zra {16, 5}, // zra_fh_sadsit_a {10, 6}, // zra_fh_sadsit_b @@ -313,24 +313,24 @@ static daNpc_GetParam1 l_btpGetParamList[8] = { {18, 9}, // zra_fh_spa_wait_b }; -static daNpc_GetParam1 l_btkGetParamList[4] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[4] = { {28, 0}, // zra {31, 0}, // zra_water02 {29, 0}, // zra_reset {30, 0}, // zra_w_eyeball }; -static daNpc_GetParam1 l_brkGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_brkGetParamList[2] = { {24, 0}, // zra {25, 0}, // zra_water02 }; -static daNpc_GetParam1 l_bpkGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bpkGetParamList[2] = { {20, 0}, // zra {21, 0}, // zra_water02 }; -static daNpc_GetParam1 l_evtGetParamList[13] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[13] = { {0, 0}, {1, 0}, {2, 0}, @@ -346,7 +346,7 @@ static daNpc_GetParam1 l_evtGetParamList[13] = { {12, 0}, }; -static char* l_evtNames[13] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[13] = { NULL, "TALK_SWIM", "BEFORE_BLAST_ZRR", @@ -362,34 +362,34 @@ static char* l_evtNames[13] = { "TALK_MULTI2", }; -static int l_loadObj_list[3][3] = { +static DUSK_CONSTEXPR int l_loadObj_list[3][3] = { {2, 3, -1}, {2, -1, -1}, {-1, -1, -1}, }; -static int l_loadObj_listTW[3][3] = { +static DUSK_CONSTEXPR int l_loadObj_listTW[3][3] = { {4, 5, -1}, {4, -1, -1}, {-1, -1, -1}, }; -static int l_loadRes_ZRAa[8] = {0, 1, 2, 4, 6, -1, -1, -1}; +static DUSK_CONSTEXPR int l_loadRes_ZRAa[8] = {0, 1, 2, 4, 6, -1, -1, -1}; -static int l_loadRes_Swim[8] = {0, 1, 2, 4, -1, -1, -1, -1}; +static DUSK_CONSTEXPR int l_loadRes_Swim[8] = {0, 1, 2, 4, -1, -1, -1, -1}; -static int l_loadRes_Tobi[8] = {0, 1, 2, 4, 8, -1, -1, -1}; +static DUSK_CONSTEXPR int l_loadRes_Tobi[8] = {0, 1, 2, 4, 8, -1, -1, -1}; -static int l_loadRes_Spa[8] = {0, 2, 4, 9, -1, -1, -1, -1}; +static DUSK_CONSTEXPR int l_loadRes_Spa[8] = {0, 2, 4, 9, -1, -1, -1, -1}; -static int l_loadRes_ZRA0[8] = {0, 1, 2, 4, -1, -1, -1, -1}; +static DUSK_CONSTEXPR int l_loadRes_ZRA0[8] = {0, 1, 2, 4, -1, -1, -1, -1}; -static int* l_loadRes_list[8] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[8] = { l_loadRes_ZRAa, l_loadRes_Swim, l_loadRes_Swim, l_loadRes_Swim, l_loadRes_Tobi, l_loadRes_Tobi, l_loadRes_Spa, l_loadRes_ZRA0, }; -static char* l_resNames[11] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[11] = { "zrA", "zrA_nml", "zrA_nml2", @@ -403,14 +403,14 @@ static char* l_resNames[11] = { "zrA_objTW", }; -static char* l_myName[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_myName[4] = { "zrA", "zrA_talk", "zrR", "zrWF", }; -char* daNpc_zrA_c::mEvtCutNameList[11] = { +char DUSK_CONST* DUSK_CONST daNpc_zrA_c::mEvtCutNameList[11] = { "", "TALK_SWIM", "BEFORE_BLAST_ZRR", @@ -424,7 +424,7 @@ char* daNpc_zrA_c::mEvtCutNameList[11] = { "TALK_MULTI", }; -daNpc_zrA_c::EventFn daNpc_zrA_c::mEvtCutList[11] = { +daNpc_zrA_c::EventFn DUSK_CONST daNpc_zrA_c::mEvtCutList[11] = { NULL, &daNpc_zrA_c::ECut_talkSwim, &daNpc_zrA_c::ECut_beforeBlastzrR, @@ -2331,7 +2331,7 @@ static int daNpc_zrA_IsDelete(void* i_this) { AUDIO_INSTANCES -static actor_method_class daNpc_zrA_MethodTable = { +static DUSK_CONST actor_method_class daNpc_zrA_MethodTable = { (process_method_func)daNpc_zrA_Create, (process_method_func)daNpc_zrA_Delete, (process_method_func)daNpc_zrA_Execute, @@ -2339,7 +2339,7 @@ static actor_method_class daNpc_zrA_MethodTable = { (process_method_func)daNpc_zrA_Draw, }; -actor_process_profile_definition g_profile_NPC_ZRA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZRA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index d7f2ebc372..c049091428 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -55,12 +55,12 @@ daNpc_zrC_HIOParam const daNpc_zrC_Param_c::m = { 2300.0f, }; -static daNpc_GetParam1 l_bmdGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[2] = { {3, 3}, // zrc {3, 4}, // zrc_sick_tw }; -static daNpc_GetParam1 l_bckGetParamList[32] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[32] = { {9, 0}, // zrc_f_wait_a {5, 2}, // zrc_f_sit_talk {8, 0}, // zrc_f_talk_a @@ -95,7 +95,7 @@ static daNpc_GetParam1 l_bckGetParamList[32] = { {5, 5}, // zrc_sick_demo_wait }; -static daNpc_GetParam1 l_btpGetParamList[15] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[15] = { {19, 0}, // zrc {10, 2}, // zrc_f_sit_talk {23, 0}, // zrc_f_talk_a @@ -113,7 +113,7 @@ static daNpc_GetParam1 l_btpGetParamList[15] = { {8, 5}, // zrc_f_sick_demo_wait }; -static daNpc_GetParam1 l_btkGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[5] = { {16, 0}, // zrc {26, 1}, // zrc_sad_talk {27, 1}, // zrc_sad_wait @@ -121,37 +121,37 @@ static daNpc_GetParam1 l_btkGetParamList[5] = { {25, 1}, // zrc_kizuku_wait }; -static daNpc_GetParam1 l_evtGetParamList[2] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[2] = { {0, 0}, {1, 6}, }; -static char* l_evtNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[2] = { NULL, "EARRING_GET", }; -static int l_loadRes_ZRCa[5] = { +static DUSK_CONSTEXPR int l_loadRes_ZRCa[5] = { 0, 3, -1, -1, 0, }; -static int l_loadRes_ZRC_SICK[5] = { +static DUSK_CONSTEXPR int l_loadRes_ZRC_SICK[5] = { 3, 5, 0, -1, 0, }; -static int l_loadRes_ZRC0[5] = { +static DUSK_CONSTEXPR int l_loadRes_ZRC0[5] = { 0, 3, -1, -1, 0, }; -static int l_loadRes_ZRC_PRAY[5] = { +static DUSK_CONSTEXPR int l_loadRes_ZRC_PRAY[5] = { 0, 3, 1, 6, -1, }; -static int l_loadRes_ZRC_SIT[5] = { +static DUSK_CONSTEXPR int l_loadRes_ZRC_SIT[5] = { 0, 2, 3, -1, 0, }; -static int* l_loadRes_list[5] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[5] = { l_loadRes_ZRCa, l_loadRes_ZRC_SICK, l_loadRes_ZRC_PRAY, @@ -159,7 +159,7 @@ static int* l_loadRes_list[5] = { l_loadRes_ZRC0, }; -static char* l_resNames[7] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[7] = { "zrC", "zrC1", "zrC2", @@ -169,14 +169,14 @@ static char* l_resNames[7] = { "zrC_EGD", }; -static char* l_myName = "zrC"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "zrC"; -char* daNpc_zrC_c::mEvtCutNameList[2] = { +char DUSK_CONST* DUSK_CONST daNpc_zrC_c::mEvtCutNameList[2] = { "", "EARRING_GET", }; -daNpc_zrC_c::EventFn daNpc_zrC_c::mEvtCutList[2] = { +daNpc_zrC_c::EventFn DUSK_CONST daNpc_zrC_c::mEvtCutList[2] = { NULL, &daNpc_zrC_c::ECut_earringGet, }; @@ -1791,7 +1791,7 @@ static int daNpc_zrC_IsDelete(void* i_this) { AUDIO_INSTANCES -static actor_method_class daNpc_zrC_MethodTable = { +static DUSK_CONST actor_method_class daNpc_zrC_MethodTable = { (process_method_func)daNpc_zrC_Create, (process_method_func)daNpc_zrC_Delete, (process_method_func)daNpc_zrC_Execute, @@ -1799,7 +1799,7 @@ static actor_method_class daNpc_zrC_MethodTable = { (process_method_func)daNpc_zrC_Draw, }; -actor_process_profile_definition g_profile_NPC_ZRC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZRC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 7e71ef130e..2aace19adf 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -58,15 +58,15 @@ daNpc_zrZ_HIOParam const daNpc_zrZ_Param_c::m = { 200.0f, }; -static daNpc_GetParam1 l_bmdGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGetParamList[1] = { {9, 0}, }; -static daNpc_GetParam1 l_bmdGTGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdGTGetParamList[1] = { {13, 1}, // gt }; -static daNpc_GetParam1 l_bckGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[5] = { {-1, 0}, {-1, 0}, {6, 0}, @@ -74,7 +74,7 @@ static daNpc_GetParam1 l_bckGetParamList[5] = { {0, 0}, }; -static daNpc_GetParam1 l_bckGTGetParamList[5] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGTGetParamList[5] = { {-1, 1}, {8, 1}, // f_talk_a {10, 1}, // wait_gt_a @@ -82,23 +82,23 @@ static daNpc_GetParam1 l_bckGTGetParamList[5] = { {7, 1}, // comeon }; -static daNpc_GetParam1 l_btpGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[1] = { {15, 0}, }; -static daNpc_GetParam1 l_btpGTGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGTGetParamList[1] = { {19, 1}, // gt }; -static daNpc_GetParam1 l_btkGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[1] = { {12, 0}, }; -static daNpc_GetParam1 l_btkGTGetParamList[1] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGTGetParamList[1] = { {16, 1}, // gt }; -static daNpc_GetParam1 l_evtGetParamList[8] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_evtGetParamList[8] = { {0, 0}, {1, 1}, {2, 1}, @@ -115,18 +115,18 @@ static int l_loadRes_ZRZ_GT[3] = {1, -1, -1}; static int l_loadRes_ZRZ0[3] = {0, -1, -1}; -static int* l_loadRes_list[3] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[3] = { l_loadRes_ZRZa, l_loadRes_ZRZ_GT, l_loadRes_ZRZ0, }; -static char* l_resNames[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[2] = { "zrZ", "zrZ_GT", }; -static char* l_evtNames[8] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNames[8] = { NULL, "HELP_PRINCE", "COME_HERE", @@ -137,9 +137,9 @@ static char* l_evtNames[8] = { "SR_SKIP", }; -static char* l_myName = "zrZ"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "zrZ"; -char* daNpc_zrZ_c::mEvtCutNameList[8] = { +char DUSK_CONST* DUSK_CONST daNpc_zrZ_c::mEvtCutNameList[8] = { "", "HELP_PRINCE", "COME_HERE", @@ -150,7 +150,7 @@ char* daNpc_zrZ_c::mEvtCutNameList[8] = { "SR_SKIP", }; -daNpc_zrZ_c::EventFn daNpc_zrZ_c::mEvtCutList[8] = { +daNpc_zrZ_c::EventFn DUSK_CONST daNpc_zrZ_c::mEvtCutList[8] = { NULL, &daNpc_zrZ_c::ECut_helpPrince, &daNpc_zrZ_c::ECut_comeHere, @@ -2446,7 +2446,7 @@ static int daNpc_zrZ_IsDelete(void* i_this) { AUDIO_INSTANCES; -static actor_method_class daNpc_zrZ_MethodTable = { +static DUSK_CONST actor_method_class daNpc_zrZ_MethodTable = { (process_method_func)daNpc_zrZ_Create, (process_method_func)daNpc_zrZ_Delete, (process_method_func)daNpc_zrZ_Execute, @@ -2454,7 +2454,7 @@ static actor_method_class daNpc_zrZ_MethodTable = { (process_method_func)daNpc_zrZ_Draw, }; -actor_process_profile_definition g_profile_NPC_ZRZ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_NPC_ZRZ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index a71ad25e33..227077c5c4 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -10,7 +10,7 @@ static int useHeapInit(fopAc_ac_c*); -static char* l_arcName = "Lv5_KEY"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Lv5_KEY"; int daObjLv5Key_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); @@ -333,13 +333,13 @@ static int daObjLv5Key_IsDelete(daObjLv5Key_c* i_this) { return 1; } -static actor_method_class l_daObjLv5Key_Method = { +static DUSK_CONST actor_method_class l_daObjLv5Key_Method = { (process_method_func)daObjLv5Key_Create, (process_method_func)daObjLv5Key_Delete, (process_method_func)daObjLv5Key_Execute, (process_method_func)daObjLv5Key_IsDelete, (process_method_func)daObjLv5Key_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv5Key = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv5Key = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 5e350e0974..2925712179 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -410,7 +410,7 @@ static int daTurara_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daTurara_Method = { +static DUSK_CONST actor_method_class l_daTurara_Method = { (process_method_func)daTurara_Create, (process_method_func)daTurara_Delete, (process_method_func)daTurara_Execute, @@ -418,7 +418,7 @@ static actor_method_class l_daTurara_Method = { (process_method_func)daTurara_Draw, }; -actor_process_profile_definition g_profile_Obj_Turara = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Turara = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 9df06beddf..2b734d2aab 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -214,7 +214,7 @@ static int daTvCdlst_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daTvCdlst_Method = { +static DUSK_CONST actor_method_class l_daTvCdlst_Method = { (process_method_func)daTvCdlst_Create, (process_method_func)daTvCdlst_Delete, (process_method_func)daTvCdlst_Execute, @@ -222,7 +222,7 @@ static actor_method_class l_daTvCdlst_Method = { (process_method_func)daTvCdlst_Draw, }; -actor_process_profile_definition g_profile_Obj_TvCdlst = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TvCdlst = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index 61f96a12ab..9050f9bb17 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -373,7 +373,7 @@ static int daObjYtaihou_MoveBGDraw(daObjYtaihou_c* i_this) { return i_this->Draw(); } -static actor_method_class daObjYtaihou_METHODS = { +static DUSK_CONST actor_method_class daObjYtaihou_METHODS = { (process_method_func)daObjYtaihou_create1st, (process_method_func)daObjYtaihou_MoveBGDelete, (process_method_func)daObjYtaihou_MoveBGExecute, @@ -381,7 +381,7 @@ static actor_method_class daObjYtaihou_METHODS = { (process_method_func)daObjYtaihou_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Ytaihou = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ytaihou = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 2150ea48ac..13004d68e3 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -293,7 +293,7 @@ actor_method_class l_daAmiShutter_Method = { }; -actor_process_profile_definition g_profile_Obj_AmiShutter = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_AmiShutter = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index 267b0003af..bde4ba7c46 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -731,7 +731,7 @@ static int daObjARI_IsDelete(daObjARI_c* i_this) { return 1; } -static actor_method_class l_daObjARI_Method = { +static DUSK_CONST actor_method_class l_daObjARI_Method = { (process_method_func)daObjARI_Create, (process_method_func)daObjARI_Delete, (process_method_func)daObjARI_Execute, @@ -739,7 +739,7 @@ static actor_method_class l_daObjARI_Method = { (process_method_func)daObjARI_Draw, }; -actor_process_profile_definition g_profile_Obj_Ari = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ari = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index bb277e015f..a0ee360518 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -10,11 +10,11 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { 9, 1, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "AutoMata", }; @@ -330,7 +330,7 @@ static int daObj_AutoMata_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_AutoMata_MethodTable = { +static DUSK_CONST actor_method_class daObj_AutoMata_MethodTable = { (process_method_func)daObj_AutoMata_Create, (process_method_func)daObj_AutoMata_Delete, (process_method_func)daObj_AutoMata_Execute, @@ -338,7 +338,7 @@ static actor_method_class daObj_AutoMata_MethodTable = { (process_method_func)daObj_AutoMata_Draw, }; -actor_process_profile_definition g_profile_OBJ_AUTOMATA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_AUTOMATA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index d905500f02..48bf874c63 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -35,13 +35,13 @@ void daObjAvalanche_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mMtx2); } -static char* l_arcName = "V_Yuki"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_Yuki"; -static char* l_evName = "SNOW_COLLAPSE"; +static DUSK_CONSTEXPR char DUSK_CONST* l_evName = "SNOW_COLLAPSE"; -static char* l_staffName = "Obj_ava"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "Obj_ava"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-500.0f, -500.0f, -700.0f}, {500.0f, 1000.0f, 700.0f}, }; @@ -204,7 +204,7 @@ void daObjAvalanche_c::actionEvent() { void daObjAvalanche_c::actionDead() { } -static char* action_table[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* action_table[2] = { "WAIT", "COLLAPSE", }; @@ -292,13 +292,13 @@ static int daObjAvalanche_MoveBGDraw(daObjAvalanche_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjAvalanche_METHODS = { +static DUSK_CONST actor_method_class daObjAvalanche_METHODS = { (process_method_func)daObjAvalanche_create1st, (process_method_func)daObjAvalanche_MoveBGDelete, (process_method_func)daObjAvalanche_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjAvalanche_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Avalanche = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Avalanche = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index d857a569ba..a8d3b944ed 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -300,13 +300,13 @@ static int daObj_Balloon_Create(daObj_Balloon_c* i_this) { return i_this->create(); } -static actor_method_class l_daObj_Balloon_Method = { +static DUSK_CONST actor_method_class l_daObj_Balloon_Method = { (process_method_func)daObj_Balloon_Create, (process_method_func)daObj_Balloon_Delete, (process_method_func)daObj_Balloon_Execute, (process_method_func)daObj_Balloon_IsDelete, (process_method_func)daObj_Balloon_Draw, }; -actor_process_profile_definition g_profile_OBJ_BALLOON = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_BALLOON = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 8de65413ba..768c233c61 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -152,7 +152,7 @@ static cPhs_Step daBarDesk_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBarDesk_Method = { +static DUSK_CONST actor_method_class l_daBarDesk_Method = { (process_method_func)daBarDesk_Create, (process_method_func)daBarDesk_Delete, (process_method_func)daBarDesk_Execute, @@ -160,7 +160,7 @@ static actor_method_class l_daBarDesk_Method = { (process_method_func)daBarDesk_Draw, }; -actor_process_profile_definition g_profile_Obj_BarDesk = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BarDesk = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 87c4114ce4..07feb23251 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -686,7 +686,7 @@ static int daObjBATTA_IsDelete(daObjBATTA_c* i_this) { return 1; } -static actor_method_class l_daObjBATTA_Method = { +static DUSK_CONST actor_method_class l_daObjBATTA_Method = { (process_method_func)daObjBATTA_Create, (process_method_func)daObjBATTA_Delete, (process_method_func)daObjBATTA_Execute, @@ -694,7 +694,7 @@ static actor_method_class l_daObjBATTA_Method = { (process_method_func)daObjBATTA_Draw, }; -actor_process_profile_definition g_profile_Obj_Batta = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Batta = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 210932589a..38f20ab3db 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -25,7 +25,7 @@ const static dCcD_SrcCyl l_cyl_src = { } }; -static char* l_arcName = "M_BBox"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_BBox"; void daObjBBox_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -127,7 +127,7 @@ static int daObjBBox_MoveBGDraw(daObjBBox_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjBBox_METHODS = { +static DUSK_CONST actor_method_class daObjBBox_METHODS = { (process_method_func)daObjBBox_create1st, (process_method_func)daObjBBox_MoveBGDelete, (process_method_func)daObjBBox_MoveBGExecute, @@ -135,7 +135,7 @@ static actor_method_class daObjBBox_METHODS = { (process_method_func)daObjBBox_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_BBox = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BBox = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 63c09e78c0..a2b017082a 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_npc.h" #include "f_pc/f_pc_name.h" -static char* l_resName = "KH_Bed"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resName = "KH_Bed"; static OBJ_BED_HIO_CLASS l_HIO; @@ -149,7 +149,7 @@ u8 daObj_Bed_c::getType() { return 0; } -char* daObj_Bed_c::getResName() { +char DUSK_CONST* daObj_Bed_c::getResName() { return l_resName; } @@ -199,7 +199,7 @@ static int daObj_Bed_IsDelete(void* param_0) { return 1; } -static actor_method_class daObj_Bed_MethodTable = { +static DUSK_CONST actor_method_class daObj_Bed_MethodTable = { (process_method_func)daObj_Bed_Create, (process_method_func)daObj_Bed_Delete, (process_method_func)daObj_Bed_Execute, @@ -207,7 +207,7 @@ static actor_method_class daObj_Bed_MethodTable = { (process_method_func)daObj_Bed_Draw, }; -actor_process_profile_definition g_profile_OBJ_BED = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_BED = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 98b4d9e597..a232df06ec 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -63,26 +63,26 @@ static const char* l_arcName = "Obj_bm"; static const char* l_eye_matName = "bmEye"; -static char* l_head_joint = "head"; +static DUSK_CONSTEXPR char DUSK_CONST* l_head_joint = "head"; -static char* l_bigGear_joint = "cogRed"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bigGear_joint = "cogRed"; -static char* l_smallGear0_joint = "cogBlue"; +static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear0_joint = "cogBlue"; -static char* l_smallGear1_joint = "cogGreen"; +static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear1_joint = "cogGreen"; -static char* l_smallGear2_joint = "cogYellow"; +static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear2_joint = "cogYellow"; -static char* l_joint_table[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_joint_table[5] = { l_head_joint, l_bigGear_joint, l_smallGear0_joint, l_smallGear1_joint, l_smallGear2_joint, }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-1200.0f, -100.0f, -1200.0f}, {1200.0f, 400.0f, 1200.0f}, }; -static dCcD_SrcSph l_sph_src = { +static DUSK_CONSTEXPR dCcD_SrcSph l_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x402020, 0x11}, 0x58}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -94,7 +94,7 @@ static dCcD_SrcSph l_sph_src = { } // mSphAttr }; -static dCcD_SrcCps l_cps_src = { +static DUSK_CONSTEXPR dCcD_SrcCps l_cps_src = { { {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj {dCcD_SE_SWORD, 0x0, 0x0, 0x1, 0x0}, // mGObjAt @@ -106,7 +106,7 @@ static dCcD_SrcCps l_cps_src = { } // mCpsAttr }; -static dCcD_SrcCyl l_cyl_src = { +static DUSK_CONSTEXPR dCcD_SrcCyl l_cyl_src = { { {0x0, {{0x0, 0x0, 0x1f}, {0x0, 0x0}, 0x79}}, // mObj {dCcD_SE_NONE, 0x1, 0x0, 0x0, 0x0}, // mGObjAt @@ -1943,13 +1943,13 @@ static int daObjBm_MoveBGDraw(daObjBm_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjBm_METHODS = { +static DUSK_CONST actor_method_class daObjBm_METHODS = { (process_method_func)daObjBm_create1st, (process_method_func)daObjBm_MoveBGDelete, (process_method_func)daObjBm_MoveBGExecute, 0, (process_method_func)daObjBm_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Bemos = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Bemos = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index 00a35bc158..a64d177433 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -346,7 +346,7 @@ static int daObjBHASHI_Execute(daObjBHASHI_c* i_this) { return i_this->MoveBGExecute(); } -static char* l_arcName = "B_Hashi"; +static DUSK_CONST char* l_arcName = "B_Hashi"; int daObjBHASHI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Lv9_R07_pillar.bmd"); @@ -494,7 +494,7 @@ int daObjBHASHI_c::Delete() { return 1; } -static actor_method_class l_daObjBHASHI_Method = { +static DUSK_CONST actor_method_class l_daObjBHASHI_Method = { (process_method_func)daObjBHASHI_Create, (process_method_func)daObjBHASHI_Delete, (process_method_func)daObjBHASHI_Execute, @@ -502,7 +502,7 @@ static actor_method_class l_daObjBHASHI_Method = { (process_method_func)daObjBHASHI_Draw, }; -actor_process_profile_definition g_profile_Obj_BHASHI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BHASHI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index f690ff1087..e2b8237475 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -80,7 +80,7 @@ static int daObjBhbridge_Delete(daObjBhbridge_c* i_this) { return 1; } -static char* l_arcName = "BHBridge"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "BHBridge"; inline int daObjBhbridge_c::create() { fopAcM_ct(this, daObjBhbridge_c); @@ -190,7 +190,7 @@ inline int daObjBhbridge_c::Delete() { return 1; } -static actor_method_class l_daObjBhbridge_Method = { +static DUSK_CONST actor_method_class l_daObjBhbridge_Method = { (process_method_func)daObjBhbridge_Create, (process_method_func)daObjBhbridge_Delete, (process_method_func)daObjBhbridge_Execute, @@ -198,7 +198,7 @@ static actor_method_class l_daObjBhbridge_Method = { (process_method_func)daObjBhbridge_Draw, }; -actor_process_profile_definition g_profile_Obj_Bhbridge = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Bhbridge = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index 7e45e0801f..19b4f638a0 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -153,13 +153,13 @@ static int daBkLeaf_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBkLeaf_Method = { +static DUSK_CONST actor_method_class l_daBkLeaf_Method = { (process_method_func)daBkLeaf_Create, (process_method_func)daBkLeaf_Delete, (process_method_func)daBkLeaf_Execute, NULL, (process_method_func)daBkLeaf_Draw, }; -actor_process_profile_definition g_profile_Obj_BkLeaf = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BkLeaf = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index 3a4501d971..894dfc56f5 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -36,7 +36,7 @@ void daObjBkDoor_c::setBaseMtx() { mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName = "A_BkDoor"; +static DUSK_CONST char* l_arcName = "A_BkDoor"; static int const l_bmd[] = {0x04, 0x05}; static int const l_dzb[] = {0x08, 0x09}; @@ -198,13 +198,13 @@ static int daObjBkDoor_MoveBGDraw(daObjBkDoor_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjBkDoor_METHODS = { +static DUSK_CONST actor_method_class daObjBkDoor_METHODS = { (process_method_func)daObjBkDoor_create1st, (process_method_func)daObjBkDoor_MoveBGDelete, (process_method_func)daObjBkDoor_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjBkDoor_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_BkDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BkDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index 25869bb0b5..08ba68267f 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -16,7 +16,7 @@ static int daBkyRock_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_arcName = "BYRock"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "BYRock"; daBkyRock_c::exeProc daBkyRock_c::s_exeProc[3] = { &daBkyRock_c::exeModeNoDamage, @@ -416,7 +416,7 @@ static int daBkyRock_draw(daBkyRock_c* i_this) { return i_this->draw(); } -static actor_method_class daBkyRock_METHODS = { +static DUSK_CONST actor_method_class daBkyRock_METHODS = { (process_method_func)daBkyRock_create, (process_method_func)daBkyRock_Delete, (process_method_func)daBkyRock_execute, @@ -424,7 +424,7 @@ static actor_method_class daBkyRock_METHODS = { (process_method_func)daBkyRock_draw, }; -actor_process_profile_definition g_profile_BkyRock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_BkyRock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 80130e8ccb..b6a09b53dd 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -326,13 +326,13 @@ static int daBmWindow_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBmWindow_Method = { +static DUSK_CONST actor_method_class l_daBmWindow_Method = { (process_method_func)daBmWindow_Create, (process_method_func)daBmWindow_Delete, (process_method_func)daBmWindow_Execute, (process_method_func)NULL, (process_method_func)daBmWindow_Draw, }; -actor_process_profile_definition g_profile_Obj_BmWindow = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BmWindow = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index 3ab56169fe..e11c2e8da8 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -288,7 +288,7 @@ int daObjBmSh_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjBmSh_Method = { +static DUSK_CONST actor_method_class l_daObjBmSh_Method = { (process_method_func)daObjBmSh_Create, (process_method_func)daObjBmSh_Delete, (process_method_func)daObjBmSh_Execute, @@ -296,7 +296,7 @@ static actor_method_class l_daObjBmSh_Method = { (process_method_func)daObjBmSh_Draw, }; -actor_process_profile_definition g_profile_Obj_BoomShutter = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BoomShutter = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index bba146781f..cc10ae7840 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -107,13 +107,13 @@ static int daObjBombf_Draw(daObjBombf_c* i_this) { return i_this->draw(); } -static actor_method_class l_daObjBombf_Method = { +static DUSK_CONST actor_method_class l_daObjBombf_Method = { (process_method_func)daObjBombf_Create, (process_method_func)daObjBombf_Delete, (process_method_func)daObjBombf_Execute, (process_method_func)NULL, (process_method_func)daObjBombf_Draw, }; -actor_process_profile_definition g_profile_Obj_Bombf = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Bombf = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index b107971f8f..e286ce1640 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -14,7 +14,7 @@ #include "d/actor/d_a_obj_ystone.h" #include -static char* l_arcName = "ef_Portal"; +static DUSK_CONST char* l_arcName = "ef_Portal"; static char const* l_clearEvName[9] = { "BOSSCLEAR01", @@ -415,7 +415,7 @@ void daObjBossWarp_c::actionCancelEvent() { } int daObjBossWarp_c::demoProc() { - static char* action_table[15] = { + static DUSK_CONST char* action_table[15] = { "WAIT", "APPEAR", "DISAPPEAR", @@ -662,7 +662,7 @@ static cPhs_Step daObjBossWarp_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjBossWarp_Method = { +static DUSK_CONST actor_method_class l_daObjBossWarp_Method = { (process_method_func)daObjBossWarp_Create, (process_method_func)daObjBossWarp_Delete, (process_method_func)daObjBossWarp_Execute, @@ -670,7 +670,7 @@ static actor_method_class l_daObjBossWarp_Method = { (process_method_func)daObjBossWarp_Draw, }; -actor_process_profile_definition g_profile_Obj_BossWarp = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BossWarp = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 34677f4112..df3bc442b3 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -37,7 +37,7 @@ static dCcD_SrcCyl l_ccDCyl = { } }; -static char* l_resName = "H_BouMato"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resName = "H_BouMato"; static daArrow_c* l_findActorPtrs[100]; @@ -278,7 +278,7 @@ void daObj_BouMato_c::deleteStuckArrow() { } } -char* daObj_BouMato_c::getResName() { +char DUSK_CONST* daObj_BouMato_c::getResName() { return l_resName; } @@ -359,7 +359,7 @@ static int daObj_BouMato_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_BouMato_MethodTable = { +static DUSK_CONST actor_method_class daObj_BouMato_MethodTable = { (process_method_func)daObj_BouMato_Create, (process_method_func)daObj_BouMato_Delete, (process_method_func)daObj_BouMato_Execute, @@ -367,7 +367,7 @@ static actor_method_class daObj_BouMato_MethodTable = { (process_method_func)daObj_BouMato_Draw, }; -actor_process_profile_definition g_profile_OBJ_BOUMATO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_BOUMATO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index 1b84e2a3ca..504c91dfa3 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -235,7 +235,7 @@ actor_method_class l_daObj_Brakeeff_Method = { (process_method_func)daObj_Brakeeff_Draw, }; -actor_process_profile_definition g_profile_OBJ_BEF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_BEF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 5615a79622..74ae23aeb9 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -1426,7 +1426,7 @@ static void CreateInit(fopAc_ac_c* i_this) { a_this->mCcStts.Init(0xFF, 0xFF, i_this); - static dCcD_SrcCyl himo_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl himo_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1442,7 +1442,7 @@ static void CreateInit(fopAc_ac_c* i_this) { } // mCylAttr }; - static dCcD_SrcCyl wire_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl wire_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1829,7 +1829,7 @@ static int daObj_Brg_Create(fopAc_ac_c* i_this) { AUDIO_INSTANCES; -static actor_method_class l_daObj_Brg_Method = { +static DUSK_CONST actor_method_class l_daObj_Brg_Method = { (process_method_func)daObj_Brg_Create, (process_method_func)daObj_Brg_Delete, (process_method_func)daObj_Brg_Execute, @@ -1837,7 +1837,7 @@ static actor_method_class l_daObj_Brg_Method = { (process_method_func)daObj_Brg_Draw, }; -actor_process_profile_definition g_profile_OBJ_BRG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_BRG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index 694ea3c2ce..0b1a53ad33 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -227,7 +227,7 @@ static cPhs_Step daBsGate_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBsGate_Method = { +static DUSK_CONST actor_method_class l_daBsGate_Method = { (process_method_func)daBsGate_Create, (process_method_func)daBsGate_Delete, (process_method_func)daBsGate_Execute, @@ -235,7 +235,7 @@ static actor_method_class l_daBsGate_Method = { (process_method_func)daBsGate_Draw, }; -actor_process_profile_definition g_profile_Obj_BsGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BsGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index a496f253c3..11e42355f2 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -218,7 +218,7 @@ static int daBubbPilar_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daBubbPilar_Method = { +static DUSK_CONST actor_method_class l_daBubbPilar_Method = { (process_method_func)daBubbPilar_Create, (process_method_func)daBubbPilar_Delete, (process_method_func)daBubbPilar_Execute, @@ -226,7 +226,7 @@ static actor_method_class l_daBubbPilar_Method = { (process_method_func)daBubbPilar_Draw, }; -actor_process_profile_definition g_profile_Obj_awaPlar = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_awaPlar = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index ebd76121f4..3d379cebe5 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -192,7 +192,7 @@ actor_method_class daObjBurnBox_METHODS = { (process_method_func) daObjBurnBox_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_BurnBox = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_BurnBox = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index a8265f69f6..f27ec717e9 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -716,32 +716,32 @@ const static dCcD_SrcCyl l_tg_cyl = { static const GXColor l_light_color = {0xFF, 0xFF, 0xFF, 0xFF}; -static char* l_arcName[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[] = { "J_tubo_00", "J_tubo_01", "Kkiba_00", "Y_ironbal", "J_taru00", "J_doku00", "Obj_bkl", "K_tubo02", "Obj_ballS", "Obj_ballS", "D_aotubo0", "Obj_tama", "O_tuboS", "O_tuboB", }; -static char* l_bmdName[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_bmdName[] = { "J_tubo_00.bmd", "J_tubo_01.bmd", "J_hako_00.bmd", "Yironball.bmd", "J_taru_00.bmd", "J_doku_00.bmd", "K_hb00.bmd", "K_tubo02.bmd", "LV8_OBJ_HikariS.bmd", "LV8_OBJ_HikariS.bmd", "D_aotubo00.bmd", "LV8_tama.bmd", "O_tuboS_LV8.bmd", "O_tuboB_LV8.bmd", }; -static Vec kibako_jv_offset[] = { +static DUSK_CONSTEXPR Vec kibako_jv_offset[] = { {0.0f, 0.0f, 0.0f}, {0.0f, 150.0f, 0.0f}, }; -static Vec taru_jv_offset[] = { +static DUSK_CONSTEXPR Vec taru_jv_offset[] = { {0.0f, 0.0f, 0.0f}, {0.0f, 100.0f, 0.0f}, }; // box joint col data -static dJntColData_c kibako_jc_data = {1, 1, 0, 45.0f, kibako_jv_offset}; +static DUSK_CONSTEXPR dJntColData_c kibako_jc_data = {1, 1, 0, 45.0f, kibako_jv_offset}; -static dJntColData_c taru_jc_data = {1, 1, 0, 45.0f, taru_jv_offset}; +static DUSK_CONSTEXPR dJntColData_c taru_jc_data = {1, 1, 0, 45.0f, taru_jv_offset}; static f32 bound(cXyz* param_0, const cBgS_PolyInfo& param_1, f32 param_2) { cM3dGPla plane; @@ -858,11 +858,11 @@ const daObjCarry_dt_t& daObjCarry_c::data() { return mData[mType]; } -char* daObjCarry_c::getArcName() { +DUSK_CONST char* daObjCarry_c::getArcName() { return l_arcName[mType]; } -char* daObjCarry_c::getBmdName() { +DUSK_CONST char* daObjCarry_c::getBmdName() { return l_bmdName[mType]; } @@ -4300,12 +4300,12 @@ static int daObjCarry_Create(fopAc_ac_c* i_this) { return ((daObjCarry_c*)i_this)->create(); } -static actor_method_class l_daObjCarry_Method = { +static DUSK_CONST actor_method_class l_daObjCarry_Method = { (process_method_func)daObjCarry_Create, (process_method_func)daObjCarry_Delete, (process_method_func)daObjCarry_Execute, (process_method_func)NULL, (process_method_func)daObjCarry_Draw}; -actor_process_profile_definition g_profile_Obj_Carry = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Carry = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 1be955b6c9..4ca78ce4d0 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -182,13 +182,13 @@ static int daObjCatDoor_Create(fopAc_ac_c* actor) { return i_this->create(); } -static actor_method_class l_daObjCatDoor_Method = { +static DUSK_CONST actor_method_class l_daObjCatDoor_Method = { (process_method_func)daObjCatDoor_Create, (process_method_func)daObjCatDoor_Delete, (process_method_func)daObjCatDoor_Execute, (process_method_func)daObjCatDoor_IsDelete, (process_method_func)daObjCatDoor_Draw, }; -actor_process_profile_definition g_profile_Obj_CatDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CatDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 6dc552a3eb..8262cd7af0 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -225,7 +225,7 @@ static int daObj_Cb_Create(fopAc_ac_c* actor) { return rv; } -static actor_method_class l_daObj_Cb_Method = { +static DUSK_CONST actor_method_class l_daObj_Cb_Method = { (process_method_func)daObj_Cb_Create, (process_method_func)daObj_Cb_Delete, (process_method_func)daObj_Cb_Execute, @@ -233,7 +233,7 @@ static actor_method_class l_daObj_Cb_Method = { (process_method_func)daObj_Cb_Draw, }; -actor_process_profile_definition g_profile_OBJ_CB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_CB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 1335e84948..42c1df44a2 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -44,12 +44,12 @@ static cXyz l_chainOffset(0.0f, 105.0f, 30.0f); static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f); -static cull_box const l_cull_box = { +static DUSK_CONSTEXPR cull_box const l_cull_box = { {-250.0f, 0.0f, -450.0f}, {250.0f, 250.0f, 400.0f}, }; -static char* l_arcName = "P_Cblock"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_Cblock"; static f32 l_side_co_offset[12] = { -255.0f, 0.0f, -30.0f, -135.0f, @@ -394,7 +394,7 @@ static const u32 dummy3[3] = { AUDIO_INSTANCES; -static actor_method_class l_daObjCBlk_Method = { +static DUSK_CONST actor_method_class l_daObjCBlk_Method = { (process_method_func)daObjCBlk_Create, (process_method_func)daObjCBlk_Delete, (process_method_func)daObjCBlk_Execute, @@ -402,7 +402,7 @@ static actor_method_class l_daObjCBlk_Method = { (process_method_func)daObjCBlk_Draw, }; -actor_process_profile_definition g_profile_Obj_ChainBlock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ChainBlock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index 2fb01212bc..d181b3cf04 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -20,13 +20,13 @@ void daObjBoard_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName = "Obj_Board"; +static DUSK_CONST char* l_arcName = "Obj_Board"; -static char* l_dzbName[5] = { +static DUSK_CONST char* l_dzbName[5] = { "ClearB00.dzb", "ClearB01.dzb", "ClearB02.dzb", "ClearB03.dzb", "ClearB04.dzb", }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-100.0f, -10.0f, -100.0f}, {100.0f, 10.0f, 100.0f}, }; @@ -150,13 +150,13 @@ static int daObjBoard_MoveBGDraw(daObjBoard_c* i_this) { return i_this->Draw(); } -static actor_method_class daObjBoard_METHODS = { +static DUSK_CONST actor_method_class daObjBoard_METHODS = { (process_method_func)daObjBoard_create1st, (process_method_func)daObjBoard_MoveBGDelete, (process_method_func)daObjBoard_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjBoard_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Cboard = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Cboard = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index d1f539a339..d41830c2e0 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "f_pc/f_pc_name.h" -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "Cdoor", "J_Suimon", }; @@ -288,7 +288,7 @@ static int daObjCdoor_Draw(daObjCdoor_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class l_daObjCdoor_Method = { +static DUSK_CONST actor_method_class l_daObjCdoor_Method = { (process_method_func)daObjCdoor_Create, (process_method_func)daObjCdoor_Delete, (process_method_func)daObjCdoor_Execute, @@ -296,7 +296,7 @@ static actor_method_class l_daObjCdoor_Method = { (process_method_func)daObjCdoor_Draw, }; -actor_process_profile_definition g_profile_Obj_Cdoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Cdoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index 46b1d5b748..900edd75ca 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "f_pc/f_pc_name.h" -static char* l_arcName = "L9Chand"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "L9Chand"; daObjChandelier_proc daObjChandelier_c::s_exeProc[5] = { &daObjChandelier_c::exeModeWait, @@ -248,7 +248,7 @@ static int daObjChandelier_MoveBGDraw(daObjChandelier_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjChandelier_METHODS = { +static DUSK_CONST actor_method_class daObjChandelier_METHODS = { (process_method_func)daObjChandelier_create1st, (process_method_func)daObjChandelier_MoveBGDelete, (process_method_func)daObjChandelier_MoveBGExecute, @@ -256,7 +256,7 @@ static actor_method_class daObjChandelier_METHODS = { (process_method_func)daObjChandelier_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Chandelier = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Chandelier = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 9d5d222d73..c8676c28c7 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -93,7 +93,7 @@ int daObjChest_c::Create() { return 1; } -static char* l_arcName = "H_Tansu"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_Tansu"; int daObjChest_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -242,13 +242,13 @@ static int daObjChest_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjChest_Method = { +static DUSK_CONST actor_method_class l_daObjChest_Method = { (process_method_func)daObjChest_Create, (process_method_func)daObjChest_Delete, (process_method_func)daObjChest_Execute, (process_method_func)NULL, (process_method_func)daObjChest_Draw, }; -actor_process_profile_definition g_profile_Obj_Chest = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Chest = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 8fbc2dbde8..74cc2ac0a2 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -598,7 +598,7 @@ static int daObjCHO_IsDelete(daObjCHO_c* i_this) { return 1; } -static actor_method_class l_daObjCHO_Method = { +static DUSK_CONST actor_method_class l_daObjCHO_Method = { (process_method_func)daObjCHO_Create, (process_method_func)daObjCHO_Delete, (process_method_func)daObjCHO_Execute, @@ -606,7 +606,7 @@ static actor_method_class l_daObjCHO_Method = { (process_method_func)daObjCHO_Draw, }; -actor_process_profile_definition g_profile_Obj_Cho = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Cho = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index 56c644b247..5841a97fb0 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -93,13 +93,13 @@ static int daCowdoor_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daCowdoor_Method = { +static DUSK_CONST actor_method_class l_daCowdoor_Method = { (process_method_func)daCowdoor_Create, (process_method_func)daCowdoor_Delete, (process_method_func)daCowdoor_Execute, (process_method_func)NULL, (process_method_func)daCowdoor_Draw, }; -actor_process_profile_definition g_profile_Obj_Cowdoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Cowdoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index c28ee05ca3..c1143dca6c 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -371,7 +371,7 @@ static int daObjCrope_Draw(daObjCrope_c* i_this) { return i_this->draw(); } -static actor_method_class l_daObjCrope_Method = { +static DUSK_CONST actor_method_class l_daObjCrope_Method = { (process_method_func)daObjCrope_Create, (process_method_func)daObjCrope_Delete, (process_method_func)daObjCrope_Execute, @@ -379,7 +379,7 @@ static actor_method_class l_daObjCrope_Method = { (process_method_func)daObjCrope_Draw, }; -actor_process_profile_definition g_profile_Obj_Crope = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Crope = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 9712205ea3..cf43df1c23 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -28,7 +28,7 @@ enum Action { /* 0x1 */ ACTION_BROKEN, }; -static char* l_arcName = "CrvFence"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "CrvFence"; BOOL daObjCRVFENCE_c::CheckVec() { cXyz vec(fopAcM_GetPosition((fopAc_ac_c*)daPy_getPlayerActorClass())); @@ -415,7 +415,7 @@ int daObjCRVFENCE_c::Delete() { return 1; } -static actor_method_class l_daObjCRVFENCE_Method = { +static DUSK_CONST actor_method_class l_daObjCRVFENCE_Method = { (process_method_func)daObjCRVFENCE_Create, (process_method_func)daObjCRVFENCE_Delete, (process_method_func)daObjCRVFENCE_Execute, @@ -423,7 +423,7 @@ static actor_method_class l_daObjCRVFENCE_Method = { (process_method_func)daObjCRVFENCE_Draw, }; -actor_process_profile_definition g_profile_Obj_CRVFENCE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVFENCE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index f0c24eb22b..bc78bc82c6 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -20,7 +20,7 @@ const static dCcD_SrcSph ccSphSrc = { } // mSphAttr }; -static char* l_arcName = "CrvGate"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "CrvGate"; namespace { static u16 s_CoCount = 0; @@ -827,13 +827,13 @@ int daObjCRVGATE_c::Delete() { return 1; } -static actor_method_class l_daObjCRVGATE_Method = { +static DUSK_CONST actor_method_class l_daObjCRVGATE_Method = { (process_method_func)daObjCRVGATE_Create, (process_method_func)daObjCRVGATE_Delete, (process_method_func)daObjCRVGATE_Execute, (process_method_func)daObjCRVGATE_IsDelete, (process_method_func)daObjCRVGATE_Draw, }; -actor_process_profile_definition g_profile_Obj_CRVGATE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVGATE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 2dc91c6e6b..446dde3809 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -234,13 +234,13 @@ static int daObjCRVHAHEN_IsDelete(daObjCRVHAHEN_c* i_this) { return true; } -static actor_method_class l_daObjCRVHAHEN_Method = { +static DUSK_CONST actor_method_class l_daObjCRVHAHEN_Method = { (process_method_func)daObjCRVHAHEN_Create, (process_method_func)daObjCRVHAHEN_Delete, (process_method_func)daObjCRVHAHEN_Execute, (process_method_func)daObjCRVHAHEN_IsDelete, (process_method_func)daObjCRVHAHEN_Draw, }; -actor_process_profile_definition g_profile_Obj_CRVHAHEN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVHAHEN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 94e9f4a0c1..4943a29091 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -13,7 +13,7 @@ #include "d/d_cc_uty.h" #include "d/d_s_play.h" -static char* l_arcName = "CrvLH_Dw"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "CrvLH_Dw"; void daObjCRVLH_DW_c::initCcCylinder() { const static dCcD_SrcCyl ccCylSrc = { @@ -233,13 +233,13 @@ int daObjCRVLH_DW_c::Delete() { return 1; } -static actor_method_class l_daObjCRVLH_DW_Method = { +static DUSK_CONST actor_method_class l_daObjCRVLH_DW_Method = { (process_method_func)daObjCRVLH_DW_Create, (process_method_func)daObjCRVLH_DW_Delete, (process_method_func)daObjCRVLH_DW_Execute, (process_method_func)daObjCRVLH_DW_IsDelete, (process_method_func)daObjCRVLH_DW_Draw, }; -actor_process_profile_definition g_profile_Obj_CRVLH_DW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVLH_DW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index ce796b4150..d0b5ae17eb 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -19,7 +19,7 @@ static int daObjCRVLH_UP_Delete(daObjCRVLH_UP_c* i_this) { return 1; } -static char* l_arcName = "CrvLH_Up"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "CrvLH_Up"; void daObjCRVLH_UP_c::HakaiSet() { fopAcM_GetPosition(daPy_getPlayerActorClass()); @@ -192,13 +192,13 @@ int daObjCRVLH_UP_c::Delete() { return 1; } -static actor_method_class l_daObjCRVLH_UP_Method = { +static DUSK_CONST actor_method_class l_daObjCRVLH_UP_Method = { (process_method_func)daObjCRVLH_UP_Create, (process_method_func)daObjCRVLH_UP_Delete, (process_method_func)daObjCRVLH_UP_Execute, (process_method_func)daObjCRVLH_UP_IsDelete, (process_method_func)daObjCRVLH_UP_Draw, }; -actor_process_profile_definition g_profile_Obj_CRVLH_UP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVLH_UP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 0dc774ef12..fbe983eac0 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -72,7 +72,7 @@ static int daObjCRVSTEEL_Execute(daObjCRVSTEEL_c* i_this) { return i_this->MoveBGExecute(); } -static char* l_arcName = "CrvSteel"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "CrvSteel"; int daObjCRVSTEEL_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvSteelGate.bmd"); @@ -140,7 +140,7 @@ int daObjCRVSTEEL_c::Delete() { return 1; } -static actor_method_class l_daObjCRVSTEEL_Method = { +static DUSK_CONST actor_method_class l_daObjCRVSTEEL_Method = { (process_method_func)daObjCRVSTEEL_Create, (process_method_func)daObjCRVSTEEL_Delete, (process_method_func)daObjCRVSTEEL_Execute, @@ -148,7 +148,7 @@ static actor_method_class l_daObjCRVSTEEL_Method = { (process_method_func)daObjCRVSTEEL_Draw, }; -actor_process_profile_definition g_profile_Obj_CRVSTEEL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_CRVSTEEL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index f3d43478d1..0ca202676a 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -28,7 +28,7 @@ void daObjCrystal_c::setBaseMtx() { mpModel[1]->setBaseTRMtx(mDoMtx_stack_c::get()); } -static char* l_arcName = "H_Suisho"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_Suisho"; int daObjCrystal_c::Create() { initBaseMtx(); @@ -131,13 +131,13 @@ static int daObjCrystal_Create(daObjCrystal_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjCrystal_Method = { +static DUSK_CONST actor_method_class l_daObjCrystal_Method = { (process_method_func)daObjCrystal_Create, (process_method_func)daObjCrystal_Delete, (process_method_func)daObjCrystal_Execute, (process_method_func)NULL, (process_method_func)daObjCrystal_Draw, }; -actor_process_profile_definition g_profile_Obj_Crystal = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Crystal = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 6bf0b480a5..b02615cd7e 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -66,12 +66,12 @@ static Vec const l_check_max_wolf = { 120.0f, 0.0f, 160.0f, }; -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "P_Cwall", "P_L4Cwall", }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-300.0f, -100.0f, -650.0f}, {300.0f, 500.0f, 300.0f}, }; @@ -830,7 +830,7 @@ static int daObjCwall_MoveBGDraw(daObjCwall_c* i_this) { return i_this->Draw(); } -static actor_method_class daObjCwall_METHODS = { +static DUSK_CONST actor_method_class daObjCwall_METHODS = { (process_method_func)daObjCwall_create1st, (process_method_func)daObjCwall_MoveBGDelete, (process_method_func)daObjCwall_MoveBGExecute, @@ -838,7 +838,7 @@ static actor_method_class daObjCwall_METHODS = { (process_method_func)daObjCwall_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_ChainWall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ChainWall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 5e234a7342..7fc9599a96 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -12,7 +12,7 @@ static daObjDamCps_HIO_c l_HIO; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-20.0f, 0.0f, -20.0f}, {20.0f, 100.0f, 20.0f}, }; @@ -193,14 +193,14 @@ static int daObjDamCps_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjDamCps_Method = { +static DUSK_CONST actor_method_class l_daObjDamCps_Method = { (process_method_func)daObjDamCps_Create, (process_method_func)daObjDamCps_Delete, (process_method_func)daObjDamCps_Execute, (process_method_func)NULL, (process_method_func)daObjDamCps_Draw, }; #endif -actor_process_profile_definition g_profile_Obj_DamCps = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_DamCps = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index cc176b9a20..fd3c3a2dae 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -594,7 +594,7 @@ static int daObjDAN_IsDelete(daObjDAN_c* i_this) { return 1; } -static actor_method_class l_daObjDAN_Method = { +static DUSK_CONST actor_method_class l_daObjDAN_Method = { (process_method_func)daObjDAN_Create, (process_method_func)daObjDAN_Delete, (process_method_func)daObjDAN_Execute, @@ -602,7 +602,7 @@ static actor_method_class l_daObjDAN_Method = { (process_method_func)daObjDAN_Draw, }; -actor_process_profile_definition g_profile_Obj_Dan = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Dan = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index b9bfcdca8a..518d745ba3 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -95,13 +95,13 @@ static int daObjDigholl_Draw(daObjDigholl_c* i_this) { return i_this->draw(); } -static actor_method_class l_daObjDigholl_Method = { +static DUSK_CONST actor_method_class l_daObjDigholl_Method = { (process_method_func)daObjDigholl_Create, (process_method_func)daObjDigholl_Delete, (process_method_func)daObjDigholl_Execute, (process_method_func)NULL, (process_method_func)daObjDigholl_Draw, }; -actor_process_profile_definition g_profile_Obj_Digholl = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Digholl = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 16fa438012..157df4f8a2 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -169,13 +169,13 @@ static int daObjDigpl_Draw(daObjDigpl_c* i_this) { return 1; } -static actor_method_class l_daObjDigpl_Method = { +static DUSK_CONST actor_method_class l_daObjDigpl_Method = { (process_method_func)daObjDigpl_Create, (process_method_func)daObjDigpl_Delete, (process_method_func)daObjDigpl_Execute, (process_method_func)NULL, (process_method_func)daObjDigpl_Draw, }; -actor_process_profile_definition g_profile_Obj_Digpl = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Digpl = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 6da13dd5c9..70092131db 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -34,7 +34,7 @@ int daObjDigSnow_c::Create() { return TRUE; } -static char* l_arcName = "Y_horiyuk"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Y_horiyuk"; int daObjDigSnow_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -173,13 +173,13 @@ static int daObjDigSnow_MoveBGDraw(daObjDigSnow_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjDigSnow_METHODS = { +static DUSK_CONST actor_method_class daObjDigSnow_METHODS = { (process_method_func)daObjDigSnow_create1st, (process_method_func)daObjDigSnow_MoveBGDelete, (process_method_func)daObjDigSnow_MoveBGExecute, NULL, (process_method_func)daObjDigSnow_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_DigSnow = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_DigSnow = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 58f863203c..836631530a 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -529,7 +529,7 @@ void daObjDmElevator_c::actionDead() { } int daObjDmElevator_c::demoProc() { - static char* action_table[2] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[2] = { "WAIT", "MOVE", }; @@ -673,7 +673,7 @@ static int daObjDmElevator_MoveBGDraw(daObjDmElevator_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjDmElevator_METHODS = { +static DUSK_CONST actor_method_class daObjDmElevator_METHODS = { (process_method_func)daObjDmElevator_create1st, (process_method_func)daObjDmElevator_MoveBGDelete, (process_method_func)daObjDmElevator_MoveBGExecute, @@ -681,7 +681,7 @@ static actor_method_class daObjDmElevator_METHODS = { (process_method_func)daObjDmElevator_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Elevator = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Elevator = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 62f3bf9f17..453ecf32f7 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -630,7 +630,7 @@ static int daObjDrop_Create(fopAc_ac_c* i_this) { return ((daObjDrop_c*)i_this)->create(); } -static actor_method_class l_daObjDrop_Method = { +static DUSK_CONST actor_method_class l_daObjDrop_Method = { (process_method_func)daObjDrop_Create, (process_method_func)daObjDrop_Delete, (process_method_func)daObjDrop_Execute, @@ -638,7 +638,7 @@ static actor_method_class l_daObjDrop_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Obj_Drop = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Drop = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index bd851109fd..a2eb45f29e 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -243,7 +243,7 @@ int daObjDust_c::Delete() { return 1; } -static actor_method_class l_daObjDust_Method = { +static DUSK_CONST actor_method_class l_daObjDust_Method = { (process_method_func)daObjDust_Create, (process_method_func)daObjDust_Delete, (process_method_func)daObjDust_Execute, @@ -252,7 +252,7 @@ static actor_method_class l_daObjDust_Method = { }; -actor_process_profile_definition g_profile_Obj_DUST = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_DUST = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 21c34b7eb2..343fa0ec75 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -47,7 +47,7 @@ int Mthd_IsDelete(void* i_this) { namespace daObjEff { namespace { -static actor_method_class Mthd_Table = { +static DUSK_CONST actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, (process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete, (process_method_func)Mthd_Draw, @@ -55,7 +55,7 @@ static actor_method_class Mthd_Table = { }; }; // namespace daObjEff -actor_process_profile_definition g_profile_Obj_Eff = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Eff = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index c5ff0c52e7..13fcfd26c2 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -247,13 +247,13 @@ static int daObjE_CREATE_IsDelete(daObjE_CREATE_c* i_this) { return 1; } -static actor_method_class l_daObjE_CREATE_Method = { +static DUSK_CONST actor_method_class l_daObjE_CREATE_Method = { (process_method_func)daObjE_CREATE_Create, (process_method_func)daObjE_CREATE_Delete, (process_method_func)daObjE_CREATE_Execute, (process_method_func)daObjE_CREATE_IsDelete, (process_method_func)daObjE_CREATE_Draw, }; -actor_process_profile_definition g_profile_Obj_E_CREATE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_E_CREATE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index e310a7925f..d95581d52f 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -13,9 +13,9 @@ #include "d/d_s_play.h" -static char* l_arcName = "K_drock00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "K_drock00"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-200.0f, -10000.0f, -200.0f}, {200.0f, 600.0f, 200.0f}, }; @@ -440,7 +440,7 @@ static int daObjFallObj_MoveBGDraw(daObjFallObj_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjFallObj_METHODS = { +static DUSK_CONST actor_method_class daObjFallObj_METHODS = { (process_method_func)daObjFallObj_create1st, (process_method_func)daObjFallObj_MoveBGDelete, (process_method_func)daObjFallObj_MoveBGExecute, @@ -448,7 +448,7 @@ static actor_method_class daObjFallObj_METHODS = { (process_method_func)daObjFallObj_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_FallObj = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_FallObj = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index dfe413c5b9..ae2f9f746c 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -111,7 +111,7 @@ int daObjFan_c::Create() { return 1; } -static char* l_arcName[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[3] = { "Obj_prop1", "Obj_prop0", "Obj_prop2", @@ -327,7 +327,7 @@ static int daObjFan_MoveBGDraw(daObjFan_c* param_0) { return param_0->MoveBGDraw(); } -static actor_method_class daObjFan_METHODS = { +static DUSK_CONST actor_method_class daObjFan_METHODS = { (process_method_func)daObjFan_create1st, (process_method_func)daObjFan_MoveBGDelete, (process_method_func)daObjFan_MoveBGExecute, @@ -335,7 +335,7 @@ static actor_method_class daObjFan_METHODS = { (process_method_func)daObjFan_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Fan = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Fan = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index acd3610b6e..b4d473c424 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -344,7 +344,7 @@ static int daObjFchain_Draw(daObjFchain_c* i_this) { return static_cast(i_this)->draw(); } -static actor_method_class l_daObjFchain_Method = { +static DUSK_CONST actor_method_class l_daObjFchain_Method = { (process_method_func)daObjFchain_Create, (process_method_func)daObjFchain_Delete, (process_method_func)daObjFchain_Execute, @@ -352,7 +352,7 @@ static actor_method_class l_daObjFchain_Method = { (process_method_func)daObjFchain_Draw, }; -actor_process_profile_definition g_profile_Obj_Fchain = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Fchain = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index dd314ed908..621a15f7a3 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -39,7 +39,7 @@ const dCcD_SrcGObjInf daFireWood_c::mCcDObjInfo = { {0}, }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-50.0f, 0.0f, -50.0f}, {50.0f, 100.0f, 50.0f}, }; @@ -184,13 +184,13 @@ static int daFireWood_Create(fopAc_ac_c* i_this) { } -static actor_method_class l_daFireWood_Method = { +static DUSK_CONST actor_method_class l_daFireWood_Method = { (process_method_func)daFireWood_Create, (process_method_func)daFireWood_Delete, (process_method_func)daFireWood_Execute, (process_method_func)NULL, (process_method_func)daFireWood_Draw, }; -actor_process_profile_definition g_profile_Obj_FireWood = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_FireWood = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 1bcc04777b..d20ab61f5e 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -39,7 +39,7 @@ dCcD_SrcCyl daFireWood2_c::mCcDCyl = { } }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-50.0f, 0.0f, -50.0f}, {50.0f, 100.0f, 50.0f}, }; @@ -268,13 +268,13 @@ static int daFireWood2_Create(fopAc_ac_c* i_this) { return ((daFireWood2_c*)i_this)->create(); } -static actor_method_class l_daFireWood2_Method = { +static DUSK_CONST actor_method_class l_daFireWood2_Method = { (process_method_func)daFireWood2_Create, (process_method_func)daFireWood2_Delete, (process_method_func)daFireWood2_Execute, (process_method_func)NULL, (process_method_func)daFireWood2_Draw, }; -actor_process_profile_definition g_profile_Obj_FireWood2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_FireWood2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 986762a1fe..a63b6a23ed 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -20,7 +20,7 @@ void daObjFPillar_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); } -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-30.0f, -10.0f, -30.0f}, {30.0f, 60.0f, 30.0f}, }; @@ -213,7 +213,7 @@ static int daObjFPillar_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjFPillar_Method = { +static DUSK_CONST actor_method_class l_daObjFPillar_Method = { (process_method_func)daObjFPillar_Create, (process_method_func)daObjFPillar_Delete, (process_method_func)daObjFPillar_Execute, @@ -221,7 +221,7 @@ static actor_method_class l_daObjFPillar_Method = { (process_method_func)daObjFPillar_Draw, }; -actor_process_profile_definition g_profile_Obj_FirePillar = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_FirePillar = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index 150f3fc4eb..149f701e3b 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -38,9 +38,9 @@ void daObjFPillar2_c::setBaseMtx() { } } -static char* l_arcName = "Obj_yogan"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_yogan"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-150.0f, -10.0f, -150.0f}, {150.0f, 1200.0f, 150.0f}, }; @@ -495,7 +495,7 @@ static int daObjFPillar2_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjFPillar2_Method = { +static DUSK_CONST actor_method_class l_daObjFPillar2_Method = { (process_method_func)daObjFPillar2_Create, (process_method_func)daObjFPillar2_Delete, (process_method_func)daObjFPillar2_Execute, @@ -503,7 +503,7 @@ static actor_method_class l_daObjFPillar2_Method = { (process_method_func)daObjFPillar2_Draw, }; -actor_process_profile_definition g_profile_Obj_FirePillar2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_FirePillar2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index dcf0640e6b..b474b05893 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -297,7 +297,7 @@ static int daObjFlag_Create(fopAc_ac_c* param_0) { FlagJoint_c::FlagJoint_c() {} -static actor_method_class l_daObjFlag_Method = { +static DUSK_CONST actor_method_class l_daObjFlag_Method = { (process_method_func)daObjFlag_Create, (process_method_func)daObjFlag_Delete, (process_method_func)daObjFlag_Execute, @@ -305,7 +305,7 @@ static actor_method_class l_daObjFlag_Method = { (process_method_func)daObjFlag_Draw, }; -actor_process_profile_definition g_profile_Obj_Flag = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Flag = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 35e0cac3bc..1475e3e310 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -498,7 +498,7 @@ static int daObjFlag2_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjFlag2_Method = { +static DUSK_CONST actor_method_class l_daObjFlag2_Method = { (process_method_func)daObjFlag2_Create, (process_method_func)daObjFlag2_Delete, (process_method_func)daObjFlag2_Execute, @@ -506,7 +506,7 @@ static actor_method_class l_daObjFlag2_Method = { (process_method_func)daObjFlag2_Draw, }; -actor_process_profile_definition g_profile_Obj_Flag2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Flag2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 501cb792f6..5ec6535a5e 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -503,7 +503,7 @@ int daObjFlag3_c::create() { return rv; } -static actor_method_class l_daObjFlag3_Method = { +static DUSK_CONST actor_method_class l_daObjFlag3_Method = { (process_method_func)daObjFlag3_Create, (process_method_func)daObjFlag3_Delete, (process_method_func)daObjFlag3_Execute, @@ -511,7 +511,7 @@ static actor_method_class l_daObjFlag3_Method = { (process_method_func)daObjFlag3_Draw, }; -actor_process_profile_definition g_profile_Obj_Flag3 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Flag3 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 3b0f3b9ecc..2bd9551164 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -112,13 +112,13 @@ static int daObj_Fmobj_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daObj_Fmobj_Method = { +static DUSK_CONST actor_method_class l_daObj_Fmobj_Method = { (process_method_func)daObj_Fmobj_Create, (process_method_func)daObj_Fmobj_Delete, (process_method_func)daObj_Fmobj_Execute, (process_method_func)daObj_Fmobj_IsDelete, (process_method_func)daObj_Fmobj_Draw, }; -actor_process_profile_definition g_profile_OBJ_FMOBJ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_FMOBJ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index bbc9ac14b6..777198868f 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -493,7 +493,7 @@ static cPhs_Step daObj_Food_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daObj_Food_Method = { +static DUSK_CONST actor_method_class l_daObj_Food_Method = { (process_method_func)daObj_Food_Create, (process_method_func)daObj_Food_Delete, (process_method_func)daObj_Food_Execute, @@ -501,7 +501,7 @@ static actor_method_class l_daObj_Food_Method = { (process_method_func)daObj_Food_Draw, }; -actor_process_profile_definition g_profile_OBJ_FOOD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_FOOD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 9ea82fe945..046a4b4144 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -297,7 +297,7 @@ static cPhs_Step daObj_Fw_Create(fopAc_ac_c* a_this) { return phase; } -static actor_method_class l_daObj_Fw_Method = { +static DUSK_CONST actor_method_class l_daObj_Fw_Method = { (process_method_func)daObj_Fw_Create, (process_method_func)daObj_Fw_Delete, (process_method_func)daObj_Fw_Execute, @@ -305,7 +305,7 @@ static actor_method_class l_daObj_Fw_Method = { (process_method_func)daObj_Fw_Draw, }; -actor_process_profile_definition g_profile_OBJ_FW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_FW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 1a7c4fed05..0f7927a243 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -52,7 +52,7 @@ static u32 l_bmdData[2][2] = { 35, 1, 34, 1, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "ykM1", }; @@ -601,7 +601,7 @@ static int daObj_Gadget_IsDelete(void* i_this) { AUDIO_INSTANCES -static actor_method_class daObj_Gadget_MethodTable = { +static DUSK_CONST actor_method_class daObj_Gadget_MethodTable = { (process_method_func)daObj_Gadget_Create, (process_method_func)daObj_Gadget_Delete, (process_method_func)daObj_Gadget_Execute, @@ -609,7 +609,7 @@ static actor_method_class daObj_Gadget_MethodTable = { (process_method_func)daObj_Gadget_Draw, }; -actor_process_profile_definition g_profile_OBJ_GADGET = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_GADGET = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index f395713d33..a1ed94b2c2 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -32,9 +32,9 @@ static const GXColor l_color[24] = { {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xB4, 0xB4, 0xB4, 0xFF}, }; -static char* l_arcName = "Y_gwall"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Y_gwall"; -static char* l_matName = "mat00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_matName = "mat00"; static int CheckCreateHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); @@ -180,7 +180,7 @@ static int daObjGWall_Create(daObjGWall_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjGWall_Method = { +static DUSK_CONST actor_method_class l_daObjGWall_Method = { (process_method_func)daObjGWall_Create, (process_method_func)daObjGWall_Delete, (process_method_func)daObjGWall_Execute, @@ -188,7 +188,7 @@ static actor_method_class l_daObjGWall_Method = { (process_method_func)daObjGWall_Draw, }; -actor_process_profile_definition g_profile_Obj_GanonWall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GanonWall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 187210687f..6f461dc11f 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -27,9 +27,9 @@ static const GXColor l_color[24] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0xB4, 0xB4, 0xFF, }; -static char* l_arcName = "V_CTGWall"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_CTGWall"; -static char* l_matName = "mat00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_matName = "mat00"; void daObjGWall2_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -166,7 +166,7 @@ static int daObjGWall2_MoveBGDraw(daObjGWall2_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjGWall2_METHODS = { +static DUSK_CONST actor_method_class daObjGWall2_METHODS = { (process_method_func)daObjGWall2_create1st, (process_method_func)daObjGWall2_MoveBGDelete, (process_method_func)daObjGWall2_MoveBGExecute, @@ -174,7 +174,7 @@ static actor_method_class daObjGWall2_METHODS = { (process_method_func)daObjGWall2_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_GanonWall2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GanonWall2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 2cf002cd65..a610dfd5fb 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -229,7 +229,7 @@ static int daObj_Gb_Create(fopAc_ac_c* actor) { return rv; } -static actor_method_class l_daObj_Gb_Method = { +static DUSK_CONST actor_method_class l_daObj_Gb_Method = { (process_method_func)daObj_Gb_Create, (process_method_func)daObj_Gb_Delete, (process_method_func)daObj_Gb_Execute, @@ -237,7 +237,7 @@ static actor_method_class l_daObj_Gb_Method = { (process_method_func)daObj_Gb_Draw, }; -actor_process_profile_definition g_profile_OBJ_GB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_GB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 0f34360a33..819f20d29b 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -19,9 +19,9 @@ void daObjGeyser_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mMtx); } -static char* l_arcName = "H_knktsn"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_knktsn"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-100.0f, -10.0f, -100.0f}, {100.0f, 550.0f, 100.0f}, }; @@ -681,7 +681,7 @@ static int daObjGeyser_MoveBGDraw(daObjGeyser_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjGeyser_METHODS = { +static DUSK_CONST actor_method_class daObjGeyser_METHODS = { (process_method_func)daObjGeyser_create1st, (process_method_func)daObjGeyser_MoveBGDelete, (process_method_func)daObjGeyser_MoveBGExecute, @@ -689,7 +689,7 @@ static actor_method_class daObjGeyser_METHODS = { (process_method_func)daObjGeyser_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Geyser = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Geyser = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index b60a1c9aa0..77b0ae9e69 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -17,7 +17,7 @@ daGlwSph_HIO_c::daGlwSph_HIO_c() { static daGlwSph_HIO_c l_HIO; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-30.0f, -10.0f, -30.0f}, {30.0f, 60.0f, 30.0f} }; @@ -456,13 +456,13 @@ void _GlSph_Mng_c::incSphSe() { } } -static actor_method_class l_daGlwSph_Method = { +static DUSK_CONST actor_method_class l_daGlwSph_Method = { (process_method_func)daGlwSph_Create, (process_method_func)daGlwSph_Delete, (process_method_func)daGlwSph_Execute, (process_method_func)NULL, (process_method_func)daGlwSph_Draw, }; -actor_process_profile_definition g_profile_Obj_glowSphere = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_glowSphere = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index 89419b1e49..a86b0045c5 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -719,7 +719,7 @@ static cPhs_Step daObj_Gm_Create(fopAc_ac_c* a_this) { return phase; } -static actor_method_class l_daObj_Gm_Method = { +static DUSK_CONST actor_method_class l_daObj_Gm_Method = { (process_method_func)daObj_Gm_Create, (process_method_func)daObj_Gm_Delete, (process_method_func)daObj_Gm_Execute, @@ -727,7 +727,7 @@ static actor_method_class l_daObj_Gm_Method = { (process_method_func)daObj_Gm_Draw, }; -actor_process_profile_definition g_profile_OBJ_GM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_GM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index fc0fef5ba5..a83b5b8584 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -170,13 +170,13 @@ static int daGoGate_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daGoGate_Method = { +static DUSK_CONST actor_method_class l_daGoGate_Method = { (process_method_func)daGoGate_Create, (process_method_func)daGoGate_Delete, (process_method_func)daGoGate_Execute, (process_method_func)NULL, (process_method_func)daGoGate_Draw, }; -actor_process_profile_definition g_profile_Obj_GoGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GoGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 66963f0efd..b5e05fe386 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" -static char* l_arcName = "GomiKabe"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "GomiKabe"; daObjGOMIKABE_HIO_c::daObjGOMIKABE_HIO_c() { mId = -1; @@ -385,7 +385,7 @@ int daObjGOMIKABE_c::Delete() { return 1; } -static actor_method_class l_daObjGOMIKABE_Method = { +static DUSK_CONST actor_method_class l_daObjGOMIKABE_Method = { (process_method_func)daObjGOMIKABE_Create, (process_method_func)daObjGOMIKABE_Delete, (process_method_func)daObjGOMIKABE_Execute, @@ -393,7 +393,7 @@ static actor_method_class l_daObjGOMIKABE_Method = { (process_method_func)daObjGOMIKABE_Draw, }; -actor_process_profile_definition g_profile_Obj_GOMIKABE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GOMIKABE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 74b0f8cfdf..e0668984c2 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -581,7 +581,7 @@ static int daGpTaru_Create(fopAc_ac_c* i_this) { return ((daGpTaru_c*)i_this)->create(); } -static actor_method_class l_daGpTaru_Method = { +static DUSK_CONST actor_method_class l_daGpTaru_Method = { (process_method_func)daGpTaru_Create, (process_method_func)daGpTaru_Delete, (process_method_func)daGpTaru_Execute, @@ -589,7 +589,7 @@ static actor_method_class l_daGpTaru_Method = { (process_method_func)daGpTaru_Draw, }; -actor_process_profile_definition g_profile_Obj_GpTaru = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GpTaru = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index ff52818c42..c8ad09dda2 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -125,33 +125,33 @@ public: }; #endif -static char* l_resFileNameList[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resFileNameList[4] = { "grA", "grA", "grA", "grA", }; -static int l_exLoadRes_GRAa[4] = { +static DUSK_CONSTEXPR int l_exLoadRes_GRAa[4] = { 1, 2, -1, -1, }; -static int l_exLoadRes_GRA_jump[4] = { +static DUSK_CONSTEXPR int l_exLoadRes_GRA_jump[4] = { 1, 2, 4, -1, }; -static int l_exLoadRes_GRA_demo[4] = { +static DUSK_CONSTEXPR int l_exLoadRes_GRA_demo[4] = { 1, 2, 3, -1, }; -static int* l_exloadRes_list[4] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_exloadRes_list[4] = { l_exLoadRes_GRAa, l_exLoadRes_GRA_jump, l_exLoadRes_GRAa, l_exLoadRes_GRA_demo, }; -static char* l_resNames[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[5] = { "grA", "grA_base", "grA_mdl", @@ -159,11 +159,11 @@ static char* l_resNames[5] = { "grA_Look", }; -static int l_bmdGetParamList[2] = { +static DUSK_CONSTEXPR int l_bmdGetParamList[2] = { 3, 2, }; -static int l_bckGetParamList[35][2] = { +static DUSK_CONSTEXPR int l_bckGetParamList[35][2] = { {21, 1}, {18, 0}, {22, 1}, {11, 0}, {18, 1}, {19, 1}, @@ -184,27 +184,27 @@ static int l_bckGetParamList[35][2] = { {9, 0}, }; -static int l_btpGetParamList[4][2] = { +static DUSK_CONSTEXPR int l_btpGetParamList[4][2] = { {28, 1}, {32, 1}, {31, 1}, {21, 0}, }; -static u16 l_eventMotionChangeTable[11] = { +static DUSK_CONSTEXPR u16 l_eventMotionChangeTable[11] = { 0, 1, 0, 2, 3, 0, 0, 0, 0, 0, 0, }; -static u16 l_eventFaceChangeTable[4] = { +static DUSK_CONSTEXPR u16 l_eventFaceChangeTable[4] = { 1, 2, 6, 7, }; -static char* l_evtNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evtNameList[2] = { NULL, "GRA_THROWN", }; -static u16 l_entryJntNoList[4] = { +static DUSK_CONSTEXPR u16 l_entryJntNoList[4] = { 5, 6, 7, 0xFFFF, }; @@ -365,7 +365,7 @@ daObj_GrA_HIO_Param_c const daObj_GrA_Param_c::m = { 30.0f, }; -static const f32 l_bgcParam[20] = { +static DUSK_CONSTEXPR const f32 l_bgcParam[20] = { 0.0f, 0.0f, 0.0f, 0.0f, -0.5f, 1.0f, -0.5f, 1.0f, 0.5f, -1.0f, -0.5f, 1.0f, @@ -655,7 +655,7 @@ void daObj_GrA_c::restart() { field_0x209c = 0; } -static cXyz l_centerOfst(0.0f, 67.0f, 26.0f); +static DUSK_CONSTEXPR cXyz l_centerOfst(0.0f, 67.0f, 26.0f); static OBJ_GRA_HIO_CLASS l_HIO; @@ -1048,7 +1048,7 @@ void daObj_GrA_c::adjustShapeAngle() { } void daObj_GrA_c::setMtx(int param_1) { - static cXyz aTrembleTrans[15] = { + static DUSK_CONSTEXPR cXyz aTrembleTrans[15] = { cXyz(0.0f, 0.0f, 0.0f), cXyz(1.154554f, -0.052719f, 1.018953f), cXyz(0.722208f, -0.14003f, 1.333208f), @@ -1149,7 +1149,7 @@ void daObj_GrA_c::setCollisions() { field_0xf50.OnTgNoConHit(); } - static cXyz aOfst(0.0f, 0.0f, 20.0f); + static DUSK_CONSTEXPR cXyz aOfst(0.0f, 0.0f, 20.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(field_0x91a.y); @@ -1198,7 +1198,7 @@ void daObj_GrA_c::setCollisions() { void daObj_GrA_c::setAttnPos() { lookat(); - static cXyz aEyeOfst(15.0f, 25.0f, 0.0f); + static DUSK_CONSTEXPR cXyz aEyeOfst(15.0f, 25.0f, 0.0f); cXyz sp18; mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(4)); @@ -2125,7 +2125,7 @@ daObj_GrA_c::MotionFunc daObj_GrA_c::mFaceMotionList[14] = { &daObj_GrA_c::face999, }; -static actor_method_class daObj_GrA_MethodTable = { +static DUSK_CONST actor_method_class daObj_GrA_MethodTable = { (process_method_func)daObj_GrA_Create, (process_method_func)daObj_GrA_Delete, (process_method_func)daObj_GrA_Execute, @@ -2133,7 +2133,7 @@ static actor_method_class daObj_GrA_MethodTable = { (process_method_func)daObj_GrA_Draw, }; -actor_process_profile_definition g_profile_OBJ_GRA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_GRA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index 3bff2a8ae2..bf4d749b97 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -95,7 +95,7 @@ static int daObjGraWall_create(fopAc_ac_c* i_this) { return static_cast(i_this)->Create(); } -static actor_method_class l_daObjGraWall_Method = { +static DUSK_CONST actor_method_class l_daObjGraWall_Method = { (process_method_func)daObjGraWall_create, (process_method_func)daObjGraWall_Delete, (process_method_func)daObjGraWall_Execute, @@ -103,7 +103,7 @@ static actor_method_class l_daObjGraWall_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_GRA_WALL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_GRA_WALL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index e2b1a06f06..a2cfb0ad17 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -171,7 +171,7 @@ int daObjGraRock_c::Create() { return 1; } -static char* l_arcName[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[5] = { "M_VBom", "grA_base", "grA_mdl", @@ -298,7 +298,7 @@ static int daObjGraRock_create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjGraRock_Method = { +static DUSK_CONST actor_method_class l_daObjGraRock_Method = { (process_method_func)daObjGraRock_create, (process_method_func)daObjGraRock_Delete, (process_method_func)daObjGraRock_Execute, @@ -306,7 +306,7 @@ static actor_method_class l_daObjGraRock_Method = { (process_method_func)daObjGraRock_Draw, }; -actor_process_profile_definition g_profile_Obj_GraRock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GraRock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 771635d589..3e2daf2d30 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -215,7 +215,7 @@ static cPhs_Step daGraveStone_create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daGraveStone_Method = { +static DUSK_CONST actor_method_class l_daGraveStone_Method = { (process_method_func)daGraveStone_create, (process_method_func)daGraveStone_Delete, (process_method_func)daGraveStone_Execute, @@ -223,7 +223,7 @@ static actor_method_class l_daGraveStone_Method = { (process_method_func)daGraveStone_Draw, }; -actor_process_profile_definition g_profile_Obj_GraveStone = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GraveStone = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 2d3d05a36c..59f310678d 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -335,7 +335,7 @@ static int daGrdWater_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daGrdWater_Method = { +static DUSK_CONST actor_method_class l_daGrdWater_Method = { (process_method_func)daGrdWater_Create, (process_method_func)daGrdWater_Delete, (process_method_func)daGrdWater_Execute, @@ -343,7 +343,7 @@ static actor_method_class l_daGrdWater_Method = { (process_method_func)daGrdWater_Draw, }; -actor_process_profile_definition g_profile_GRDWATER = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_GRDWATER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 772f7a8cff..ac4441d585 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -49,7 +49,7 @@ int daObjGrzRock_c::Create() { return 1; } -static char* l_arcName = "grZRock"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "grZRock"; int daObjGrzRock_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -153,7 +153,7 @@ static int daObjGrzRock_create(fopAc_ac_c* a_this) { return static_cast(a_this)->create(); } -static actor_method_class l_daObjGrzRock_Method = { +static DUSK_CONST actor_method_class l_daObjGrzRock_Method = { (process_method_func)daObjGrzRock_create, (process_method_func)daObjGrzRock_Delete, (process_method_func)daObjGrzRock_Execute, @@ -161,7 +161,7 @@ static actor_method_class l_daObjGrzRock_Method = { (process_method_func)daObjGrzRock_Draw, }; -actor_process_profile_definition g_profile_Obj_GrzRock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_GrzRock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index 1349e377ea..737a212bbc 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_h_saku.h" #include "Z2AudioLib/Z2Instances.h" -static char* l_arcName = "H_Saku"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_Saku"; void daObjH_Saku_c::BreakSet() { cXyz pos(240.0f, 0.0f, -30.0f); @@ -294,7 +294,7 @@ static cXyz s_pos_r; AUDIO_INSTANCES; -static actor_method_class l_daObjH_Saku_Method = { +static DUSK_CONST actor_method_class l_daObjH_Saku_Method = { (process_method_func)daObjH_Saku_Create, (process_method_func)daObjH_Saku_Delete, (process_method_func)daObjH_Saku_Execute, @@ -302,7 +302,7 @@ static actor_method_class l_daObjH_Saku_Method = { (process_method_func)daObjH_Saku_Draw, }; -actor_process_profile_definition g_profile_Obj_H_Saku = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_H_Saku = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index ea157e4822..618c4adb95 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -12,7 +12,7 @@ static int daObjHBarrel_c_createHeap(fopAc_ac_c* i_this) { return ((daObjHBarrel_c*)i_this)->createHeap(); } -static char* l_arcName = "HBarrel"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "HBarrel"; daObjHBarrel_c::daObjHBarrel_c() {} @@ -189,7 +189,7 @@ static int daObjHBarrel_draw(daObjHBarrel_c* param_0) { return param_0->draw(); } -static actor_method_class daObjHBarrel_METHODS = { +static DUSK_CONST actor_method_class daObjHBarrel_METHODS = { (process_method_func)daObjHBarrel_create, (process_method_func)daObjHBarrel_Delete, (process_method_func)daObjHBarrel_execute, @@ -197,7 +197,7 @@ static actor_method_class daObjHBarrel_METHODS = { (process_method_func)daObjHBarrel_draw, }; -actor_process_profile_definition g_profile_Obj_HBarrel = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_HBarrel = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index c2696234e5..c0efb5af88 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -201,13 +201,13 @@ static int daObjHFtr_draw(daObjHFtr_c* param_0) { return param_0->draw(); } -static actor_method_class daObjHFtr_METHODS = { +static DUSK_CONST actor_method_class daObjHFtr_METHODS = { (process_method_func)daObjHFtr_create, (process_method_func)daObjHFtr_Delete, (process_method_func)daObjHFtr_execute, 0, (process_method_func)daObjHFtr_draw, }; -actor_process_profile_definition g_profile_Obj_HFtr = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_HFtr = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index 139dfc9bf6..3ca19f9727 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -24,7 +24,7 @@ static const cull_box l_cull_box = { {133.0f, 29.0f, 127.0f} }; -static char* l_arcName = "M_Hasu"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_Hasu"; nObjMHasu::daObjMHasu_c::daObjMHasu_c() : mConst1(25.5f), @@ -184,7 +184,7 @@ actor_method_class daObjMHasu_METHODS = { (process_method_func)&daObjMHasu_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_MHasu = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MHasu = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index fd4d30cbca..f4a675b156 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -33,7 +33,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { return 1; } -static char* l_arcName = "Hata"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Hata"; daObjHata_c::daObjHata_c() {} @@ -172,7 +172,7 @@ static int daObjHata_draw(daObjHata_c* i_this) { return i_this->draw(); } -static actor_method_class daObjHata_METHODS = { +static DUSK_CONST actor_method_class daObjHata_METHODS = { (process_method_func)daObjHata_create, (process_method_func)daObjHata_Delete, (process_method_func)daObjHata_execute, @@ -180,7 +180,7 @@ static actor_method_class daObjHata_METHODS = { (process_method_func)daObjHata_draw, }; -actor_process_profile_definition g_profile_Obj_Hata = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Hata = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index 76fee9ab7b..1162804e09 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -710,7 +710,7 @@ static cPhs_Step daOBJ_HB_Create(fopAc_ac_c* a_this) { return phase; } -static actor_method_class l_daOBJ_HB_Method = { +static DUSK_CONST actor_method_class l_daOBJ_HB_Method = { (process_method_func)daOBJ_HB_Create, (process_method_func)daOBJ_HB_Delete, (process_method_func)daOBJ_HB_Execute, @@ -718,7 +718,7 @@ static actor_method_class l_daOBJ_HB_Method = { (process_method_func)daOBJ_HB_Draw, }; -actor_process_profile_definition g_profile_OBJ_HB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_HB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index 22868d08cf..eaf67ff995 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -static char* l_arcName = "H_Bombkoy"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_Bombkoy"; int daObjHBombkoya_c::create1st() { if (fopAcM_isSwitch(this, getSw2No())) { @@ -264,7 +264,7 @@ static int daObjHBombkoya_MoveBGDraw(daObjHBombkoya_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjHBombkoya_METHODS = { +static DUSK_CONST actor_method_class daObjHBombkoya_METHODS = { (process_method_func)daObjHBombkoya_create1st, (process_method_func)daObjHBombkoya_MoveBGDelete, (process_method_func)daObjHBombkoya_MoveBGExecute, @@ -272,7 +272,7 @@ static actor_method_class daObjHBombkoya_METHODS = { (process_method_func)daObjHBombkoya_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_HBombkoya = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_HBombkoya = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index bcfe282ed5..e8a8a60cfe 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -283,13 +283,13 @@ static int daHeavySw_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daHeavySw_Method = { +static DUSK_CONST actor_method_class l_daHeavySw_Method = { (process_method_func)daHeavySw_Create, (process_method_func)daHeavySw_Delete, (process_method_func)daHeavySw_Execute, (process_method_func)NULL, (process_method_func)daHeavySw_Draw, }; -actor_process_profile_definition g_profile_Obj_HeavySw = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_HeavySw = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index d79a74459a..6701112c3d 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -40,7 +40,7 @@ int daObjFuta_c::Create() { return 1; } -static char* l_arcName = "Obj_hfuta"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_hfuta"; int daObjFuta_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -188,7 +188,7 @@ static int daObjFuta_MoveBGDraw(daObjFuta_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjFuta_METHODS = { +static DUSK_CONST actor_method_class daObjFuta_METHODS = { (process_method_func)daObjFuta_create1st, (process_method_func)daObjFuta_MoveBGDelete, (process_method_func)daObjFuta_MoveBGExecute, @@ -196,7 +196,7 @@ static actor_method_class daObjFuta_METHODS = { (process_method_func)daObjFuta_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Hfuta = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Hfuta = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index d5ab5558b0..59e87383c5 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -272,7 +272,7 @@ static int daObjHHASHI_Execute(daObjHHASHI_c* i_this) { return i_this->MoveBGExecute(); } -static char* l_arcName = "L_hhashi"; +static DUSK_CONST char* l_arcName = "L_hhashi"; int daObjHHASHI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi00.bmd"); @@ -373,7 +373,7 @@ int daObjHHASHI_c::Delete() { return 1; } -static actor_method_class l_daObjHHASHI_Method = { +static DUSK_CONST actor_method_class l_daObjHHASHI_Method = { (process_method_func)daObjHHASHI_Create, (process_method_func)daObjHHASHI_Delete, (process_method_func)daObjHHASHI_Execute, @@ -381,7 +381,7 @@ static actor_method_class l_daObjHHASHI_Method = { (process_method_func)daObjHHASHI_Draw, }; -actor_process_profile_definition g_profile_Obj_HHASHI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_HHASHI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index ba686bbc34..9c622f3c11 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -88,13 +88,13 @@ static int daHsTarget_Create(fopAc_ac_c* i_this) { static daHsTarget_HIO_c l_HIO; -static actor_method_class l_daHsTarget_Method = { +static DUSK_CONST actor_method_class l_daHsTarget_Method = { (process_method_func)daHsTarget_Create, (process_method_func)daHsTarget_Delete, (process_method_func)daHsTarget_Execute, (process_method_func)NULL, (process_method_func)daHsTarget_Draw, }; -actor_process_profile_definition g_profile_Obj_HsTarget = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_HsTarget = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 1c7dbc917e..f4eec3bc36 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -127,7 +127,7 @@ static int daObjIce_l_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static char* l_arcName = "V_Ice_l"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_Ice_l"; int daObjIce_l_c::create() { fopAcM_ct(this, daObjIce_l_c); @@ -247,7 +247,7 @@ int daObjIce_l_c::Delete() { return 1; } -static actor_method_class l_daObjIce_l_Method = { +static DUSK_CONST actor_method_class l_daObjIce_l_Method = { (process_method_func)daObjIce_l_Create, (process_method_func)daObjIce_l_Delete, (process_method_func)daObjIce_l_Execute, @@ -255,7 +255,7 @@ static actor_method_class l_daObjIce_l_Method = { (process_method_func)daObjIce_l_Draw, }; -actor_process_profile_definition g_profile_Obj_Ice_l = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ice_l = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 7387bea34f..77802532ff 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -26,7 +26,7 @@ public: /* 0xC */ f32 mSinkingAmount; }; -static char* l_arcName = "V_Ice_s"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_Ice_s"; daOBJ_ICE_S_HIO_c::daOBJ_ICE_S_HIO_c() { mId = -1; @@ -292,7 +292,7 @@ int daObjIce_s_c::Delete() { } -static actor_method_class l_daObjIce_s_Method = { +static DUSK_CONST actor_method_class l_daObjIce_s_Method = { (process_method_func)daObjIce_s_Create, (process_method_func)daObjIce_s_Delete, (process_method_func)daObjIce_s_Execute, @@ -300,7 +300,7 @@ static actor_method_class l_daObjIce_s_Method = { (process_method_func)daObjIce_s_Draw, }; -actor_process_profile_definition g_profile_Obj_Ice_s = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ice_s = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 81a72b85e7..e796d19559 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -199,7 +199,7 @@ void daObjIceBlk_c::disablePushPull() { } } -static char* l_arcName = "Y_icecube"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Y_icecube"; int daObjIceBlk_c::Create() { mpPath = dPath_GetRoomPath(getPathId(), fopAcM_GetRoomNo(this)); @@ -830,13 +830,13 @@ static int daObjIceBlk_MoveBGDraw(daObjIceBlk_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjIceBlk_METHODS = { +static DUSK_CONST actor_method_class daObjIceBlk_METHODS = { (process_method_func)daObjIceBlk_create1st, (process_method_func)daObjIceBlk_MoveBGDelete, (process_method_func)daObjIceBlk_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjIceBlk_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_IceBlock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_IceBlock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index f4dbfac98a..afccb22e84 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -20,7 +20,7 @@ void daObjIceLeaf_c::initBaseMtx() { setBaseMtx(); } -static char* l_arcName = "V_IceLeaf"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_IceLeaf"; void daObjIceLeaf_c::setBaseMtx() { if (mRide) { @@ -405,13 +405,13 @@ static int daObjIceLeaf_Create(daObjIceLeaf_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjIceLeaf_Method = { +static DUSK_CONST actor_method_class l_daObjIceLeaf_Method = { (process_method_func)daObjIceLeaf_Create, (process_method_func)daObjIceLeaf_Delete, (process_method_func)daObjIceLeaf_Execute, (process_method_func)NULL, (process_method_func)daObjIceLeaf_Draw, }; -actor_process_profile_definition g_profile_Obj_IceLeaf = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_IceLeaf = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index 0a647bbb12..1ad0c570a4 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -216,13 +216,13 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) { return step; } -static actor_method_class l_daObj_Ihasi_Method = { +static DUSK_CONST actor_method_class l_daObj_Ihasi_Method = { (process_method_func)daObj_Ihasi_Create, (process_method_func)daObj_Ihasi_Delete, (process_method_func)daObj_Ihasi_Execute, (process_method_func)daObj_Ihasi_IsDelete, (process_method_func)daObj_Ihasi_Draw, }; -actor_process_profile_definition g_profile_OBJ_IHASI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_IHASI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index eb94d61272..dae2d8a1d6 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -85,7 +85,7 @@ static int daObjIkada_Delete(daObjIkada_c* i_this) { return 1; } -static char* l_arcName = "M_Ikada"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_Ikada"; int daObjIkada_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Ikada.bmd"); @@ -196,7 +196,7 @@ int daObjIkada_c::Delete() { return 1; } -static actor_method_class l_daObjIkada_Method = { +static DUSK_CONST actor_method_class l_daObjIkada_Method = { (process_method_func)daObjIkada_Create, (process_method_func)daObjIkada_Delete, (process_method_func)daObjIkada_Execute, @@ -204,7 +204,7 @@ static actor_method_class l_daObjIkada_Method = { (process_method_func)daObjIkada_Draw, }; -actor_process_profile_definition g_profile_Obj_Ikada = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ikada = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 2076405828..6425f65a4c 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -277,7 +277,7 @@ static int daObjIBone_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjIBone_Method = { +static DUSK_CONST actor_method_class l_daObjIBone_Method = { (process_method_func)daObjIBone_Create, (process_method_func)daObjIBone_Delete, (process_method_func)daObjIBone_Execute, @@ -285,7 +285,7 @@ static actor_method_class l_daObjIBone_Method = { (process_method_func)daObjIBone_Draw, }; -actor_process_profile_definition g_profile_Obj_InoBone = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_InoBone = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index 31e696eee4..e2f83334de 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -43,7 +43,7 @@ void daObj_ITA_HIO_c::genMessage(JORMContext* ctx) { } #endif -static char* l_arcName = "M_Ita"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_Ita"; static f32 dummy() { return 0.0f; @@ -288,7 +288,7 @@ int daObjIta_c::Delete() { return 1; } -static actor_method_class l_daObjIta_Method = { +static DUSK_CONST actor_method_class l_daObjIta_Method = { (process_method_func)daObjIta_Create, (process_method_func)daObjIta_Delete, (process_method_func)daObjIta_Execute, @@ -296,7 +296,7 @@ static actor_method_class l_daObjIta_Method = { (process_method_func)daObjIta_Draw, }; -actor_process_profile_definition g_profile_Obj_ITA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ITA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 0538d7c783..5fdce10cf5 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -81,7 +81,7 @@ static dCcD_SrcSph l_ccDSph = { static OBJ_ITAMATO_HIO_CLASS l_HIO; -static char* l_resName = "H_ItaMato"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resName = "H_ItaMato"; daObj_ItaMato_c::~daObj_ItaMato_c() { OS_REPORT("|%06d:%x|daObj_ItaMato_c -> デストラクト\n", g_Counter.mCounter0, this); @@ -465,7 +465,7 @@ static int daObj_ItaMato_IsDelete(void* a_this) { return 1; } -static actor_method_class daObj_ItaMato_MethodTable = { +static DUSK_CONST actor_method_class daObj_ItaMato_MethodTable = { (process_method_func)daObj_ItaMato_Create, (process_method_func)daObj_ItaMato_Delete, (process_method_func)daObj_ItaMato_Execute, @@ -473,7 +473,7 @@ static actor_method_class daObj_ItaMato_MethodTable = { (process_method_func)daObj_ItaMato_Draw, }; -actor_process_profile_definition g_profile_OBJ_ITAMATO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_ITAMATO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 2c95c040be..c71111ba63 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -1280,13 +1280,13 @@ static int daItem_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->_daItem_create(); } -static actor_method_class l_daItem_Method = { +static DUSK_CONST actor_method_class l_daItem_Method = { (process_method_func)daItem_Create, (process_method_func)daItem_Delete, (process_method_func)daItem_Execute, (process_method_func)NULL, (process_method_func)daItem_Draw, }; -actor_process_profile_definition g_profile_ITEM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ITEM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 02601f7e31..b224c2a943 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -681,7 +681,7 @@ static cPhs_Step daObj_Ito_Create(fopAc_ac_c* a_this) { return phase; } -static actor_method_class l_daObj_Ito_Method = { +static DUSK_CONST actor_method_class l_daObj_Ito_Method = { (process_method_func)daObj_Ito_Create, (process_method_func)daObj_Ito_Delete, (process_method_func)daObj_Ito_Execute, @@ -689,7 +689,7 @@ static actor_method_class l_daObj_Ito_Method = { (process_method_func)daObj_Ito_Draw, }; -actor_process_profile_definition g_profile_OBJ_ITO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_ITO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 1e923eff24..3c564df0e2 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -855,7 +855,7 @@ static int daObjKABUTO_IsDelete(daObjKABUTO_c* i_this) { return 1; } -static actor_method_class l_daObjKABUTO_Method = { +static DUSK_CONST actor_method_class l_daObjKABUTO_Method = { (process_method_func)daObjKABUTO_Create, (process_method_func)daObjKABUTO_Delete, (process_method_func)daObjKABUTO_Execute, @@ -863,7 +863,7 @@ static actor_method_class l_daObjKABUTO_Method = { (process_method_func)daObjKABUTO_Draw, }; -actor_process_profile_definition g_profile_Obj_Kabuto = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kabuto = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index acfeb88fd2..d7b1a7523d 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -760,7 +760,7 @@ void daObjKAG_c::kag_setParticle() { } } -static actor_method_class l_daObjKAG_Method = { +static DUSK_CONST actor_method_class l_daObjKAG_Method = { (process_method_func)daObjKAG_Create, (process_method_func)daObjKAG_Delete, (process_method_func)daObjKAG_Execute, @@ -768,7 +768,7 @@ static actor_method_class l_daObjKAG_Method = { (process_method_func)daObjKAG_Draw, }; -actor_process_profile_definition g_profile_Obj_Kag = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kag = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index 768ea5f61d..2f0d1b182f 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -121,7 +121,7 @@ static int daObj_Kage_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daObj_Kage_Method = { +static DUSK_CONST actor_method_class l_daObj_Kage_Method = { (process_method_func)daObj_Kage_Create, (process_method_func)daObj_Kage_Delete, (process_method_func)daObj_Kage_Execute, @@ -129,7 +129,7 @@ static actor_method_class l_daObj_Kage_Method = { (process_method_func)daObj_Kage_Draw, }; -actor_process_profile_definition g_profile_OBJ_KAGE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KAGE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index dc15a05907..c8a68de52f 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -42,11 +42,11 @@ const dCcD_SrcGObjInf l_ccDObjData = { {0} // mGObjCo }; -static int l_bmdData[2][2] = { +static DUSK_CONSTEXPR int l_bmdData[2][2] = { { 3, 1 }, { 4, 1 }, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "uri_kago" }; @@ -676,7 +676,7 @@ static int daObj_Kago_IsDelete(void* param_1) { AUDIO_INSTANCES; -static actor_method_class daObj_Kago_MethodTable = { +static DUSK_CONST actor_method_class daObj_Kago_MethodTable = { (process_method_func)daObj_Kago_Create, (process_method_func)daObj_Kago_Delete, (process_method_func)daObj_Kago_Execute, @@ -684,7 +684,7 @@ static actor_method_class daObj_Kago_MethodTable = { (process_method_func)daObj_Kago_Draw, }; -actor_process_profile_definition g_profile_OBJ_KAGO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KAGO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index fe2204d8ca..a0e5281e5c 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -66,7 +66,7 @@ static int JointCallBack(J3DJoint* i_joint, int param_2) { return 1; } -static char* l_arcName = "M_kaisou"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_kaisou"; int daObjKaisou_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_kaisou.bmd"); @@ -295,7 +295,7 @@ static int daObjKaisou_IsDelete(daObjKaisou_c* i_this) { return 1; } -static actor_method_class l_daObjKaisou_Method = { +static DUSK_CONST actor_method_class l_daObjKaisou_Method = { (process_method_func)daObjKaisou_Create, (process_method_func)daObjKaisou_Delete, (process_method_func)daObjKaisou_Execute, @@ -303,7 +303,7 @@ static actor_method_class l_daObjKaisou_Method = { (process_method_func)daObjKaisou_Draw, }; -actor_process_profile_definition g_profile_Obj_Kaisou = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kaisou = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 2b641d7769..21e6030a7f 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -898,13 +898,13 @@ static BOOL daObjKAM_IsDelete(daObjKAM_c* param_0) { return TRUE; } -static actor_method_class l_daObjKAM_Method = { +static DUSK_CONST actor_method_class l_daObjKAM_Method = { (process_method_func)daObjKAM_Create, (process_method_func)daObjKAM_Delete, (process_method_func)daObjKAM_Execute, (process_method_func)daObjKAM_IsDelete, (process_method_func)daObjKAM_Draw, }; -actor_process_profile_definition g_profile_Obj_Kam = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kam = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 8c1f501755..8998952202 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -89,7 +89,7 @@ enum daObj_Kanban2_DamageType { }; namespace { -static char* l_kn2_bmdidx[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_kn2_bmdidx[] = { "J_kanban00.bmd", "J_kanban00_01.bmd", "J_kanban00_02.bmd", @@ -111,7 +111,7 @@ static char* l_kn2_bmdidx[] = { "J_kanban00_18.bmd", }; -static s16 dKn2_CarryOffset[] = { +static DUSK_CONSTEXPR s16 dKn2_CarryOffset[] = { -0x2f83, -0x45df, -0x45df, @@ -122,7 +122,7 @@ static s16 dKn2_CarryOffset[] = { -0x3993, }; -static struct { +static DUSK_CONSTEXPR struct { f32 speed_y; f32 speed_f; } dKb2_BAN_SPEED[] = { @@ -146,7 +146,7 @@ static struct { { 0.0f, 30.0f }, }; -static u16 dKb2_BAN_ANGLE[] = { +static DUSK_CONSTEXPR u16 dKb2_BAN_ANGLE[] = { 0x6800, 0x7800, 0x8800, @@ -167,7 +167,7 @@ static u16 dKb2_BAN_ANGLE[] = { 0x9000, }; -static u32 dKb2_BAN_PARTS[] = { +static DUSK_CONSTEXPR u32 dKb2_BAN_PARTS[] = { PART_TOP_LEFT_UNDER, PART_SPINE_LEFT_UPPER | PART_TOP_LEFT_UPPER, PART_SPINE_RIGHT_UPPER | PART_TOP_RIGHT_UPPER, @@ -188,7 +188,7 @@ static u32 dKb2_BAN_PARTS[] = { 0, }; -static dCcD_SrcSph cc_kn2_src = { +static DUSK_CONSTEXPR dCcD_SrcSph cc_kn2_src = { { {0x0, {{AT_TYPE_1000, 0x2, 0x13}, {0xD8FBFDFF, 0x11}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -200,7 +200,7 @@ static dCcD_SrcSph cc_kn2_src = { } // mSphAttr }; -static struct { +static DUSK_CONSTEXPR struct { f32 x; f32 y; } d_KANBAN_OFFSET[] = { @@ -1770,7 +1770,7 @@ static int daObj_Kanban2_Create(daObj_Kanban2_c* i_this) { return i_this->create(); } -static actor_method_class l_daObj_Kanban2_Method = { +static DUSK_CONST actor_method_class l_daObj_Kanban2_Method = { (process_method_func)daObj_Kanban2_Create, (process_method_func)daObj_Kanban2_Delete, (process_method_func)daObj_Kanban2_Execute, @@ -1778,7 +1778,7 @@ static actor_method_class l_daObj_Kanban2_Method = { (process_method_func)daObj_Kanban2_Draw, }; -actor_process_profile_definition g_profile_OBJ_KANBAN2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KANBAN2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index 3d38a949af..a521a119a1 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -254,7 +254,7 @@ static int daItemKantera_Create(fopAc_ac_c* i_this) { } -static actor_method_class l_daItemKantera_Method = { +static DUSK_CONST actor_method_class l_daItemKantera_Method = { (process_method_func)daItemKantera_Create, (process_method_func)daItemKantera_Delete, (process_method_func)daItemKantera_Execute, @@ -262,7 +262,7 @@ static actor_method_class l_daItemKantera_Method = { (process_method_func)daItemKantera_Draw, }; -actor_process_profile_definition g_profile_Obj_Kantera = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kantera = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 805aa37b44..e9a540e726 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -870,7 +870,7 @@ static int daObjKAT_IsDelete(daObjKAT_c* param_0) { return 1; } -static actor_method_class l_daObjKAT_Method = { +static DUSK_CONST actor_method_class l_daObjKAT_Method = { (process_method_func)daObjKAT_Create, (process_method_func)daObjKAT_Delete, (process_method_func)daObjKAT_Execute, @@ -878,7 +878,7 @@ static actor_method_class l_daObjKAT_Method = { (process_method_func)daObjKAT_Draw, }; -actor_process_profile_definition g_profile_Obj_Kat = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kat = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index e686683f27..3b1e8766ec 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -103,7 +103,7 @@ void daObjKazeNeko_c::getFirstVec(cXyz* param_1, int param_2) { param_1->set((attr().field_0x20 * cM_ssin(sVar4)), 30.0f, attr().field_0x20 * cM_scos(sVar4)); } -static char* l_arcName = "J_Kazami"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "J_Kazami"; inline int daObjKazeNeko_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "pole.bmd"); @@ -219,7 +219,7 @@ static int daObjKazeNeko_Create(fopAc_ac_c* i_this) { } -static actor_method_class l_daObjKazeNeko_Method = { +static DUSK_CONST actor_method_class l_daObjKazeNeko_Method = { (process_method_func)daObjKazeNeko_Create, (process_method_func)daObjKazeNeko_Delete, (process_method_func)daObjKazeNeko_Execute, @@ -227,7 +227,7 @@ static actor_method_class l_daObjKazeNeko_Method = { (process_method_func)daObjKazeNeko_Draw, }; -actor_process_profile_definition g_profile_Obj_KazeNeko = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KazeNeko = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 72f74b9496..65c60b74d3 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -15,7 +15,7 @@ static s32 l_bmdData[4] = { 8, 0, 9, 0 }; -static char* l_resNameList[1] = {"Kakashi"}; +static DUSK_CONST char* l_resNameList[1] = {"Kakashi"}; const daObj_KBacket_HIOParam daObj_KBacket_Param_c::m = { 0.0f, -5.0f, 1.0f, 400.0f, 73.0f, 30.0f, 30.0f, 30.0f, 37.0f, 45.0f, 0.0f @@ -685,7 +685,7 @@ static int daObj_KBacket_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_KBacket_MethodTable = { +static DUSK_CONST actor_method_class daObj_KBacket_MethodTable = { (process_method_func)daObj_KBacket_Create, (process_method_func)daObj_KBacket_Delete, (process_method_func)daObj_KBacket_Execute, @@ -693,7 +693,7 @@ static actor_method_class daObj_KBacket_MethodTable = { (process_method_func)daObj_KBacket_Draw, }; -actor_process_profile_definition g_profile_OBJ_KBACKET = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KBACKET = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 61eb2a6418..b916fac0a1 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -520,7 +520,7 @@ static int daObj_Kbox_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daObj_Kbox_Method = { +static DUSK_CONST actor_method_class l_daObj_Kbox_Method = { (process_method_func)daObj_Kbox_Create, (process_method_func)daObj_Kbox_Delete, (process_method_func)daObj_Kbox_Execute, @@ -528,7 +528,7 @@ static actor_method_class l_daObj_Kbox_Method = { (process_method_func)daObj_Kbox_Draw, }; -actor_process_profile_definition g_profile_OBJ_KBOX = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KBOX = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index b7814189ed..94adc504ac 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -641,7 +641,7 @@ static int daObj_Key_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daObj_Key_Method = { +static DUSK_CONST actor_method_class l_daObj_Key_Method = { (process_method_func)daObj_Key_Create, (process_method_func)daObj_Key_Delete, (process_method_func)daObj_Key_Execute, @@ -649,7 +649,7 @@ static actor_method_class l_daObj_Key_Method = { (process_method_func)daObj_Key_Draw, }; -actor_process_profile_definition g_profile_OBJ_KEY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KEY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 4e58733163..8b120f77e3 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -261,7 +261,7 @@ static void chain_move(obj_keyhole_class* i_this) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); - static cXyz lock_pos[] = { + static DUSK_CONSTEXPR cXyz lock_pos[] = { cXyz(140.0f, 130.0f, 0.0f), cXyz(-140.0f, 130.0f, 0.0f), cXyz(170.0f, 30.0f, 0.0f), @@ -648,19 +648,19 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_keyhole_class* a_this = (obj_keyhole_class*)i_this; void* modelData; - static int bmd_d[] = { + static DUSK_CONSTEXPR int bmd_d[] = { 7, 11, 11, 7, 11, 11, 11, 11, 11, 11, }; - static u32 mdl_f[] = { + static DUSK_CONSTEXPR u32 mdl_f[] = { 0x80000, 0, 0x80000, 0, 0, 0, 0, 0, 0, 0, }; - static int bck_d[] = { + static DUSK_CONSTEXPR int bck_d[] = { 0, 5, 5, 0, 5, 5, 5, 5, 5, 5, }; - static int cbmd_d[] = { + static DUSK_CONSTEXPR int cbmd_d[] = { 4, 8, 8, 4, 8, 8, 8, 8, 8, 8, }; @@ -709,7 +709,7 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) { obj_keyhole_class* i_this = (obj_keyhole_class*)a_this; fopAcM_ct(a_this, obj_keyhole_class); - static char* arc_name[] = { + static DUSK_CONSTEXPR char DUSK_CONST* arc_name[] = { "Obj_keyh", "Obj_bkey", "Obj_bkey2", "Obj_bkey3", "Obj_bkey", "Obj_bkey5", "Obj_bkey", "Obj_bkey", "Obj_bkey", "Obj_bkey", }; @@ -771,7 +771,7 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) { fopAcM_SetMin(a_this, -400.0f, -400.0f, -400.0f); fopAcM_SetMax(a_this, 400.0f, 400.0f, 400.0f); - static dCcD_SrcSph cc_sph_src = { + static DUSK_CONSTEXPR dCcD_SrcSph cc_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdbf, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -833,7 +833,7 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) { return phase_state; } -static actor_method_class l_daObj_Keyhole_Method = { +static DUSK_CONST actor_method_class l_daObj_Keyhole_Method = { (process_method_func)daObj_Keyhole_Create, (process_method_func)daObj_Keyhole_Delete, (process_method_func)daObj_Keyhole_Execute, @@ -841,7 +841,7 @@ static actor_method_class l_daObj_Keyhole_Method = { (process_method_func)daObj_Keyhole_Draw, }; -actor_process_profile_definition g_profile_OBJ_KEYHOLE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KEYHOLE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index ceb677a846..6fc8dd28d4 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -52,7 +52,7 @@ static u32 const l_gate_heap[] = {0x1940, 0x1940, 0x1940}; static u32 const l_key_heap[] = {0x1000, 0x1000, 0x1000}; -static cull_box const l_cull_box = { +static DUSK_CONSTEXPR cull_box const l_cull_box = { {-300.0f, 0.0f, -350.0f}, {300.0f, 450.0f, 350.0f}, }; @@ -205,14 +205,14 @@ void daObjKGate_c::setBaseMtx() { } } -static char* l_arcName[] = { +static DUSK_CONST char* l_arcName[] = { "D_Kgate00", "D_Kgate01", "M_RGate00", }; int daObjKGate_c::Create() { - static char* l_evName[] = {"KOKI_GATE_OPEN00", NULL, "RIDER_GATE_OPEN00"}; + static DUSK_CONST char* l_evName[] = {"KOKI_GATE_OPEN00", NULL, "RIDER_GATE_OPEN00"}; u8 sw_no = getSwNo(); @@ -910,7 +910,7 @@ void daObjKGate_c::demoProc() { } int daObjKGate_c::getDemoAction() { - static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"}; + static DUSK_CONST char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"}; return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0); } @@ -981,13 +981,13 @@ static int daObjKGate_MoveBGDraw(daObjKGate_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjKGate_METHODS = { +static DUSK_CONST actor_method_class daObjKGate_METHODS = { (process_method_func)daObjKGate_create1st, (process_method_func)daObjKGate_MoveBGDelete, (process_method_func)daObjKGate_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjKGate_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KkrGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KkrGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 569368a4a6..b108092ca7 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -216,7 +216,7 @@ static cPhs_Step daObj_Ki_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daObj_Ki_Method = { +static DUSK_CONST actor_method_class l_daObj_Ki_Method = { (process_method_func)daObj_Ki_Create, (process_method_func)daObj_Ki_Delete, (process_method_func)daObj_Ki_Execute, @@ -224,7 +224,7 @@ static actor_method_class l_daObj_Ki_Method = { (process_method_func)daObj_Ki_Draw, }; -actor_process_profile_definition g_profile_OBJ_KI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index 54e01c5a12..53e91646a3 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -10,7 +10,7 @@ static daKiPot_HIO_c l_HIO; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-50.0f, 0.0f, -50.0f}, {50.0f, 100.0f, 50.0f}, }; @@ -108,13 +108,13 @@ static int daKiPot_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daKiPot_Method = { +static DUSK_CONST actor_method_class l_daKiPot_Method = { (process_method_func)daKiPot_Create, (process_method_func)daKiPot_Delete, (process_method_func)daKiPot_Execute, 0, (process_method_func)daKiPot_Draw, }; -actor_process_profile_definition g_profile_Obj_KiPot = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KiPot = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 7c531310bf..ceba9bdb81 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -254,7 +254,7 @@ static int daObj_Kita_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daObj_Kita_Method = { +static DUSK_CONST actor_method_class l_daObj_Kita_Method = { (process_method_func)daObj_Kita_Create, (process_method_func)daObj_Kita_Delete, (process_method_func)daObj_Kita_Execute, @@ -262,7 +262,7 @@ static actor_method_class l_daObj_Kita_Method = { (process_method_func)daObj_Kita_Draw, }; -actor_process_profile_definition g_profile_OBJ_KITA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_KITA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 2a174669d5..cd4fe03757 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -106,13 +106,13 @@ static int daObjKJgjs_MoveBGDraw(daObjKJgjs_c* i_this) { daObjKJgjs_c::~daObjKJgjs_c() {} -static actor_method_class daObjKJgjs_METHODS = { +static DUSK_CONST actor_method_class daObjKJgjs_METHODS = { (process_method_func)daObjKJgjs_create1st, (process_method_func)daObjKJgjs_MoveBGDelete, (process_method_func)daObjKJgjs_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjKJgjs_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KJgjs = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KJgjs = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index 661b26d1be..f81440fe6f 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -38,7 +38,7 @@ void daObjKKanban_c::setBaseMtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -static char* l_arcName = "H_KKanban"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_KKanban"; static dCcD_SrcTri l_tri_src = { { @@ -149,13 +149,13 @@ static int daObjKKanban_MoveBGDraw(daObjKKanban_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjKKanban_METHODS = { +static DUSK_CONST actor_method_class daObjKKanban_METHODS = { (process_method_func)daObjKKanban_create1st, (process_method_func)daObjKKanban_MoveBGDelete, (process_method_func)daObjKKanban_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjKKanban_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KKanban = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KKanban = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index c7cede3b0e..fbccb64edb 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -538,7 +538,7 @@ static int daObjKLift00_MoveBGDraw(daObjKLift00_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjKLift00_METHODS = { +static DUSK_CONST actor_method_class daObjKLift00_METHODS = { (process_method_func)daObjKLift00_create1st, (process_method_func)daObjKLift00_MoveBGDelete, (process_method_func)daObjKLift00_MoveBGExecute, @@ -546,7 +546,7 @@ static actor_method_class daObjKLift00_METHODS = { (process_method_func)daObjKLift00_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KLift00 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KLift00 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index c4eabe796a..b8c7a922ff 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -194,7 +194,7 @@ static int daObjKnBullet_create(fopAc_ac_c* i_this) { return ((daObjKnBullet_c*)i_this)->Create(); } -static actor_method_class l_daObjKnBullet_Method = { +static DUSK_CONST actor_method_class l_daObjKnBullet_Method = { (process_method_func)daObjKnBullet_create, (process_method_func)daObjKnBullet_Delete, (process_method_func)daObjKnBullet_Execute, @@ -202,7 +202,7 @@ static actor_method_class l_daObjKnBullet_Method = { (process_method_func)daObjKnBullet_Draw, }; -actor_process_profile_definition g_profile_KN_BULLET = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_KN_BULLET = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 5cfa8c719b..8470a9d327 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -129,11 +129,11 @@ static u32 const l_heap_size[5] = { 0x1300, 0x1300, 0x1300, 0x1300, 0x20D0, }; -static cull_box const l_cull_box = { +static DUSK_CONSTEXPR cull_box const l_cull_box = { {-450.0f, 0.0f, -50.0f}, {450.0f, 700.0f, 150.0f}, }; -static char* l_arcName[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[5] = { "S_shut00", "S_shut00", "Lv3shut00", @@ -141,7 +141,7 @@ static char* l_arcName[5] = { "V_Shutter", }; -static char* l_anmName[10] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_anmName[10] = { "oj_DoorOpC.bck", "md_oj_DoorOpC.bck", "oj_DoorOpC.bck", @@ -154,7 +154,7 @@ static char* l_anmName[10] = { "V_Shutter.bck", }; -static char* l_eventName[10] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_eventName[10] = { "KEY_JAIL_00", "KEY_JAIL_WOLF_00", "KEY_JAIL_00", @@ -234,7 +234,7 @@ void daObjKshtr_c::offDzb() { } } -static char* l_anmArcName[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_anmArcName[5] = { "DoorY00", "DoorY00", "DoorT00", @@ -381,7 +381,7 @@ cPhs_Step daObjKshtr_c::phase_2() { } cPhs_Step daObjKshtr_c::create1st() { - static daObjKshtr_c::PhaseFunc l_ct_func[3] = { + static DUSK_CONSTEXPR daObjKshtr_c::PhaseFunc l_ct_func[3] = { &daObjKshtr_c::phase_0, &daObjKshtr_c::phase_1, &daObjKshtr_c::phase_2, @@ -391,7 +391,7 @@ cPhs_Step daObjKshtr_c::create1st() { } void daObjKshtr_c::event_proc_call() { - static daObjKshtr_c::ActionFunc l_func[3] = { + static DUSK_CONSTEXPR daObjKshtr_c::ActionFunc l_func[3] = { &daObjKshtr_c::actionWaitEvent, &daObjKshtr_c::actionEvent, &daObjKshtr_c::actionDead, @@ -401,7 +401,7 @@ void daObjKshtr_c::event_proc_call() { } void daObjKshtr_c::event_proc_call2() { - static daObjKshtr_c::ActionFunc l_func[4] = { + static DUSK_CONSTEXPR daObjKshtr_c::ActionFunc l_func[4] = { &daObjKshtr_c::actionWaitEvent2, &daObjKshtr_c::actionEvent2, &daObjKshtr_c::actionDead2, @@ -474,7 +474,7 @@ BOOL daObjKshtr_c::checkOpen() { } int daObjKshtr_c::getDemoAction() { - static char* action_table[6] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[6] = { "WAIT", "ADJUSTMENT", "UNLOCK", @@ -667,7 +667,7 @@ BOOL daObjKshtr_c::openProc_type1() { } BOOL daObjKshtr_c::openProc_type2() { - static u16 const l_eff_id[5] = { + static DUSK_CONSTEXPR u16 const l_eff_id[5] = { 0x8762, 0x8763, 0x8764, @@ -698,12 +698,12 @@ BOOL daObjKshtr_c::openProc_typeL3Boss() { } void daObjKshtr_c::demoProc() { - static daObjKshtr_c::DemoFunc l_demoProc[2] = { + static DUSK_CONSTEXPR daObjKshtr_c::DemoFunc l_demoProc[2] = { &daObjKshtr_c::demoJail1, &daObjKshtr_c::demoJail2, }; - static daObjKshtr_c::DemoFunc l_demoProc2[2] = { + static DUSK_CONSTEXPR daObjKshtr_c::DemoFunc l_demoProc2[2] = { &daObjKshtr_c::demoJail11, &daObjKshtr_c::demoJail21, }; @@ -963,7 +963,7 @@ static int daObjKshtr_MoveBGDraw(daObjKshtr_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjKshtr_METHODS = { +static DUSK_CONST actor_method_class daObjKshtr_METHODS = { (process_method_func)daObjKshtr_create1st, (process_method_func)daObjKshtr_MoveBGDelete, (process_method_func)daObjKshtr_MoveBGExecute, @@ -971,7 +971,7 @@ static actor_method_class daObjKshtr_METHODS = { (process_method_func)daObjKshtr_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Kshutter = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kshutter = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index b11a22c7cf..e8c27304e7 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -20,7 +20,7 @@ public: static daKtOnFire_HIO_c l_HIO; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-50.0f, 0.0f, -50.0f}, {50.0f, 100.0f, 50.0f}, }; @@ -194,7 +194,7 @@ static int daKtOnFire_Create(fopAc_ac_c* i_this) { return ((daKtOnFire_c*)i_this)->create(); } -static actor_method_class l_daKtOnFire_Method = { +static DUSK_CONST actor_method_class l_daKtOnFire_Method = { (process_method_func)daKtOnFire_Create, (process_method_func)daKtOnFire_Delete, (process_method_func)daKtOnFire_Execute, @@ -202,7 +202,7 @@ static actor_method_class l_daKtOnFire_Method = { (process_method_func)daKtOnFire_Draw, }; -actor_process_profile_definition g_profile_Tag_KtOnFire = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_KtOnFire = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 80020208d3..ccdbd7c4f4 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -891,7 +891,7 @@ static int daObjKUW_IsDelete(daObjKUW_c* param_0) { return 1; } -static actor_method_class l_daObjKUW_Method = { +static DUSK_CONST actor_method_class l_daObjKUW_Method = { (process_method_func)daObjKUW_Create, (process_method_func)daObjKUW_Delete, (process_method_func)daObjKUW_Execute, @@ -899,7 +899,7 @@ static actor_method_class l_daObjKUW_Method = { (process_method_func)daObjKUW_Draw, }; -actor_process_profile_definition g_profile_Obj_Kuw = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Kuw = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index 5ec012478d..b543bbb0cf 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -347,7 +347,7 @@ bool daObjKWheel00_c::eventStart() { return true; } -static actor_method_class daObjKWheel00_METHODS = { +static DUSK_CONST actor_method_class daObjKWheel00_METHODS = { (process_method_func)daObjKWheel00_create1st, (process_method_func)daObjKWheel00_MoveBGDelete, (process_method_func)daObjKWheel00_MoveBGExecute, @@ -355,7 +355,7 @@ static actor_method_class daObjKWheel00_METHODS = { (process_method_func)daObjKWheel00_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KWheel00 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KWheel00 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index b91a01ce23..5566c2b5cd 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -339,7 +339,7 @@ bool daObjKWheel01_c::eventStart() { return true; } -static actor_method_class daObjKWheel01_METHODS = { +static DUSK_CONST actor_method_class daObjKWheel01_METHODS = { (process_method_func)daObjKWheel01_create1st, (process_method_func)daObjKWheel01_MoveBGDelete, (process_method_func)daObjKWheel01_MoveBGExecute, @@ -347,7 +347,7 @@ static actor_method_class daObjKWheel01_METHODS = { (process_method_func)daObjKWheel01_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KWheel01 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KWheel01 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 2b8828ce03..9499b05226 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -80,7 +80,7 @@ void daObjKznkarm_Hio_c::genMessage(JORMContext* ctx) { 12.0f, 0, 0x1000, 0, -0x2000, }; -static char* l_arcName = "J_Kazami"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "J_Kazami"; daObjKznkarm_c::actionFunc daObjKznkarm_c::ActionTable[4][2] = { &daObjKznkarm_c::initBroken, @@ -437,7 +437,7 @@ static int daObjKznkarm_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjKznkarm_Method = { +static DUSK_CONST actor_method_class l_daObjKznkarm_Method = { (process_method_func)daObjKznkarm_Create, (process_method_func)daObjKznkarm_Delete, (process_method_func)daObjKznkarm_Execute, @@ -445,7 +445,7 @@ static actor_method_class l_daObjKznkarm_Method = { (process_method_func)daObjKznkarm_Draw, }; -actor_process_profile_definition g_profile_Obj_KznkArm = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KznkArm = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index bb2b145fc6..8d95a53558 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -408,7 +408,7 @@ namespace { return ((Act_c*)i_this)->MoveBGIsDelete(); } - static actor_method_class Mthd_Table = { + static DUSK_CONST actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, (process_method_func)Mthd_Execute, @@ -419,7 +419,7 @@ namespace { } -actor_process_profile_definition g_profile_Obj_Ladder = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ladder = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 289ed5f1c4..85fc350e8e 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -182,7 +182,7 @@ static int nodeCallBack(J3DJoint* i_joint, int i_callbackCondition) { return 1; } -static char* l_arcName = "J_Sentaku"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "J_Sentaku"; int daObjLdy_c::getObjType() { return fopAcM_GetParam(this) & 0xff; @@ -277,13 +277,13 @@ static int daObjLdy_Create(fopAc_ac_c* i_this) { return ((daObjLdy_c*)i_this)->create(); } -static actor_method_class l_daObjLdy_Method = { +static DUSK_CONST actor_method_class l_daObjLdy_Method = { (process_method_func)daObjLdy_Create, (process_method_func)daObjLdy_Delete, (process_method_func)daObjLdy_Execute, (process_method_func)daObjLdy_IsDelete, (process_method_func)daObjLdy_Draw, }; -actor_process_profile_definition g_profile_Obj_Laundry = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Laundry = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index 5dc3ff8f92..fd45526bae 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -207,7 +207,7 @@ void daObjLndRope_c::setNormalRopePos() { } } -static char* l_arcName = "Obj_SRope"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_SRope"; int daObjLndRope_c::createHeap() { ResTIMG* resTimg = (ResTIMG*)dComIfG_getObjectRes(l_arcName, "Obj_ItaRope.bti"); @@ -282,13 +282,13 @@ static int daObjLndRope_Create(fopAc_ac_c* i_this) { return ((daObjLndRope_c*)i_this)->create(); } -static actor_method_class l_daObjLndRope_Method = { +static DUSK_CONST actor_method_class l_daObjLndRope_Method = { (process_method_func)daObjLndRope_Create, (process_method_func)daObjLndRope_Delete, (process_method_func)daObjLndRope_Execute, (process_method_func)daObjLndRope_IsDelete, (process_method_func)daObjLndRope_Draw, }; -actor_process_profile_definition g_profile_Obj_LndRope = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_LndRope = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 96f2f29bd2..dd8dc81ccc 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -190,12 +190,12 @@ static cPhs_Step daObj_Lbox_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daObj_Lbox_Method = { +static DUSK_CONST actor_method_class l_daObj_Lbox_Method = { (process_method_func)daObj_Lbox_Create, (process_method_func)daObj_Lbox_Delete, (process_method_func)daObj_Lbox_Execute, (process_method_func)daObj_Lbox_IsDelete, (process_method_func)daObj_Lbox_Draw}; -actor_process_profile_definition g_profile_OBJ_LBOX = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_LBOX = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 221f106d67..22706ba447 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -502,7 +502,7 @@ static int daObjLife_Create(fopAc_ac_c* i_this) { return ((daObjLife_c*)i_this)->create(); } -static actor_method_class l_daObjLife_Method = { +static DUSK_CONST actor_method_class l_daObjLife_Method = { (process_method_func)daObjLife_Create, (process_method_func)daObjLife_Delete, (process_method_func)daObjLife_Execute, @@ -510,7 +510,7 @@ static actor_method_class l_daObjLife_Method = { (process_method_func)daObjLife_Draw, }; -actor_process_profile_definition g_profile_Obj_LifeContainer = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_LifeContainer = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 2d688ac3de..828909e307 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -486,7 +486,7 @@ static int daObj_Lp_Create(fopAc_ac_c* a_this) { return phase_state; } -static actor_method_class l_daObj_Lp_Method = { +static DUSK_CONST actor_method_class l_daObj_Lp_Method = { (process_method_func)daObj_Lp_Create, (process_method_func)daObj_Lp_Delete, (process_method_func)daObj_Lp_Execute, @@ -494,7 +494,7 @@ static actor_method_class l_daObj_Lp_Method = { (process_method_func)daObj_Lp_Draw, }; -actor_process_profile_definition g_profile_OBJ_LP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_LP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 12582c32af..aaa3a8ccc4 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -267,7 +267,7 @@ static cPhs_Step daLv1Cdl00_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daLv1Cdl00_Method = { +static DUSK_CONST actor_method_class l_daLv1Cdl00_Method = { (process_method_func)daLv1Cdl00_Create, (process_method_func)daLv1Cdl00_Delete, (process_method_func)daLv1Cdl00_Execute, @@ -275,7 +275,7 @@ static actor_method_class l_daLv1Cdl00_Method = { (process_method_func)daLv1Cdl00_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv1Cdl00 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index 9e1cabfebb..0d6fdaa337 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -221,7 +221,7 @@ static cPhs_Step daLv1Cdl01_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daLv1Cdl01_Method = { +static DUSK_CONST actor_method_class l_daLv1Cdl01_Method = { (process_method_func)daLv1Cdl01_Create, (process_method_func)daLv1Cdl01_Delete, (process_method_func)daLv1Cdl01_Execute, @@ -229,7 +229,7 @@ static actor_method_class l_daLv1Cdl01_Method = { (process_method_func)daLv1Cdl01_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv1Cdl01 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index e93a4d05ed..0abdc763b2 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -55,7 +55,7 @@ dCcD_SrcCyl daLv2Candle_c::mCcDCyl = { } }; -static char* l_resNameIdx[3] = { +static DUSK_CONST char* l_resNameIdx[3] = { "L2candl", "L4candl", "L9Candle", @@ -386,7 +386,7 @@ static cPhs_Step daLv2Candle_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daLv2Candle_Method = { +static DUSK_CONST actor_method_class l_daLv2Candle_Method = { (process_method_func)daLv2Candle_Create, (process_method_func)daLv2Candle_Delete, (process_method_func)daLv2Candle_Execute, @@ -394,7 +394,7 @@ static actor_method_class l_daLv2Candle_Method = { (process_method_func)daLv2Candle_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv2Candle = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv2Candle = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index 784af3210b..58e8cb3185 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -43,7 +43,7 @@ dCcD_SrcGObjInf const daLv3Candle_c::mCcDObjInfo = { dCcD_SrcSph daLv3Candle_c::mCcDSph = {daLv3Candle_c::mCcDObjInfo, {{{0.0f, 0.0f, 0.0f}, 0.0f}}}; -static char* l_resNameIdx[] = {"L3candl", "L3candl2"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[] = {"L3candl", "L3candl2"}; void daLv3Candle_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); @@ -238,13 +238,13 @@ static int daLv3Candle_Create(fopAc_ac_c* i_this) { return actor->create(); } -static actor_method_class l_daLv3Candle_Method = { +static DUSK_CONST actor_method_class l_daLv3Candle_Method = { (process_method_func)daLv3Candle_Create, (process_method_func)daLv3Candle_Delete, (process_method_func)daLv3Candle_Execute, NULL, (process_method_func)daLv3Candle_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv3Candle = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3Candle = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index d0b5490c8d..22226f64b2 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -78,7 +78,7 @@ static const int l_btkIdrIdx[] = { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, -1, -1, }; -static char* l_resNameIdx[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[] = { "Kr10water", "Kr10wat01", "Kr02wat00", "Kr03wat00", "Kr03wat01", "Kr03wat02", "Kr03wat03", "Kr03wat04", "Kr07wat00", "Kr08wat00", "Kr08wat01", "Kr02wat01", "Kr02wat02", "Kr02wat03", "Kr11wat00", "Kr12wat00", "Kr13wat00", "Kr13wat01", "Kr13wat02", "Kr03wat05", "Kr03wat06", @@ -452,13 +452,13 @@ static int daLv3Water_Create(fopAc_ac_c* i_this) { return actor->create(); } -static actor_method_class l_daLv3Water_Method = { +static DUSK_CONST actor_method_class l_daLv3Water_Method = { (process_method_func)daLv3Water_Create, (process_method_func)daLv3Water_Delete, (process_method_func)daLv3Water_Execute, 0, (process_method_func)daLv3Water_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv3Water = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3Water = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 32995e646b..97290e43a4 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -39,7 +39,7 @@ void daLv3Water2_HIO_c::genMessage(JORMContext* ctx) { } #endif -static char* l_resNameIdx[] = {"Kr03wat04"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[] = {"Kr03wat04"}; void daLv3Water2_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); @@ -283,7 +283,7 @@ static int daLv3Water2_Create(fopAc_ac_c* i_this) { return actor->create(); } -static actor_method_class l_daLv3Water2_Method = { +static DUSK_CONST actor_method_class l_daLv3Water2_Method = { (process_method_func)daLv3Water2_Create, (process_method_func)daLv3Water2_Delete, (process_method_func)daLv3Water2_Execute, @@ -291,7 +291,7 @@ static actor_method_class l_daLv3Water2_Method = { (process_method_func)daLv3Water2_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv3Water2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3Water2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index f4ad49685d..b1c84808c3 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -213,13 +213,13 @@ static int daObj_Lv3waterB_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daObj_Lv3waterB_Method = { +static DUSK_CONST actor_method_class l_daObj_Lv3waterB_Method = { (process_method_func)daObj_Lv3waterB_Create, (process_method_func)daObj_Lv3waterB_Delete, (process_method_func)daObj_Lv3waterB_Execute, (process_method_func)daObj_Lv3waterB_IsDelete, (process_method_func)daObj_Lv3waterB_Draw, }; -actor_process_profile_definition g_profile_OBJ_LV3WATERB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_LV3WATERB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index 792747c664..06b9f63186 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -11,7 +11,7 @@ #include "f_pc/f_pc_name.h" #include "m_Do/m_Do_mtx.h" -static char* l_arcName[] = {"Obj_saka", "Obj_saka2"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[] = {"Obj_saka", "Obj_saka2"}; #if DEBUG class daObjLv3saka_HIO_c : public mDoHIO_entry_c { @@ -178,12 +178,12 @@ static int daObjLv3saka_MoveBGDraw(daObjLv3saka_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv3saka_METHODS = { +static DUSK_CONST actor_method_class daObjLv3saka_METHODS = { (process_method_func)daObjLv3saka_create1st, (process_method_func)daObjLv3saka_MoveBGDelete, (process_method_func)daObjLv3saka_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjLv3saka_MoveBGDraw}; -actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv3R10Saka = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index 07b3dfb7bc..af29a4b71c 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -92,7 +92,7 @@ static int daObjWaterEff_Create(fopAc_ac_c* i_this) { return actor->create(); } -static actor_method_class l_daObjWaterEff_Method = { +static DUSK_CONST actor_method_class l_daObjWaterEff_Method = { (process_method_func)daObjWaterEff_Create, (process_method_func)daObjWaterEff_Delete, (process_method_func)daObjWaterEff_Execute, @@ -100,7 +100,7 @@ static actor_method_class l_daObjWaterEff_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Obj_WaterEff = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WaterEff = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index 7212b0f492..3a35c879f3 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -186,7 +186,7 @@ static int dalv4CandleDemoTag_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_dalv4CandleDemoTag_Method = { +static DUSK_CONST actor_method_class l_dalv4CandleDemoTag_Method = { (process_method_func)dalv4CandleDemoTag_Create, (process_method_func)dalv4CandleDemoTag_Delete, (process_method_func)dalv4CandleDemoTag_Execute, @@ -194,7 +194,7 @@ static actor_method_class l_dalv4CandleDemoTag_Method = { (process_method_func)dalv4CandleDemoTag_Draw, }; -actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv4CandleDm = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index e25c5f1cd1..70c047c03d 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -140,7 +140,7 @@ static int dalv4CandleTag_Create(fopAc_ac_c* i_this) { return ((dalv4CandleTag_c*)i_this)->create(); } -static actor_method_class l_dalv4CandleTag_Method = { +static DUSK_CONST actor_method_class l_dalv4CandleTag_Method = { (process_method_func)dalv4CandleTag_Create, (process_method_func)dalv4CandleTag_Delete, (process_method_func)dalv4CandleTag_Execute, @@ -148,7 +148,7 @@ static actor_method_class l_dalv4CandleTag_Method = { (process_method_func)dalv4CandleTag_Draw, }; -actor_process_profile_definition g_profile_Tag_Lv4Candle = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv4Candle = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index 64868f15b2..46a238bbd3 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -214,7 +214,7 @@ static int daLv4EdShutter_Create(fopAc_ac_c* i_this) { return ((daLv4EdShutter_c*)i_this)->create(); } -static actor_method_class l_daLv4EdShutter_Method = { +static DUSK_CONST actor_method_class l_daLv4EdShutter_Method = { (process_method_func)daLv4EdShutter_Create, (process_method_func)daLv4EdShutter_Delete, (process_method_func)daLv4EdShutter_Execute, @@ -222,7 +222,7 @@ static actor_method_class l_daLv4EdShutter_Method = { (process_method_func)daLv4EdShutter_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4EdShutter = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index 3d1ff0a730..68f8799723 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -173,13 +173,13 @@ static int daLv4Gate_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daLv4Gate_Method = { +static DUSK_CONST actor_method_class l_daLv4Gate_Method = { (process_method_func)daLv4Gate_Create, (process_method_func)daLv4Gate_Delete, (process_method_func)daLv4Gate_Execute, (process_method_func)NULL, (process_method_func)daLv4Gate_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv4Gate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Gate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index ed66cdddb4..face5c51ce 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -84,13 +84,13 @@ static int daLv4HsTarget_Create(fopAc_ac_c* i_this) { static daLv4HsTarget_HIO_c l_HIO; -static actor_method_class l_daLv4HsTarget_Method = { +static DUSK_CONST actor_method_class l_daLv4HsTarget_Method = { (process_method_func)daLv4HsTarget_Create, (process_method_func)daLv4HsTarget_Delete, (process_method_func)daLv4HsTarget_Execute, (process_method_func)NULL, (process_method_func)daLv4HsTarget_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4HsTarget = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index eb0b5442ec..cc9e9068e5 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -253,13 +253,13 @@ static int daLv4PoGate_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daLv4PoGate_Method = { +static DUSK_CONST actor_method_class l_daLv4PoGate_Method = { (process_method_func)daLv4PoGate_Create, (process_method_func)daLv4PoGate_Delete, (process_method_func)daLv4PoGate_Execute, (process_method_func)NULL, (process_method_func)daLv4PoGate_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv4PoGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4PoGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 9128376496..98ad348663 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_b_ds.h" #include "d/d_s_play.h" -static char* l_arcName = "P_L4Rwall"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_L4Rwall"; static void* s_BossSearch(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_B_DS_e) { @@ -241,7 +241,7 @@ static int daObjLv4Wall_MoveBGDraw(daObjLv4Wall_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv4Wall_METHODS = { +static DUSK_CONST actor_method_class daObjLv4Wall_METHODS = { (process_method_func)daObjLv4Wall_create1st, (process_method_func)daObjLv4Wall_MoveBGDelete, (process_method_func)daObjLv4Wall_MoveBGExecute, @@ -249,7 +249,7 @@ static actor_method_class daObjLv4Wall_METHODS = { (process_method_func)daObjLv4Wall_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4RailWall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4RailWall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 2742339487..cce1c80f26 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -167,7 +167,7 @@ static int daSldWall_Create(fopAc_ac_c* i_this) { return ((daSldWall_c*)i_this)->create(); } -static actor_method_class l_daSldWall_Method = { +static DUSK_CONST actor_method_class l_daSldWall_Method = { (process_method_func)daSldWall_Create, (process_method_func)daSldWall_Delete, (process_method_func)daSldWall_Execute, @@ -175,7 +175,7 @@ static actor_method_class l_daSldWall_Method = { (process_method_func)daSldWall_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4SlideWall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index b11fa22d55..9b260823cc 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -41,7 +41,7 @@ int daObjLv4Brg_c::Create() { return 1; } -static char* l_arcName = "Obj_l4brg"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_l4brg"; int daObjLv4Brg_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -162,7 +162,7 @@ static int daObjLv4Brg_MoveBGDraw(daObjLv4Brg_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv4Brg_METHODS = { +static DUSK_CONST actor_method_class daObjLv4Brg_METHODS = { (process_method_func)daObjLv4Brg_create1st, (process_method_func)daObjLv4Brg_MoveBGDelete, (process_method_func)daObjLv4Brg_MoveBGExecute, @@ -170,7 +170,7 @@ static actor_method_class daObjLv4Brg_METHODS = { (process_method_func)daObjLv4Brg_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4Bridge = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Bridge = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index fbd0cf2fe0..9ab47345d4 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -36,7 +36,7 @@ static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* param_2, fopAc_ac_c* param_3) ((daObjLv4Chan_c*)param_2)->rideActor(param_3); } -static char* l_arcName = "P_Lv4Chan"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_Lv4Chan"; int daObjLv4Chan_c::create1st() { int rv = dComIfG_resLoad(this, l_arcName); @@ -869,7 +869,7 @@ static int daObjLv4Chan_MoveBGDraw(daObjLv4Chan_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv4Chan_METHODS = { +static DUSK_CONST actor_method_class daObjLv4Chan_METHODS = { (process_method_func)daObjLv4Chan_create1st, (process_method_func)daObjLv4Chan_MoveBGDelete, (process_method_func)daObjLv4Chan_MoveBGExecute, @@ -877,7 +877,7 @@ static actor_method_class daObjLv4Chan_METHODS = { (process_method_func)daObjLv4Chan_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4Chan = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Chan = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 53a1e05511..f25f0907a6 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -33,7 +33,7 @@ int daObjL4DigSand_c::Create() { return 1; } -static char* l_arcName = "P_DSand"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_DSand"; int daObjL4DigSand_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -171,7 +171,7 @@ static int daObjL4DigSand_MoveBGDraw(daObjL4DigSand_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjL4DigSand_METHODS = { +static DUSK_CONST actor_method_class daObjL4DigSand_METHODS = { (process_method_func)daObjL4DigSand_create1st, (process_method_func)daObjL4DigSand_MoveBGDelete, (process_method_func)daObjL4DigSand_MoveBGExecute, @@ -179,7 +179,7 @@ static actor_method_class daObjL4DigSand_METHODS = { (process_method_func)daObjL4DigSand_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4DigSand = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4DigSand = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index ab04768a0a..d7f76e3304 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -27,7 +27,7 @@ int daObjLv4Floor_c::Create() { return 1; } -static char* l_arcName = "P_L4Floor"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_L4Floor"; int daObjLv4Floor_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -132,7 +132,7 @@ static int daObjLv4Floor_MoveBGDraw(daObjLv4Floor_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv4Floor_METHODS = { +static DUSK_CONST actor_method_class daObjLv4Floor_METHODS = { (process_method_func)daObjLv4Floor_create1st, (process_method_func)daObjLv4Floor_MoveBGDelete, (process_method_func)daObjLv4Floor_MoveBGExecute, @@ -140,7 +140,7 @@ static actor_method_class daObjLv4Floor_METHODS = { (process_method_func)daObjLv4Floor_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4Floor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Floor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 02ea392cb9..25b61dc52b 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -47,7 +47,7 @@ int daObjLv4Gear_c::Create() { static int const l_bmd[] = {4, 3}; -static char* l_arcName = "P_Gear"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_Gear"; int daObjLv4Gear_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mType]); @@ -154,13 +154,13 @@ static int daObjLv4Gear_Create(daObjLv4Gear_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjLv4Gear_Method = { +static DUSK_CONST actor_method_class l_daObjLv4Gear_Method = { (process_method_func)daObjLv4Gear_Create, (process_method_func)daObjLv4Gear_Delete, (process_method_func)daObjLv4Gear_Execute, (process_method_func)NULL, (process_method_func)daObjLv4Gear_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv4Gear = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Gear = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index a8f9a9061a..488496f4e9 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_lv4prelvtr.h" #include "d/d_com_inf_game.h" -static char* l_arcName = "PRElvtr"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "PRElvtr"; int daObjPRElvtr_c::create1st() { int phase = dComIfG_resLoad(this, l_arcName); @@ -109,13 +109,13 @@ static int daObjPRElvtr_MoveBGDraw(daObjPRElvtr_c* i_this) { return i_this->Draw(); } -static actor_method_class daObjPRElvtr_METHODS = { +static DUSK_CONST actor_method_class daObjPRElvtr_METHODS = { (process_method_func)daObjPRElvtr_create1st, (process_method_func)daObjPRElvtr_MoveBGDelete, (process_method_func)daObjPRElvtr_MoveBGExecute, 0, (process_method_func)daObjPRElvtr_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_PRElvtr = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_PRElvtr = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 76e24dd16f..de2e112fb3 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -20,7 +20,7 @@ static const int l_bmdidx[] = { 4, }; -static char* l_arcName[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[3] = { "PRWallR09", "P_Rwall", "PRWallR04", @@ -294,7 +294,7 @@ static int daObjLv4PRwall_MoveBGDraw(daObjLv4PRwall_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv4PRwall_METHODS = { +static DUSK_CONST actor_method_class daObjLv4PRwall_METHODS = { (process_method_func)daObjLv4PRwall_create1st, (process_method_func)daObjLv4PRwall_MoveBGDelete, (process_method_func)daObjLv4PRwall_MoveBGExecute, @@ -302,7 +302,7 @@ static actor_method_class daObjLv4PRwall_METHODS = { (process_method_func)daObjLv4PRwall_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4PRwall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4PRwall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index 13f08b6534..89513ee80e 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_lv4sand.h" #include "d/d_s_play.h" -static char* l_arcName = "P_L4Sand"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_L4Sand"; void daObjLv4Sand_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -162,7 +162,7 @@ static int daObjLv4Sand_MoveBGDraw(daObjLv4Sand_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv4Sand_METHODS = { +static DUSK_CONST actor_method_class daObjLv4Sand_METHODS = { (process_method_func)daObjLv4Sand_create1st, (process_method_func)daObjLv4Sand_MoveBGDelete, (process_method_func)daObjLv4Sand_MoveBGExecute, @@ -170,7 +170,7 @@ static actor_method_class daObjLv4Sand_METHODS = { (process_method_func)daObjLv4Sand_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv4Sand = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv4Sand = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index fc3819cf08..db7416dc5a 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -183,13 +183,13 @@ static int daFlorBoad_Create(fopAc_ac_c* i_this) { return ((daFlorBoad_c*)i_this)->create(); } -static actor_method_class l_daFlorBoad_Method = { +static DUSK_CONST actor_method_class l_daFlorBoad_Method = { (process_method_func)daFlorBoad_Create, (process_method_func)daFlorBoad_Delete, (process_method_func)daFlorBoad_Execute, (process_method_func)NULL, (process_method_func)daFlorBoad_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv5FBoard = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv5FBoard = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index dc17845331..d1d2eb29a0 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -289,13 +289,13 @@ static int daIceWall_Create(fopAc_ac_c* i_this) { return ((daIceWall_c*)i_this)->create(); } -static actor_method_class l_daIceWall_Method = { +static DUSK_CONST actor_method_class l_daIceWall_Method = { (process_method_func)daIceWall_Create, (process_method_func)daIceWall_Delete, (process_method_func)daIceWall_Execute, (process_method_func)NULL, (process_method_func)daIceWall_Draw, }; -actor_process_profile_definition g_profile_Obj_IceWall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_IceWall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index 2ff52396c0..62171dc2bb 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -193,13 +193,13 @@ static int daLv5SwIce_Create(fopAc_ac_c* i_this) { return ((daLv5SwIce_c*)i_this)->create(); } -static actor_method_class l_daLv5SwIce_Method = { +static DUSK_CONST actor_method_class l_daLv5SwIce_Method = { (process_method_func)daLv5SwIce_Create, (process_method_func)daLv5SwIce_Delete, (process_method_func)daLv5SwIce_Execute, (process_method_func)NULL, (process_method_func)daLv5SwIce_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv5SwIce = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv5SwIce = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index 22eaac0e15..cf39d80a4f 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -11,7 +11,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -static char* l_arcName = "Ychandelr"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Ychandelr"; int daObjYchndlr_c::create1st() { int phase = dComIfG_resLoad(this, l_arcName); @@ -354,13 +354,13 @@ static int daObjYchndlr_MoveBGDraw(daObjYchndlr_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjYchndlr_METHODS = { +static DUSK_CONST actor_method_class daObjYchndlr_METHODS = { (process_method_func)daObjYchndlr_create1st, (process_method_func)daObjYchndlr_MoveBGDelete, (process_method_func)daObjYchndlr_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjYchndlr_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Ychndlr = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ychndlr = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index 7a9aa47e22..5bc8fea278 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_obj_carry.h" -static char* l_arcName = "YIblltray"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "YIblltray"; int daObjYIblltray_c::create1st() { int phase = dComIfG_resLoad(this, l_arcName); @@ -572,7 +572,7 @@ static int daObjYIblltray_MoveBGDraw(daObjYIblltray_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjYIblltray_METHODS = { +static DUSK_CONST actor_method_class daObjYIblltray_METHODS = { (process_method_func)daObjYIblltray_create1st, (process_method_func)daObjYIblltray_MoveBGDelete, (process_method_func)daObjYIblltray_MoveBGExecute, @@ -580,7 +580,7 @@ static actor_method_class daObjYIblltray_METHODS = { (process_method_func)daObjYIblltray_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_YIblltray = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_YIblltray = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index a725b4bdf8..59638a4d45 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -302,7 +302,7 @@ static int daLv6ChangeGate_Create(fopAc_ac_c* i_this) { return ((daLv6ChangeGate_c*)i_this)->create(); } -static actor_method_class l_daLv6ChangeGate_Method = { +static DUSK_CONST actor_method_class l_daLv6ChangeGate_Method = { (process_method_func)daLv6ChangeGate_Create, (process_method_func)daLv6ChangeGate_Delete, (process_method_func)daLv6ChangeGate_Execute, @@ -310,7 +310,7 @@ static actor_method_class l_daLv6ChangeGate_Method = { (process_method_func)daLv6ChangeGate_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6ChgGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index ae0828e248..0aab579c51 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -185,7 +185,7 @@ static int daLv6FurikoTrap_Create(fopAc_ac_c* i_this) { return this_trap->create(); } -static actor_method_class l_daLv6FurikoTrap_Method = { +static DUSK_CONST actor_method_class l_daLv6FurikoTrap_Method = { (process_method_func)daLv6FurikoTrap_Create, (process_method_func)daLv6FurikoTrap_Delete, (process_method_func)daLv6FurikoTrap_Execute, @@ -193,7 +193,7 @@ static actor_method_class l_daLv6FurikoTrap_Method = { (process_method_func)daLv6FurikoTrap_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6FuriTrap = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index dbb701b0b1..f9e0badc72 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -171,7 +171,7 @@ static int daLv6Lblock_Create(fopAc_ac_c* i_this) { return ((daLv6Lblock_c*)i_this)->create(); } -static actor_method_class l_daLv6Lblock_Method = { +static DUSK_CONST actor_method_class l_daLv6Lblock_Method = { (process_method_func)daLv6Lblock_Create, (process_method_func)daLv6Lblock_Delete, (process_method_func)daLv6Lblock_Execute, @@ -179,7 +179,7 @@ static actor_method_class l_daLv6Lblock_Method = { (process_method_func)daLv6Lblock_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6Lblock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6Lblock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index c8b4b62b61..14e0bc4bb6 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -46,7 +46,7 @@ dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = { } // mCylAttr }; -static cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f}; +static DUSK_CONSTEXPR cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f}; void daLv6SwGate_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); @@ -314,7 +314,7 @@ static int daLv6SwGate_Create(fopAc_ac_c* i_this) { return gate->create(); } -static actor_method_class l_daLv6SwGate_Method = { +static DUSK_CONST actor_method_class l_daLv6SwGate_Method = { (process_method_func)daLv6SwGate_Create, (process_method_func)daLv6SwGate_Delete, (process_method_func)daLv6SwGate_Execute, @@ -322,7 +322,7 @@ static actor_method_class l_daLv6SwGate_Method = { (process_method_func)daLv6SwGate_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6SwGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6SwGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index b5c02b197d..7d21557671 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -9,7 +9,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -static cull_box l_cull_box = {{-1200.0f, -300.0f, -100.0f}, {1200.0f, 300.0f, 100.0f}}; +static DUSK_CONSTEXPR cull_box l_cull_box = {{-1200.0f, -300.0f, -100.0f}, {1200.0f, 300.0f, 100.0f}}; static daLv6SzGate_HIO_c l_HIO; @@ -250,13 +250,13 @@ static int daLv6SzGate_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daLv6SzGate_Method = { +static DUSK_CONST actor_method_class l_daLv6SzGate_Method = { (process_method_func)daLv6SzGate_Create, (process_method_func)daLv6SzGate_Delete, (process_method_func)daLv6SzGate_Execute, (process_method_func)NULL, (process_method_func)daLv6SzGate_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6SzGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6SzGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 4f36a4ffbf..4c6fd2936d 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -50,7 +50,7 @@ void daTenbin_HIO_c::genMessage(JORMContext* context) { } #endif -static cull_box l_cull_box = {-300.0f, -500.0f, -400.0f, 1200.0f, 300.0f, 1300.0f}; +static DUSK_CONSTEXPR cull_box l_cull_box = {-300.0f, -500.0f, -400.0f, 1200.0f, 300.0f, 1300.0f}; static daTenbin_HIO_c l_HIO; @@ -346,7 +346,7 @@ static int daTenbin_Create(fopAc_ac_c* i_this) { return this_tenbin->create(); } -static actor_method_class l_daTenbin_Method = { +static DUSK_CONST actor_method_class l_daTenbin_Method = { (process_method_func)daTenbin_Create, (process_method_func)daTenbin_Delete, (process_method_func)daTenbin_Execute, @@ -354,7 +354,7 @@ static actor_method_class l_daTenbin_Method = { (process_method_func)daTenbin_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6Tenbin = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 386a9e5ea0..f4e4816f8d 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -432,13 +432,13 @@ static int daTogeRoll_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daTogeRoll_Method = { +static DUSK_CONST actor_method_class l_daTogeRoll_Method = { (process_method_func)daTogeRoll_Create, (process_method_func)daTogeRoll_Delete, (process_method_func)daTogeRoll_Execute, 0, (process_method_func)daTogeRoll_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6TogeRoll = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 24e41124bf..b5244139f2 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -83,7 +83,7 @@ dCcD_SrcCyl daLv6TogeTrap_c::mCcDCyl = { } }; -static char* l_resNameIdx[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[3] = { "L6TogeTp", "L4TogeTp", "L9Toge", @@ -764,7 +764,7 @@ static int daLv6TogeTrap_Create(fopAc_ac_c* i_this) { return ((daLv6TogeTrap_c*)i_this)->create(); } -static actor_method_class l_daLv6TogeTrap_Method = { +static DUSK_CONST actor_method_class l_daLv6TogeTrap_Method = { (process_method_func)daLv6TogeTrap_Create, (process_method_func)daLv6TogeTrap_Delete, (process_method_func)daLv6TogeTrap_Execute, @@ -772,7 +772,7 @@ static actor_method_class l_daLv6TogeTrap_Method = { (process_method_func)daLv6TogeTrap_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6TogeTrap = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 760f09efb3..8703d1c376 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -108,9 +108,9 @@ void daObjL6Bm_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName = "Obj_lv6bm"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_lv6bm"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-200.0f, -100.0f, -200.0f}, {200.0f, 100.0f, 200.0f}, }; @@ -407,7 +407,7 @@ static int daObjL6Bm_MoveBGDraw(daObjL6Bm_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjL6Bm_METHODS = { +static DUSK_CONST actor_method_class daObjL6Bm_METHODS = { (process_method_func)daObjL6Bm_create1st, (process_method_func)daObjL6Bm_MoveBGDelete, (process_method_func)daObjL6Bm_MoveBGExecute, @@ -415,7 +415,7 @@ static actor_method_class daObjL6Bm_METHODS = { (process_method_func)daObjL6Bm_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv6bemos = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6bemos = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index be86aa46e6..247c3764db 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -107,21 +107,21 @@ void daObjLv6Bm_c::setBaseMtx() { mBeamEffectModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -static char* l_arcName = "E_bm6"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "E_bm6"; -static char* l_eye_matName = "bm6_eye"; +static DUSK_CONSTEXPR char DUSK_CONST* l_eye_matName = "bm6_eye"; -static char* l_head_joint = "head"; +static DUSK_CONSTEXPR char DUSK_CONST* l_head_joint = "head"; -static char* l_bigGear_joint = "cogRed"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bigGear_joint = "cogRed"; -static char* l_smallGear0_joint = "cogBlue"; +static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear0_joint = "cogBlue"; -static char* l_smallGear1_joint = "cogGreen"; +static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear1_joint = "cogGreen"; -static char* l_smallGear2_joint = "cogYellow"; +static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear2_joint = "cogYellow"; -static char* l_joint_table[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_joint_table[5] = { l_head_joint, l_bigGear_joint, l_smallGear0_joint, @@ -129,12 +129,12 @@ static char* l_joint_table[5] = { l_smallGear2_joint, }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-1200.0f, -100.0f, -1200.0f}, {1200.0f, 400.0f, 1200.0f}, }; -static dCcD_SrcSph l_sph_src = { +static DUSK_CONSTEXPR dCcD_SrcSph l_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x402420, 0x11}, 0x58}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -146,7 +146,7 @@ static dCcD_SrcSph l_sph_src = { } // mSphAttr }; -static dCcD_SrcCps l_cps_src = { +static DUSK_CONSTEXPR dCcD_SrcCps l_cps_src = { { {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj {dCcD_SE_SWORD, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -158,7 +158,7 @@ static dCcD_SrcCps l_cps_src = { } // mCpsAttr }; -static dCcD_SrcCyl l_cyl_src = { +static DUSK_CONSTEXPR dCcD_SrcCyl l_cyl_src = { { {0x0, {{0x0, 0x0, 0x1e}, {0x400, 0x11}, 0x18}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -368,7 +368,7 @@ int daObjLv6Bm_c::Execute(f32 (**param_1)[3][4]) { } void daObjLv6Bm_c::action() { - static daObjLv6Bm_c::actionFunc l_func[6] = { + static DUSK_CONSTEXPR daObjLv6Bm_c::actionFunc l_func[6] = { &daObjLv6Bm_c::actionSwWait, &daObjLv6Bm_c::actionWarning, &daObjLv6Bm_c::actionFindPlayer, @@ -587,7 +587,7 @@ f32 daObjLv6Bm_c::getBeamSearchDistance() { } void daObjLv6Bm_c::effect_proc() { - static daObjLv6Bm_c::effectFunc l_eff_func[2] = { + static DUSK_CONSTEXPR daObjLv6Bm_c::effectFunc l_eff_func[2] = { &daObjLv6Bm_c::effectWait, &daObjLv6Bm_c::effectSet0, }; @@ -1167,7 +1167,7 @@ static int daObjLv6Bm_MoveBGDraw(daObjLv6Bm_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv6Bm_METHODS = { +static DUSK_CONST actor_method_class daObjLv6Bm_METHODS = { (process_method_func)daObjLv6Bm_create1st, (process_method_func)daObjLv6Bm_MoveBGDelete, (process_method_func)daObjLv6Bm_MoveBGExecute, @@ -1175,7 +1175,7 @@ static actor_method_class daObjLv6Bm_METHODS = { (process_method_func)daObjLv6Bm_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6bemos2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 1d81549d6a..58453509b7 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv6egate.h" -static char* l_arcName = "LV6EGATE"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "LV6EGATE"; const int l_dzbidx = 3; @@ -226,7 +226,7 @@ static int daObjLv6EGate_MoveBGDraw(daObjLv6EGate_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv6EGate_METHODS = { +static DUSK_CONST actor_method_class daObjLv6EGate_METHODS = { (process_method_func)daObjLv6EGate_create1st, (process_method_func)daObjLv6EGate_MoveBGDelete, (process_method_func)daObjLv6EGate_MoveBGExecute, @@ -234,7 +234,7 @@ static actor_method_class daObjLv6EGate_METHODS = { (process_method_func)daObjLv6EGate_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv6EGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6EGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index a4126f0213..233e6cff9a 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -12,7 +12,7 @@ // // Declarations: // -static char* l_arcName = "Lv6ElevtA"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Lv6ElevtA"; static const int l_dzbidx = {7}; static const int l_bmdidx = {4}; @@ -263,7 +263,7 @@ static int daObjLv6ElevtA_MoveBGDraw(daObjLv6ElevtA_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv6ElevtA_METHODS = { +static DUSK_CONST actor_method_class daObjLv6ElevtA_METHODS = { (process_method_func)daObjLv6ElevtA_create1st, (process_method_func)daObjLv6ElevtA_MoveBGDelete, (process_method_func)daObjLv6ElevtA_MoveBGExecute, @@ -271,7 +271,7 @@ static actor_method_class daObjLv6ElevtA_METHODS = { (process_method_func)daObjLv6ElevtA_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6ElevtA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index d512118bb5..ccb57a1036 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_obj_lv6swturn.h" #include "d/actor/d_a_player.h" -static char* l_arcName = "Obj_l6tsw"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_l6tsw"; #if DEBUG daObjLv6SwTurn_HIO_c::daObjLv6SwTurn_HIO_c() { @@ -335,7 +335,7 @@ static int daObjLv6SwTurn_MoveBGDraw(daObjLv6SwTurn_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv6SwTurn_METHODS = { +static DUSK_CONST actor_method_class daObjLv6SwTurn_METHODS = { (process_method_func)daObjLv6SwTurn_create1st, (process_method_func)daObjLv6SwTurn_MoveBGDelete, (process_method_func)daObjLv6SwTurn_MoveBGExecute, @@ -343,7 +343,7 @@ static actor_method_class daObjLv6SwTurn_METHODS = { (process_method_func)daObjLv6SwTurn_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv6SwTurn = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index 811b301f81..62be603399 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -21,14 +21,14 @@ public: static daLv7BsGate_HIO_c l_HIO; -static char* l_type[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_type[2] = { "L7Gate", "L7GateL", }; -static int l_bmdIdx[] = {4, 4}; +static DUSK_CONSTEXPR int l_bmdIdx[] = {4, 4}; -static int l_dzbIdx[] = {7, 7}; +static DUSK_CONSTEXPR int l_dzbIdx[] = {7, 7}; daLv7BsGate_HIO_c::daLv7BsGate_HIO_c() { open_speed = 2.0f; @@ -103,7 +103,7 @@ int daLv7BsGate_c::Execute(Mtx** param_0) { } void daLv7BsGate_c::moveGate() { - static void (daLv7BsGate_c::*mode_proc[])() = { + static DUSK_CONSTEXPR void (daLv7BsGate_c::*mode_proc[])() = { &daLv7BsGate_c::modeWait, &daLv7BsGate_c::modeOpen, &daLv7BsGate_c::modeClose, @@ -199,7 +199,7 @@ static int daLv7BsGate_Create(fopAc_ac_c* i_this) { return ((daLv7BsGate_c*)i_this)->create(); } -static actor_method_class l_daLv7BsGate_Method = { +static DUSK_CONST actor_method_class l_daLv7BsGate_Method = { (process_method_func)daLv7BsGate_Create, (process_method_func)daLv7BsGate_Delete, (process_method_func)daLv7BsGate_Execute, @@ -207,7 +207,7 @@ static actor_method_class l_daLv7BsGate_Method = { (process_method_func)daLv7BsGate_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv7BsGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv7BsGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index f7933b263b..0f32987c2c 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -23,14 +23,14 @@ public: /* 0x1C */ f32 y_offset; }; -static char* l_type[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_type[2] = { "stickwl00", "stickwl01", }; -static int l_bmdIdx[] = {4, 4}; +static DUSK_CONSTEXPR int l_bmdIdx[] = {4, 4}; -static int l_dzbIdx[] = {7, 7}; +static DUSK_CONSTEXPR int l_dzbIdx[] = {7, 7}; daPropY_HIO_c::daPropY_HIO_c() { rot_speed = 0.0f; @@ -128,7 +128,7 @@ int daPropY_c::Execute(Mtx** param_0) { } void daPropY_c::procMain() { - static void (daPropY_c::*mode_proc[])() = { + static DUSK_CONSTEXPR void (daPropY_c::*mode_proc[])() = { &daPropY_c::modeMoveWait, &daPropY_c::modeMove, &daPropY_c::modeWait, @@ -289,7 +289,7 @@ static int daPropY_Create(fopAc_ac_c* i_this) { return ((daPropY_c*)i_this)->create(); } -static actor_method_class l_daPropY_Method = { +static DUSK_CONST actor_method_class l_daPropY_Method = { (process_method_func)daPropY_Create, (process_method_func)daPropY_Delete, (process_method_func)daPropY_Execute, @@ -297,7 +297,7 @@ static actor_method_class l_daPropY_Method = { (process_method_func)daPropY_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv7PropY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv7PropY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 193796ebab..dc4f85590c 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -107,7 +107,7 @@ void daObjLv7Brg_c::setBaseMtx() { } } -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "Obj_l7brg", "K_bridge", }; @@ -465,7 +465,7 @@ static int daObjLv7Brg_MoveBGDraw(daObjLv7Brg_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjLv7Brg_METHODS = { +static DUSK_CONST actor_method_class daObjLv7Brg_METHODS = { (process_method_func)daObjLv7Brg_create1st, (process_method_func)daObjLv7Brg_MoveBGDelete, (process_method_func)daObjLv7Brg_MoveBGExecute, @@ -473,7 +473,7 @@ static actor_method_class daObjLv7Brg_METHODS = { (process_method_func)daObjLv7Brg_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Lv7Bridge = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv7Bridge = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index 557a39aa32..cb7dedd214 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -24,11 +24,11 @@ public: static daKekaiTrap_HIO_c l_HIO; -static char* l_type[] = {"Lv8Kekkai"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_type[] = {"Lv8Kekkai"}; -static int l_bmdIdx[] = {4}; +static DUSK_CONSTEXPR int l_bmdIdx[] = {4}; -static int l_dzbIdx[] = {7}; +static DUSK_CONSTEXPR int l_dzbIdx[] = {7}; daKekaiTrap_HIO_c::daKekaiTrap_HIO_c() { appear_init_speed = 0.0f; @@ -100,7 +100,7 @@ int daKekaiTrap_c::Execute(Mtx** param_0) { } void daKekaiTrap_c::moveMain() { - static void (daKekaiTrap_c::*mode_proc[])() = { + static DUSK_CONSTEXPR void (daKekaiTrap_c::*mode_proc[])() = { &daKekaiTrap_c::modeWait, &daKekaiTrap_c::modeMoveUp, &daKekaiTrap_c::modeMoveDown, @@ -203,7 +203,7 @@ static int daKekaiTrap_Create(fopAc_ac_c* i_this) { return ((daKekaiTrap_c*)i_this)->create(); } -static actor_method_class l_daKekaiTrap_Method = { +static DUSK_CONST actor_method_class l_daKekaiTrap_Method = { (process_method_func)daKekaiTrap_Create, (process_method_func)daKekaiTrap_Delete, (process_method_func)daKekaiTrap_Execute, @@ -211,7 +211,7 @@ static actor_method_class l_daKekaiTrap_Method = { (process_method_func)daKekaiTrap_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8KekkaiTrap = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index 8fa9422325..a598830e74 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -477,7 +477,7 @@ static int daL8Lift_Create(fopAc_ac_c* a_this) { return i_this->create(); } -static actor_method_class l_daL8Lift_Method = { +static DUSK_CONST actor_method_class l_daL8Lift_Method = { (process_method_func)daL8Lift_Create, (process_method_func)daL8Lift_Delete, (process_method_func)daL8Lift_Execute, @@ -485,7 +485,7 @@ static actor_method_class l_daL8Lift_Method = { (process_method_func)daL8Lift_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv8Lift = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8Lift = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index 6b6c806d64..50b84ac981 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -511,13 +511,13 @@ static int daOptiLift_Create(fopAc_ac_c* i_this) { return ((daOptiLift_c*)i_this)->create(); } -static actor_method_class l_daOptiLift_Method = { +static DUSK_CONST actor_method_class l_daOptiLift_Method = { (process_method_func)daOptiLift_Create, (process_method_func)daOptiLift_Delete, (process_method_func)daOptiLift_Execute, (process_method_func)NULL, (process_method_func)daOptiLift_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8OptiLift = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 920ff92fa4..1c7e9a21ee 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -27,7 +27,7 @@ public: /* 0x14 */ u8 up_framecount; }; -static char* l_resNameIdx[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[2] = { "L8Step", "L8StepX", }; @@ -279,7 +279,7 @@ static int daUdFloor_Create(fopAc_ac_c* i_this) { return ((daUdFloor_c*)i_this)->create(); } -static actor_method_class l_daUdFloor_Method = { +static DUSK_CONST actor_method_class l_daUdFloor_Method = { (process_method_func)daUdFloor_Create, (process_method_func)daUdFloor_Delete, (process_method_func)daUdFloor_Execute, @@ -287,7 +287,7 @@ static actor_method_class l_daUdFloor_Method = { (process_method_func)daUdFloor_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv8UdFloor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 0a034ea6bd..6b7755ff15 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -185,7 +185,7 @@ static int daLv9SwShutter_Create(fopAc_ac_c* i_this) { return ((daLv9SwShutter_c*)i_this)->create(); } -static actor_method_class l_daLv9SwShutter_Method = { +static DUSK_CONST actor_method_class l_daLv9SwShutter_Method = { (process_method_func)daLv9SwShutter_Create, (process_method_func)daLv9SwShutter_Delete, (process_method_func)daLv9SwShutter_Execute, @@ -193,7 +193,7 @@ static actor_method_class l_daLv9SwShutter_Method = { (process_method_func)daLv9SwShutter_Draw, }; -actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Lv9SwShutter = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 6e677b5f34..f9ddc34be0 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -234,7 +234,7 @@ static int daMagLift_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daMagLift_Method = { +static DUSK_CONST actor_method_class l_daMagLift_Method = { (process_method_func) daMagLift_Create, (process_method_func) daMagLift_Delete, (process_method_func) daMagLift_Execute, @@ -242,7 +242,7 @@ static actor_method_class l_daMagLift_Method = { (process_method_func) daMagLift_Draw, }; -actor_process_profile_definition g_profile_Obj_MagLift = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MagLift = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index f55368de37..100469b25b 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -14,7 +14,7 @@ #include "d/d_bg_w.h" #include "SSystem/SComponent/c_math.h" -static char* l_arcName[3] = {"MagLiftS", "MagLiftM", "MagLiftL"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[3] = {"MagLiftS", "MagLiftM", "MagLiftL"}; daMagLiftRot_HIO_c::daMagLiftRot_HIO_c() { mWaitTime = 60; @@ -354,7 +354,7 @@ static int daMagLiftRot_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daMagLiftRot_Method = { +static DUSK_CONST actor_method_class l_daMagLiftRot_Method = { (process_method_func)daMagLiftRot_Create, (process_method_func)daMagLiftRot_Delete, (process_method_func)daMagLiftRot_Execute, @@ -362,7 +362,7 @@ static actor_method_class l_daMagLiftRot_Method = { (process_method_func)daMagLiftRot_Draw, }; -actor_process_profile_definition g_profile_Obj_MagLiftRot = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MagLiftRot = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index 54a734c35d..f092de8b8b 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -141,15 +141,15 @@ void rideCallBack(dBgW* param_0, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { } } -static char* l_arcName = "D_Marm"; +static DUSK_CONST char* l_arcName = "D_Marm"; static void dummyStrings() { DEAD_STRING("D_MN54"); } -static cull_box l_cull_box = {{-500.0f, -3000.0f, -500.0f}, {500.0f, 3000.0f, 2500.0f}}; +static DUSK_CONSTEXPR cull_box l_cull_box = {{-500.0f, -3000.0f, -500.0f}, {500.0f, 3000.0f, 2500.0f}}; -static cull_box l_cull_box2 = {{-500.0f, -4000.0f, -500.0f}, {500.0f, 3000.0f, 2500.0f}}; +static DUSK_CONSTEXPR cull_box l_cull_box2 = {{-500.0f, -4000.0f, -500.0f}, {500.0f, 3000.0f, 2500.0f}}; static Vec const l_offsetB = {-150.0f, 1200.0f, 0.0f}; // unused @@ -1090,7 +1090,7 @@ static int daObjMarm_MoveBGDraw(daObjMarm_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjMarm_METHODS = { +static DUSK_CONST actor_method_class daObjMarm_METHODS = { (process_method_func)daObjMarm_create1st, (process_method_func)daObjMarm_MoveBGDelete, (process_method_func)daObjMarm_MoveBGExecute, @@ -1098,7 +1098,7 @@ static actor_method_class daObjMarm_METHODS = { (process_method_func)daObjMarm_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_MagneArm = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MagneArm = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index f207b2f7f0..7d4ac8e32a 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -243,7 +243,7 @@ actor_method_class l_daObj_Maki_Method = { (process_method_func)daObj_Maki_Draw, }; -actor_process_profile_definition g_profile_OBJ_MAKI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_MAKI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index cc00bc91f4..e0b741fe18 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -54,7 +54,7 @@ int daObjMasterSword_c::createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); } -static char* l_arcName = "MstrSword"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "MstrSword"; int daObjMasterSword_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); @@ -236,7 +236,7 @@ static int daObjMasterSword_IsDelete(daObjMasterSword_c* param_0) { return 1; } -static actor_method_class l_daObjMasterSword_Method = { +static DUSK_CONST actor_method_class l_daObjMasterSword_Method = { (process_method_func)daObjMasterSword_Create, (process_method_func)daObjMasterSword_Delete, (process_method_func)daObjMasterSword_Execute, @@ -244,7 +244,7 @@ static actor_method_class l_daObjMasterSword_Method = { (process_method_func)daObjMasterSword_Draw, }; -actor_process_profile_definition g_profile_Obj_MasterSword = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MasterSword = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index f45df05570..d173d364ea 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -365,7 +365,7 @@ static int daObjMATO_IsDelete(daObjMATO_c* i_this) { return 1; } -static actor_method_class l_daObjMATO_Method = { +static DUSK_CONST actor_method_class l_daObjMATO_Method = { (process_method_func)daObjMATO_Create, (process_method_func)daObjMATO_Delete, (process_method_func)daObjMATO_Execute, @@ -373,7 +373,7 @@ static actor_method_class l_daObjMATO_Method = { (process_method_func)daObjMATO_Draw, }; -actor_process_profile_definition g_profile_Obj_Mato = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Mato = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index 41ca666474..523c0e5804 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -98,7 +98,7 @@ static int daObjMBox_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjMBox_Method = { +static DUSK_CONST actor_method_class l_daObjMBox_Method = { (process_method_func)daObjMBox_Create, (process_method_func)daObjMBox_Delete, (process_method_func)daObjMBox_Execute, @@ -106,7 +106,7 @@ static actor_method_class l_daObjMBox_Method = { (process_method_func)daObjMBox_Draw, }; -actor_process_profile_definition g_profile_Obj_MetalBox = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MetalBox = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index 8a09785678..10f4de85db 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -74,24 +74,24 @@ int daObjMGate_c::Create() { return 1; } -static char* l_arcName[] = { +static DUSK_CONST char* l_arcName[] = { "M_IGate", "M_HGate", }; -static char* l_bmdName[] = { +static DUSK_CONST char* l_bmdName[] = { "M_IzumiGate.bmd", "M_HashiGate.bmd", }; -static char* l_dzbName[] = { +static DUSK_CONST char* l_dzbName[] = { "M_IzumiGate.dzb", "M_HashiGate.dzb", }; -static char* l_keyArcName = "M_GateKey"; +static DUSK_CONST char* l_keyArcName = "M_GateKey"; -static char* l_keyBmdName = "M_IGateKey.bmd"; +static DUSK_CONST char* l_keyBmdName = "M_IGateKey.bmd"; int daObjMGate_c::CreateHeap() { J3DModelData* modelData = @@ -235,13 +235,13 @@ static int daObjMGate_MoveBGDraw(daObjMGate_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjMGate_METHODS = { +static DUSK_CONST actor_method_class daObjMGate_METHODS = { (process_method_func)daObjMGate_create1st, (process_method_func)daObjMGate_MoveBGDelete, (process_method_func)daObjMGate_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjMGate_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_MGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 0b3093d388..0667afd39e 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -375,7 +375,7 @@ static int daObjMHole_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjMHole_Method = { +static DUSK_CONST actor_method_class l_daObjMHole_Method = { (process_method_func)daObjMHole_Create, (process_method_func)daObjMHole_Delete, (process_method_func)daObjMHole_Execute, @@ -383,7 +383,7 @@ static actor_method_class l_daObjMHole_Method = { (process_method_func)daObjMHole_Draw, }; -actor_process_profile_definition g_profile_Obj_MHole = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MHole = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index dc55c589e8..d6790c3637 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -18,7 +18,7 @@ static u32 l_bmdData[1][2] = { 23, 1, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "pouyaA", }; @@ -512,7 +512,7 @@ static int daObj_Mie_IsDelete(void* a_this) { AUDIO_INSTANCES -static actor_method_class daObj_Mie_MethodTable = { +static DUSK_CONST actor_method_class daObj_Mie_MethodTable = { (process_method_func)daObj_Mie_Create, (process_method_func)daObj_Mie_Delete, (process_method_func)daObj_Mie_Execute, @@ -520,7 +520,7 @@ static actor_method_class daObj_Mie_MethodTable = { (process_method_func)daObj_Mie_Draw, }; -actor_process_profile_definition g_profile_OBJ_MIE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_MIE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index bec22c08f2..5887fffc22 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -9,7 +9,7 @@ #include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" -static char* l_arcName = "MR-6Pole"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "MR-6Pole"; const actionFunc daObjMirror6Pole_c::ActionTable[][2] = { {&daObjMirror6Pole_c::initWait, &daObjMirror6Pole_c::executeWait}, @@ -167,13 +167,13 @@ static int daObjMirror6Pole_IsDelete(daObjMirror6Pole_c* i_this) { return 1; } -static actor_method_class l_daObjMirror6Pole_Method = { +static DUSK_CONST actor_method_class l_daObjMirror6Pole_Method = { (process_method_func)daObjMirror6Pole_Create, (process_method_func)daObjMirror6Pole_Delete, (process_method_func)daObjMirror6Pole_Execute, (process_method_func)daObjMirror6Pole_IsDelete, (process_method_func)daObjMirror6Pole_Draw, }; -actor_process_profile_definition g_profile_Obj_Mirror6Pole = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Mirror6Pole = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 92c062f7c8..8301e14e4a 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -496,7 +496,7 @@ static cPhs_Step daObjMirrorChain_Create(fopAc_ac_c* i_this) { return ((daObjMirrorChain_c*)i_this)->create(); } -static actor_method_class l_daObjMirrorChain_Method = { +static DUSK_CONST actor_method_class l_daObjMirrorChain_Method = { (process_method_func)daObjMirrorChain_Create, (process_method_func)daObjMirrorChain_Delete, (process_method_func)daObjMirrorChain_Execute, @@ -504,7 +504,7 @@ static actor_method_class l_daObjMirrorChain_Method = { (process_method_func)daObjMirrorChain_Draw, }; -actor_process_profile_definition g_profile_Obj_MirrorChain = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorChain = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 38d9ce0cf5..5039148ed2 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_mirror_sand.h" #include "f_pc/f_pc_name.h" -static char* l_arcName = "MR-Sand"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "MR-Sand"; int daObjMirrorSand_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); @@ -163,13 +163,13 @@ static int daObjMirrorSand_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjMirrorSand_Method = { +static DUSK_CONST actor_method_class l_daObjMirrorSand_Method = { (process_method_func)daObjMirrorSand_Create, (process_method_func)daObjMirrorSand_Delete, (process_method_func)daObjMirrorSand_Execute, (process_method_func)daObjMirrorSand_IsDelete, (process_method_func)daObjMirrorSand_Draw, }; -actor_process_profile_definition g_profile_Obj_MirrorSand = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorSand = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index 4d8432f1c4..a9948e8b75 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -252,13 +252,13 @@ int daObjMirrorScrew_c::Delete() { return 1; } -static actor_method_class l_daObjMirrorScrew_Method = { +static DUSK_CONST actor_method_class l_daObjMirrorScrew_Method = { (process_method_func)daObjMirrorScrew_Create, (process_method_func)daObjMirrorScrew_Delete, (process_method_func)daObjMirrorScrew_Execute, (process_method_func)daObjMirrorScrew_IsDelete, (process_method_func)daObjMirrorScrew_Draw, }; -actor_process_profile_definition g_profile_Obj_MirrorScrew = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorScrew = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index ec77a7ac91..6be9fdc295 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -454,7 +454,7 @@ void daObjMirrorTable_c::initBaseMtx() { setBaseMtx(); } -static actor_method_class l_daObjMirrorTable_Method = { +static DUSK_CONST actor_method_class l_daObjMirrorTable_Method = { (process_method_func)daObjMirrorTable_Create, (process_method_func)daObjMirrorTable_Delete, (process_method_func)daObjMirrorTable_Execute, @@ -462,7 +462,7 @@ static actor_method_class l_daObjMirrorTable_Method = { (process_method_func)daObjMirrorTable_Draw, }; -actor_process_profile_definition g_profile_Obj_MirrorTable = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MirrorTable = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 0392c33d79..7e685080c9 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1498,7 +1498,7 @@ int Mthd_IsDelete(void* i_this) { return ((daObjMovebox::Act_c*)i_this)->MoveBGIsDelete(); } -static actor_method_class Mthd_Table = { +static DUSK_CONST actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, (process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete, (process_method_func)Mthd_Draw, @@ -1506,7 +1506,7 @@ static actor_method_class Mthd_Table = { }; // namespace }; // namespace daObjMovebox -actor_process_profile_definition g_profile_Obj_Movebox = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Movebox = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index fadc177a4c..7b94ca0acc 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -500,7 +500,7 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daObj_Msima_Method = { +static DUSK_CONST actor_method_class l_daObj_Msima_Method = { (process_method_func)daObj_Msima_Create, (process_method_func)daObj_Msima_Delete, (process_method_func)daObj_Msima_Execute, @@ -508,7 +508,7 @@ static actor_method_class l_daObj_Msima_Method = { (process_method_func)daObj_Msima_Draw, }; -actor_process_profile_definition g_profile_OBJ_MSIMA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_MSIMA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index 330695d16f..73ee2c2c86 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -72,7 +72,7 @@ int daObjStair_c::Create() { return 1; } -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "K_mvkai00", "Lv9_mvkai", }; @@ -454,7 +454,7 @@ static int daObjStair_MoveBGDraw(daObjStair_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjStair_METHODS = { +static DUSK_CONST actor_method_class daObjStair_METHODS = { (process_method_func)daObjStair_create1st, (process_method_func)daObjStair_MoveBGDelete, (process_method_func)daObjStair_MoveBGExecute, @@ -462,7 +462,7 @@ static actor_method_class daObjStair_METHODS = { (process_method_func)daObjStair_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_MvStair = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_MvStair = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 745b4e21b5..af488ef92a 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -161,13 +161,13 @@ static int daObj_Myogan_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daObj_Myogan_Method = { +static DUSK_CONST actor_method_class l_daObj_Myogan_Method = { (process_method_func)daObj_Myogan_Create, (process_method_func)daObj_Myogan_Delete, (process_method_func)daObj_Myogan_Execute, (process_method_func)daObj_Myogan_IsDelete, (process_method_func)daObj_Myogan_Draw, }; -actor_process_profile_definition g_profile_OBJ_MYOGAN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_MYOGAN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index bc1b3c1b53..6341843ae4 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -11,7 +11,7 @@ static int daObjNagaisu_c_createHeap(fopAc_ac_c* i_this) { return ((daObjNagaisu_c*)i_this)->createHeap(); } -static char* l_arcName = "Nagaisu"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Nagaisu"; daObjNagaisu_c::daObjNagaisu_c() {} @@ -312,7 +312,7 @@ static int daObjNagaisu_draw(daObjNagaisu_c* i_this) { return i_this->draw(); } -static actor_method_class daObjNagaisu_METHODS = { +static DUSK_CONST actor_method_class daObjNagaisu_METHODS = { (process_method_func)daObjNagaisu_create, (process_method_func)daObjNagaisu_Delete, (process_method_func)daObjNagaisu_execute, @@ -320,7 +320,7 @@ static actor_method_class daObjNagaisu_METHODS = { (process_method_func)daObjNagaisu_draw, }; -actor_process_profile_definition g_profile_Obj_Nagaisu = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Nagaisu = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index e72cc6553c..56bb13f9ec 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -228,7 +228,7 @@ void daObjNameplate_c::messageProc() { } } -char* daObjNameplate_c::l_arcName = "J_Hyosatu"; +char DUSK_CONST* DUSK_CONST daObjNameplate_c::l_arcName = "J_Hyosatu"; int daObjNameplate_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "J_Hyousatu.bmd"); @@ -300,13 +300,13 @@ static int daObjNameplate_Create(fopAc_ac_c* i_this) { /* ############################################################################################## */ -static actor_method_class l_daObjNameplate_Method = { +static DUSK_CONST actor_method_class l_daObjNameplate_Method = { (process_method_func)daObjNameplate_Create, (process_method_func)daObjNameplate_Delete, (process_method_func)daObjNameplate_Execute, (process_method_func)daObjNameplate_IsDelete, (process_method_func)daObjNameplate_Draw, }; -actor_process_profile_definition g_profile_Obj_NamePlate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_NamePlate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index c830433453..691d2525ca 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -720,7 +720,7 @@ static int daObjNAN_IsDelete(daObjNAN_c* i_this) { return 1; } -static actor_method_class l_daObjNAN_Method = { +static DUSK_CONST actor_method_class l_daObjNAN_Method = { (process_method_func)daObjNAN_Create, (process_method_func)daObjNAN_Delete, (process_method_func)daObjNAN_Execute, @@ -728,7 +728,7 @@ static actor_method_class l_daObjNAN_Method = { (process_method_func)daObjNAN_Draw, }; -actor_process_profile_definition g_profile_Obj_Nan = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Nan = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index c57cb162a7..67c8ef9e2b 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -125,13 +125,13 @@ static int daObj_Ndoor_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daObj_Ndoor_Method = { +static DUSK_CONST actor_method_class l_daObj_Ndoor_Method = { (process_method_func)daObj_Ndoor_Create, (process_method_func)daObj_Ndoor_Delete, (process_method_func)daObj_Ndoor_Execute, (process_method_func)daObj_Ndoor_IsDelete, (process_method_func)daObj_Ndoor_Draw, }; -actor_process_profile_definition g_profile_OBJ_NDOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_NDOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index ae3ee5bba9..2a81bb3033 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -16,7 +16,7 @@ dCcD_SrcSph daObj_Nougu_c::mCcDSph = { }, }; -static char* l_resName = "Jagar4"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resName = "Jagar4"; const daObj_Nougu_HIOParam daObj_Nougu_Param_c::m = { 0.0f, @@ -227,7 +227,7 @@ static int daObj_Nougu_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_Nougu_MethodTable = { +static DUSK_CONST actor_method_class daObj_Nougu_MethodTable = { (process_method_func)daObj_Nougu_Create, (process_method_func)daObj_Nougu_Delete, (process_method_func)daObj_Nougu_Execute, @@ -235,7 +235,7 @@ static actor_method_class daObj_Nougu_MethodTable = { (process_method_func)daObj_Nougu_Draw, }; -actor_process_profile_definition g_profile_OBJ_NOUGU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_NOUGU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index 6f38f99b2d..0dfa795942 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -25,7 +25,7 @@ const static dCcD_SrcSph ccSphSrc = { } // mSphAttr }; -static char* l_arcName[1] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[1] = { "Octhashi" }; @@ -376,7 +376,7 @@ int daObjOCTHASHI_c::Delete() { return 1; } -static actor_method_class l_daObjOCTHASHI_Method = { +static DUSK_CONST actor_method_class l_daObjOCTHASHI_Method = { (process_method_func)daObjOCTHASHI_Create, (process_method_func)daObjOCTHASHI_Delete, (process_method_func)daObjOCTHASHI_Execute, @@ -384,7 +384,7 @@ static actor_method_class l_daObjOCTHASHI_Method = { (process_method_func)daObjOCTHASHI_Draw, }; -actor_process_profile_definition g_profile_OCTHASHI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OCTHASHI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index a2110168f4..553eed640c 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -7,15 +7,15 @@ #include "d/actor/d_a_obj_oiltubo.h" -static char* l_resFileName = "Obj_otubo"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resFileName = "Obj_otubo"; -static char* l_bmdFileName = "x_oiltubo_00.bmd"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bmdFileName = "x_oiltubo_00.bmd"; -static char* l_bbmdFileName = "x_oiltubo_00b.bmd"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bbmdFileName = "x_oiltubo_00b.bmd"; -static char* l_bbtkFileName = "x_oiltubo_00b.btk"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bbtkFileName = "x_oiltubo_00b.btk"; -dCcD_SrcCyl daObj_Oiltubo_c::mCcDCyl = { +dCcD_SrcCyl DUSK_CONST daObj_Oiltubo_c::mCcDCyl = { daObj_Oiltubo_c::mCcDObjInfo, { { @@ -284,13 +284,13 @@ static int daObj_Oiltubo_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_Oiltubo_MethodTable = { +static DUSK_CONST actor_method_class daObj_Oiltubo_MethodTable = { (process_method_func)daObj_Oiltubo_Create, (process_method_func)daObj_Oiltubo_Delete, (process_method_func)daObj_Oiltubo_Execute, (process_method_func)daObj_Oiltubo_IsDelete, (process_method_func)daObj_Oiltubo_Draw, }; -actor_process_profile_definition g_profile_OBJ_OILTUBO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_OILTUBO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index de484230c7..d1e2bd1df9 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -39,7 +39,7 @@ static const u32 l_dzb[2] = {12, 12}; static const u32 l_heap_size[2] = {10240, 6880}; -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "H_Onsen", "H_KaOnsen", }; @@ -121,13 +121,13 @@ static int daObjOnsen_MoveBGDraw(daObjOnsen_c* i_this) { return static_cast(i_this)->MoveBGDraw(); } -static actor_method_class daObjOnsen_METHODS = { +static DUSK_CONST actor_method_class daObjOnsen_METHODS = { (process_method_func)daObjOnsen_create1st, (process_method_func)daObjOnsen_MoveBGDelete, (process_method_func)daObjOnsen_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjOnsen_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Onsen = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Onsen = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index 9adfca491d..1d45d79e25 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -38,13 +38,13 @@ static int daObjOnsenFire_Delete(daObjOnsenFire_c* i_this) { return 1; } -static actor_method_class l_daObjOnsenFire_Method = { +static DUSK_CONST actor_method_class l_daObjOnsenFire_Method = { (process_method_func)daObjOnsenFire_Create, (process_method_func)daObjOnsenFire_Delete, (process_method_func)daObjOnsenFire_Execute }; -actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_ONSEN_FIRE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index ea2b107ecf..62890f85b8 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -384,13 +384,13 @@ static int daOnsTaru_Create(fopAc_ac_c* i_this) { return ((daOnsTaru_c*)i_this)->create(); } -static actor_method_class l_daOnsTaru_Method = { +static DUSK_CONST actor_method_class l_daOnsTaru_Method = { (process_method_func)daOnsTaru_Create, (process_method_func)daOnsTaru_Delete, (process_method_func)daOnsTaru_Execute, (process_method_func)NULL, (process_method_func)daOnsTaru_Draw, }; -actor_process_profile_definition g_profile_Obj_OnsenTaru = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_OnsenTaru = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 32569f300d..f5931ebd43 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -205,7 +205,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { return 1; } -static char* l_arcName = "J_Necktie"; +static DUSK_CONST char* l_arcName = "J_Necktie"; int daObjOnCloth_c::createHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcName, "J_Necktie.bmd")); @@ -311,7 +311,7 @@ ClothJoint_c::ClothJoint_c() { /* empty function */ } -static actor_method_class l_daObjOnCloth_Method = { +static DUSK_CONST actor_method_class l_daObjOnCloth_Method = { (process_method_func)daObjOnCloth_Create, (process_method_func)daObjOnCloth_Delete, (process_method_func)daObjOnCloth_Execute, @@ -319,7 +319,7 @@ static actor_method_class l_daObjOnCloth_Method = { (process_method_func)daObjOnCloth_Draw, }; -actor_process_profile_definition g_profile_Obj_OnCloth = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_OnCloth = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index cffabcd90e..eb67b6c00f 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -51,9 +51,9 @@ void daObjPDoor_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName = "V_OsuDoor"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_OsuDoor"; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {0.0f, 0.0f, -600.0f}, {600.0f, 1000.0f, 600.0f}, }; @@ -270,7 +270,7 @@ static int daObjPDoor_MoveBGDraw(daObjPDoor_c* i_this) { return i_this->Draw(); } -static actor_method_class daObjPDoor_METHODS = { +static DUSK_CONST actor_method_class daObjPDoor_METHODS = { (process_method_func)daObjPDoor_create1st, (process_method_func)daObjPDoor_MoveBGDelete, (process_method_func)daObjPDoor_MoveBGExecute, @@ -278,7 +278,7 @@ static actor_method_class daObjPDoor_METHODS = { (process_method_func)daObjPDoor_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_PushDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_PushDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 79bbb7d80e..63bece04e8 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -16,39 +16,39 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 static_cast(param_2)->rideActor(param_3); } -static char* l_arcName4 = "P_Dtile"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName4 = "P_Dtile"; -static u32 l_dzbidx4[2] = { +static DUSK_CONSTEXPR u32 l_dzbidx4[2] = { 9, 8, }; -static u32 l_bmdidx4[2] = { +static DUSK_CONSTEXPR u32 l_bmdidx4[2] = { 5, 4, }; -static cull_box l_cull_box4[2] = { +static DUSK_CONSTEXPR cull_box l_cull_box4[2] = { {{-50.0f, -100.0f, -50.0f}, {50.0f, 20.49f, 50.0f}}, {{-160.0f, -460.0f, -160.0f}, {160.0f, 20.0f, 160.0f}}, }; -static char* l_arcName7 = "P_Dtile00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName7 = "P_Dtile00"; -static u32 l_dzbidx7 = 7; +static DUSK_CONSTEXPR u32 l_dzbidx7 = 7; -static u32 l_bmdidx7 = 4; +static DUSK_CONSTEXPR u32 l_bmdidx7 = 4; -static cull_box l_cull_box7 = { +static DUSK_CONSTEXPR cull_box l_cull_box7 = { {-200.0f, -700.0f, -200.0f}, {200.0f, 50.0f, 200.0f}, }; -static char* l_arcName9 = "Lv9_Dtile"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName9 = "Lv9_Dtile"; -static u32 l_dzbidx9 = 7; +static DUSK_CONSTEXPR u32 l_dzbidx9 = 7; -static u32 l_bmdidx9 = 4; +static DUSK_CONSTEXPR u32 l_bmdidx9 = 4; -static cull_box l_cull_box9 = { +static DUSK_CONSTEXPR cull_box l_cull_box9 = { {-200.0f, -650.0f, -200.0f}, {200.0f, 50.0f, 200.0f}, }; @@ -185,7 +185,7 @@ int daObjPDtile_c::CreateHeap() { return mModel != 0 ? TRUE : FALSE; } -static dCcD_SrcCyl cc_cyl_src = { +static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x8020, 0x11}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -514,7 +514,7 @@ static int daObjPDtile_MoveBGDraw(daObjPDtile_c* i_this) { } -static actor_method_class daObjPDtile_METHODS = { +static DUSK_CONST actor_method_class daObjPDtile_METHODS = { (process_method_func)daObjPDtile_create1st, (process_method_func)daObjPDtile_MoveBGDelete, (process_method_func)daObjPDtile_MoveBGExecute, @@ -522,7 +522,7 @@ static actor_method_class daObjPDtile_METHODS = { (process_method_func)daObjPDtile_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_PDtile = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_PDtile = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index cfdf2dfc32..dc6a1913fd 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -16,7 +16,7 @@ static const cull_box l_cull_box = { {750.0f, 500.0f, 300.0f}, }; -static char* l_arcName = "P_Dwall"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_Dwall"; int daObjPDwall_c::create1st() { int phase_state = dComIfG_resLoad(this, l_arcName); @@ -192,7 +192,7 @@ static int daObjPDwall_MoveBGDraw(daObjPDwall_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjPDwall_METHODS = { +static DUSK_CONST actor_method_class daObjPDwall_METHODS = { (process_method_func)daObjPDwall_create1st, (process_method_func)daObjPDwall_MoveBGDelete, (process_method_func)daObjPDwall_MoveBGExecute, @@ -200,7 +200,7 @@ static actor_method_class daObjPDwall_METHODS = { (process_method_func)daObjPDwall_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_PDwall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_PDwall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 800650d4f0..3cf8765962 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -12,7 +12,7 @@ static int daObjPicture_c_createHeap(fopAc_ac_c* i_this) { return ((daObjPicture_c*)i_this)->createHeap(); } -static char* l_arcName = "L9Picture"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "L9Picture"; static Vec l_LINE_OFFSET_POS[] = { {-100.0f, 200.0f, -2.0f}, @@ -548,7 +548,7 @@ dCcD_SrcCyl daObjPicture_c::s_CcDCyl_pic_at = { } }; -static actor_method_class daObjPicture_METHODS = { +static DUSK_CONST actor_method_class daObjPicture_METHODS = { (process_method_func)daObjPicture_create, (process_method_func)daObjPicture_Delete, (process_method_func)daObjPicture_execute, @@ -556,7 +556,7 @@ static actor_method_class daObjPicture_METHODS = { (process_method_func)daObjPicture_draw, }; -actor_process_profile_definition g_profile_Obj_Picture = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Picture = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 965b93fc4d..47ecccf575 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -59,7 +59,7 @@ static const daPillar_c::sdata_t l_shake_data[] = { /* CRASH */ {5, 0, 800, 120, 7000, 30, 15}, }; -static char* l_arcName[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[] = { "K_mbhasi0", "K_mbhasi1", }; @@ -479,7 +479,7 @@ static int daPillar_MoveBGDraw(daPillar_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daPillar_METHODS = { +static DUSK_CONST actor_method_class daPillar_METHODS = { (process_method_func)daPillar_create1st, (process_method_func)daPillar_MoveBGDelete, (process_method_func)daPillar_MoveBGExecute, @@ -487,7 +487,7 @@ static actor_method_class daPillar_METHODS = { (process_method_func)daPillar_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Pillar = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Pillar = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index b714bbd870..3510a08111 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_pleaf.h" -static char* l_resName = "J_Hatake"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resName = "J_Hatake"; daObj_Pleaf_HIOParam const daObj_Pleaf_Param_c::m = {0, -3.0f, 1.0f, 900.0f}; @@ -123,7 +123,7 @@ int daObj_Pleaf_c::createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); } -char* daObj_Pleaf_c::getResName() { +char DUSK_CONST* daObj_Pleaf_c::getResName() { return l_resName; } @@ -172,13 +172,13 @@ static int daObj_Pleaf_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_Pleaf_MethodTable = { +static DUSK_CONST actor_method_class daObj_Pleaf_MethodTable = { (process_method_func)daObj_Pleaf_Create, (process_method_func)daObj_Pleaf_Delete, (process_method_func)daObj_Pleaf_Execute, (process_method_func)daObj_Pleaf_IsDelete, (process_method_func)daObj_Pleaf_Draw, }; -actor_process_profile_definition g_profile_OBJ_PLEAF = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_PLEAF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 70f914bb25..e7bc470f2f 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -241,7 +241,7 @@ static int daPoCandle_Create(fopAc_ac_c* i_this) { return ((daPoCandle_c*)i_this)->create(); } -static actor_method_class l_daPoCandle_Method = { +static DUSK_CONST actor_method_class l_daPoCandle_Method = { (process_method_func)daPoCandle_Create, (process_method_func)daPoCandle_Delete, (process_method_func)daPoCandle_Execute, @@ -249,7 +249,7 @@ static actor_method_class l_daPoCandle_Method = { (process_method_func)daPoCandle_Draw, }; -actor_process_profile_definition g_profile_Obj_poCandle = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_poCandle = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 4c2f9d9ac0..ed01ba3013 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -380,7 +380,7 @@ bool daPoFire_c::eventStart() { } bool daPoFire_c::eventRun() { - static char* action_table[1] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[1] = { "MOVE_END", }; @@ -431,13 +431,13 @@ static int daPoFire_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daPoFire_Method = { +static DUSK_CONST actor_method_class l_daPoFire_Method = { (process_method_func)daPoFire_Create, (process_method_func)daPoFire_Delete, (process_method_func)daPoFire_Execute, NULL, (process_method_func)daPoFire_Draw, }; -actor_process_profile_definition g_profile_Obj_poFire = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_poFire = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index 9ef2bfde09..e850c0e67b 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -18,16 +18,16 @@ public: /* 0x8 */ f32 close_speed; }; -static char* l_type[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_type[2] = { "pouBox0", "pouBox1", }; -static int l_bmdIdx[] = { +static DUSK_CONSTEXPR int l_bmdIdx[] = { 10, 8, }; -static int l_dzbIdx[] = { +static DUSK_CONSTEXPR int l_dzbIdx[] = { 21, 11, }; @@ -157,7 +157,7 @@ int daPoTbox_c::create() { static daPoTbox_HIO_c l_HIO; int daPoTbox_c::Execute(Mtx** param_0) { - static void (daPoTbox_c::*mode_proc[])() = { + static DUSK_CONSTEXPR void (daPoTbox_c::*mode_proc[])() = { &daPoTbox_c::modeWait, &daPoTbox_c::modeOpen, &daPoTbox_c::modeOpenEnd, @@ -295,7 +295,7 @@ static int daPoTbox_Create(fopAc_ac_c* i_this) { return ((daPoTbox_c*)i_this)->create(); } -static actor_method_class l_daPoTbox_Method = { +static DUSK_CONST actor_method_class l_daPoTbox_Method = { (process_method_func)daPoTbox_Create, (process_method_func)daPoTbox_Delete, (process_method_func)daPoTbox_Execute, @@ -303,7 +303,7 @@ static actor_method_class l_daPoTbox_Method = { (process_method_func)daPoTbox_Draw, }; -actor_process_profile_definition g_profile_Obj_poTbox = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_poTbox = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 393bd02c7e..c49cc10cd8 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -93,13 +93,13 @@ static int daObjProp_draw(daObjProp_c* i_this) { return i_this->draw(); } -static actor_method_class daObjProp_METHODS = { +static DUSK_CONST actor_method_class daObjProp_METHODS = { (process_method_func)daObjProp_create, (process_method_func)daObjProp_Delete, (process_method_func)daObjProp_execute, (process_method_func)NULL, (process_method_func)daObjProp_draw, }; -actor_process_profile_definition g_profile_Obj_Prop = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Prop = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 6dcd0988f7..0ad30174ae 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -143,11 +143,11 @@ const dCcD_SrcGObjInf l_ccDObjData = { }; -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { {3, 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "pumpkin", }; @@ -883,7 +883,7 @@ static int daObj_Pumpkin_IsDelete(void*) { return 1; } -static actor_method_class daObj_Pumpkin_MethodTable = { +static DUSK_CONST actor_method_class daObj_Pumpkin_MethodTable = { (process_method_func)daObj_Pumpkin_Create, (process_method_func)daObj_Pumpkin_Delete, (process_method_func)daObj_Pumpkin_Execute, @@ -891,7 +891,7 @@ static actor_method_class daObj_Pumpkin_MethodTable = { (process_method_func)daObj_Pumpkin_Draw, }; -actor_process_profile_definition g_profile_OBJ_PUMPKIN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_PUMPKIN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index 6beb12110c..35b91e8129 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -12,7 +12,7 @@ static int daObjRCircle_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_arcName = "RCircle"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "RCircle"; daObjRCircle_c::daObjRCircle_c() {} @@ -116,13 +116,13 @@ static int daObjRCircle_draw(daObjRCircle_c* i_this) { return i_this->draw(); } -static actor_method_class daObjRCircle_METHODS = { +static DUSK_CONST actor_method_class daObjRCircle_METHODS = { (process_method_func)daObjRCircle_create, (process_method_func)daObjRCircle_Delete, (process_method_func)daObjRCircle_execute, (process_method_func)NULL, (process_method_func)daObjRCircle_draw, }; -actor_process_profile_definition g_profile_Obj_RCircle = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RCircle = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 7cec9644c1..28e18466ed 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -193,7 +193,7 @@ static int daRfHole_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daRfHole_Method = { +static DUSK_CONST actor_method_class l_daRfHole_Method = { (process_method_func)daRfHole_Create, (process_method_func)daRfHole_Delete, (process_method_func)daRfHole_Execute, @@ -201,7 +201,7 @@ static actor_method_class l_daRfHole_Method = { (process_method_func)daRfHole_Draw, }; -actor_process_profile_definition g_profile_Obj_RfHole = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RfHole = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index a652eb6a03..66616d3d34 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -210,10 +210,10 @@ void daObjRgate_c::setBaseMtx() { } } -static char* l_arcName = "M_RGate00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_RGate00"; int daObjRgate_c::Create() { - static char* l_evName = "RIDER_GATE_OPEN00"; + static DUSK_CONSTEXPR char DUSK_CONST* l_evName = "RIDER_GATE_OPEN00"; u8 sw_no = getSwNo(); if (sw_no != 0xFF && !fopAcM_isSwitch(this, sw_no) && @@ -803,7 +803,7 @@ void daObjRgate_c::demoProc() { } int daObjRgate_c::getDemoAction() { - static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"}; + static DUSK_CONSTEXPR char DUSK_CONST* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"}; return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0); } @@ -872,13 +872,13 @@ static int daObjRgate_MoveBGDraw(daObjRgate_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjRgate_METHODS = { +static DUSK_CONST actor_method_class daObjRgate_METHODS = { (process_method_func)daObjRgate_create1st, (process_method_func)daObjRgate_MoveBGDelete, (process_method_func)daObjRgate_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjRgate_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_RiderGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RiderGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 4b530882a1..7c61b15de4 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -10,7 +10,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -static char* l_arcName = "RiverRock"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "RiverRock"; daObjRIVERROCK_HIO_c::daObjRIVERROCK_HIO_c() { field_0x4 = -1; @@ -312,7 +312,7 @@ int daObjRIVERROCK_c::Delete() { return 1; } -static actor_method_class l_daObjRIVERROCK_Method = { +static DUSK_CONST actor_method_class l_daObjRIVERROCK_Method = { (process_method_func)daObjRIVERROCK_Create, (process_method_func)daObjRIVERROCK_Delete, (process_method_func)daObjRIVERROCK_Execute, @@ -320,7 +320,7 @@ static actor_method_class l_daObjRIVERROCK_Method = { (process_method_func)daObjRIVERROCK_Draw, }; -actor_process_profile_definition g_profile_Obj_RIVERROCK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RIVERROCK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 6bf1bf84e1..453eff92f0 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -195,12 +195,12 @@ rock_ss::~rock_ss() {} rock_ss::rock_ss() {} -static actor_method_class l_daObj_Rock_Method = { +static DUSK_CONST actor_method_class l_daObj_Rock_Method = { (process_method_func)daObj_Rock_Create, (process_method_func)daObj_Rock_Delete, (process_method_func)daObj_Rock_Execute, (process_method_func)daObj_Rock_IsDelete, (process_method_func)daObj_Rock_Draw}; -actor_process_profile_definition g_profile_OBJ_ROCK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_ROCK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 7d5ff20af5..3fcd949d1a 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -10,9 +10,9 @@ #include "d/d_s_play.h" #include -static char* l_arcName[2] = {"L_RopeB_S", "L_RopeB_L"}; +static DUSK_CONST char* l_arcName[2] = {"L_RopeB_S", "L_RopeB_L"}; -static char* l_ropeArcName = "L_Ropest"; +static DUSK_CONST char* l_ropeArcName = "L_Ropest"; void daObjRBridge_c::initBaseMtx() { mDoMtx_stack_c::transS(current.pos); @@ -244,12 +244,12 @@ BOOL daObjRBridge_c::checkTight() { return FALSE; } -static cull_box l_cull_sizeS = { +static DUSK_CONSTEXPR cull_box l_cull_sizeS = { {-250.0f, 0.0f, -100.0f}, {250.0f, 1100.0f, 1000.0f}, }; -static cull_box l_cull_sizeL = { +static DUSK_CONSTEXPR cull_box l_cull_sizeL = { {-400.0f, 0.0f, -100.0f}, {400.0f, 1500.0f, 1500.0f}, }; @@ -321,8 +321,8 @@ int daObjRBridge_c::Create() { mCcCps[i].SetStts(&mCcStts); } - Vec* cull_min; - Vec* cull_max; + Vec DUSK_CONST* cull_min; + Vec DUSK_CONST* cull_max; if (mType == 0) { cull_min = &l_cull_sizeS.min; cull_max = &l_cull_sizeS.max; @@ -629,7 +629,7 @@ static int daObjRBridge_MoveBGDraw(daObjRBridge_c* a_this) { return a_this->MoveBGDraw(); } -static actor_method_class daObjRBridge_METHODS = { +static DUSK_CONST actor_method_class daObjRBridge_METHODS = { (process_method_func)daObjRBridge_create1st, (process_method_func)daObjRBridge_MoveBGDelete, (process_method_func)daObjRBridge_MoveBGExecute, @@ -637,7 +637,7 @@ static actor_method_class daObjRBridge_METHODS = { (process_method_func)daObjRBridge_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_RopeBridge = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RopeBridge = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index e024eedb9a..7f2577f563 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_rotBridge.h" -static char* l_resNameIdx[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[3] = { "P_Mbridge", "P_Mbridge", "P_Mbrid9", @@ -252,7 +252,7 @@ static int daRotBridge_Create(fopAc_ac_c* i_this) { return ((daRotBridge_c*)i_this)->create(); } -static actor_method_class l_daRotBridge_Method = { +static DUSK_CONST actor_method_class l_daRotBridge_Method = { (process_method_func)daRotBridge_Create, (process_method_func)daRotBridge_Delete, (process_method_func)daRotBridge_Execute, @@ -260,7 +260,7 @@ static actor_method_class l_daRotBridge_Method = { (process_method_func)daRotBridge_Draw, }; -actor_process_profile_definition g_profile_Obj_RotBridge = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RotBridge = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 095b2e457d..1c8a711b49 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -311,7 +311,7 @@ static int daRotTrap_Create(fopAc_ac_c* i_this) { return ((daRotTrap_c*)i_this)->create(); } -static actor_method_class l_daRotTrap_Method = { +static DUSK_CONST actor_method_class l_daRotTrap_Method = { (process_method_func)daRotTrap_Create, (process_method_func)daRotTrap_Delete, (process_method_func)daRotTrap_Execute, @@ -319,7 +319,7 @@ static actor_method_class l_daRotTrap_Method = { (process_method_func)daRotTrap_Draw, }; -actor_process_profile_definition g_profile_Obj_RotTrap = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RotTrap = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index dbbe609654..7fa091e59e 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -68,9 +68,9 @@ int daObj_Roten_c::Create() { return 1; } -static char* l_resFileName = "Obj_roten"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resFileName = "Obj_roten"; -static u32 l_bmdFileIdx = 4; +static DUSK_CONSTEXPR u32 l_bmdFileIdx = 4; int daObj_Roten_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileIdx); @@ -79,7 +79,7 @@ int daObj_Roten_c::CreateHeap() { return mModel != NULL; } -static u32 l_dzbFileIdx = 7; +static DUSK_CONSTEXPR u32 l_dzbFileIdx = 7; int daObj_Roten_c::create() { fopAcM_ct(this, daObj_Roten_c); @@ -142,7 +142,7 @@ int daObj_Roten_c::Delete() { return 1; } -char* daObj_Roten_c::getResName() { +char DUSK_CONST* daObj_Roten_c::getResName() { return l_resFileName; } @@ -169,7 +169,7 @@ static int daObj_Roten_IsDelete(void* i_this) { daObj_Roten_c::~daObj_Roten_c() { } -static actor_method_class daObj_Roten_MethodTable = { +static DUSK_CONST actor_method_class daObj_Roten_MethodTable = { (process_method_func)daObj_Roten_Create, (process_method_func)daObj_Roten_Delete, (process_method_func)daObj_Roten_Execute, @@ -177,7 +177,7 @@ static actor_method_class daObj_Roten_MethodTable = { (process_method_func)daObj_Roten_Draw, }; -actor_process_profile_definition g_profile_OBJ_ROTEN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_ROTEN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 609a0cf7b8..33068cdae7 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -70,7 +70,7 @@ int daObjRotStair_c::Create() { return 1; } -static char* l_arcName = "K_spkai00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "K_spkai00"; static Vec l_water_check_offset = { 0.0f, 2000.0f, -2000.0f, @@ -354,7 +354,7 @@ static int daObjRotStair_MoveBGDraw(daObjRotStair_c* i_this) { } -static actor_method_class daObjRotStair_METHODS = { +static DUSK_CONST actor_method_class daObjRotStair_METHODS = { (process_method_func)daObjRotStair_create1st, (process_method_func)daObjRotStair_MoveBGDelete, (process_method_func)daObjRotStair_MoveBGExecute, @@ -362,7 +362,7 @@ static actor_method_class daObjRotStair_METHODS = { (process_method_func)daObjRotStair_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_RotStair = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_RotStair = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index 94ea6350c4..1958c4d583 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -335,7 +335,7 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { } // mSphAttr }; - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -386,7 +386,7 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { return phase_state; } -static actor_method_class l_daOBJ_RW_Method = { +static DUSK_CONST actor_method_class l_daOBJ_RW_Method = { (process_method_func)daOBJ_RW_Create, (process_method_func)daOBJ_RW_Delete, (process_method_func)daOBJ_RW_Execute, @@ -394,7 +394,7 @@ static actor_method_class l_daOBJ_RW_Method = { (process_method_func)daOBJ_RW_Draw, }; -actor_process_profile_definition g_profile_OBJ_RW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_RW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 7c7f2b0c63..c90ce1ec1a 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -static char* l_resNameIdx[2] = { +static DUSK_CONST char* l_resNameIdx[2] = { "P_Rgate", "SDGate", }; @@ -231,13 +231,13 @@ static int daSwShutter_Create(fopAc_ac_c* i_this) { return ((daSwShutter_c*)i_this)->create(); } -static actor_method_class l_daSwShutter_Method = { +static DUSK_CONST actor_method_class l_daSwShutter_Method = { (process_method_func)daSwShutter_Create, (process_method_func)daSwShutter_Delete, (process_method_func)daSwShutter_Execute, (process_method_func)NULL, (process_method_func)daSwShutter_Draw, }; -actor_process_profile_definition g_profile_Obj_SwallShutter = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwallShutter = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index ed4818e0f5..ab0d6bf923 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -148,13 +148,13 @@ static int daSaidan_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daSaidan_Method = { +static DUSK_CONST actor_method_class l_daSaidan_Method = { (process_method_func)daSaidan_Create, (process_method_func)daSaidan_Delete, (process_method_func)daSaidan_Execute, NULL, (process_method_func)daSaidan_Draw, }; -actor_process_profile_definition g_profile_Obj_Saidan = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Saidan = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index d81e2a6825..f2f8d14348 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -55,7 +55,7 @@ daObjSakuita_Attr_c const daObjSakuita_c::M_attr = { 20.0f, 12.0f, 70.0f, -50.0f, 0.8f, 0.5f, -6.0f, 900.0f, 20000.0f, 100.0f, 0x1400, 0x14, }; -static char* l_arcName = "A_Sakuita"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "A_Sakuita"; void daObjSakuita_c::create_init() { fopAcM_setCullSizeBox(this, -30.0f, -90.0f, -10.0f, 30.0f, 20.0f, 10.0f); @@ -205,7 +205,7 @@ static int daObjSakuita_Create(fopAc_ac_c* i_actor) { return static_cast(i_actor)->create(); } -static actor_method_class l_daObjSakuita_Method = { +static DUSK_CONST actor_method_class l_daObjSakuita_Method = { (process_method_func)daObjSakuita_Create, (process_method_func)daObjSakuita_Delete, (process_method_func)daObjSakuita_Execute, @@ -213,7 +213,7 @@ static actor_method_class l_daObjSakuita_Method = { (process_method_func)daObjSakuita_Draw, }; -actor_process_profile_definition g_profile_Obj_Sakuita = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Sakuita = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 87beb7066f..d0328440c0 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -134,7 +134,7 @@ void Sakuita_c::calcAngle() { mRotation.z = -cM_atan2s(local_28.x, local_28.y); } -static char* l_arcName = "A_Sakuita"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "A_Sakuita"; #if DEBUG daObjItaRope_Hio_c M_hio; @@ -376,7 +376,7 @@ static int daObjItaRope_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjItaRope_Method = { +static DUSK_CONST actor_method_class l_daObjItaRope_Method = { (process_method_func)daObjItaRope_Create, (process_method_func)daObjItaRope_Delete, (process_method_func)daObjItaRope_Execute, @@ -384,7 +384,7 @@ static actor_method_class l_daObjItaRope_Method = { (process_method_func)daObjItaRope_Draw, }; -actor_process_profile_definition g_profile_Obj_ItaRope = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ItaRope = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 29c36b85fc..7e93898a1d 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -11,17 +11,17 @@ #include "d/d_s_play.h" #include -char* l_arcName_Comp = "SkyCannon"; +DUSK_CONSTEXPR char DUSK_CONST* l_arcName_Comp = "SkyCannon"; -char* l_arcName_Crash = "SCanHai"; +DUSK_CONSTEXPR char DUSK_CONST* l_arcName_Crash = "SCanHai"; -char* l_arcName_Zev = "SCanZev"; +DUSK_CONSTEXPR char DUSK_CONST* l_arcName_Zev = "SCanZev"; -char* l_arcName_Ptl = "SCanPtl"; +DUSK_CONSTEXPR char DUSK_CONST* l_arcName_Ptl = "SCanPtl"; -char* l_staffName = "SCannon"; +DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "SCannon"; -char* l_eventName[4] = { +DUSK_CONSTEXPR char DUSK_CONST* l_eventName[4] = { "SKY_CANNON_WARP_END", "SKY_CANNON_FIRE_FIRST", "SKY_CANNON_FIRE_TKS", @@ -53,7 +53,7 @@ daSCannon_c::daSCannon_c() { } daSCannon_c::~daSCannon_c() { - char* arcname; + char DUSK_CONST* arcname; if (mLayerNo == 3 || mLayerNo == 10) { arcname = l_arcName_Comp; } else if (mLayerNo == 1) { @@ -93,7 +93,7 @@ int daSCannon_c::create() { return cPhs_ERROR_e; } - char* arcname = l_arcName_Comp; + char DUSK_CONST* arcname = l_arcName_Comp; int ptl_phase_state = cPhs_COMPLEATE_e; if (layerNo == 1) { arcname = l_arcName_Crash; @@ -264,7 +264,7 @@ void daSCannon_c::setPtlModelMtx() { } int daSCannon_c::createHeap() { - char* arcname; + char DUSK_CONST* arcname; int bmd_index; int dzb_index; @@ -436,51 +436,51 @@ void daSCannon_c::exeModeOrderEvt() { eventInfo.onCondition(dEvtCnd_CANDEMO_e); } -void (daSCannon_c::*daSCannon_c::s_exeProc[])() = { +void (daSCannon_c::*DUSK_CONST daSCannon_c::s_exeProc[])() = { &daSCannon_c::exeModeWait, &daSCannon_c::exeModeOrderEvt, &daSCannon_c::exeModeActionEvt, &daSCannon_c::exeModeEnd, }; -char* CUT_TYPE_TABLE_WARP_END[2] = { +DUSK_CONSTEXPR char DUSK_CONST* CUT_TYPE_TABLE_WARP_END[2] = { "WAIT", "MOVE", }; -char* CUT_TYPE_TABLE_FIRE_TKS[3] = { +DUSK_CONSTEXPR char DUSK_CONST* CUT_TYPE_TABLE_FIRE_TKS[3] = { "0001_WAIT", "0002_RUN", "0003_JUMP", }; -char* CUT_TYPE_TABLE_FIRE_FIRST[1] = { +DUSK_CONSTEXPR char DUSK_CONST* CUT_TYPE_TABLE_FIRE_FIRST[1] = { "LINK_IN", }; -char* CUT_TYPE_TABLE_FIRE_SECOND[4] = { +DUSK_CONSTEXPR char DUSK_CONST* CUT_TYPE_TABLE_FIRE_SECOND[4] = { "SET", "MOVE", "FIRE", "FINISH", }; -void (daSCannon_c::*daSCannon_c::s_demoExeProc_WarpEnd[][2])() = { +void (daSCannon_c::*DUSK_CONST daSCannon_c::s_demoExeProc_WarpEnd[][2])() = { {&daSCannon_c::demoInitWarpEndWait, &daSCannon_c::demoExeWarpEndWait}, {&daSCannon_c::demoInitWarpEndMove, &daSCannon_c::demoExeWarpEndMove}, }; -void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireTks[][2])() = { +void (daSCannon_c::*DUSK_CONST daSCannon_c::s_demoExeProc_FireTks[][2])() = { {NULL, NULL}, {NULL, NULL}, {NULL, NULL}, }; -void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireFirst[][2])() = { +void (daSCannon_c::*DUSK_CONST daSCannon_c::s_demoExeProc_FireFirst[][2])() = { {&daSCannon_c::demoInitLinkIn, &daSCannon_c::demoExeLinkIn}, }; -void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireSecond[][2])() = { +void (daSCannon_c::*DUSK_CONST daSCannon_c::s_demoExeProc_FireSecond[][2])() = { {&daSCannon_c::demoInitSet, &daSCannon_c::demoExeSet}, {&daSCannon_c::demoInitMove, &daSCannon_c::demoExeMove}, {&daSCannon_c::demoInitFire, &daSCannon_c::demoExeFire}, @@ -533,7 +533,7 @@ const daSCannon_c::demoTable_s daSCannon_c::s_demoTable[] = { }; void daSCannon_c::demoExe() { - char** cut_table = s_demoTable[mDemoType].cut_table; + char DUSK_CONST* DUSK_CONST* cut_table = s_demoTable[mDemoType].cut_table; int cut_num = s_demoTable[mDemoType].cut_num; int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, cut_table, cut_num, 0, 0); if (act_idx != -1) { @@ -566,7 +566,7 @@ void daSCannon_c::demoExeLinkIn() { player_p->onPlayerNoDraw(); player_p->onPlayerShadowNoDraw(); - cXyz pos(-102065.44f, -17973.893f, 53981.64f); + DUSK_CONSTEXPR cXyz pos(-102065.44f, -17973.893f, 53981.64f); player_p->setPlayerPosAndAngle(&pos, player_p->shape_angle.y, 0); mpBgW->OffRoofRegist(); } @@ -842,7 +842,7 @@ static int daSCannon_draw(daSCannon_c* i_this) { return i_this->draw(); } -static actor_method_class daSCannon_METHODS = { +static DUSK_CONST actor_method_class daSCannon_METHODS = { (process_method_func)daSCannon_create, (process_method_func)daSCannon_Delete, (process_method_func)daSCannon_execute, @@ -850,7 +850,7 @@ static actor_method_class daSCannon_METHODS = { (process_method_func)daSCannon_draw, }; -actor_process_profile_definition g_profile_Obj_SCannon = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SCannon = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 28d91740b1..e422fd9a2c 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -33,11 +33,11 @@ static int eventCallBack(void* i_proc, int param_1) { return 1; } -static char* l_arcName = "SCanCrs"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "SCanCrs"; -static char* l_eventName = "SKY_CANNON_WARP_START"; +static DUSK_CONSTEXPR char DUSK_CONST* l_eventName = "SKY_CANNON_WARP_START"; -static char* l_staffName = "SCanCrs"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "SCanCrs"; daSCannonCrs_c::daSCannonCrs_c() { mpBgW = NULL; @@ -277,7 +277,7 @@ void (daSCannonCrs_c::*daSCannonCrs_c::s_exeProc[])(daMidna_c*) = { }; void daSCannonCrs_c::demoExe() { - static char* CUT_TYPE_TABLE[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* CUT_TYPE_TABLE[4] = { "WAIT", "BEAM_HIT", "READY", @@ -509,7 +509,7 @@ static int daSCannonCrs_draw(daSCannonCrs_c* i_this) { return i_this->draw(); } -static actor_method_class daSCannonCrs_METHODS = { +static DUSK_CONST actor_method_class daSCannonCrs_METHODS = { (process_method_func)daSCannonCrs_create, (process_method_func)daSCannonCrs_Delete, (process_method_func)daSCannonCrs_execute, @@ -517,7 +517,7 @@ static actor_method_class daSCannonCrs_METHODS = { (process_method_func)daSCannonCrs_draw, }; -actor_process_profile_definition g_profile_Obj_SCannonCrs = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SCannonCrs = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 17a3f5e61f..63f8d370b2 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -11,11 +11,11 @@ #include "f_op/f_op_camera_mng.h" #include -static char* l_arcName = "SCanTen"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "SCanTen"; -static char* l_staffName = "SCanTen"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "SCanTen"; -static char* l_eventName = "SKY_CANNON_TEN_FIRE"; +static DUSK_CONSTEXPR char DUSK_CONST* l_eventName = "SKY_CANNON_TEN_FIRE"; static int eventCallBack(void* i_proc, int param_1) { daObjSCannonTen_c* proc = (daObjSCannonTen_c*)i_proc; @@ -217,7 +217,7 @@ void daObjSCannonTen_c::exeModeActionEvt() { void daObjSCannonTen_c::exeModeEnd() {} void daObjSCannonTen_c::demoExe() { - static char* CUT_TYPE_TABLE_FIRE_SECOND[6] = { + static DUSK_CONSTEXPR char DUSK_CONST* CUT_TYPE_TABLE_FIRE_SECOND[6] = { "LINK_IN", "SET", "MOVE", @@ -460,7 +460,7 @@ static int daObjSCannonTen_draw(daObjSCannonTen_c* i_this) { return i_this->draw(); } -static actor_method_class daObjSCannonTen_METHODS = { +static DUSK_CONST actor_method_class daObjSCannonTen_METHODS = { (process_method_func)daObjSCannonTen_create, (process_method_func)daObjSCannonTen_Delete, (process_method_func)daObjSCannonTen_execute, @@ -468,7 +468,7 @@ static actor_method_class daObjSCannonTen_METHODS = { (process_method_func)daObjSCannonTen_draw, }; -actor_process_profile_definition g_profile_Obj_SCannonTen = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SCannonTen = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index 498282f4b4..3431397a9f 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -18,7 +18,7 @@ static struct { u32 resIdx; } l_dzbData[1] = {7, 1}; -static char* l_resNameList[2] = {"", "SekiDoor"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = {"", "SekiDoor"}; static OBJ_SEKIDOOR_HIO_CLASS l_HIO; @@ -269,7 +269,7 @@ static int daObj_SekiDoor_IsDelete(void* param_0) { return 1; } -static actor_method_class daObj_SekiDoor_MethodTable = { +static DUSK_CONST actor_method_class daObj_SekiDoor_MethodTable = { (process_method_func)daObj_SekiDoor_Create, (process_method_func)daObj_SekiDoor_Delete, (process_method_func)daObj_SekiDoor_Execute, @@ -277,7 +277,7 @@ static actor_method_class daObj_SekiDoor_MethodTable = { (process_method_func)daObj_SekiDoor_Draw, }; -actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SEKIDOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index 6c73025257..bf464b3fcc 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -19,7 +19,7 @@ static struct { u32 resIdx; } l_dzbData[1] = {7, 1}; -static char* l_resNameList[2] = {"", "Sekizo"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = {"", "Sekizo"}; static u8 lit_3800[12]; @@ -149,12 +149,12 @@ static int daObj_Sekizo_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_Sekizo_MethodTable = { +static DUSK_CONST actor_method_class daObj_Sekizo_MethodTable = { (process_method_func)daObj_Sekizo_Create, (process_method_func)daObj_Sekizo_Delete, (process_method_func)daObj_Sekizo_Execute, (process_method_func)daObj_Sekizo_IsDelete, (process_method_func)daObj_Sekizo_Draw}; -actor_process_profile_definition g_profile_OBJ_SEKIZO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SEKIZO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index ac0ca0d5b1..7f34ca6fd1 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -14,42 +14,42 @@ #include "f_op/f_op_msg.h" -static daNpc_GetParam1 l_bmdData[9] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdData[9] = { {36, 1}, {36, 1}, {35, 1}, {37, 1}, {38, 1}, {3, 2}, {3, 2}, {4, 2}, {5, 2}, }; -static daNpcT_evtData_c l_evtList[10] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[10] = { {"", 1}, {"NO_RESPONSE", 1}, {"START", 1}, {"RESTART", 1}, {"TURN", 1}, {"JUMP", 1}, {"GOAL", 1}, {"EXIT", 1}, {"FREE", 1}, {"EXTINCTION", 1}, }; -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "sekizoA", "seki_1k", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8 l_loadResPtrn1[3] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn1[3] = { 1, 2, -1, }; -static s8* l_loadResPtrnList[8] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[8] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData = { -1, 0, 0, -1, 0, 0, 0, }; -static daNpcT_motionAnmData_c l_motionAnmData[24] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[24] = { {daObj_Sekizoa_c::ANM_SEKI_WAIT_A, 2, 1, -1, 0, 0, 0}, {daObj_Sekizoa_c::ANM_SEKI_WAIT_R, 2, 1, -1, 0, 0, 0}, {daObj_Sekizoa_c::ANM_SEKI_STILL_R, 2, 1, -1, 0, 0, 0}, @@ -75,14 +75,14 @@ static daNpcT_motionAnmData_c l_motionAnmData[24] = { {daObj_Sekizoa_c::ANM_SEKI_STEP_L, 0, 1, -1, 0, 0, 0}, {daObj_Sekizoa_c::ANM_SEKI_WAIT_A, 2, 1, -1, 0, 0, 0}}; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[96] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[96] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, @@ -98,11 +98,11 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[96] = { {21, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {22, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {23, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}}; -char* daObj_Sekizoa_c::mCutNameList[9] = { +char DUSK_CONST* DUSK_CONST daObj_Sekizoa_c::mCutNameList[9] = { "", "START", "START", "TURN", "JUMP", "GOAL", "EXIT", "FREE", "EXTINCTION", }; -daObj_Sekizoa_c::cutFunc daObj_Sekizoa_c::mCutList[9] = { +daObj_Sekizoa_c::cutFunc DUSK_CONST daObj_Sekizoa_c::mCutList[9] = { NULL, &daObj_Sekizoa_c::cutStart, &daObj_Sekizoa_c::cutStart, @@ -114,9 +114,9 @@ daObj_Sekizoa_c::cutFunc daObj_Sekizoa_c::mCutList[9] = { &daObj_Sekizoa_c::cutExtinction, }; -static cXyz l_srcPosR(-600.0f, 1000.0f, 1800.0f); +static DUSK_CONSTEXPR cXyz l_srcPosR(-600.0f, 1000.0f, 1800.0f); -static cXyz l_srcPosL(600.0f, 1000.0f, 1800.0f); +static DUSK_CONSTEXPR cXyz l_srcPosL(600.0f, 1000.0f, 1800.0f); daObj_Sekizoa_HIOParam const daObj_Sekizoa_Param_c::m = { 600.0f, -10.0f, 1.0f, 1100.0f, 255.0f, 550.0f, 100.0f, 70.0f, 0.0f, 0.0f, 30.0f, @@ -865,7 +865,7 @@ void daObj_Sekizoa_c::drawOtherMdl() { int daObj_Sekizoa_c::setYariAnm(int i_frame, int i_mode, f32 i_morf) { - static struct { + static DUSK_CONSTEXPR struct { u32 param_0; u32 param_1; } yariAnmData[24] = { @@ -929,7 +929,7 @@ void daObj_Sekizoa_c::drawGhost() { bool daObj_Sekizoa_c::afterSetMotionAnm(int i_frame, int i_mode, f32 i_morf, int param_3) { f32 var1; - static struct { + static DUSK_CONSTEXPR struct { int field_0x0; u32 field_0x4; u32 field_0x8; @@ -937,7 +937,7 @@ bool daObj_Sekizoa_c::afterSetMotionAnm(int i_frame, int i_mode, f32 i_morf, int {0x2A, 0, 1}, {0x2B, 0, 1}, {0x2C, 0, 1}, {0x2D, 0, 1}, {0x2E, 0, 1}, {0x29, 0, 1}, }; - static struct { + static DUSK_CONSTEXPR struct { int field_0x0; u32 field_0x4; u32 field_0x8; @@ -2455,12 +2455,12 @@ static int daObj_Sekizoa_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_Sekizoa_MethodTable = { +static DUSK_CONST actor_method_class daObj_Sekizoa_MethodTable = { daObj_Sekizoa_Create, daObj_Sekizoa_Delete, daObj_Sekizoa_Execute, daObj_Sekizoa_IsDelete, daObj_Sekizoa_Draw, }; -actor_process_profile_definition g_profile_OBJ_SEKIZOA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SEKIZOA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 953c578888..3941011043 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -361,7 +361,7 @@ static int daItemShield_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daItemShield_Method = { +static DUSK_CONST actor_method_class l_daItemShield_Method = { (process_method_func)daItemShield_Create, (process_method_func)daItemShield_Delete, (process_method_func)daItemShield_Execute, @@ -369,7 +369,7 @@ static actor_method_class l_daItemShield_Method = { (process_method_func)daItemShield_Draw, }; -actor_process_profile_definition g_profile_Obj_Shield = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Shield = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index e1d490d10c..01ddb831fa 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_e_pm.h" -static char* l_arcName = "sm_door"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "sm_door"; static cPhs_Step daObjSM_DOOR_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); @@ -284,7 +284,7 @@ inline int daObjSM_DOOR_c::Delete() { return 1; } -static actor_method_class l_daObjSM_DOOR_Method = { +static DUSK_CONST actor_method_class l_daObjSM_DOOR_Method = { (process_method_func)daObjSM_DOOR_Create, (process_method_func)daObjSM_DOOR_Delete, (process_method_func)daObjSM_DOOR_Execute, @@ -292,7 +292,7 @@ static actor_method_class l_daObjSM_DOOR_Method = { (process_method_func)daObjSM_DOOR_Draw, }; -actor_process_profile_definition g_profile_Obj_SM_DOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SM_DOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index e5d31c214c..9bf8face57 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -550,7 +550,7 @@ static int daKey_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daKey_Method = { +static DUSK_CONST actor_method_class l_daKey_Method = { (process_method_func)daKey_Create, (process_method_func)daKey_Delete, (process_method_func)daKey_Execute, @@ -558,7 +558,7 @@ static actor_method_class l_daKey_Method = { (process_method_func)daKey_Draw, }; -actor_process_profile_definition g_profile_Obj_SmallKey = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SmallKey = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 42777605fb..343513e15a 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -70,24 +70,24 @@ void daObjSmgDoor_c::setBaseMtx() { cMtx_copy(field_0x5b8, mBgMtx); } -static char* l_arcName[2] = {"A_SMGDoor", "A_SMKDoor"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = {"A_SMGDoor", "A_SMKDoor"}; -static char* l_bmd[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_bmd[2] = { "A_SMGDoor.bmd", "A_SMKDoor.bmd", }; -static char* l_dzb[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_dzb[2] = { "A_SMGDoor.dzb", "A_SMKDoor.dzb", }; -static char* l_eventName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_eventName[2] = { "NOW_DOOR_IN", "OLD_DOOR_IN", }; -static cull_box l_cull_box = {{-200.0f, 0.0f, -50.0f}, {200.0f, 400.0f, 50.0f}}; +static DUSK_CONSTEXPR cull_box l_cull_box = {{-200.0f, 0.0f, -50.0f}, {200.0f, 400.0f, 50.0f}}; int daObjSmgDoor_c::Create() { initBaseMtx(); @@ -148,7 +148,7 @@ int daObjSmgDoor_c::Execute(Mtx** param_0) { } int daObjSmgDoor_c::getDemoAction() { - static char* action_table[6] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[6] = { "WAIT", "OPEN", "SETGOAL", "SETPOS", "SCENE_CHG", "COLOR_CHG", }; @@ -419,13 +419,13 @@ static int daObjSmgDoor_MoveBGDraw(daObjSmgDoor_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjSmgDoor_METHODS = { +static DUSK_CONST actor_method_class daObjSmgDoor_METHODS = { (process_method_func)daObjSmgDoor_create1st, (process_method_func)daObjSmgDoor_MoveBGDelete, (process_method_func)daObjSmgDoor_MoveBGExecute, 0, (process_method_func)daObjSmgDoor_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_SmgDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SmgDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index 18631fd32a..63b491c9d9 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -66,13 +66,13 @@ static int daObjSmoke_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjSmoke_Method = { +static DUSK_CONST actor_method_class l_daObjSmoke_Method = { (process_method_func)daObjSmoke_Create, (process_method_func)daObjSmoke_Delete, (process_method_func)daObjSmoke_Execute, }; -actor_process_profile_definition g_profile_Obj_Smoke = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Smoke = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index 0cdd9f0077..7b43dfe031 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -13,7 +13,7 @@ static u32 l_bmdData[1][2] = { 4, 1, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "A_SMTile", }; @@ -340,7 +340,7 @@ static int daObj_SMTile_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_SMTile_MethodTable = { +static DUSK_CONST actor_method_class daObj_SMTile_MethodTable = { (process_method_func)daObj_SMTile_Create, (process_method_func)daObj_SMTile_Delete, (process_method_func)daObj_SMTile_Execute, @@ -348,7 +348,7 @@ static actor_method_class daObj_SMTile_MethodTable = { (process_method_func)daObj_SMTile_Draw, }; -actor_process_profile_definition g_profile_OBJ_SMTILE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SMTILE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index f214bd7a67..4d8968c491 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -10,7 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -static char* l_arcName = "WStoneF"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "WStoneF"; static int daSmWStone_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); @@ -187,7 +187,7 @@ static int daSmWStone_draw(daSmWStone_c* i_this) { return i_this->draw(); } -static actor_method_class daSmWStone_METHODS = { +static DUSK_CONST actor_method_class daSmWStone_METHODS = { (process_method_func)daSmWStone_create, (process_method_func)daSmWStone_Delete, (process_method_func)daSmWStone_execute, @@ -195,7 +195,7 @@ static actor_method_class daSmWStone_METHODS = { (process_method_func)daSmWStone_draw, }; -actor_process_profile_definition g_profile_Obj_SmWStone = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SmWStone = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index 09287aeddb..9f84f8d96b 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -124,13 +124,13 @@ daSnowEffTag_HIO_c::~daSnowEffTag_HIO_c() {} static daSnowEffTag_HIO_c l_HIO; -static actor_method_class l_daSnowEffTag_Method = { +static DUSK_CONST actor_method_class l_daSnowEffTag_Method = { (process_method_func)daSnowEffTag_Create, (process_method_func)daSnowEffTag_Delete, (process_method_func)daSnowEffTag_Execute, (process_method_func)NULL, (process_method_func)daSnowEffTag_Draw, }; -actor_process_profile_definition g_profile_Tag_SnowEff = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_SnowEff = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 027d0bd8c8..eebcf323c4 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -15,7 +15,7 @@ static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_arcName = "SnowSoup"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "SnowSoup"; static Vec const SOUP_MODEL_OFFSET = {3317.86f, 214.73f, 323.3f}; @@ -185,7 +185,7 @@ static int daObjSnowSoup_draw(daObjSnowSoup_c* i_this) { return i_this->draw(); } -static actor_method_class daObjSnowSoup_METHODS = { +static DUSK_CONST actor_method_class daObjSnowSoup_METHODS = { (process_method_func)daObjSnowSoup_create, (process_method_func)daObjSnowSoup_Delete, (process_method_func)daObjSnowSoup_execute, @@ -193,7 +193,7 @@ static actor_method_class daObjSnowSoup_METHODS = { (process_method_func)daObjSnowSoup_draw, }; -actor_process_profile_definition g_profile_Obj_SnowSoup = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SnowSoup = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 537db9d0ad..a377946d82 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -980,7 +980,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } static int daObj_So_Create(fopAc_ac_c* a_this) { - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fafd3f, 0x1f}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -1080,7 +1080,7 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { return phase; } -static actor_method_class l_daObj_So_Method = { +static DUSK_CONST actor_method_class l_daObj_So_Method = { (process_method_func)daObj_So_Create, (process_method_func)daObj_So_Delete, (process_method_func)daObj_So_Execute, @@ -1088,7 +1088,7 @@ static actor_method_class l_daObj_So_Method = { (process_method_func)daObj_So_Draw, }; -actor_process_profile_definition g_profile_OBJ_SO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 9c59768e26..ae51ab08eb 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -50,7 +50,7 @@ void daSpinLift_HIO_c::genMessage(JORMContext* ctx) { } #endif -static char* l_resNameIdx[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[] = { "L4_N_Entr", "L4_N_SlpH", "L4_N_SlpL", "L4_Center", "L4_Switch", "L4_S_Slp", "L4_Wal_ZE", "L4_Wal_ZW", "L4_Wal_X", }; @@ -272,13 +272,13 @@ static int daSpinLift_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daSpinLift_Method = { +static DUSK_CONST actor_method_class l_daSpinLift_Method = { (process_method_func)daSpinLift_Create, (process_method_func)daSpinLift_Delete, (process_method_func)daSpinLift_Execute, 0, (process_method_func)daSpinLift_Draw, }; -actor_process_profile_definition g_profile_Obj_SpinLift = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SpinLift = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index a2b68af17e..7d3f02f6d3 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -11,9 +11,9 @@ #include "d/d_msg_object.h" #include "d/d_s_play.h" -static char* l_resFileName = "Obj_btl"; +static DUSK_CONSTEXPR char DUSK_CONST* l_resFileName = "Obj_btl"; -static char* l_bmdName = "al_bottle.bmd"; +static DUSK_CONSTEXPR char DUSK_CONST* l_bmdName = "al_bottle.bmd"; dCcD_SrcGObjInf const daObj_SSDrink_c::mCcDObjInfo = { {0, {{0, 0, 0}, {0, 0}, {0x79}}}, @@ -22,7 +22,7 @@ dCcD_SrcGObjInf const daObj_SSDrink_c::mCcDObjInfo = { {{0}}, }; -dCcD_SrcCyl daObj_SSDrink_c::mCcDCyl = {mCcDObjInfo, {}}; +dCcD_SrcCyl DUSK_CONST daObj_SSDrink_c::mCcDCyl = {mCcDObjInfo, {}}; daObj_SSDrink_c::~daObj_SSDrink_c() { dComIfG_resDelete(&mPhase, getResName()); @@ -170,7 +170,7 @@ void daObj_SSDrink_c::setSoldOut() { } } -char* daObj_SSDrink_c::getResName() { +char DUSK_CONST* daObj_SSDrink_c::getResName() { return l_resFileName; } @@ -479,13 +479,13 @@ static int daObj_SSDrink_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_SSDrink_MethodTable = { +static DUSK_CONST actor_method_class daObj_SSDrink_MethodTable = { (process_method_func)daObj_SSDrink_Create, (process_method_func)daObj_SSDrink_Delete, (process_method_func)daObj_SSDrink_Execute, (process_method_func)daObj_SSDrink_IsDelete, (process_method_func)daObj_SSDrink_Draw, }; -actor_process_profile_definition g_profile_OBJ_SSDRINK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SSDRINK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index 4c354878ae..7a9664ae1f 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -11,15 +11,15 @@ #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_myna.h" -static char* l_resFileName[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resFileName[] = { "Always", "Always", "Pumpkin", }; -static int l_bmdIdxName[] = {0x23, 0x23, 0x00}; +static DUSK_CONSTEXPR int l_bmdIdxName[] = {0x23, 0x23, 0x00}; -static char* l_bmdFileName[] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_bmdFileName[] = { "", "", "pumpkin.bmd", @@ -32,7 +32,7 @@ dCcD_SrcGObjInf const daObj_SSItem_c::mCcDObjInfo = { {{0}}, }; -dCcD_SrcCyl daObj_SSItem_c::mCcDCyl = {mCcDObjInfo, {}}; +dCcD_SrcCyl DUSK_CONST daObj_SSItem_c::mCcDCyl = {mCcDObjInfo, {}}; daObj_SSItem_c::~daObj_SSItem_c() { dComIfG_resDelete(&mPhase, getResName()); @@ -180,7 +180,7 @@ daObj_SSItem_c* daObj_SSItem_c::getExchangeItemPtr() { return this; } -char* daObj_SSItem_c::getResName() { +char DUSK_CONST* daObj_SSItem_c::getResName() { return l_resFileName[field_0xB0E]; } @@ -365,13 +365,13 @@ static int daObj_SSItem_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_SSItem_MethodTable = { +static DUSK_CONST actor_method_class daObj_SSItem_MethodTable = { (process_method_func)daObj_SSItem_Create, (process_method_func)daObj_SSItem_Delete, (process_method_func)daObj_SSItem_Execute, (process_method_func)daObj_SSItem_IsDelete, (process_method_func)daObj_SSItem_Draw, }; -actor_process_profile_definition g_profile_OBJ_SSITEM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SSITEM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 9ca15c8477..d3f07e7992 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -168,13 +168,13 @@ static int daStairBlock_Create(fopAc_ac_c* i_this) { dCcD_SrcSph daStairBlock_c::mCcDSph = {daStairBlock_c::mCcDObjInfo, {{{0.0f, 0.0f, 0.0f}, 4.0f}}}; -static actor_method_class l_daStairBlock_Method = { +static DUSK_CONST actor_method_class l_daStairBlock_Method = { (process_method_func)daStairBlock_Create, (process_method_func)daStairBlock_Delete, (process_method_func)daStairBlock_Execute, 0, (process_method_func)daStairBlock_Draw, }; -actor_process_profile_definition g_profile_Obj_StairBlock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_StairBlock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index d6aa8d1e22..71f69e58a8 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -22,7 +22,7 @@ dCcD_SrcSph daObj_Stick_c::mCcDSph = { } // mSphAttr }; -static char* l_resName = "Taro6"; +static DUSK_CONST char* l_resName = "Taro6"; static OBJ_STICK_HIO_CLASS l_HIO; @@ -218,7 +218,7 @@ static int daObj_Stick_IsDelete(void* param_0) { return 1; } -static actor_method_class daObj_Stick_MethodTable = { +static DUSK_CONST actor_method_class daObj_Stick_MethodTable = { (process_method_func)daObj_Stick_Create, (process_method_func)daObj_Stick_Delete, (process_method_func)daObj_Stick_Execute, @@ -226,7 +226,7 @@ static actor_method_class daObj_Stick_MethodTable = { (process_method_func)daObj_Stick_Draw, }; -actor_process_profile_definition g_profile_OBJ_STICK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_STICK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 080069e4f0..c6adef08d8 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -114,7 +114,7 @@ const static s16 l_rot_angle[2] = {35, 18}; const static s16 l_walk_rot_angle[2] = {40, 40}; -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "D_Srock", // small rock "D_Brock", // big rock }; @@ -1011,7 +1011,7 @@ static int daObjStone_Create(fopAc_ac_c* param_0) { return static_cast(param_0)->create(); } -static actor_method_class l_daObjStone_Method = { +static DUSK_CONST actor_method_class l_daObjStone_Method = { (process_method_func)daObjStone_Create, (process_method_func)daObjStone_Delete, (process_method_func)daObjStone_Execute, @@ -1019,7 +1019,7 @@ static actor_method_class l_daObjStone_Method = { (process_method_func)daObjStone_Draw, }; -actor_process_profile_definition g_profile_Obj_Stone = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Stone = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index 9c4e3a063e..bb4dcf7456 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -13,7 +13,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" -static char* l_arcName = "A_IwaAto"; +static DUSK_CONST char* l_arcName = "A_IwaAto"; void daObjSMark_c::initBaseMtx() { setBaseMtx(); @@ -75,7 +75,7 @@ static int daObjSMark_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjSMark_Method = { +static DUSK_CONST actor_method_class l_daObjSMark_Method = { (process_method_func)daObjSMark_Create, (process_method_func)daObjSMark_Delete, (process_method_func)NULL, @@ -83,7 +83,7 @@ static actor_method_class l_daObjSMark_Method = { (process_method_func)daObjSMark_Draw, }; -actor_process_profile_definition g_profile_Obj_StoneMark = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_StoneMark = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index 75ef504d63..dc14eab469 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -508,13 +508,13 @@ static int daObjStopper_Create(fopAc_ac_c* param_0) { return static_cast(param_0)->create(); } -static actor_method_class l_daObjStopper_Method = { +static DUSK_CONST actor_method_class l_daObjStopper_Method = { (process_method_func)daObjStopper_Create, (process_method_func)daObjStopper_Delete, (process_method_func)daObjStopper_Execute, 0, (process_method_func)daObjStopper_Draw, }; -actor_process_profile_definition g_profile_Obj_Stopper = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Stopper = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index a65969bc22..138d415e54 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -8,16 +8,16 @@ #include "d/actor/d_a_obj_stopper2.h" #include "d/actor/d_a_player.h" -static char* l_arcName = "Stop00"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Stop00"; -static char* l_evName[4] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_evName[4] = { "STOP_OPEN", "STOP_CLOSE", "STOP_OPEN2", "STOP_CLOSE2", }; -static char* l_staffName = "dstop"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "dstop"; static int CheckCreateHeap(fopAc_ac_c* i_this) { return ((daObjStopper2_c*)i_this)->CreateHeap(); @@ -205,7 +205,7 @@ void daObjStopper2_c::actionEvent() { void daObjStopper2_c::actionDead() {} int daObjStopper2_c::demoProc() { - static char* action_table[3] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[3] = { "WAIT", "STOP_OPEN", "STOP_CLOSE", @@ -299,7 +299,7 @@ static int daObjStopper2_Create(daObjStopper2_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjStopper2_Method = { +static DUSK_CONST actor_method_class l_daObjStopper2_Method = { (process_method_func)daObjStopper2_Create, (process_method_func)daObjStopper2_Delete, (process_method_func)daObjStopper2_Execute, @@ -307,7 +307,7 @@ static actor_method_class l_daObjStopper2_Method = { (process_method_func)daObjStopper2_Draw, }; -actor_process_profile_definition g_profile_Obj_Stopper2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Stopper2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index f14ff36706..a1da37f0c6 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -98,13 +98,13 @@ static int daObj_Suisya_Create(daObj_Suisya_c* i_this) { return i_this->create(); } -static actor_method_class l_daObj_Suisya_Method = { +static DUSK_CONST actor_method_class l_daObj_Suisya_Method = { (process_method_func)daObj_Suisya_Create, (process_method_func)daObj_Suisya_Delete, (process_method_func)daObj_Suisya_Execute, (process_method_func)daObj_Suisya_IsDelete, (process_method_func)daObj_Suisya_Draw, }; -actor_process_profile_definition g_profile_OBJ_SUISYA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SUISYA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index cc850f79c3..85b9a24daa 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -820,13 +820,13 @@ static int daObj_Sw_Create(fopAc_ac_c* a_this) { return phase; } -static actor_method_class l_daObj_Sw_Method = { +static DUSK_CONST actor_method_class l_daObj_Sw_Method = { (process_method_func)daObj_Sw_Create, (process_method_func)daObj_Sw_Delete, (process_method_func)daObj_Sw_Execute, (process_method_func)daObj_Sw_IsDelete, (process_method_func)daObj_Sw_Draw, }; -actor_process_profile_definition g_profile_OBJ_SW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_SW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index 19c1a81995..813b36a6c3 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -128,7 +128,7 @@ int daObjSwBallA_c::Create() { return 1; } -static char* l_arcName = "P_LBswA"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_LBswA"; int daObjSwBallA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -339,7 +339,7 @@ static int daObjSwBallA_Create(fopAc_ac_c* param_0) { return ((daObjSwBallA_c*)param_0)->create(); } -static actor_method_class l_daObjSwBallA_Method = { +static DUSK_CONST actor_method_class l_daObjSwBallA_Method = { (process_method_func)daObjSwBallA_Create, (process_method_func)daObjSwBallA_Delete, (process_method_func)daObjSwBallA_Execute, @@ -347,7 +347,7 @@ static actor_method_class l_daObjSwBallA_Method = { (process_method_func)daObjSwBallA_Draw, }; -actor_process_profile_definition g_profile_Obj_SwBallA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwBallA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 0b516eecc1..d5337095bc 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -156,7 +156,7 @@ int daObjSwBallB_c::Create() { return 1; } -static char* l_arcName = "P_LBswBC"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_LBswBC"; int daObjSwBallB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); @@ -402,7 +402,7 @@ static int daObjSwBallB_Create(fopAc_ac_c* param_0) { return ((daObjSwBallB_c*)param_0)->create(); } -static actor_method_class l_daObjSwBallB_Method = { +static DUSK_CONST actor_method_class l_daObjSwBallB_Method = { (process_method_func)daObjSwBallB_Create, (process_method_func)daObjSwBallB_Delete, (process_method_func)daObjSwBallB_Execute, @@ -410,7 +410,7 @@ static actor_method_class l_daObjSwBallB_Method = { (process_method_func)daObjSwBallB_Draw, }; -actor_process_profile_definition g_profile_Obj_SwBallB = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwBallB = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 560edd9ec4..99e750469b 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -58,9 +58,9 @@ void daObjSwBallC_c::setBaseMtx() { static GXColor const l_color = {0x03, 0x96, 0xFF, 0xFF}; -static char* l_arcName = "P_LBswBC"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_LBswBC"; -static char* l_evName = "REVIVE_MASTER_SWORD"; +static DUSK_CONSTEXPR char DUSK_CONST* l_evName = "REVIVE_MASTER_SWORD"; static f32 dummyFloat() { return -1.0f; @@ -93,7 +93,7 @@ int daObjSwBallC_c::Create() { return 1; } -static char* l_staffName = "lbsw"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "lbsw"; int daObjSwBallC_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); @@ -136,7 +136,7 @@ void daObjSwBallC_c::event_proc_call() { (this->*l_func[field_0x57f])(); } -static char* action_table[13] = { +static DUSK_CONSTEXPR char DUSK_CONST* action_table[13] = { "WAIT", "ON", "OFF", "ON_ALL_B", "OFF_ALL_B", "DEL_BALL", "SOUND", "SCALING", "INIT", "MESSAGE", "ST_CUT2", "LINK_INIT", "EQUIP_SWD", }; @@ -402,7 +402,7 @@ static int daObjSwBallC_Create(daObjSwBallC_c* param_0) { return param_0->create(); } -static actor_method_class l_daObjSwBallC_Method = { +static DUSK_CONST actor_method_class l_daObjSwBallC_Method = { (process_method_func)daObjSwBallC_Create, (process_method_func)daObjSwBallC_Delete, (process_method_func)daObjSwBallC_Execute, @@ -410,7 +410,7 @@ static actor_method_class l_daObjSwBallC_Method = { (process_method_func)daObjSwBallC_Draw, }; -actor_process_profile_definition g_profile_Obj_SwBallC = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwBallC = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 6883fe8ba8..64a09c81ad 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -78,9 +78,9 @@ const static dCcD_SrcSph l_sph_src_tg = { } // mSphAttr }; -static char* l_arcName = "Obj_l8sw0"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_l8sw0"; -static cull_box l_cull_box = {{ +static DUSK_CONSTEXPR cull_box l_cull_box = {{ -500.0f, 0.0f, -500.0f, @@ -470,13 +470,13 @@ static int daObjSwLight_MoveBGDraw(daObjSwLight_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjSwLight_METHODS = { +static DUSK_CONST actor_method_class daObjSwLight_METHODS = { (process_method_func)daObjSwLight_create1st, (process_method_func)daObjSwLight_MoveBGDelete, (process_method_func)daObjSwLight_MoveBGExecute, 0, (process_method_func)daObjSwLight_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_SwLight = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwLight = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index a9c3ff42ac..8a30d9b7aa 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -122,7 +122,7 @@ static s16 GetActorName(cBgS_PolyInfo& param_0) { return fpcNm_Obj_SwChain_e; } -static char* l_arcName = "P_Chain"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_Chain"; static dCcD_SrcSph l_sph_src = { { @@ -1184,13 +1184,13 @@ static int daObjSwChain_Create(fopAc_ac_c* i_this) { return a_this->create1st(); } -static actor_method_class l_daObjSwChain_Method = { +static DUSK_CONST actor_method_class l_daObjSwChain_Method = { (process_method_func)daObjSwChain_Create, (process_method_func)daObjSwChain_Delete, (process_method_func)daObjSwChain_Execute, 0, (process_method_func)daObjSwChain_Draw, }; -actor_process_profile_definition g_profile_Obj_SwChain = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwChain = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 7fd34fc3ee..5f5218a866 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -66,7 +66,7 @@ void daObjSwHang_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[5] = { "S_bura_A", "S_bura_B", "S_bura_7a", @@ -74,7 +74,7 @@ static char* l_arcName[5] = { "S_bura_7c", }; -static char* l_pull_jnt[5] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_pull_jnt[5] = { "totte", "hook", "hook", @@ -82,12 +82,12 @@ static char* l_pull_jnt[5] = { "tottel", }; -static Vec l_hang_offset[5] = { +static DUSK_CONSTEXPR Vec l_hang_offset[5] = { {0.0f, -470.0f, 10.0f}, {0.0f, -183.0f, 10.0f}, {0.0f, -200.0f, 10.0f}, {0.0f, -520.0f, 10.0f}, {0.0f, -1010.0f, 10.0f}, }; -static dCcD_SrcSph l_sph_src = { +static DUSK_CONSTEXPR dCcD_SrcSph l_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x10}, 0x19}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -493,7 +493,7 @@ static void dummy() { JKR_DELETE((cCcD_GStts*)NULL); } -static actor_method_class daObjSwHang_METHODS = { +static DUSK_CONST actor_method_class daObjSwHang_METHODS = { (process_method_func)daObjSwHang_create1st, (process_method_func)daObjSwHang_MoveBGDelete, (process_method_func)daObjSwHang_MoveBGExecute, @@ -501,7 +501,7 @@ static actor_method_class daObjSwHang_METHODS = { (process_method_func)daObjSwHang_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_SwHang = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwHang = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index bb34eb6d8d..b346c4232e 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" -static cull_box l_cull_box = {{-200.0f, 0.0f, -200.0f}, {200.0f, 100.0f, 200.0f}}; +static DUSK_CONSTEXPR cull_box l_cull_box = {{-200.0f, 0.0f, -200.0f}, {200.0f, 100.0f, 200.0f}}; void daObjSword_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -140,13 +140,13 @@ static int daObjSword_Create(daObjSword_c* param_0) { return param_0->create(); } -static actor_method_class l_daObjSword_Method = { +static DUSK_CONST actor_method_class l_daObjSword_Method = { (process_method_func)daObjSword_Create, (process_method_func)daObjSword_Delete, (process_method_func)daObjSword_Execute, 0, (process_method_func)daObjSword_Draw, }; -actor_process_profile_definition g_profile_Obj_Sword = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Sword = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 957798805e..635d223b51 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -73,9 +73,9 @@ static f32 const l_cull_size[] = {-150.0f, 0.0f, -150.0f, 150.0f, 150.0f, 150.0f // This was used for this object's HIO, which was removed in retail static s16 const l_r00_rot_time[] = {190, 148, 100}; -static char* l_arcName[] = {"K_prop00", "Lv9_puro"}; +static DUSK_CONST char* l_arcName[] = {"K_prop00", "Lv9_puro"}; -static char* l_joint_name = "kaiten"; +static DUSK_CONST char* l_joint_name = "kaiten"; int daObjSwPr_c::Create() { #if AVOID_UB @@ -329,13 +329,13 @@ static int daObjSwPr_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjSwPr_Method = { +static DUSK_CONST actor_method_class l_daObjSwPr_Method = { (process_method_func)daObjSwPr_Create, (process_method_func)daObjSwPr_Delete, (process_method_func)daObjSwPr_Execute, (process_method_func)NULL, (process_method_func)daObjSwPr_Draw, }; -actor_process_profile_definition g_profile_Obj_Swpropeller = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpropeller = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index b6d465744e..5cdf0f4372 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -58,7 +58,7 @@ s16 const daObjSwpush::Act_c::M_bmd[3] = {BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_ s16 const daObjSwpush::Act_c::M_dzb[3] = {DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00}; -char* daObjSwpush::Act_c::M_arcname[3] = { +DUSK_CONST char* daObjSwpush::Act_c::M_arcname[3] = { "Kbota_00", "S_lv3bota", "S_lv6bota", @@ -853,7 +853,7 @@ namespace { return 1; } - static actor_method_class Mthd_Table = { + static DUSK_CONST actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, (process_method_func)Mthd_Execute, @@ -865,7 +865,7 @@ namespace { AUDIO_INSTANCES; -actor_process_profile_definition g_profile_Obj_Swpush = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpush = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index cb59f80d1f..bf13e741c0 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -714,7 +714,7 @@ actor_method_class Mthd_Table = { } } -actor_process_profile_definition g_profile_Obj_Swpush2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpush2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index ab0844c9dd..7082e317fa 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -112,7 +112,7 @@ int daObjSw5_c::Create() { return 1; } -static char* l_arcName = "D_Hfsw00"; +static DUSK_CONST char* l_arcName = "D_Hfsw00"; int daObjSw5_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -409,7 +409,7 @@ static int daObjSw5_Create(fopAc_ac_c* i_this) { return ((daObjSw5_c*)i_this)->create(); } -static actor_method_class l_daObjSw5_Method = { +static DUSK_CONST actor_method_class l_daObjSw5_Method = { (process_method_func)daObjSw5_Create, (process_method_func)daObjSw5_Delete, (process_method_func)daObjSw5_Execute, @@ -417,7 +417,7 @@ static actor_method_class l_daObjSw5_Method = { (process_method_func)daObjSw5_Draw, }; -actor_process_profile_definition g_profile_Obj_Swpush5 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Swpush5 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index e7966e7735..9cd51d2024 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -70,7 +70,7 @@ int daObjSwSpinner_c::Create() { return 1; } -static char* l_arcName = "P_Sswitch"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "P_Sswitch"; int daObjSwSpinner_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -216,7 +216,7 @@ static int daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjSwSpinner_METHODS = { +static DUSK_CONST actor_method_class daObjSwSpinner_METHODS = { (process_method_func)daObjSwSpinner_create1st, (process_method_func)daObjSwSpinner_MoveBGDelete, (process_method_func)daObjSwSpinner_MoveBGExecute, @@ -224,7 +224,7 @@ static actor_method_class daObjSwSpinner_METHODS = { (process_method_func)daObjSwSpinner_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_SwSpinner = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwSpinner = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 6db58daf07..e850179e31 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -113,7 +113,7 @@ int daObjSwTurn_c::Create() { return 1; } -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "P_Lv4tsw", "P_Lv4tswD", }; @@ -428,7 +428,7 @@ static int daObjSwTurn_MoveBGDraw(daObjSwTurn_c* i_this) { return i_this->Draw(); } -static actor_method_class daObjSwTurn_METHODS = { +static DUSK_CONST actor_method_class daObjSwTurn_METHODS = { (process_method_func)daObjSwTurn_create1st, (process_method_func)daObjSwTurn_MoveBGDelete, (process_method_func)daObjSwTurn_MoveBGExecute, @@ -436,7 +436,7 @@ static actor_method_class daObjSwTurn_METHODS = { (process_method_func)daObjSwTurn_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_SwTurn = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SwTurn = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index e419725eb3..5cabf2f30a 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -607,7 +607,7 @@ static int daSyRock_Create(fopAc_ac_c* i_this) { return actor->create(); } -static actor_method_class l_daSyRock_Method = { +static DUSK_CONST actor_method_class l_daSyRock_Method = { (process_method_func)daSyRock_Create, (process_method_func)daSyRock_Delete, (process_method_func)daSyRock_Execute, @@ -615,7 +615,7 @@ static actor_method_class l_daSyRock_Method = { (process_method_func)daSyRock_Draw, }; -actor_process_profile_definition g_profile_Obj_SyRock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SyRock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index c362e5720a..78ef961276 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -164,7 +164,7 @@ static int daObjSZbridge_MoveBGDraw(daObjSZbridge_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjSZbridge_METHODS = { +static DUSK_CONST actor_method_class daObjSZbridge_METHODS = { (process_method_func)daObjSZbridge_create1st, (process_method_func)daObjSZbridge_MoveBGDelete, (process_method_func)daObjSZbridge_MoveBGExecute, @@ -172,7 +172,7 @@ static actor_method_class daObjSZbridge_METHODS = { (process_method_func)daObjSZbridge_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_SZbridge = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_SZbridge = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 42d436bddd..4958e8a52f 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -407,7 +407,7 @@ static int daTaFence_Create(fopAc_ac_c* i_this) { return ((daTaFence_c*)i_this)->create(); } -static actor_method_class l_daTaFence_Method = { +static DUSK_CONST actor_method_class l_daTaFence_Method = { (process_method_func)daTaFence_Create, (process_method_func)daTaFence_Delete, (process_method_func)daTaFence_Execute, @@ -415,7 +415,7 @@ static actor_method_class l_daTaFence_Method = { (process_method_func)daTaFence_Draw, }; -actor_process_profile_definition g_profile_Obj_TaFence = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TaFence = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index eb6b0e5896..d9d7c133a3 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -13,7 +13,7 @@ #include "d/d_meter2_info.h" #include "d/d_msg_object.h" -static char* l_arcName = "Table"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Table"; void daObjTable_c::initBaseMtx() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -191,13 +191,13 @@ int daObjTable_c::Delete() { return 1; } -static actor_method_class l_daObjTable_Method = { +static DUSK_CONST actor_method_class l_daObjTable_Method = { (process_method_func)daObjTable_Create, (process_method_func)daObjTable_Delete, (process_method_func)daObjTable_Execute, (process_method_func)daObjTable_IsDelete, (process_method_func)daObjTable_Draw, }; -actor_process_profile_definition g_profile_Obj_Table = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Table = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index b33111f137..5e1f95ddce 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -196,13 +196,13 @@ static int daTkraDai_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daTkraDai_Method = { +static DUSK_CONST actor_method_class l_daTkraDai_Method = { (process_method_func)daTkraDai_Create, (process_method_func)daTkraDai_Delete, (process_method_func)daTkraDai_Execute, 0, (process_method_func)daTkraDai_Draw, }; -actor_process_profile_definition g_profile_Obj_TakaraDai = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TakaraDai = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 93c07f409a..092a6e6d8f 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -110,7 +110,7 @@ static BOOL set_pos_check(obj_tatigi_class* i_this, int param_2) { } static int daObj_Tatigi_Create(fopAc_ac_c* a_this) { - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -206,7 +206,7 @@ static int daObj_Tatigi_Create(fopAc_ac_c* a_this) { return rv; } -static actor_method_class l_daObj_Tatigi_Method = { +static DUSK_CONST actor_method_class l_daObj_Tatigi_Method = { (process_method_func)daObj_Tatigi_Create, (process_method_func)daObj_Tatigi_Delete, (process_method_func)daObj_Tatigi_Execute, @@ -214,7 +214,7 @@ static actor_method_class l_daObj_Tatigi_Method = { (process_method_func)daObj_Tatigi_Draw, }; -actor_process_profile_definition g_profile_OBJ_TATIGI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_TATIGI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index fbedd6a8c9..596d05cf90 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -801,7 +801,7 @@ static int daObjTEN_IsDelete(daObjTEN_c* param_0) { return 1; } -static actor_method_class l_daObjTEN_Method = { +static DUSK_CONST actor_method_class l_daObjTEN_Method = { (process_method_func)daObjTEN_Create, (process_method_func)daObjTEN_Delete, (process_method_func)daObjTEN_Execute, @@ -809,7 +809,7 @@ static actor_method_class l_daObjTEN_Method = { (process_method_func)daObjTEN_Draw, }; -actor_process_profile_definition g_profile_Obj_Ten = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Ten = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index a9469551b4..c2beadc71b 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -351,7 +351,7 @@ static int daObjCube_Create(fopAc_ac_c* actor) { return i_this->create(); } -static actor_method_class l_daObjCube_Method = { +static DUSK_CONST actor_method_class l_daObjCube_Method = { (process_method_func)daObjCube_Create, (process_method_func)daObjCube_Delete, (process_method_func)daObjCube_Execute, @@ -366,7 +366,7 @@ static actor_method_class l_daObjCube_Method = { #define OBJCUBE_METHODS NULL #endif -actor_process_profile_definition g_profile_Obj_TestCube = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TestCube = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 18ca94f97b..7284e246be 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -36,7 +36,7 @@ int daObjGake_c::Create() { return 1; } -static char* l_arcName = "A_TGake"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "A_TGake"; int daObjGake_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); @@ -125,13 +125,13 @@ static int daObjGake_MoveBGDraw(daObjGake_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjGake_METHODS = { +static DUSK_CONST actor_method_class daObjGake_METHODS = { (process_method_func)daObjGake_create1st, (process_method_func)daObjGake_MoveBGDelete, (process_method_func)daObjGake_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjGake_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Gake = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Gake = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index 48aa05a435..2feafd46d4 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -27,7 +27,7 @@ void daObjTHASHI_c::initCcCylinder() { #if !DEBUG const #endif - static dCcD_SrcCyl ccCylSrc = { + static DUSK_CONSTEXPR dCcD_SrcCyl ccCylSrc = { { {0x0, {{AT_TYPE_0, 0x0, 0x0}, {0x00100000, 0x1f}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -239,7 +239,7 @@ static int daObjTHASHI_IsDelete(daObjTHASHI_c* param_0) { return TRUE; } -static actor_method_class l_daObjTHASHI_Method = { +static DUSK_CONST actor_method_class l_daObjTHASHI_Method = { (process_method_func)daObjTHASHI_Create, (process_method_func)daObjTHASHI_Delete, (process_method_func)daObjTHASHI_Execute, @@ -247,7 +247,7 @@ static actor_method_class l_daObjTHASHI_Method = { (process_method_func)daObjTHASHI_Draw, }; -actor_process_profile_definition g_profile_Obj_THASHI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_THASHI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 3a84a59cb8..81a847789a 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -62,11 +62,11 @@ void daObjThDoor_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName = "V_CTDoor"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "V_CTDoor"; -static char* l_evName = "CHASE_AWAY_WOLF"; +static DUSK_CONSTEXPR char DUSK_CONST* l_evName = "CHASE_AWAY_WOLF"; -static char* l_staffName = "thdoor"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "thdoor"; static dCcD_SrcCyl l_cyl_src = { { @@ -243,7 +243,7 @@ void daObjThDoor_c::actionDead() {} int daObjThDoor_c::demoProc() { - static char* action_table[3] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[3] = { "WAIT", "MSG", "CLOSE", @@ -355,7 +355,7 @@ static int daObjThDoor_MoveBGDraw(daObjThDoor_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjThDoor_METHODS = { +static DUSK_CONST actor_method_class daObjThDoor_METHODS = { (process_method_func)daObjThDoor_create1st, (process_method_func)daObjThDoor_MoveBGDelete, (process_method_func)daObjThDoor_MoveBGExecute, @@ -363,7 +363,7 @@ static actor_method_class daObjThDoor_METHODS = { (process_method_func)daObjThDoor_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_TDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index 8b7b2ba730..8ab9dfaa96 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -146,7 +146,7 @@ static int daTimeFire_Create(fopAc_ac_c* i_this) { static daTimeFire_HIO_c l_HIO; -static actor_method_class l_daTimeFire_Method = { +static DUSK_CONST actor_method_class l_daTimeFire_Method = { (process_method_func)daTimeFire_Create, (process_method_func)daTimeFire_Delete, (process_method_func)daTimeFire_Execute, @@ -154,7 +154,7 @@ static actor_method_class l_daTimeFire_Method = { (process_method_func)daTimeFire_Draw, }; -actor_process_profile_definition g_profile_Obj_TimeFire = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TimeFire = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 0bdb9f769b..4923185555 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -131,7 +131,7 @@ namespace { }; // namespace daObjTimer -actor_process_profile_definition g_profile_Obj_Timer = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Timer = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 10, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 7c87356c85..505a1bd09c 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -10,7 +10,7 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" -static daNpc_GetParam1 l_bckGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_bckGetParamList[] = { {-1, 2}, {7, 0}, {11, 2}, @@ -19,11 +19,11 @@ static daNpc_GetParam1 l_bckGetParamList[] = { {9, 0}, }; -static daNpc_GetParam1 l_btpGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btpGetParamList[] = { {20, 2}, }; -static daNpc_GetParam1 l_btkGetParamList[] = { +static DUSK_CONSTEXPR daNpc_GetParam1 l_btkGetParamList[] = { {17, 2}, }; @@ -35,9 +35,9 @@ static u8 l_evtNames[4] = { 0x00, }; -static char* l_arcName = "TKS2"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "TKS2"; -static char* l_myName = "ObjTks"; +static DUSK_CONSTEXPR char DUSK_CONST* l_myName = "ObjTks"; daObjTks_c::daObjTks_c() {} @@ -896,7 +896,7 @@ BOOL daObjTks_c::drawDbgInfo() { void daObjTks_c::drawOtherMdls() {} -static actor_method_class daObjTks_MethodTable = { +static DUSK_CONST actor_method_class daObjTks_MethodTable = { (process_method_func)daObjTks_Create, (process_method_func)daObjTks_Delete, (process_method_func)daObjTks_Execute, @@ -904,7 +904,7 @@ static actor_method_class daObjTks_MethodTable = { (process_method_func)daObjTks_Draw, }; -actor_process_profile_definition g_profile_OBJ_TKS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_TKS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index 58b9a5b4c7..8c83b16838 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -95,13 +95,13 @@ static int daObjTMoon_Create(daObjTMoon_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjTMoon_Method = { +static DUSK_CONST actor_method_class l_daObjTMoon_Method = { (process_method_func)daObjTMoon_Create, (process_method_func)daObjTMoon_Delete, (process_method_func)daObjTMoon_Execute, (process_method_func)NULL, (process_method_func)daObjTMoon_Draw, }; -actor_process_profile_definition g_profile_Obj_TMoon = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TMoon = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 8bacb9ba53..9b3d366a81 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -12,7 +12,7 @@ static int daObjToaruMaki_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_arcName[2] = {"T_Maki1", "T_Maki2"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = {"T_Maki1", "T_Maki2"}; daObjToaruMaki_c::daObjToaruMaki_c() { mpBgW = NULL; @@ -120,7 +120,7 @@ static int daObjToaruMaki_draw(daObjToaruMaki_c* i_this) { return i_this->draw(); } -static actor_method_class daObjToaruMaki_METHODS = { +static DUSK_CONST actor_method_class daObjToaruMaki_METHODS = { (process_method_func)daObjToaruMaki_create, (process_method_func)daObjToaruMaki_Delete, (process_method_func)daObjToaruMaki_execute, @@ -128,7 +128,7 @@ static actor_method_class daObjToaruMaki_METHODS = { (process_method_func)daObjToaruMaki_draw, }; -actor_process_profile_definition g_profile_Obj_ToaruMaki = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ToaruMaki = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index ade90bcdf7..2e235796dc 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -19,7 +19,7 @@ #include #endif -static s8 r05yuka_image[192] = { +static DUSK_CONSTEXPR s8 r05yuka_image[192] = { 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -34,7 +34,7 @@ static s8 r05yuka_image[192] = { 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -static s8 r11yuka_image[192] = { +static DUSK_CONSTEXPR s8 r11yuka_image[192] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -519,7 +519,7 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) { cXyz cStack_38(a_this->home.pos); if (i_this->field_0x577 == 3) { i_this->mYukaNum = 0; - s8* local_64; + s8 DUSK_CONST* local_64; if (fopAcM_GetRoomNo(a_this) == 5) { local_64 = r05yuka_image; } else { @@ -696,7 +696,7 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) { AUDIO_INSTANCES; -static actor_method_class l_daObj_Toby_Method = { +static DUSK_CONST actor_method_class l_daObj_Toby_Method = { (process_method_func)daObj_Toby_Create, (process_method_func)daObj_Toby_Delete, (process_method_func)daObj_Toby_Execute, @@ -704,7 +704,7 @@ static actor_method_class l_daObj_Toby_Method = { (process_method_func)daObj_Toby_Draw, }; -actor_process_profile_definition g_profile_OBJ_TOBY = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_TOBY = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index 2e83318c9d..ee6fe73dd3 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -125,13 +125,13 @@ void daObjTobyHouse_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "M_THouse", "U_THouse", }; -static char* l_staff_name = "thouse"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staff_name = "thouse"; -static char* l_event_name[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_event_name[2] = { "TOBY_HOUSE_FIRE_TO_RAKKA", "TOBY_HOUSE_FIRE_TO_DESERT", }; @@ -254,7 +254,7 @@ int daObjTobyHouse_c::Execute(Mtx** i_mtx) { } void daObjTobyHouse_c::action() { - static daObjTobyHouse_c::actionFunc l_func[4] = { + static DUSK_CONSTEXPR daObjTobyHouse_c::actionFunc l_func[4] = { &daObjTobyHouse_c::actionWait, &daObjTobyHouse_c::actionOrderEvent, &daObjTobyHouse_c::actionEvent, @@ -322,8 +322,8 @@ void daObjTobyHouse_c::demoProc() { }; daPy_py_c* player = daPy_getPlayerActorClass(); - static cXyz l_shotSmokeScale(8.0f, 8.0f, 8.0f); - static Vec l_shotSmokeOffset = {0.0f, 2500.0f, -600.0f}; + static DUSK_CONSTEXPR cXyz l_shotSmokeScale(8.0f, 8.0f, 8.0f); + static DUSK_CONSTEXPR Vec l_shotSmokeOffset = {0.0f, 2500.0f, -600.0f}; cXyz cStack_24; csXyz cStack_98; fopAcM_SearchByName(fpcNm_NPC_TOBY_e); @@ -592,7 +592,7 @@ static int daObjTobyHouse_MoveBGDraw(daObjTobyHouse_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjTobyHouse_METHODS = { +static DUSK_CONST actor_method_class daObjTobyHouse_METHODS = { (process_method_func)daObjTobyHouse_create1st, (process_method_func)daObjTobyHouse_MoveBGDelete, (process_method_func)daObjTobyHouse_MoveBGExecute, @@ -600,7 +600,7 @@ static actor_method_class daObjTobyHouse_METHODS = { (process_method_func)daObjTobyHouse_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_TobyHouse = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TobyHouse = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index c1aec26441..2ea6767dfc 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -293,7 +293,7 @@ static int daTogeTrap_Create(fopAc_ac_c* i_this) { return ((daTogeTrap_c*)i_this)->create(); } -static actor_method_class l_daTogeTrap_Method = { +static DUSK_CONST actor_method_class l_daTogeTrap_Method = { (process_method_func)daTogeTrap_Create, (process_method_func)daTogeTrap_Delete, (process_method_func)daTogeTrap_Execute, @@ -301,7 +301,7 @@ static actor_method_class l_daTogeTrap_Method = { (process_method_func)daTogeTrap_Draw, }; -actor_process_profile_definition g_profile_Obj_TogeTrap = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TogeTrap = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index a518e3cf25..7d392408c9 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -673,7 +673,7 @@ static int daObjTOMBO_IsDelete(daObjTOMBO_c* param_0) { return 1; } -static actor_method_class l_daObjTOMBO_Method = { +static DUSK_CONST actor_method_class l_daObjTOMBO_Method = { (process_method_func)daObjTOMBO_Create, (process_method_func)daObjTOMBO_Delete, (process_method_func)daObjTOMBO_Execute, @@ -681,7 +681,7 @@ static actor_method_class l_daObjTOMBO_Method = { (process_method_func)daObjTOMBO_Draw, }; -actor_process_profile_definition g_profile_Obj_Tombo = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Tombo = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index b7e8ce3725..b64c268e79 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -220,13 +220,13 @@ static void dummyString() { DEAD_STRING(""); } -static actor_method_class l_daObjTrnd_Method = { +static DUSK_CONST actor_method_class l_daObjTrnd_Method = { (process_method_func)daObjTrnd_Create, (process_method_func)daObjTrnd_Delete, (process_method_func)daObjTrnd_Execute, (process_method_func)NULL, (process_method_func)daObjTrnd_Draw, }; -actor_process_profile_definition g_profile_Obj_Tornado = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Tornado = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index 4b9a8fe38e..73bf50a073 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -392,13 +392,13 @@ static int daObjTrnd2_Create(daObjTrnd2_c* i_this) { return i_this->create(); } -static actor_method_class l_daObjTrnd2_Method = { +static DUSK_CONST actor_method_class l_daObjTrnd2_Method = { (process_method_func)daObjTrnd2_Create, (process_method_func)daObjTrnd2_Delete, (process_method_func)daObjTrnd2_Execute, (process_method_func)NULL, (process_method_func)daObjTrnd2_Draw, }; -actor_process_profile_definition g_profile_Obj_Tornado2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Tornado2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 2690de3e04..bd3fa4d6a2 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -490,7 +490,7 @@ static int daObj_Tp_Create(fopAc_ac_c* i_this) { return rv; } -static actor_method_class l_daObj_Tp_Method = { +static DUSK_CONST actor_method_class l_daObj_Tp_Method = { (process_method_func)daObj_Tp_Create, (process_method_func)daObj_Tp_Delete, (process_method_func)daObj_Tp_Execute, @@ -498,7 +498,7 @@ static actor_method_class l_daObj_Tp_Method = { (process_method_func)daObj_Tp_Draw, }; -actor_process_profile_definition g_profile_OBJ_TP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_TP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index dea5b1ed78..8a19dc9533 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_treesh.h" #include "d/d_com_inf_game.h" -static char* l_arcName = "M_TreeSh"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_TreeSh"; daTreeSh_HIO_c::daTreeSh_HIO_c() { shake_strength = 800; @@ -151,7 +151,7 @@ static int daTreeSh_MoveBGDraw(daTreeSh_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daTreeSh_METHODS = { +static DUSK_CONST actor_method_class daTreeSh_METHODS = { (process_method_func)daTreeSh_create1st, (process_method_func)daTreeSh_MoveBGDelete, (process_method_func)daTreeSh_MoveBGExecute, @@ -159,7 +159,7 @@ static actor_method_class daTreeSh_METHODS = { (process_method_func)daTreeSh_MoveBGDraw, }; -actor_process_profile_definition g_profile_TREESH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TREESH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 1003f97a7e..d7151f5ead 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -29,7 +29,7 @@ void daTwGate_HIO_c::genMessage(JORMContext* ctx) { } #endif -static char* l_resNameIdx[13] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameIdx[13] = { "twGtFiro", "twGtK0102", "twGtK0709", @@ -222,7 +222,7 @@ static int daTwGate_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daTwGate_Method = { +static DUSK_CONST actor_method_class l_daTwGate_Method = { (process_method_func)daTwGate_Create, (process_method_func)daTwGate_Delete, (process_method_func)daTwGate_Execute, @@ -230,7 +230,7 @@ static actor_method_class l_daTwGate_Method = { (process_method_func)daTwGate_Draw, }; -actor_process_profile_definition g_profile_Obj_TwGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_TwGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index ea4f79adfc..86ab9147bc 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -156,7 +156,7 @@ static cPhs_Step daObj_Udoor_Create(fopAc_ac_c* i_this) { return phase_state; } -static actor_method_class l_daObj_Udoor_Method = { +static DUSK_CONST actor_method_class l_daObj_Udoor_Method = { (process_method_func)daObj_Udoor_Create, (process_method_func)daObj_Udoor_Delete, (process_method_func)daObj_Udoor_Execute, @@ -164,7 +164,7 @@ static actor_method_class l_daObj_Udoor_Method = { (process_method_func)daObj_Udoor_Draw, }; -actor_process_profile_definition g_profile_OBJ_UDOOR = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_UDOOR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index 07561ec0a3..7598cf11d7 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -110,13 +110,13 @@ static int daObj_Usaku_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daObj_Usaku_Method = { +static DUSK_CONST actor_method_class l_daObj_Usaku_Method = { (process_method_func)daObj_Usaku_Create, (process_method_func)daObj_Usaku_Delete, (process_method_func)daObj_Usaku_Execute, (process_method_func)daObj_Usaku_IsDelete, (process_method_func)daObj_Usaku_Draw, }; -actor_process_profile_definition g_profile_OBJ_USAKU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_USAKU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 9041b3da92..daf0709ff6 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -33,7 +33,7 @@ int daObjVGnd_c::Create() { return 1; } -static char* l_arcName = "M_VolcGnd"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_VolcGnd"; int daObjVGnd_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0x5); @@ -130,13 +130,13 @@ static int daObjVGnd_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjVGnd_Method = { +static DUSK_CONST actor_method_class l_daObjVGnd_Method = { (process_method_func)daObjVGnd_Create, (process_method_func)daObjVGnd_Delete, (process_method_func)daObjVGnd_Execute, (process_method_func)NULL, (process_method_func)daObjVGnd_Draw, }; -actor_process_profile_definition g_profile_Obj_VolcGnd = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_VolcGnd = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index 0997d36900..62ccb199db 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -604,7 +604,7 @@ static int daObjVolcBall_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjVolcBall_Method = { +static DUSK_CONST actor_method_class l_daObjVolcBall_Method = { (process_method_func)daObjVolcBall_Create, (process_method_func)daObjVolcBall_Delete, (process_method_func)daObjVolcBall_Execute, @@ -612,7 +612,7 @@ static actor_method_class l_daObjVolcBall_Method = { (process_method_func)daObjVolcBall_Draw, }; -actor_process_profile_definition g_profile_Obj_VolcanicBall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_VolcanicBall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 6399071bfe..6ffeea3695 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -66,13 +66,13 @@ static u16 const l_bind_eff[4] = { 0x8B47, 0x8B48, 0x8B49, 0x8B4A, }; -static char* l_arcName = "M_VolcBom"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "M_VolcBom"; -static char* l_portal_warp_name = "PORTAL_WARP_BIGVOLC"; +static DUSK_CONSTEXPR char DUSK_CONST* l_portal_warp_name = "PORTAL_WARP_BIGVOLC"; -static char* l_staff_name = "BigVolc"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staff_name = "BigVolc"; -static dCcD_SrcCyl l_cyl_src = { +static DUSK_CONSTEXPR dCcD_SrcCyl l_cyl_src = { { {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x1f}, {0x0, 0x10}, 0x78}}, // mObj {dCcD_SE_NONE, 0x0, 0xc, 0x0, 0x0}, // mGObjAt @@ -252,7 +252,7 @@ int daObjVolcBom_c::Execute(Mtx** i_mtx) { } void daObjVolcBom_c::mode_proc_call() { - static daObjVolcBom_c::modeFunc mode_proc[4] = { + static DUSK_CONSTEXPR daObjVolcBom_c::modeFunc mode_proc[4] = { &daObjVolcBom_c::modeWaitAppear, &daObjVolcBom_c::modeFall, &daObjVolcBom_c::modeWaitEndFallDemo, @@ -553,7 +553,7 @@ void daObjVolcBom_c::endSrcEffect() { } void daObjVolcBom_c::event_proc_call() { - static daObjVolcBom_c::actionFunc l_func[6] = { + static DUSK_CONSTEXPR daObjVolcBom_c::actionFunc l_func[6] = { &daObjVolcBom_c::actionWait, &daObjVolcBom_c::actionOrderEvent, &daObjVolcBom_c::actionTalkEvent, @@ -875,7 +875,7 @@ static int daObjVolcBom_MoveBGDraw(daObjVolcBom_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjVolcBom_METHODS = { +static DUSK_CONST actor_method_class daObjVolcBom_METHODS = { (process_method_func)daObjVolcBom_create1st, (process_method_func)daObjVolcBom_MoveBGDelete, (process_method_func)daObjVolcBom_MoveBGExecute, @@ -883,7 +883,7 @@ static actor_method_class daObjVolcBom_METHODS = { (process_method_func)daObjVolcBom_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_VolcanicBomb = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_VolcanicBomb = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 246bad9686..007ebd6d83 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -78,19 +78,19 @@ void daObjWarpKBrg_c::setBaseMtx() { } } -static char* l_arcName[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[2] = { "Obj_kbrgS", "Obj_kbrgD", }; -static char* l_evArcName = "Obj_kbrg"; +static DUSK_CONSTEXPR char DUSK_CONST* l_evArcName = "Obj_kbrg"; -static char* l_portal_warp_name[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_portal_warp_name[2] = { "PORTAL_WARP_KBRIDGE", "PORTAL_WARP_KBRIDGE_OUT", }; -static char* l_staff_name = "WarpBrg"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staff_name = "WarpBrg"; int daObjWarpKBrg_c::Create() { switch (getNameArg()) { @@ -273,7 +273,7 @@ int daObjWarpKBrg_c::Execute(Mtx** param_0) { } void daObjWarpKBrg_c::event_proc_call() { - static void (daObjWarpKBrg_c::*l_func[])() = { + static DUSK_CONSTEXPR void (daObjWarpKBrg_c::*l_func[])() = { &daObjWarpKBrg_c::actionWait, &daObjWarpKBrg_c::actionOrderEvent, &daObjWarpKBrg_c::actionTalkEvent, @@ -439,7 +439,7 @@ void daObjWarpKBrg_c::actionWarpEvent2() { void daObjWarpKBrg_c::actionDead2() {} void daObjWarpKBrg_c::demoProc() { - static char* action_table[7] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[7] = { "WAIT", "FLY", "DOWN", @@ -815,7 +815,7 @@ static int daObjWarpKBrg_MoveBGDraw(daObjWarpKBrg_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjWarpKBrg_METHODS = { +static DUSK_CONST actor_method_class daObjWarpKBrg_METHODS = { (process_method_func)daObjWarpKBrg_create1st, (process_method_func)daObjWarpKBrg_MoveBGDelete, (process_method_func)daObjWarpKBrg_MoveBGExecute, @@ -823,7 +823,7 @@ static actor_method_class daObjWarpKBrg_METHODS = { (process_method_func)daObjWarpKBrg_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_KakarikoBrg = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_KakarikoBrg = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 65662d37c0..3741880e15 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -13,9 +13,9 @@ #include "d/d_bg_w.h" #include -static char* l_arcName = "Obj_obrg"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_obrg"; -static char* l_portal_warp_name[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_portal_warp_name[2] = { "PORTAL_WARP_OBRIDGE", "PORTAL_WARP_OUT_OBRIDGE", }; @@ -36,7 +36,7 @@ static const u16 l_app_eff[] = {0x8B34, 0x8B36, 0x8B37}; static const Vec l_midna_wait_offset = {100.0f, -1265.0f, -760.0f}; -static char* l_staff_name[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_staff_name[2] = { "WarpOB1", "WarpOB2", }; @@ -346,7 +346,7 @@ void daObjWarpOBrg_c::actionWarpEventDst() { void daObjWarpOBrg_c::actionDead() {} void daObjWarpOBrg_c::demoProc() { - static char* action_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[4] = { "WAIT", "OBJ_DISAPP", "OBJ_APP", @@ -591,7 +591,7 @@ static int daObjWarpOBrg_MoveBGDraw(daObjWarpOBrg_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjWarpOBrg_METHODS = { +static DUSK_CONST actor_method_class daObjWarpOBrg_METHODS = { (process_method_func)daObjWarpOBrg_create1st, (process_method_func)daObjWarpOBrg_MoveBGDelete, (process_method_func)daObjWarpOBrg_MoveBGExecute, @@ -599,7 +599,7 @@ static actor_method_class daObjWarpOBrg_METHODS = { (process_method_func)daObjWarpOBrg_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_OrdinBrg = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_OrdinBrg = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index 2f2b623dd1..e5385530fa 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -206,7 +206,7 @@ static int daWtGate_Create(fopAc_ac_c* i_this) { return waterGate->create(); } -static actor_method_class l_daWtGate_Method = { +static DUSK_CONST actor_method_class l_daWtGate_Method = { (process_method_func)daWtGate_Create, (process_method_func)daWtGate_Delete, (process_method_func)daWtGate_Execute, @@ -214,7 +214,7 @@ static actor_method_class l_daWtGate_Method = { (process_method_func)daWtGate_Draw, }; -actor_process_profile_definition g_profile_Obj_WtGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WtGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index 67d454bc9a..522b82a634 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -702,7 +702,7 @@ actor_method_class l_daWtPillar_Method = { (process_method_func)daWtPillar_Draw, }; -actor_process_profile_definition g_profile_Obj_WaterPillar = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WaterPillar = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index 851e95080f..0987eec4a1 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -30,7 +30,7 @@ static int target_info_count; const char* l_arcName = "sample"; #if DEBUG -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-200.0f, -100.0f, -200.0f}, {200.0f, 100.0f, 200.0f} }; @@ -391,7 +391,7 @@ static int daObjWaterFall_Create(fopAc_ac_c* i_this) { return actor->create(); } -static actor_method_class l_daObjWaterFall_Method = { +static DUSK_CONST actor_method_class l_daObjWaterFall_Method = { (process_method_func)daObjWaterFall_Create, (process_method_func)daObjWaterFall_Delete, (process_method_func)daObjWaterFall_Execute, @@ -399,7 +399,7 @@ static actor_method_class l_daObjWaterFall_Method = { (process_method_func)daObjWaterFall_Draw, }; -actor_process_profile_definition g_profile_Obj_WaterFall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WaterFall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index 25e2c4f69f..a8f5c39086 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -378,7 +378,7 @@ static int daObjWchain_Draw(daObjWchain_c* i_this) { return i_this->draw(); } -static actor_method_class l_daObjWchain_Method = { +static DUSK_CONST actor_method_class l_daObjWchain_Method = { (process_method_func)daObjWchain_Create, (process_method_func)daObjWchain_Delete, (process_method_func)daObjWchain_Execute, @@ -386,7 +386,7 @@ static actor_method_class l_daObjWchain_Method = { (process_method_func)daObjWchain_Draw, }; -actor_process_profile_definition g_profile_Obj_Wchain = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Wchain = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index d26f3aae4b..d18cc67ee2 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -499,7 +499,7 @@ static int daWdStick_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daWdStick_Method = { +static DUSK_CONST actor_method_class l_daWdStick_Method = { (process_method_func)daWdStick_Create, (process_method_func)daWdStick_Delete, (process_method_func)daWdStick_Execute, @@ -507,7 +507,7 @@ static actor_method_class l_daWdStick_Method = { (process_method_func)daWdStick_Draw, }; -actor_process_profile_definition g_profile_Obj_WdStick = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WdStick = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index 2ad9351ee6..a68253faa9 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -280,13 +280,13 @@ static int daObj_Web0_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daObj_Web0_Method = { +static DUSK_CONST actor_method_class l_daObj_Web0_Method = { (process_method_func)daObj_Web0_Create, (process_method_func)daObj_Web0_Delete, (process_method_func)daObj_Web0_Execute, (process_method_func)daObj_Web0_IsDelete, (process_method_func)daObj_Web0_Draw, }; -actor_process_profile_definition g_profile_OBJ_WEB0 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_WEB0 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 104191ad1b..9e450e00e4 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -242,7 +242,7 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { fopAcM_ct(i_this, obj_web1_class); obj_web1_class* _this = static_cast(i_this); - static dCcD_SrcCyl cc_cyl_src = { + static DUSK_CONSTEXPR dCcD_SrcCyl cc_cyl_src = { { {0, {{0, 0, 0}, {0xD8FBFFFF, 17}, 0}}, {dCcD_SE_NONE, 0, 0, 0, {0}}, @@ -309,13 +309,13 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daObj_Web1_Method = { +static DUSK_CONST actor_method_class l_daObj_Web1_Method = { (process_method_func)daObj_Web1_Create, (process_method_func)daObj_Web1_Delete, (process_method_func)daObj_Web1_Execute, (process_method_func)daObj_Web1_IsDelete, (process_method_func)daObj_Web1_Draw, }; -actor_process_profile_definition g_profile_OBJ_WEB1 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_WEB1 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index 34b5253978..a26a9879c8 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -28,7 +28,7 @@ int daObjWCover_c::Create() { return 1; } -static char* l_arcName = "H_Idohuta"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "H_Idohuta"; int daObjWCover_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcName, 4)); @@ -138,7 +138,7 @@ static int daObjWCover_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjWCover_Method = { +static DUSK_CONST actor_method_class l_daObjWCover_Method = { (process_method_func)daObjWCover_Create, (process_method_func)daObjWCover_Delete, (process_method_func)daObjWCover_Execute, @@ -146,7 +146,7 @@ static actor_method_class l_daObjWCover_Method = { (process_method_func)daObjWCover_Draw, }; -actor_process_profile_definition g_profile_Obj_WellCover = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WellCover = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index df3112c6fb..b80b1f8b07 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -247,7 +247,7 @@ static int daObj_Wflag_Create(fopAc_ac_c* actor) { return rv; } -static actor_method_class l_daObj_Wflag_Method = { +static DUSK_CONST actor_method_class l_daObj_Wflag_Method = { (process_method_func)daObj_Wflag_Create, (process_method_func)daObj_Wflag_Delete, (process_method_func)daObj_Wflag_Execute, @@ -255,7 +255,7 @@ static actor_method_class l_daObj_Wflag_Method = { (process_method_func)daObj_Wflag_Draw, }; -actor_process_profile_definition g_profile_OBJ_WFLAG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_WFLAG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 3158b93848..0d51999789 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -14,7 +14,7 @@ static int daWindStone_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -static char* l_arcName = "WindStone"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "WindStone"; daWindStone_c::daWindStone_c() : mpBgW(NULL), field_0x5c4(0) {} @@ -241,13 +241,13 @@ static int daWindStone_draw(daWindStone_c* i_this) { return i_this->draw(); } -static actor_method_class daWindStone_METHODS = { +static DUSK_CONST actor_method_class daWindStone_METHODS = { (process_method_func)daWindStone_create, (process_method_func)daWindStone_Delete, (process_method_func)daWindStone_execute, (process_method_func)NULL, (process_method_func)daWindStone_draw, }; -actor_process_profile_definition g_profile_Obj_WindStone = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WindStone = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index 3b6f258942..2710bd31d8 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "f_pc/f_pc_name.h" -static char* l_arcName = "J_KazeD"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "J_KazeD"; static int const l_bck[3] = {5, 6, -1}; @@ -169,7 +169,7 @@ static int daObjWindow_MoveBGDraw(daObjWindow_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daObjWindow_METHODS = { +static DUSK_CONST actor_method_class daObjWindow_METHODS = { (process_method_func)daObjWindow_create1st, (process_method_func)daObjWindow_MoveBGDelete, (process_method_func)daObjWindow_MoveBGExecute, @@ -177,7 +177,7 @@ static actor_method_class daObjWindow_METHODS = { (process_method_func)daObjWindow_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_Window = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Window = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index b01504b480..a1d0a42bdb 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -69,7 +69,7 @@ int daObjWPndlm_c::Create() { return 1; } -static char* l_arcName = "A_Turuki"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "A_Turuki"; int daObjWPndlm_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3); @@ -162,13 +162,13 @@ static int daObjWPndlm_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjWPndlm_Method = { +static DUSK_CONST actor_method_class l_daObjWPndlm_Method = { (process_method_func)daObjWPndlm_Create, (process_method_func)daObjWPndlm_Delete, (process_method_func)daObjWPndlm_Execute, 0, (process_method_func)daObjWPndlm_Draw, }; -actor_process_profile_definition g_profile_Obj_WoodPendulum = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WoodPendulum = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 208ccd2729..7c6d69d576 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -28,9 +28,9 @@ const static dCcD_SrcCyl l_cyl_src = { } }; -static char* l_arcName = "O_wood"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "O_wood"; -static char* l_eventName = "GET_WOOD_STATUE"; +static DUSK_CONSTEXPR char DUSK_CONST* l_eventName = "GET_WOOD_STATUE"; class daObjWStatue_HIO_c : public fOpAcm_HIO_entry_c { public: @@ -351,7 +351,7 @@ int daObjWStatue_c::actionBoomerangCarry() { } void daObjWStatue_c::demoProc() { - static char* action_table[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* action_table[4] = { "WAIT", "MOVE", "SETPOS", @@ -478,13 +478,13 @@ static int daObjWStatue_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjWStatue_Method = { +static DUSK_CONST actor_method_class l_daObjWStatue_Method = { (process_method_func)daObjWStatue_Create, (process_method_func)daObjWStatue_Delete, (process_method_func)daObjWStatue_Execute, NULL, (process_method_func)daObjWStatue_Draw, }; -actor_process_profile_definition g_profile_Obj_WoodStatue = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WoodStatue = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 8598371674..4cb446cef2 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -static char* l_arcName = "Obj_brksw"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Obj_brksw"; static dCcD_SrcCyl l_cyl_src = { { @@ -106,7 +106,7 @@ static int daObjWSword_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjWSword_Method = { +static DUSK_CONST actor_method_class l_daObjWSword_Method = { (process_method_func)daObjWSword_Create, (process_method_func)daObjWSword_Delete, (process_method_func)daObjWSword_Execute, @@ -114,7 +114,7 @@ static actor_method_class l_daObjWSword_Method = { (process_method_func)daObjWSword_Draw, }; -actor_process_profile_definition g_profile_Obj_WoodenSword = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_WoodenSword = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index a4ddd1ee60..1b7b7c8374 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -20,12 +20,12 @@ static int l_loadRes_YBAG0[3] = { 0, -1, -1, }; -static int* l_loadRes_list[2] = { +static DUSK_CONSTEXPR int DUSK_CONST* l_loadRes_list[2] = { l_loadRes_YBAG0, l_loadRes_YBAG0, }; -static char* l_resNames[] = {"yel_bag"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_resNames[] = {"yel_bag"}; dCcD_SrcCyl daObj_YBag_c::mCcDCyl = { daNpcT_c::mCcDObjData, @@ -534,7 +534,7 @@ static int daObj_YBag_IsDelete(void* i_this) { return 1; } -static actor_method_class daObj_YBag_MethodTable = { +static DUSK_CONST actor_method_class daObj_YBag_MethodTable = { (process_method_func)daObj_YBag_Create, (process_method_func)daObj_YBag_Delete, (process_method_func)daObj_YBag_Execute, @@ -542,7 +542,7 @@ static actor_method_class daObj_YBag_MethodTable = { (process_method_func)daObj_YBag_Draw, }; -actor_process_profile_definition g_profile_OBJ_YBAG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_YBAG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index a880f28a45..fd2a53f24e 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -263,8 +263,8 @@ bool daObjYobikusa_c::setNewLeaf() { } int daObjYobikusa_c::createHeap() { - char* res_name1; - char* res_name2; + DUSK_CONST char* res_name1; + DUSK_CONST char* res_name2; J3DModelData* model_data1; J3DModelData* model_data2; @@ -412,13 +412,13 @@ static int daObjYobikusa_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjYobikusa_Method = { +static DUSK_CONST actor_method_class l_daObjYobikusa_Method = { (process_method_func)daObjYobikusa_Create, (process_method_func)daObjYobikusa_Delete, (process_method_func)daObjYobikusa_Execute, (process_method_func)daObjYobikusa_IsDelete, (process_method_func)daObjYobikusa_Draw, }; -actor_process_profile_definition g_profile_Obj_Yobikusa = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Yobikusa = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 7bd087157a..63f826483a 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -851,7 +851,7 @@ static int daObjYOUSEI_IsDelete(daObjYOUSEI_c* i_this) { return 1; } -static actor_method_class l_daObjYOUSEI_Method = { +static DUSK_CONST actor_method_class l_daObjYOUSEI_Method = { (process_method_func)daObjYOUSEI_Create, (process_method_func)daObjYOUSEI_Delete, (process_method_func)daObjYOUSEI_Execute, @@ -859,7 +859,7 @@ static actor_method_class l_daObjYOUSEI_Method = { (process_method_func)daObjYOUSEI_Draw, }; -actor_process_profile_definition g_profile_Obj_Yousei = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Yousei = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index 50f751d987..6484c31cff 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -284,7 +284,7 @@ static cPhs_Step daObj_Ystone_Create(fopAc_ac_c* i_this) { } -static actor_method_class l_daObj_Ystone_Method = { +static DUSK_CONST actor_method_class l_daObj_Ystone_Method = { (process_method_func)daObj_Ystone_Create, (process_method_func)daObj_Ystone_Delete, (process_method_func)daObj_Ystone_Execute, @@ -292,7 +292,7 @@ static actor_method_class l_daObj_Ystone_Method = { (process_method_func)daObj_Ystone_Draw, }; -actor_process_profile_definition g_profile_OBJ_YSTONE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_YSTONE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index c2eb40be00..49580d2589 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -78,7 +78,7 @@ static int daObjZCloth_Create(fopAc_ac_c* i_this) { return a_this->create(); } -static actor_method_class l_daObjZCloth_Method = { +static DUSK_CONST actor_method_class l_daObjZCloth_Method = { (process_method_func)daObjZCloth_Create, (process_method_func)daObjZCloth_Delete, (process_method_func)daObjZCloth_Execute, @@ -86,7 +86,7 @@ static actor_method_class l_daObjZCloth_Method = { (process_method_func)daObjZCloth_Draw, }; -actor_process_profile_definition g_profile_Obj_ZoraCloth = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ZoraCloth = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index 5787a6f7b8..2038e49357 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -237,13 +237,13 @@ int daZdoor_c::Create() { return 1; } -static char* l_arcName[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[3] = { "J_Zdoor", "J_Rdoor", "J_STdoa", }; -static char* l_bmdName[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_bmdName[3] = { "J_Zdoor.bmd", "J_Rdoor.bmd", "J_STdoa.bmd", @@ -267,7 +267,7 @@ static const u16 estimateSizeTbl[2] = { 0x0D30, }; -static char* l_dzbName[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_dzbName[3] = { "J_Zdoor.dzb", "J_Rdoor.dzb", "J_STdoa.dzb", @@ -377,7 +377,7 @@ static int daZdoor_MoveBGDraw(daZdoor_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daZdoor_METHODS = { +static DUSK_CONST actor_method_class daZdoor_METHODS = { (process_method_func)daZdoor_create1st, (process_method_func)daZdoor_MoveBGDelete, (process_method_func)daZdoor_MoveBGExecute, @@ -385,7 +385,7 @@ static actor_method_class daZdoor_METHODS = { (process_method_func)daZdoor_MoveBGDraw, }; -actor_process_profile_definition g_profile_Obj_ZDoor = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ZDoor = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 956508f375..f4a94de7ec 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -252,7 +252,7 @@ static cPhs_Step daZrTurara_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daZrTurara_Method = { +static DUSK_CONST actor_method_class l_daZrTurara_Method = { (process_method_func)daZrTurara_Create, (process_method_func)daZrTurara_Delete, (process_method_func)daZrTurara_Execute, @@ -260,7 +260,7 @@ static actor_method_class l_daZrTurara_Method = { (process_method_func)daZrTurara_Draw, }; -actor_process_profile_definition g_profile_Obj_zrTurara = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_zrTurara = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index cf004c7339..45f58dd543 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -169,7 +169,7 @@ static cPhs_Step daZrTuraRc_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daZrTuraRc_Method = { +static DUSK_CONST actor_method_class l_daZrTuraRc_Method = { (process_method_func)daZrTuraRc_Create, (process_method_func)daZrTuraRc_Delete, (process_method_func)daZrTuraRc_Execute, @@ -177,7 +177,7 @@ static actor_method_class l_daZrTuraRc_Method = { (process_method_func)daZrTuraRc_Draw, }; -actor_process_profile_definition g_profile_Obj_zrTuraraRc = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_zrTuraraRc = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 81332dad8c..1ff2272e3b 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -42,7 +42,7 @@ static const dCcD_SrcCyl l_sph_src = { static const int l_arcIdx[] = {3, 6, 5, 4}; -static char* l_arcName[1] = {"buoy"}; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName[1] = {"buoy"}; int daObjZraMark_c::Create() { fopAcM_ct(this, daObjZraMark_c); @@ -529,7 +529,7 @@ void _ZraMark_Hahen_Mng_c::draw() { } } -static actor_method_class l_daObjZraMark_Method = { +static DUSK_CONST actor_method_class l_daObjZraMark_Method = { (process_method_func)daObjZraMark_create, (process_method_func)daObjZraMark_Delete, (process_method_func)daObjZraMark_Execute, @@ -537,7 +537,7 @@ static actor_method_class l_daObjZraMark_Method = { (process_method_func)daObjZraMark_Draw, }; -actor_process_profile_definition g_profile_ZRA_MARK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ZRA_MARK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index 1525bdb572..c231fc9322 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "f_pc/f_pc_name.h" -static char* l_arcName = "zrF"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "zrF"; static f32 const l_DATA[2] = { 800.0f, 0.0f }; @@ -80,7 +80,7 @@ cPhs_Step daZraFreeze_c::Create() { } int daZraFreeze_c::CreateHeap() { - static char* l_bmdName[3] = { + static DUSK_CONSTEXPR char DUSK_CONST* l_bmdName[3] = { "zrA_a_TW.bmd", "zrA_pain_TW.bmd", "zrA_sol_TW.bmd", @@ -191,7 +191,7 @@ static cPhs_Step daZraFreeze_create(fopAc_ac_c* i_this) { return static_cast(i_this)->Create(); } -static actor_method_class l_daZraFreeze_Method = { +static DUSK_CONST actor_method_class l_daZraFreeze_Method = { (process_method_func)daZraFreeze_create, (process_method_func)daZraFreeze_Delete, (process_method_func)daZraFreeze_Execute, @@ -199,7 +199,7 @@ static actor_method_class l_daZraFreeze_Method = { (process_method_func)daZraFreeze_Draw, }; -actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_OBJ_ZRAFREEZE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index df8b9333a7..d482b3d62d 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -140,7 +140,7 @@ static cPhs_Step daObjZraRock_create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daObjZraRock_Method = { +static DUSK_CONST actor_method_class l_daObjZraRock_Method = { (process_method_func)daObjZraRock_create, (process_method_func)daObjZraRock_Delete, (process_method_func)daObjZraRock_Execute, @@ -149,7 +149,7 @@ static actor_method_class l_daObjZraRock_Method = { }; -actor_process_profile_definition g_profile_Obj_ZraRock = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_ZraRock = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index fe57254149..aa7af1f5bb 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -601,14 +601,14 @@ void daPasserMng_c::create_init() { } } -static actor_method_class l_daPasserMng_Method = { +static DUSK_CONST actor_method_class l_daPasserMng_Method = { (process_method_func)daPasserMng_Create, (process_method_func)daPasserMng_Delete, (process_method_func)daPasserMng_Execute, (process_method_func)daPasserMng_IsDelete, }; -actor_process_profile_definition g_profile_PASSER_MNG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_PASSER_MNG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 23048b4e87..d356c6e22b 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_path_line.h" #include "f_op/f_op_actor_mng.h" -actor_process_profile_definition2 g_profile_PATH_LINE = { +DUSK_PROFILE actor_process_profile_definition2 DUSK_CONST g_profile_PATH_LINE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index b02c740c06..6ef259209a 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -9,32 +9,32 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_obj_catdoor.h" -static int l_bmdData[1][2] = { +static DUSK_CONSTEXPR int l_bmdData[1][2] = { 24, 1, }; -static daNpcT_evtData_c l_evtList[3] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[3] = { {"", 0}, {"PERU_APPEAR", 1}, {"PERU_APPEAR_SKIP", 1}, }; -static char* l_resNameList[2] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[2] = { "", "Peru", }; -static s8 l_loadResPtrn0[2] = { +static DUSK_CONSTEXPR s8 l_loadResPtrn0[2] = { 1, -1, }; -static s8* l_loadResPtrnList[3] = { +static DUSK_CONSTEXPR s8 DUSK_CONST* l_loadResPtrnList[3] = { l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, }; -static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { +static DUSK_CONSTEXPR daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {-1, 0, 0, 30, 2, 1, 1}, {10, 0, 1, 30, 2, 1, 1}, {8, 2, 1, 32, 2, 1, 0}, @@ -42,7 +42,7 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = { {7, 0, 1, 31, 0, 1, 0}, }; -static daNpcT_motionAnmData_c l_motionAnmData[11] = { +static DUSK_CONSTEXPR daNpcT_motionAnmData_c l_motionAnmData[11] = { {20, 2, 1, 27, 0, 1, 1, 0}, {17, 2, 1, 27, 0, 1, 1, 0}, {18, 2, 1, 27, 0, 1, 1, 0}, @@ -56,13 +56,13 @@ static daNpcT_motionAnmData_c l_motionAnmData[11] = { {11, 0, 1, 27, 0, 1, 1, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = { {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, }; -static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[40] = { +static DUSK_CONSTEXPR daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[40] = { {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 0}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -1242,7 +1242,7 @@ static int daPeru_IsDelete(void* i_this) { AUDIO_INSTANCES -static actor_method_class daPeru_MethodTable = { +static DUSK_CONST actor_method_class daPeru_MethodTable = { (process_method_func)daPeru_Create, (process_method_func)daPeru_Delete, (process_method_func)daPeru_Execute, @@ -1250,7 +1250,7 @@ static actor_method_class daPeru_MethodTable = { (process_method_func)daPeru_Draw, }; -actor_process_profile_definition g_profile_PERU = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_PERU = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index 829712f23a..6efc10c5ff 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -14,7 +14,7 @@ static int daPPolamp_c_createHeap(fopAc_ac_c* i_this) { return ((daPPolamp_c*)i_this)->createHeap(); } -static char* l_arcName = "PPolamp"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "PPolamp"; daPPolamp_c::~daPPolamp_c() { dComIfG_resDelete(this, l_arcName); @@ -174,7 +174,7 @@ static int daPPolamp_draw(daPPolamp_c* i_this) { return i_this->draw(); } -static actor_method_class daPPolamp_METHODS = { +static DUSK_CONST actor_method_class daPPolamp_METHODS = { (process_method_func)daPPolamp_create, (process_method_func)daPPolamp_Delete, (process_method_func)daPPolamp_execute, @@ -182,7 +182,7 @@ static actor_method_class daPPolamp_METHODS = { (process_method_func)daPPolamp_draw, }; -actor_process_profile_definition g_profile_PPolamp = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_PPolamp = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index ce328480d8..cf490848f2 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -98,13 +98,13 @@ int daScex_c::execute() { return 1; } -static actor_method_class l_daScex_Method = { +static DUSK_CONST actor_method_class l_daScex_Method = { (process_method_func)daScex_Create, NULL, (process_method_func)daScex_Execute, }; -actor_process_profile_definition2 g_profile_SCENE_EXIT = { +DUSK_PROFILE actor_process_profile_definition2 DUSK_CONST g_profile_SCENE_EXIT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 10, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index 5e9032d9b6..30f3819f55 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -18,9 +18,9 @@ void daScExit_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle); } -static char* l_arcName = "SceneExit"; +static DUSK_CONST char* l_arcName = "SceneExit"; -static char* l_evName = "SCENE_EXIT"; +static DUSK_CONST char* l_evName = "SCENE_EXIT"; int daScExit_c::Create() { mRadius = scale.x * 100.0f; @@ -90,7 +90,7 @@ void daScExit_c::actionEvent() { void daScExit_c::actionDead() {} int daScExit_c::demoProc() { - static char* action_table[3] = {"WAIT", "START", "SCENE_CHG"}; + static DUSK_CONST char* action_table[3] = {"WAIT", "START", "SCENE_CHG"}; u8 scene_id = getSceneID(); int act_id = dComIfGp_evmng_getMyActIdx(mStaffID, action_table, 3, 0, 0); @@ -166,13 +166,13 @@ static int daScExit_Create(daScExit_c* i_this) { return i_this->create(); } -static actor_method_class l_daScExit_Method = { +static DUSK_CONST actor_method_class l_daScExit_Method = { (process_method_func)daScExit_Create, (process_method_func)daScExit_Delete, (process_method_func)daScExit_Execute, (process_method_func)NULL, (process_method_func)daScExit_Draw, }; -actor_process_profile_definition g_profile_SCENE_EXIT2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SCENE_EXIT2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index f898f34ffb..f544c2d2fc 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -50,12 +50,12 @@ static int daSetBgObj_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daSetBgObj_Method = { +static DUSK_CONST actor_method_class l_daSetBgObj_Method = { (process_method_func)daSetBgObj_Create, (process_method_func)daSetBgObj_Delete, }; -actor_process_profile_definition g_profile_SET_BG_OBJ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SET_BG_OBJ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 09f99c1ca7..568128757f 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -269,13 +269,13 @@ static int daShopItem_IsDelete(void* i_this) { return 1; } -static actor_method_class daShopItemMethodTable = { +static DUSK_CONST actor_method_class daShopItemMethodTable = { (process_method_func)daShopItem_Create, (process_method_func)daShopItem_Delete, (process_method_func)daShopItem_Execute, (process_method_func)daShopItem_IsDelete, (process_method_func)daShopItem_Draw, }; -actor_process_profile_definition g_profile_ShopItem = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_ShopItem = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index b4edbf6136..01be9ac7e7 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -72,13 +72,13 @@ static int daSkip2D_IsDelete(void*) { return 1; } -static actor_method_class daSkip2D_MethodTable = { +static DUSK_CONST actor_method_class daSkip2D_MethodTable = { (process_method_func)daSkip2D_Create, (process_method_func)daSkip2D_Delete, (process_method_func)daSkip2D_Execute, (process_method_func)daSkip2D_IsDelete, (process_method_func)daSkip2D_Draw, }; -actor_process_profile_definition g_profile_SKIP2D = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SKIP2D = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index b879c919b0..730f120905 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -933,7 +933,7 @@ static int daSpinner_Draw(daSpinner_c* i_this) { return i_this->draw(); } -static actor_method_class l_daSpinner_Method = { +static DUSK_CONST actor_method_class l_daSpinner_Method = { (process_method_func)daSpinner_Create, (process_method_func)daSpinner_Delete, (process_method_func)daSpinner_Execute, @@ -941,7 +941,7 @@ static actor_method_class l_daSpinner_Method = { (process_method_func)daSpinner_Draw, }; -actor_process_profile_definition g_profile_SPINNER = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SPINNER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index ee0aafa1be..8e60c6e939 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -577,7 +577,7 @@ static cPhs_Step daSq_Create(fopAc_ac_c* i_this) { return step; } -static actor_method_class l_daSq_Method = { +static DUSK_CONST actor_method_class l_daSq_Method = { (process_method_func)daSq_Create, (process_method_func)daSq_Delete, (process_method_func)daSq_Execute, @@ -585,7 +585,7 @@ static actor_method_class l_daSq_Method = { (process_method_func)daSq_Draw, }; -actor_process_profile_definition g_profile_SQ = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SQ = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index 53d5a3f007..3132e148f0 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -182,13 +182,13 @@ static int daStartAndGoal_create(fopAc_ac_c* i_this) { return static_cast(i_this)->Create(); } -static actor_method_class l_daStartAndGoal_Method = { +static DUSK_CONST actor_method_class l_daStartAndGoal_Method = { (process_method_func)daStartAndGoal_create, (process_method_func)daStartAndGoal_Delete, (process_method_func)daStartAndGoal_Execute, (process_method_func)daStartAndGoal_IsDelete, (process_method_func)daStartAndGoal_Draw, }; -actor_process_profile_definition g_profile_START_AND_GOAL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_START_AND_GOAL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 25e7a3934a..ad62e80430 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -38,11 +38,11 @@ static int daSus_create(daSus_c* i_this) { return i_this->create(); } -static actor_method_class daSus_METHODS = { +static DUSK_CONST actor_method_class daSus_METHODS = { (process_method_func)daSus_create, NULL, NULL, NULL, NULL, }; -actor_process_profile_definition g_profile_SUSPEND = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SUSPEND = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 11, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index 02580416cb..e0d3c98594 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -270,13 +270,13 @@ static int daSwBall_Create(fopAc_ac_c* i_this) { return ((daSwBall_c*)i_this)->create(); } -static actor_method_class l_daSwBall_Method = { +static DUSK_CONST actor_method_class l_daSwBall_Method = { (process_method_func)daSwBall_Create, (process_method_func)daSwBall_Delete, (process_method_func)daSwBall_Execute, }; -actor_process_profile_definition g_profile_SwBall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SwBall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index 12fe142cef..130648ccce 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -246,7 +246,7 @@ static int daSwLBall_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daSwLBall_Method = { +static DUSK_CONST actor_method_class l_daSwLBall_Method = { (process_method_func)daSwLBall_Create, (process_method_func)daSwLBall_Delete, (process_method_func)daSwLBall_Execute, @@ -254,7 +254,7 @@ static actor_method_class l_daSwLBall_Method = { NULL, }; -actor_process_profile_definition g_profile_SwLBall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SwLBall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index 2d867109d4..2e7a6d36a5 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -52,13 +52,13 @@ static int daSwTime_Create(daSwTime_c* i_this) { return i_this->create(); } -static actor_method_class l_daSwTime_Method = { +static DUSK_CONST actor_method_class l_daSwTime_Method = { (process_method_func)daSwTime_Create, (process_method_func)daSwTime_Delete, (process_method_func)daSwTime_Execute }; -actor_process_profile_definition g_profile_SwTime = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SwTime = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 0925ae0829..cb7d48d05b 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -324,7 +324,7 @@ static int daSwc00_Create(fopAc_ac_c* a_this) { return cPhs_COMPLEATE_e; } -static actor_method_class l_daSwc00_Method = { +static DUSK_CONST actor_method_class l_daSwc00_Method = { (process_method_func)daSwc00_Create, (process_method_func)daSwc00_Delete, (process_method_func)daSwc00_Execute, @@ -336,7 +336,7 @@ static actor_method_class l_daSwc00_Method = { #endif }; -actor_process_profile_definition g_profile_SWC00 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SWC00 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 416a635c7f..2ad71589b2 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -14,7 +14,7 @@ #define COLOR_RED 2 #define COLOR_GREEN 3 -static char* l_arcName = "S_swHit00"; +static DUSK_CONST char* l_arcName = "S_swHit00"; int daSwhit0_c::getSwNo() { return fopAcM_GetParam(this) & 0xFF; @@ -196,7 +196,7 @@ void daSwhit0_c::offSwitch() { } int daSwhit0_c::DemoProc() { - static char* action_table[2] = { + static DUSK_CONST char* action_table[2] = { "WAIT", "CHANGE", }; @@ -469,7 +469,7 @@ static int daSwhit0_Create(fopAc_ac_c* i_this) { return ((daSwhit0_c*)i_this)->create(); } -static actor_method_class l_daSwhit0_Method = { +static DUSK_CONST actor_method_class l_daSwhit0_Method = { (process_method_func)daSwhit0_Create, (process_method_func)daSwhit0_Delete, (process_method_func)daSwhit0_Execute, @@ -477,7 +477,7 @@ static actor_method_class l_daSwhit0_Method = { (process_method_func)daSwhit0_Draw, }; -actor_process_profile_definition g_profile_SWHIT0 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_SWHIT0 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index bd945ec07f..41584286da 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -121,13 +121,13 @@ static int daTagCstaSw_Create(fopAc_ac_c* i_this) { return cstaSw->create(); } -static actor_method_class l_daTagCstaSw_Method = { +static DUSK_CONST actor_method_class l_daTagCstaSw_Method = { (process_method_func)daTagCstaSw_Create, (process_method_func)daTagCstaSw_Delete, (process_method_func)daTagCstaSw_Execute, (process_method_func)NULL, (process_method_func)daTagCstaSw_Draw, }; -actor_process_profile_definition g_profile_Tag_CstaSw = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_CstaSw = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index 8f9a282d9f..bdd78af32c 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -14,7 +14,7 @@ static f32 const l_minRelative[] = {-700.0f, -300.0f, -2000.0f}; static f32 const l_maxRelative[] = {700.0f, 0.0f, 1000.0f}; -static char* l_arcName = "Lv6Gate"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Lv6Gate"; static int createSolidHeap(fopAc_ac_c* i_this) { daTagLv6Gate_c* gate = static_cast(i_this); @@ -372,13 +372,13 @@ static int daTagLv6Gate_Delete(daTagLv6Gate_c* i_this) { return 1; } -static actor_method_class l_daTagLv6Gate_Method = { +static DUSK_CONST actor_method_class l_daTagLv6Gate_Method = { (process_method_func)daTagLv6Gate_Create, (process_method_func)daTagLv6Gate_Delete, (process_method_func)daTagLv6Gate_Execute, (process_method_func)daTagLv6Gate_IsDelete, (process_method_func)daTagLv6Gate_Draw, }; -actor_process_profile_definition g_profile_Tag_Lv6Gate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv6Gate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 4bb0fc7691..d745679513 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -10,7 +10,7 @@ #include "d/d_path.h" #include "f_pc/f_pc_name.h" -static char* l_arcName = "Lv7Gate"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Lv7Gate"; int daTagLv7Gate_c::createHeap() { // Watched City in the Sky start cutscene @@ -353,13 +353,13 @@ static int daTagLv7Gate_Delete(daTagLv7Gate_c* i_this) { return 1; } -static actor_method_class l_daTagLv7Gate_Method = { +static DUSK_CONST actor_method_class l_daTagLv7Gate_Method = { (process_method_func)daTagLv7Gate_Create, (process_method_func)daTagLv7Gate_Delete, (process_method_func)daTagLv7Gate_Execute, (process_method_func)daTagLv7Gate_IsDelete, (process_method_func)daTagLv7Gate_Draw, }; -actor_process_profile_definition g_profile_Tag_Lv7Gate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv7Gate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index a2214ec750..82aac1029c 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_obj_mirror_table.h" #include -static char* l_arcName = "Lv8Gate"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Lv8Gate"; static int createSolidHeap(fopAc_ac_c* i_this) { daTagLv8Gate_c* gate = static_cast(i_this); @@ -228,13 +228,13 @@ static int daTagLv8Gate_Delete(daTagLv8Gate_c* i_this) { return TRUE; } -static actor_method_class l_daTagLv8Gate_Method = { +static DUSK_CONST actor_method_class l_daTagLv8Gate_Method = { (process_method_func)daTagLv8Gate_Create, (process_method_func)daTagLv8Gate_Delete, (process_method_func)daTagLv8Gate_Execute, (process_method_func)daTagLv8Gate_IsDelete, (process_method_func)daTagLv8Gate_Draw, }; -actor_process_profile_definition g_profile_Tag_Lv8Gate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv8Gate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 8eba989b7e..4f06c69899 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -13,12 +13,12 @@ #include "f_op/f_op_actor_mng.h" struct daTagTWGate_zevParam { - /* 0x00 */ char* mArcName; - /* 0x04 */ char* mEventName; - /* 0x08 */ char* mTalkEventName; - /* 0x0C */ char* mInEventName; + /* 0x00 */ DUSK_CONST char* mArcName; + /* 0x04 */ DUSK_CONST char* mEventName; + /* 0x08 */ DUSK_CONST char* mTalkEventName; + /* 0x0C */ DUSK_CONST char* mInEventName; /* 0x10 */ int mLv; - /* 0x14 */ char* mStage; + /* 0x14 */ DUSK_CONST char* mStage; /* 0x18 */ s16 mPoint; /* 0x1A */ s8 mRoomNo; /* 0x1B */ s8 mLayer; @@ -77,7 +77,7 @@ static daTagTWGate_zevParam const l_zevParamTbl[4] = { }, }; -static const char* l_myName = "Gate"; +static DUSK_CONSTEXPR const char* l_myName = "Gate"; const actionFunc daTagTWGate_c::ActionTable[][2] = { {&daTagTWGate_c::initWait, &daTagTWGate_c::executeWait}, @@ -1170,13 +1170,13 @@ static int daTagTWGate_IsDelete(daTagTWGate_c* i_this) { return 1; } -static actor_method_class l_daTagTWGate_Method = { +static DUSK_CONST actor_method_class l_daTagTWGate_Method = { (process_method_func)daTagTWGate_Create, (process_method_func)daTagTWGate_Delete, (process_method_func)daTagTWGate_Execute, (process_method_func)daTagTWGate_IsDelete, (process_method_func)daTagTWGate_Draw, }; -actor_process_profile_definition g_profile_Tag_TWGate = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_TWGate = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 6634e7c334..c3da04b053 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -59,13 +59,13 @@ static int daTagAJnot_Draw(daTagAJnot_c* i_this) { return 1; } -static actor_method_class l_daTagAJnot_Method = { +static DUSK_CONST actor_method_class l_daTagAJnot_Method = { (process_method_func)daTagAJnot_Create, (process_method_func)daTagAJnot_Delete, (process_method_func)daTagAJnot_Execute, (process_method_func)NULL, (process_method_func)daTagAJnot_Draw, }; -actor_process_profile_definition g_profile_Tag_AJnot = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_AJnot = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index c9414bf755..4ab2f1765a 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -8,7 +8,7 @@ #include "f_op/f_op_camera_mng.h" #include -static daNpcT_evtData_c l_evtList[8] = { +static DUSK_CONSTEXPR daNpcT_evtData_c l_evtList[8] = { {"", 0}, {"FOCUS_BOUMATO", 2}, {"FOCUS_ITAMATO", 2}, @@ -28,7 +28,7 @@ static daNpcT_evtData_c l_evtList[8] = { #define EVT_HIT_BOUMATO3 6 #define EVT_NEARPIN_BOUMATO 7 -static char* l_resNameList[3] = { +static DUSK_CONSTEXPR char DUSK_CONST* l_resNameList[3] = { "", "Taro1", "Taro2", @@ -584,7 +584,7 @@ static int daTag_AllMato_IsDelete(void* i_this) { return 1; } -static actor_method_class daTag_AllMato_MethodTable = { +static DUSK_CONST actor_method_class daTag_AllMato_MethodTable = { (process_method_func)daTag_AllMato_Create, (process_method_func)daTag_AllMato_Delete, (process_method_func)daTag_AllMato_Execute, @@ -592,7 +592,7 @@ static actor_method_class daTag_AllMato_MethodTable = { (process_method_func)daTag_AllMato_Draw }; -actor_process_profile_definition g_profile_TAG_ALLMATO = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_ALLMATO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 10, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index f8eaef153c..878948c084 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -19,12 +19,12 @@ static int daTagArena_Delete(daTagArena_c* i_this) { return 1; } -static actor_method_class l_daTagArena_Method = { +static DUSK_CONST actor_method_class l_daTagArena_Method = { (process_method_func)daTagArena_Create, (process_method_func)daTagArena_Delete, }; -actor_process_profile_definition g_profile_Tag_Arena = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Arena = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index a78a43f264..d95de3bd01 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -45,14 +45,14 @@ static int daTagAssist_Delete(daTagAssist_c* i_this) { return 1; } -static actor_method_class l_daTagAssist_Method = { +static DUSK_CONST actor_method_class l_daTagAssist_Method = { (process_method_func)daTagAssist_Create, (process_method_func)daTagAssist_Delete, (process_method_func)daTagAssist_Execute, (process_method_func)daTagAssist_IsDelete }; -actor_process_profile_definition g_profile_Tag_Assist = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Assist = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index 3c61256e3b..c98d268ad1 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -195,7 +195,7 @@ static int daTagAtkItem_Create(daTagAtkItem_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagAtkItem_Method = { +static DUSK_CONST actor_method_class l_daTagAtkItem_Method = { (process_method_func)daTagAtkItem_Create, (process_method_func)daTagAtkItem_Delete, (process_method_func)daTagAtkItem_Execute, @@ -207,7 +207,7 @@ static actor_method_class l_daTagAtkItem_Method = { #endif }; -actor_process_profile_definition g_profile_Tag_AttackItem = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_AttackItem = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index a0b8bf0339..702193ec65 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -283,13 +283,13 @@ static int daAttp_Create(fopAc_ac_c* i_this) { return attp->create(); } -static actor_method_class l_daAttp_Method = { +static DUSK_CONST actor_method_class l_daAttp_Method = { (process_method_func)daAttp_Create, (process_method_func)daAttp_Delete, (process_method_func)daAttp_Execute, (process_method_func)NULL, (process_method_func)daAttp_Draw, }; -actor_process_profile_definition g_profile_Tag_Attp = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Attp = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 1cfd2447a8..c30dacdee1 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -183,7 +183,7 @@ static int daTag_BottleItem_IsDelete(void* i_this) { daTag_BottleItem_c::~daTag_BottleItem_c() {} -static actor_method_class daTag_BottleItem_MethodTable = { +static DUSK_CONST actor_method_class daTag_BottleItem_MethodTable = { (process_method_func)daTag_BottleItem_Create, (process_method_func)daTag_BottleItem_Delete, (process_method_func)daTag_BottleItem_Execute, @@ -191,7 +191,7 @@ static actor_method_class daTag_BottleItem_MethodTable = { (process_method_func)daTag_BottleItem_Draw }; -actor_process_profile_definition g_profile_TAG_BTLITM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_BTLITM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index ce5a929c9c..e83a067ebe 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -326,13 +326,13 @@ static int daTag_Cam_Create(fopAc_ac_c* i_this) { return result; } -static actor_method_class l_daTag_Cam_Method = { +static DUSK_CONST actor_method_class l_daTag_Cam_Method = { (process_method_func)daTag_Cam_Create, (process_method_func)daTag_Cam_Delete, (process_method_func)daTag_Cam_Execute, (process_method_func)daTag_Cam_IsDelete, (process_method_func)daTag_Cam_Draw, }; -actor_process_profile_definition g_profile_TAG_CAMERA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_CAMERA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index 352341051e..504fe65dd7 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -175,7 +175,7 @@ static int daTagChgRestart_Draw(daTagChgRestart_c* i_this) { return i_this->draw(); } -static actor_method_class l_daTagChgRestart_Method = { +static DUSK_CONST actor_method_class l_daTagChgRestart_Method = { (process_method_func)daTagChgRestart_Create, (process_method_func)daTagChgRestart_Delete, (process_method_func)daTagChgRestart_Execute, @@ -187,7 +187,7 @@ static actor_method_class l_daTagChgRestart_Method = { #endif }; -actor_process_profile_definition g_profile_Tag_ChgRestart = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_ChgRestart = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 56df12bd53..352bb38db0 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -129,12 +129,12 @@ static int daTag_Chk_Create(fopAc_ac_c* i_this) { return result; } -static actor_method_class l_daTag_Chk_Method = { +static DUSK_CONST actor_method_class l_daTag_Chk_Method = { (process_method_func)daTag_Chk_Create, (process_method_func)daTag_Chk_Delete, (process_method_func)daTag_Chk_Execute, (process_method_func)daTag_Chk_IsDelete, (process_method_func)daTag_Chk_Draw}; -actor_process_profile_definition g_profile_TAG_CHKPOINT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_CHKPOINT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index 106785a9c0..af5a2ef78e 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -541,7 +541,7 @@ static int daTagCsw_Create(fopAc_ac_c* i_this) { return csw->create(); } -static actor_method_class l_daTagCsw_Method = { +static DUSK_CONST actor_method_class l_daTagCsw_Method = { (process_method_func)daTagCsw_Create, (process_method_func)daTagCsw_Delete, (process_method_func)daTagCsw_Execute, @@ -549,7 +549,7 @@ static actor_method_class l_daTagCsw_Method = { (process_method_func)daTagCsw_Draw, }; -actor_process_profile_definition g_profile_TAG_CSW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_CSW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index 7300968c4d..ddf14f990b 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -25,7 +25,7 @@ static int daTagEscape_Delete(daTagEscape_c* i_this) { return 1; } -static actor_method_class l_daTagEscape_Method = { +static DUSK_CONST actor_method_class l_daTagEscape_Method = { (process_method_func)daTagEscape_Create, (process_method_func)daTagEscape_Delete, (process_method_func)NULL, @@ -33,7 +33,7 @@ static actor_method_class l_daTagEscape_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Tag_Escape = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Escape = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index adcef6c611..77783396ef 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -363,13 +363,13 @@ static int daTag_Event_Create(fopAc_ac_c* i_this) { return result; } -static actor_method_class l_daTag_Event_Method = { +static DUSK_CONST actor_method_class l_daTag_Event_Method = { (process_method_func)daTag_Event_Create, (process_method_func)daTag_Event_Delete, (process_method_func)daTag_Event_Execute, (process_method_func)daTag_Event_IsDelete, (process_method_func)daTag_Event_Draw, }; -actor_process_profile_definition g_profile_TAG_EVENT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_EVENT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index e68c980b23..7cf68b91b3 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -10,14 +10,14 @@ #include "dusk/string.hpp" -static char* l_evtNameList[] = { +static DUSK_CONST char* l_evtNameList[] = { NULL, "JUMP_DEMOSTAGE", }; -static char* l_resFileName = "TAGEVT"; +static DUSK_CONST char* l_resFileName = "TAGEVT"; -char* daTag_Evt_c::mEvtCutList[] = { +DUSK_CONST char* daTag_Evt_c::mEvtCutList[] = { "WAIT", "TALK", "NEXT", @@ -238,13 +238,13 @@ static int daTag_Evt_IsDelete(void* i_this) { daTag_Evt_c::~daTag_Evt_c() {} -static actor_method_class daTag_Evt_MethodTable = { +static DUSK_CONST actor_method_class daTag_Evt_MethodTable = { (process_method_func)daTag_Evt_Create, (process_method_func)daTag_Evt_Delete, (process_method_func)daTag_Evt_Execute, (process_method_func)daTag_Evt_IsDelete, (process_method_func)daTag_Evt_Draw, }; -actor_process_profile_definition g_profile_TAG_EVT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_EVT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index a3f403eb94..2093c0cb64 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -225,13 +225,13 @@ static BOOL daTag_EvtArea_IsDelete(void* i_this) { return true; } -static actor_method_class daTag_EvtArea_MethodTable = { +static DUSK_CONST actor_method_class daTag_EvtArea_MethodTable = { (process_method_func)daTag_EvtArea_Create, (process_method_func)daTag_EvtArea_Delete, (process_method_func)daTag_EvtArea_Execute, (process_method_func)daTag_EvtArea_IsDelete, (process_method_func)daTag_EvtArea_Draw, }; -actor_process_profile_definition g_profile_TAG_EVTAREA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_EVTAREA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index b5e71f00e3..c63ec8b3ce 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -17,7 +17,7 @@ enum evt_cut_e { NUM_EVT_CUTS_e, }; -char* daTag_EvtMsg_c::mEvtCutNameList[] = {"", "TALK", "WAIT"}; +DUSK_CONST char* daTag_EvtMsg_c::mEvtCutNameList[] = {"", "TALK", "WAIT"}; EvtCutFunc daTag_EvtMsg_c::mEvtCutList[] = { NULL, @@ -25,7 +25,7 @@ EvtCutFunc daTag_EvtMsg_c::mEvtCutList[] = { &daTag_EvtMsg_c::ECut_wait, }; -static char* l_myName = "EvtMsg"; +static DUSK_CONST char* l_myName = "EvtMsg"; int daTag_EvtMsg_c::create() { int var_r28 = 0; @@ -238,13 +238,13 @@ static int daTag_EvtMsg_IsDelete(void* i_this) { daTag_EvtMsg_c::~daTag_EvtMsg_c() {} -static actor_method_class daTag_EvtMsg_MethodTable = { +static DUSK_CONST actor_method_class daTag_EvtMsg_MethodTable = { (process_method_func)daTag_EvtMsg_Create, (process_method_func)daTag_EvtMsg_Delete, (process_method_func)daTag_EvtMsg_Execute, (process_method_func)daTag_EvtMsg_IsDelete, (process_method_func)daTag_EvtMsg_Draw, }; -actor_process_profile_definition g_profile_TAG_EVTMSG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_EVTMSG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 34264045bb..0f1a461ba2 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -212,13 +212,13 @@ static int daTag_FWall_Create(daTag_FWall_c* i_this) { return i_this->create(); } -static actor_method_class l_daTag_FWall_Method = { +static DUSK_CONST actor_method_class l_daTag_FWall_Method = { (process_method_func)daTag_FWall_Create, (process_method_func)daTag_FWall_Delete, (process_method_func)daTag_FWall_Execute, (process_method_func)daTag_FWall_IsDelete, (process_method_func)daTag_FWall_Draw, }; -actor_process_profile_definition g_profile_Tag_FWall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_FWall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index d42cfdd26e..ec690eaf70 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -19,12 +19,12 @@ static int daTagGra_Delete(daTagGra_c* i_this) { return 1; } -static actor_method_class l_daTagGra_Method = { +static DUSK_CONST actor_method_class l_daTagGra_Method = { (process_method_func)daTagGra_Create, (process_method_func)daTagGra_Delete }; -actor_process_profile_definition g_profile_TAG_GRA = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_GRA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index d982cb1c51..14960e706a 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -55,13 +55,13 @@ static int daTagGstart_Draw(daTagGstart_c*) { return 1; } -static actor_method_class l_daTagGstart_Method = { +static DUSK_CONST actor_method_class l_daTagGstart_Method = { (process_method_func)daTagGstart_Create, (process_method_func)daTagGstart_Delete, (process_method_func)daTagGstart_Execute, (process_method_func)NULL, (process_method_func)daTagGstart_Draw, }; -actor_process_profile_definition g_profile_Tag_Gstart = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Gstart = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 237c873444..0a6d0ddcfd 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -75,12 +75,12 @@ static int daTagGuard_Delete(daTagGuard_c* i_this) { return 1; } -static actor_method_class l_daTagGuard_Method = { +static DUSK_CONST actor_method_class l_daTagGuard_Method = { (process_method_func)daTagGuard_Create, (process_method_func)daTagGuard_Delete, }; -actor_process_profile_definition g_profile_TAG_GUARD = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_GUARD = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index 80f598515e..60fd5f508d 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -66,14 +66,14 @@ static int daTagHinit_Draw(daTagHinit_c*) { return 1; } -static actor_method_class l_daTagHinit_Method = { +static DUSK_CONST actor_method_class l_daTagHinit_Method = { (process_method_func)daTagHinit_Create, (process_method_func)daTagHinit_Delete, (process_method_func)daTagHinit_Execute, (process_method_func)NULL, (process_method_func)daTagHinit_Draw, }; -actor_process_profile_definition g_profile_Tag_Hinit = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Hinit = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index 36613aaaee..845fa6370d 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -222,13 +222,13 @@ static int daTagHjump_Draw(daTagHjump_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class l_daTagHjump_Method = { +static DUSK_CONST actor_method_class l_daTagHjump_Method = { (process_method_func)daTagHjump_Create, (process_method_func)daTagHjump_Delete, (process_method_func)daTagHjump_Execute, (process_method_func)NULL, (process_method_func)daTagHjump_Draw, }; -actor_process_profile_definition g_profile_Tag_Hjump = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Hjump = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index ea1e2b013e..b06aa26562 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -91,14 +91,14 @@ static int daTag_Howl_IsDelete(void* i_this) { return 1; } -static actor_method_class daTag_Howl_MethodTable = { +static DUSK_CONST actor_method_class daTag_Howl_MethodTable = { (process_method_func)daTag_Howl_Create, (process_method_func)daTag_Howl_Delete, (process_method_func)daTag_Howl_Execute, (process_method_func)daTag_Howl_IsDelete, (process_method_func)daTag_Howl_Draw, }; -actor_process_profile_definition g_profile_TAG_HOWL = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_HOWL = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index 589fb71b29..825ab6e647 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -199,13 +199,13 @@ static int daTagHstop_Draw(daTagHstop_c* i_this) { return 1; } -static actor_method_class l_daTagHstop_Method = { +static DUSK_CONST actor_method_class l_daTagHstop_Method = { (process_method_func)daTagHstop_Create, (process_method_func)daTagHstop_Delete, (process_method_func)daTagHstop_Execute, (process_method_func)NULL, (process_method_func)daTagHstop_Draw, }; -actor_process_profile_definition g_profile_Tag_Hstop = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Hstop = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index e59488c37b..0c287d665d 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -20,7 +20,7 @@ static int daTagInst_Delete(daTagInst_c* i_this) { return 1; } -static actor_method_class l_daTagInst_Method = { +static DUSK_CONST actor_method_class l_daTagInst_Method = { (process_method_func)daTagInst_Create, (process_method_func)daTagInst_Delete, (process_method_func)NULL, @@ -28,7 +28,7 @@ static actor_method_class l_daTagInst_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Tag_Instruction = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Instruction = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 2ce69dabf9..e805f4d0a8 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -268,13 +268,13 @@ static int daTagKagoFall_Create(daTagKagoFall_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagKagoFall_Method = { +static DUSK_CONST actor_method_class l_daTagKagoFall_Method = { (process_method_func)daTagKagoFall_Create, (process_method_func)daTagKagoFall_Delete, (process_method_func)daTagKagoFall_Execute, }; -actor_process_profile_definition g_profile_Tag_KagoFall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_KagoFall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 760884bc3a..fb703e8d5a 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -7,17 +7,17 @@ #include struct EventListItem { - char* mEventName; + DUSK_CONST char* mEventName; u32 field_0x4; }; -static EventListItem l_evtList[3] = { +static DUSK_CONSTEXPR EventListItem l_evtList[3] = { {"", 0}, {"EXTINCTION", 2}, {"PURCHASE", 1}, }; -static char* l_resNameList[3] = { +static DUSK_CONST char* l_resNameList[3] = { "", "Bans1", "sekizoA", @@ -261,7 +261,7 @@ static int daTag_KMsg_IsDelete(void* param_0) { return 1; } -static actor_method_class daTag_KMsg_MethodTable = { +static DUSK_CONST actor_method_class daTag_KMsg_MethodTable = { (process_method_func)daTag_KMsg_Create, (process_method_func)daTag_KMsg_Delete, (process_method_func)daTag_KMsg_Execute, @@ -269,7 +269,7 @@ static actor_method_class daTag_KMsg_MethodTable = { (process_method_func)daTag_KMsg_Draw, }; -actor_process_profile_definition g_profile_TAG_KMSG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_KMSG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index 88660a029d..00d4e49b95 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -165,13 +165,13 @@ static int daTag_Lantern_IsDelete(void* i_this) { return 1; } -static actor_method_class daTag_Lantern_MethodTable = { +static DUSK_CONST actor_method_class daTag_Lantern_MethodTable = { (process_method_func)daTag_Lantern_Create, (process_method_func)daTag_Lantern_Delete, (process_method_func)daTag_Lantern_Execute, (process_method_func)daTag_Lantern_IsDelete, (process_method_func)daTag_Lantern_Draw, }; -actor_process_profile_definition g_profile_TAG_LANTERN = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_LANTERN = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index e6bc73ed78..6a553381f6 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -112,13 +112,13 @@ static int daTagLightBall_Create(fopAc_ac_c* i_this) { return lightBall->create(); } -static actor_method_class l_daTagLightBall_Method = { +static DUSK_CONST actor_method_class l_daTagLightBall_Method = { (process_method_func)daTagLightBall_Create, (process_method_func)daTagLightBall_Delete, (process_method_func)daTagLightBall_Execute, (process_method_func)NULL, (process_method_func)daTagLightBall_Draw, }; -actor_process_profile_definition g_profile_Tag_LightBall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_LightBall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index dbea932afd..12df655e5e 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -180,7 +180,7 @@ static int daTagLv2PrChk_Create(daTagLv2PrChk_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagLv2PrChk_Method = { +static DUSK_CONST actor_method_class l_daTagLv2PrChk_Method = { (process_method_func)daTagLv2PrChk_Create, (process_method_func)daTagLv2PrChk_Delete, (process_method_func)daTagLv2PrChk_Execute, @@ -188,7 +188,7 @@ static actor_method_class l_daTagLv2PrChk_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Tag_Lv2PrChk = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv2PrChk = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index 6039804791..f0f6b9fc26 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -76,13 +76,13 @@ static int daTag_Lv5Soup_IsDelete(void* i_this) { daTag_Lv5Soup_c::~daTag_Lv5Soup_c() {} -static actor_method_class daTag_Lv5Soup_MethodTable = { +static DUSK_CONST actor_method_class daTag_Lv5Soup_MethodTable = { (process_method_func)daTag_Lv5Soup_Create, (process_method_func)daTag_Lv5Soup_Delete, (process_method_func)daTag_Lv5Soup_Execute, (process_method_func)daTag_Lv5Soup_IsDelete, (process_method_func)daTag_Lv5Soup_Draw, }; -actor_process_profile_definition g_profile_TAG_LV5SOUP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_LV5SOUP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index 843bc68294..728e877585 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -121,13 +121,13 @@ static int daLv6CstaSw_Create(fopAc_ac_c* i_this) { return cStaSw->create(); } -static actor_method_class l_daLv6CstaSw_Method = { +static DUSK_CONST actor_method_class l_daLv6CstaSw_Method = { (process_method_func)daLv6CstaSw_Create, (process_method_func)daLv6CstaSw_Delete, (process_method_func)daLv6CstaSw_Execute, (process_method_func)NULL, (process_method_func)daLv6CstaSw_Draw, }; -actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Lv6CstaSw = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index ca74c0655a..7df0d78f5d 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -55,7 +55,7 @@ static int daTagMagne_Create(fopAc_ac_c* i_this) { return magne->create(); } -static actor_method_class l_daTagMagne_Method = { +static DUSK_CONST actor_method_class l_daTagMagne_Method = { (process_method_func)daTagMagne_Create, (process_method_func)daTagMagne_Delete, (process_method_func)NULL, @@ -63,7 +63,7 @@ static actor_method_class l_daTagMagne_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Tag_Magne = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Magne = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index c1afbde4e4..c32311a41c 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -233,13 +233,13 @@ static int daTagMhint_Draw(daTagMhint_c* i_this) { return 1; } -static actor_method_class l_daTagMhint_Method = { +static DUSK_CONST actor_method_class l_daTagMhint_Method = { (process_method_func)daTagMhint_Create, (process_method_func)daTagMhint_Delete, (process_method_func)daTagMhint_Execute, (process_method_func)NULL, (process_method_func)daTagMhint_Draw, }; -actor_process_profile_definition g_profile_Tag_Mhint = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Mhint = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index de8756a971..4683b25034 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -198,7 +198,7 @@ static int daTagMist_Create(fopAc_ac_c* i_this) { return mist->create(); } -static actor_method_class l_daTagMist_Method = { +static DUSK_CONST actor_method_class l_daTagMist_Method = { (process_method_func)daTagMist_Create, (process_method_func)daTagMist_Delete, (process_method_func)daTagMist_Execute, @@ -210,7 +210,7 @@ static actor_method_class l_daTagMist_Method = { #endif }; -actor_process_profile_definition g_profile_Tag_Mist = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Mist = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index f5da6c8ab0..3c5ebfb5f7 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -92,13 +92,13 @@ static int daTagMmsg_Draw(daTagMmsg_c* i_this) { return 1; } -static actor_method_class l_daTagMmsg_Method = { +static DUSK_CONST actor_method_class l_daTagMmsg_Method = { (process_method_func)daTagMmsg_Create, (process_method_func)daTagMmsg_Delete, (process_method_func)daTagMmsg_Execute, (process_method_func)NULL, (process_method_func)daTagMmsg_Draw, }; -actor_process_profile_definition g_profile_Tag_Mmsg = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Mmsg = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 55b135964a..08bd00b001 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -18,9 +18,9 @@ static int createHeapCallBack(fopAc_ac_c* i_this) { return msg->createHeap(); } -static char* l_resName = "TagMsg"; +static DUSK_CONST char* l_resName = "TagMsg"; -static char* l_evtNameTBL[2] = { +static DUSK_CONST char* l_evtNameTBL[2] = { NULL, "SPEAK", }; @@ -200,7 +200,7 @@ BOOL daTag_Msg_c::otherCheck() { } } -char* daTag_Msg_c::getResName() { +DUSK_CONST char* daTag_Msg_c::getResName() { return l_resName; } @@ -224,7 +224,7 @@ void daTag_Msg_c::getParam() { SAFE_STRCPY(mStaffName, "Tag_ms"); } -char* daTag_Msg_c::mEvtCutTBL[2] = { +DUSK_CONST char* daTag_Msg_c::mEvtCutTBL[2] = { "SPEAK", "PAUSE", }; @@ -271,13 +271,13 @@ static void dummyString() { DEAD_STRING("Timer"); } -static actor_method_class daTag_Msg_MethodTable = { +static DUSK_CONST actor_method_class daTag_Msg_MethodTable = { (process_method_func)daTag_Msg_Create, (process_method_func)daTag_Msg_Delete, (process_method_func)daTag_Msg_Execute, (process_method_func)daTag_Msg_IsDelete, (process_method_func)daTag_Msg_Draw, }; -actor_process_profile_definition g_profile_TAG_MSG = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_MSG = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index d3fecddebf..276c6632ab 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -168,11 +168,11 @@ static int daTagMstop_Draw(daTagMstop_c* i_this) { return 1; } -static actor_method_class l_daTagMstop_Method = { +static DUSK_CONST actor_method_class l_daTagMstop_Method = { (process_method_func)daTagMstop_Create, (process_method_func)daTagMstop_Delete, (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw}; -actor_process_profile_definition g_profile_Tag_Mstop = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Mstop = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index c8ea32413b..8c3bbb761e 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -152,13 +152,13 @@ static int daTagMwait_Draw(daTagMwait_c* i_this) { return 1; } -static actor_method_class l_daTagMwait_Method = { +static DUSK_CONST actor_method_class l_daTagMwait_Method = { (process_method_func)daTagMwait_Create, (process_method_func)daTagMwait_Delete, (process_method_func)daTagMwait_Execute, (process_method_func)NULL, (process_method_func)daTagMwait_Draw, }; -actor_process_profile_definition g_profile_Tag_Mwait = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Mwait = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index ec518c48ea..73f0f98115 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -66,13 +66,13 @@ static s32 daTagMyna2_Delete(daTagMyna2_c* i_this) { return 1; } -static actor_method_class l_daTagMyna2_Method = { +static DUSK_CONST actor_method_class l_daTagMyna2_Method = { (process_method_func)daTagMyna2_Create, (process_method_func)daTagMyna2_Delete, (process_method_func)daTagMyna2_Execute, }; -actor_process_profile_definition g_profile_TAG_MYNA2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_MYNA2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index 84dd0da316..55cdf80ff3 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -152,13 +152,13 @@ static int daTag_MynaLight_IsDelete(void* i_this) { daTag_MynaLight_c::~daTag_MynaLight_c() {} -static actor_method_class daTag_MynaLight_MethodTable = { +static DUSK_CONST actor_method_class daTag_MynaLight_MethodTable = { (process_method_func)daTag_MynaLight_Create, (process_method_func)daTag_MynaLight_Delete, (process_method_func)daTag_MynaLight_Execute, (process_method_func)daTag_MynaLight_IsDelete, (process_method_func)daTag_MynaLight_Draw, }; -actor_process_profile_definition g_profile_TAG_MNLIGHT = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_MNLIGHT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index cb7c3b3399..4718e8d33c 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -80,13 +80,13 @@ static int daTagPati_Delete(daTagPati_c* i_this) { return 1; } -static actor_method_class l_daTagPati_Method = { +static DUSK_CONST actor_method_class l_daTagPati_Method = { (process_method_func)daTagPati_Create, (process_method_func)daTagPati_Delete, (process_method_func)daTagPati_Execute, }; -actor_process_profile_definition g_profile_TAG_PATI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_PATI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index a801209578..2449a37863 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -70,13 +70,13 @@ static u8 lit_3617[12]; static daTagPoFire_HIO_c l_HIO; -static actor_method_class l_daTagPoFire_Method = { +static DUSK_CONST actor_method_class l_daTagPoFire_Method = { (process_method_func)daTagPoFire_Create, (process_method_func)daTagPoFire_Delete, (process_method_func)daTagPoFire_Execute, (process_method_func)NULL, (process_method_func)daTagPoFire_Draw, }; -actor_process_profile_definition g_profile_Tag_poFire = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_poFire = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 336477613b..f6bc9f2268 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -158,13 +158,13 @@ static int daTag_Push_IsDelete(void*) { return 1; } -static actor_method_class daTag_Push_MethodTable = { +static DUSK_CONST actor_method_class daTag_Push_MethodTable = { (process_method_func)daTag_Push_Create, (process_method_func)daTag_Push_Delete, (process_method_func)daTag_Push_Execute, (process_method_func)daTag_Push_IsDelete, (process_method_func)daTag_Push_Draw, }; -actor_process_profile_definition g_profile_TAG_PUSH = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_PUSH = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 8, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 76a5dec8b9..92c2fb2ade 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -403,13 +403,13 @@ static int daTagQs_Create(fopAc_ac_c* i_this) { return qs->create(); } -static actor_method_class l_daTagQs_Method = { +static DUSK_CONST actor_method_class l_daTagQs_Method = { (process_method_func)daTagQs_Create, (process_method_func)daTagQs_Delete, (process_method_func)daTagQs_Execute, (process_method_func)daTagQs_IsDelete, (process_method_func)daTagQs_Draw, }; -actor_process_profile_definition g_profile_TAG_QS = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_QS = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 382476b96a..cd2b7f2b9c 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -157,14 +157,14 @@ static int daTagRetRm_draw(daTagRetRm_c* i_this) { return i_this->draw(); } -static actor_method_class daTagRetRm_METHODS = { +static DUSK_CONST actor_method_class daTagRetRm_METHODS = { (process_method_func)daTagRetRm_create, (process_method_func)daTagRetRm_Delete, (process_method_func)daTagRetRm_execute, (process_method_func)NULL, (process_method_func)daTagRetRm_draw, }; -actor_process_profile_definition g_profile_Tag_RetRoom = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_RetRoom = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index 3a31d7f505..04a46393d7 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -8,11 +8,11 @@ #include "d/actor/d_a_tag_river_back.h" #include "f_pc/f_pc_name.h" -static char* l_arcName = "RvBack"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "RvBack"; -static char* l_evName = "RIVER_BACK"; +static DUSK_CONSTEXPR char DUSK_CONST* l_evName = "RIVER_BACK"; -static char* l_staffName = "rvback"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staffName = "rvback"; int daTagRiverBack_c::Create() { mMapToolID = -1; @@ -97,7 +97,7 @@ void daTagRiverBack_c::actionEvent() { void daTagRiverBack_c::actionDead() {} int daTagRiverBack_c::demoProc() { - static char* action_table[] = {"WAIT", "SCENE_CHG"}; + static DUSK_CONSTEXPR char DUSK_CONST* action_table[] = {"WAIT", "SCENE_CHG"}; daPy_py_c* player = daPy_getPlayerActorClass(); int act_id = dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0); @@ -153,11 +153,11 @@ static int daTagRiverBack_Create(daTagRiverBack_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagRiverBack_Create, +static DUSK_CONST actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagRiverBack_Create, (process_method_func)daTagRiverBack_Delete, (process_method_func)daTagRiverBack_Execute}; -actor_process_profile_definition g_profile_Tag_RiverBack = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_RiverBack = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index 43106c773d..eacb1580d5 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -196,14 +196,14 @@ static int daTagRmbitSw_draw(daTagRmbitSw_c* i_this) { return i_this->draw(); } -static actor_method_class daTagRmbitSw_METHODS = { +static DUSK_CONST actor_method_class daTagRmbitSw_METHODS = { (process_method_func)daTagRmbitSw_create, (process_method_func)daTagRmbitSw_Delete, (process_method_func)daTagRmbitSw_execute, (process_method_func)NULL, (process_method_func)daTagRmbitSw_draw, }; -actor_process_profile_definition g_profile_Tag_RmbitSw = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_RmbitSw = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index b1efb05c10..9dd8f25c9f 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -19,12 +19,12 @@ static int daTagSchedule_Delete(daTagSchedule_c* i_this) { return 1; } -static actor_method_class l_daTagSchedule_Method = { +static DUSK_CONST actor_method_class l_daTagSchedule_Method = { (process_method_func)daTagSchedule_Create, (process_method_func)daTagSchedule_Delete }; -actor_process_profile_definition g_profile_Tag_Schedule = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Schedule = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index bffd6bfdc8..b2e7798d5c 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -52,7 +52,7 @@ static int daTagSetBall_Create(daTagSetBall_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagSetBall_Method = { +static DUSK_CONST actor_method_class l_daTagSetBall_Method = { (process_method_func)daTagSetBall_Create, (process_method_func)daTagSetBall_Delete, (process_method_func)daTagSetBall_Execute, @@ -60,7 +60,7 @@ static actor_method_class l_daTagSetBall_Method = { (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Tag_SetBall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_SetBall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index 4230abb920..637f1464de 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -173,7 +173,7 @@ static int daTagRestart_Create(fopAc_ac_c* i_this) { return restart->create(); } -static actor_method_class l_daTagRestart_Method = { +static DUSK_CONST actor_method_class l_daTagRestart_Method = { (process_method_func)daTagRestart_Create, (process_method_func)daTagRestart_Delete, (process_method_func)daTagRestart_Execute, @@ -185,7 +185,7 @@ static actor_method_class l_daTagRestart_Method = { #endif }; -actor_process_profile_definition g_profile_Tag_Restart = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Restart = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index 021ac7f276..ca730b2eae 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -52,7 +52,7 @@ static int daTag_ShopCamera_IsDelete(void* param_0) { return 1; } -static actor_method_class daTag_ShopCamera_MethodTable = { +static DUSK_CONST actor_method_class daTag_ShopCamera_MethodTable = { (process_method_func)daTag_ShopCamera_Create, (process_method_func)daTag_ShopCamera_Delete, (process_method_func)daTag_ShopCamera_Execute, @@ -60,7 +60,7 @@ static actor_method_class daTag_ShopCamera_MethodTable = { (process_method_func)daTag_ShopCamera_Draw, }; -actor_process_profile_definition g_profile_TAG_SHOPCAM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_SHOPCAM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index 302b6d1503..b76bdb3dde 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -178,13 +178,13 @@ static int daTag_ShopItem_IsDelete(void* i_this) { daTag_ShopItem_c::~daTag_ShopItem_c() {} -static actor_method_class daTag_ShopItem_MethodTable = { +static DUSK_CONST actor_method_class daTag_ShopItem_MethodTable = { (process_method_func)daTag_ShopItem_Create, (process_method_func)daTag_ShopItem_Delete, (process_method_func)daTag_ShopItem_Execute, (process_method_func)daTag_ShopItem_IsDelete, (process_method_func)daTag_ShopItem_Draw, }; -actor_process_profile_definition g_profile_TAG_SHOPITM = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_SHOPITM = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 262804610e..d878654760 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -76,7 +76,7 @@ static int daTagSmkEmt_draw(daTagSmkEmt_c* i_this) { return i_this->draw(); } -static actor_method_class daTagSmkEmt_METHODS = { +static DUSK_CONST actor_method_class daTagSmkEmt_METHODS = { (process_method_func)daTagSmkEmt_create, (process_method_func)daTagSmkEmt_Delete, (process_method_func)daTagSmkEmt_execute, @@ -84,7 +84,7 @@ static actor_method_class daTagSmkEmt_METHODS = { (process_method_func)daTagSmkEmt_draw }; -actor_process_profile_definition g_profile_Tag_SmkEmt = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_SmkEmt = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index f4f64d6eea..c19e2b9217 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -150,7 +150,7 @@ static int daTagSpinner_Create(fopAc_ac_c* i_this) { return spinner->create(); } -static actor_method_class l_daTagSpinner_Method = { +static DUSK_CONST actor_method_class l_daTagSpinner_Method = { (process_method_func)daTagSpinner_Create, (process_method_func)daTagSpinner_Delete, (process_method_func)daTagSpinner_Execute, @@ -163,7 +163,7 @@ static actor_method_class l_daTagSpinner_Method = { }; -actor_process_profile_definition g_profile_Tag_Spinner = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Spinner = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 9fdb00fe55..2d654c256d 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -213,13 +213,13 @@ static int daTagSppath_Draw(daTagSppath_c* i_this) { return 1; } -static actor_method_class l_daTagSppath_Method = { +static DUSK_CONST actor_method_class l_daTagSppath_Method = { (process_method_func)daTagSppath_Create, (process_method_func)daTagSppath_Delete, (process_method_func)daTagSppath_Execute, (process_method_func)NULL, (process_method_func)daTagSppath_Draw, }; -actor_process_profile_definition g_profile_Tag_Sppath = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Sppath = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index f7aa3b26ba..61f8216578 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -155,14 +155,14 @@ static int daTagSpring_Create(daTagSpring_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagSpring_Method = { +static DUSK_CONST actor_method_class l_daTagSpring_Method = { (process_method_func)daTagSpring_Create, (process_method_func)daTagSpring_Delete, (process_method_func)daTagSpring_Execute, (process_method_func)NULL, }; -actor_process_profile_definition g_profile_Tag_Spring = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Spring = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 8f2ee55815..b027891fb8 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -252,13 +252,13 @@ void daObj_SSBase_c::setSoldOut() { } #endif -static actor_method_class daTag_SSDrink_MethodTable = { +static DUSK_CONST actor_method_class daTag_SSDrink_MethodTable = { (process_method_func)daTag_SSDrink_Create, (process_method_func)daTag_SSDrink_Delete, (process_method_func)daTag_SSDrink_Execute, (process_method_func)daTag_SSDrink_IsDelete, (process_method_func)daTag_SSDrink_Draw, }; -actor_process_profile_definition g_profile_TAG_SSDRINK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_SSDRINK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 806d8ee3b6..8a4c0c4397 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -54,13 +54,13 @@ static const u16 l_event_bit[6] = { dSv_event_flag_c::F_0812, /* N/A - N/A */ }; -static char* l_arcName = "Obj_cs_f"; +static DUSK_CONST char* l_arcName = "Obj_cs_f"; -static u16 l_eff_id[3] = { +static DUSK_CONSTEXPR u16 l_eff_id[3] = { 0x8C7E, 0x8C7F, 0x8C84 }; -static char* l_eventName[6] = { +static DUSK_CONST char* l_eventName[6] = { "SKY_LETTERS_00", // Faron Woods "SKY_LETTERS_01", // Gerudo Desert "SKY_LETTERS_02", // Kakariko Gorge @@ -69,7 +69,7 @@ static char* l_eventName[6] = { "SKY_LETTERS_05" // Ruined Theatre }; -static char* l_evArcName[6] = { +static DUSK_CONST char* l_evArcName[6] = { NULL, // Faron Woods "cs_ev_01", // Gerudo Desert "cs_ev_02", // Kakariko Gorge @@ -78,7 +78,7 @@ static char* l_evArcName[6] = { "cs_ev_05" // Ruined Theatre }; -static cull_box l_cull_box = { +static DUSK_CONSTEXPR cull_box l_cull_box = { {-300.0f, -100.0f, -300.0f}, // Min {300.0f, 400.0f, 300.0f} // Max }; @@ -290,14 +290,14 @@ void daTagStatue_c::actionDead() { } int daTagStatue_c::demoProc() { - static char* action_table[3] = { + static DUSK_CONST char* action_table[3] = { "WAIT", "ST_MOVE", "ITEM" }; // Saved positions of Owl Statues for cutscenes - static Vec l_statue_pos[6] = { + static DUSK_CONSTEXPR Vec l_statue_pos[6] = { {-17312.3007812f, -349.100006104f, -20523.1992188f}, // Faron Woods {-17312.3007812f, -349.100006104f, -20523.1992188f}, // Gerudo Desert {-9675.59960938f, -4800.0f, 39693.8984375f}, // Kakariko Gorge @@ -307,7 +307,7 @@ int daTagStatue_c::demoProc() { }; // Saved y orientations of Owl Statues for cutscenes - static s16 l_statue_ang[6] = { + static DUSK_CONSTEXPR s16 l_statue_ang[6] = { 16384, // Faron Woods 16384, // Gerudo Desert 8485, // Kakariko Gorge @@ -529,7 +529,7 @@ static int daTagStatue_Create(daTagStatue_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagStatue_Method = { +static DUSK_CONST actor_method_class l_daTagStatue_Method = { reinterpret_cast(daTagStatue_Create), reinterpret_cast(daTagStatue_Delete), reinterpret_cast(daTagStatue_Execute), @@ -537,7 +537,7 @@ NULL, reinterpret_cast(daTagStatue_Draw), }; -actor_process_profile_definition g_profile_Tag_Statue = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Statue = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index 40e2dad415..d1021dd0a7 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -132,7 +132,7 @@ static int daTagStream_Draw(daTagStream_c* i_this) { return 1; } -static actor_method_class l_daTagStream_Method = { +static DUSK_CONST actor_method_class l_daTagStream_Method = { (process_method_func)daTagStream_Create, (process_method_func)daTagStream_Delete, (process_method_func)daTagStream_Execute, @@ -140,7 +140,7 @@ static actor_method_class l_daTagStream_Method = { (process_method_func)daTagStream_Draw }; -actor_process_profile_definition g_profile_Tag_Stream = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Stream = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index a46102cbf2..82094f90cb 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -63,13 +63,13 @@ static int daTag_Telop_Create(fopAc_ac_c* i_this) { return telop->create(); } -static actor_method_class l_daTag_Telop_Method = { +static DUSK_CONST actor_method_class l_daTag_Telop_Method = { (process_method_func)daTag_Telop_Create, (process_method_func)daTag_Telop_Delete, (process_method_func)daTag_Telop_Execute, (process_method_func)daTag_Telop_IsDelete, (process_method_func)daTag_Telop_Draw, }; -actor_process_profile_definition g_profile_TAG_TELOP = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_TELOP = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index 58887f976e..aa8962b4a1 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -49,13 +49,13 @@ static int daTagTheBHint_Execute(daTagTheBHint_c* i_this) { return i_this->execute(); } -static actor_method_class l_daTagTheBHint_Method = { +static DUSK_CONST actor_method_class l_daTagTheBHint_Method = { (process_method_func)daTagTheBHint_Create, (process_method_func)daTagTheBHint_Delete, (process_method_func)daTagTheBHint_Execute }; -actor_process_profile_definition g_profile_Tag_TheBHint = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_TheBHint = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index 1a15938c4d..a1525e99ac 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -77,13 +77,13 @@ static int daTagWrHowl_draw(daTagWrHowl_c* i_this) { return i_this->draw(); } -static actor_method_class daTagWrHowl_METHODS = { +static DUSK_CONST actor_method_class daTagWrHowl_METHODS = { (process_method_func)daTagWrHowl_create, (process_method_func)daTagWrHowl_Delete, (process_method_func)daTagWrHowl_execute, (process_method_func)NULL, (process_method_func)daTagWrHowl_draw, }; -actor_process_profile_definition g_profile_Tag_WaraHowl = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_WaraHowl = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 2b87c74d73..0e71587fb3 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -86,7 +86,7 @@ static int daTagWatchGe_Create(daTagWatchGe_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagWatchGe_Method = { +static DUSK_CONST actor_method_class l_daTagWatchGe_Method = { (process_method_func)daTagWatchGe_Create, (process_method_func)daTagWatchGe_Delete, (process_method_func)daTagWatchGe_Execute, @@ -94,7 +94,7 @@ static actor_method_class l_daTagWatchGe_Method = { (process_method_func)daTagWatchGe_Draw }; -actor_process_profile_definition g_profile_Tag_WatchGe = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_WatchGe = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index 6fac4d4d00..ce57b0d23e 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -328,13 +328,13 @@ static int daTagWaterFall_Create(daTagWaterFall_c* i_this) { return i_this->create(); } -static actor_method_class l_daTagWaterFall_Method = { +static DUSK_CONST actor_method_class l_daTagWaterFall_Method = { (process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete, (process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete, (process_method_func)daTagWaterFall_Draw, }; -actor_process_profile_definition g_profile_Tag_WaterFall = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_WaterFall = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index 9c09a8ad71..ac8487f966 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -232,7 +232,7 @@ static int daTagWljump_Draw(daTagWljump_c* i_this) { return i_this->draw(); } -static actor_method_class l_daTagWljump_Method = { +static DUSK_CONST actor_method_class l_daTagWljump_Method = { (process_method_func)daTagWljump_Create, (process_method_func)daTagWljump_Delete, (process_method_func)daTagWljump_Execute, @@ -240,7 +240,7 @@ static actor_method_class l_daTagWljump_Method = { (process_method_func)daTagWljump_Draw, }; -actor_process_profile_definition g_profile_Tag_Wljump = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Tag_Wljump = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index 19467a0e25..0367d1a447 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -125,13 +125,13 @@ int daTagYami_Delete(daTagYami_c* i_this) { return 1; } -static actor_method_class l_daTagYami_Method = { +static DUSK_CONST actor_method_class l_daTagYami_Method = { (process_method_func)daTagYami_Create, (process_method_func)daTagYami_Delete, (process_method_func)daTagYami_Execute, }; -actor_process_profile_definition g_profile_TAG_YAMI = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TAG_YAMI = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 3, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 849dea194a..67e4bb0a0e 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -100,13 +100,13 @@ static int daTalk_Draw(daTalk_c* i_this) { return i_this->draw(); } -static actor_method_class l_daTalk_Method = { +static DUSK_CONST actor_method_class l_daTalk_Method = { (process_method_func)daTalk_Create, (process_method_func)daTalk_Delete, (process_method_func)daTalk_Execute, (process_method_func)NULL, (process_method_func)daTalk_Draw, }; -actor_process_profile_definition g_profile_TALK = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TALK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 6cad41b4e3..1d1826b7e7 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -20,9 +20,9 @@ static const cM3dGCylS l_cyl_info[3] = { { 0.0f, 0.0f, -60.0f, 70.0f, 80.0f }, }; -static char* l_staff_name = "TREASURE"; +static DUSK_CONSTEXPR char DUSK_CONST* l_staff_name = "TREASURE"; -static dCcD_SrcCyl l_cyl_src = { +static DUSK_CONSTEXPR dCcD_SrcCyl l_cyl_src = { { {0x0, {{0x0, 0x0, 0x1e}, {0x0, 0x0}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -38,13 +38,13 @@ static dCcD_SrcCyl l_cyl_src = { } }; -static daTbox_ModelInfo l_modelInfo[3] = { +static DUSK_CONSTEXPR daTbox_ModelInfo l_modelInfo[3] = { { "Dalways", 12, 7, 25, 26, 14, 19 }, { "Dalways", 13, 8, 27, 28, 14, 19 }, { "BoxC", 14, 8, 20, 21, 11, 17 }, }; -static cXyz l_light_offset(0.0f, 35.0f, 0.0f); +static DUSK_CONSTEXPR cXyz l_light_offset(0.0f, 35.0f, 0.0f); class daTbox_HIO_c : public mDoHIO_entry_c { public: @@ -96,14 +96,14 @@ daTbox_HIO_c::daTbox_HIO_c() { mForPlacementCheck = 0; } -daTbox_ModelInfo* daTbox_c::getModelInfo() { +DUSK_CONST daTbox_ModelInfo* daTbox_c::getModelInfo() { return &l_modelInfo[getShapeType()]; } static const u32 l_open_se_id[3] = { Z2SE_OBJ_TBOX_OPEN_A, Z2SE_OBJ_TBOX_OPEN_B, Z2SE_OBJ_TBOX_OPEN_C }; cPhs_Step daTbox_c::commonShapeSet() { - daTbox_ModelInfo* model_info = getModelInfo(); + DUSK_CONST daTbox_ModelInfo* model_info = getModelInfo(); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mModelResNo); JUT_ASSERT(0x191, modelData != NULL); @@ -180,7 +180,7 @@ cPhs_Step daTbox_c::envShapeSet() { } cPhs_Step daTbox_c::bgCheckSet() { - daTbox_ModelInfo* model_info = getModelInfo(); + DUSK_CONST daTbox_ModelInfo* model_info = getModelInfo(); cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(model_info->mArcName, model_info->mOpenDzbResNo); JUT_ASSERT(528, bgd != NULL); @@ -845,7 +845,7 @@ void daTbox_c::demoProcAppear() { } int daTbox_c::demoProc() { - static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT", "DROP"}; + static DUSK_CONSTEXPR char DUSK_CONST* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT", "DROP"}; int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZEU(action_table), 0, 0); int tbox_no; @@ -1796,7 +1796,7 @@ cPhs_Step daTbox_c::create1st() { JUT_ASSERT(3544, FALSE); } - daTbox_ModelInfo* model_info = getModelInfo(); + DUSK_CONST daTbox_ModelInfo* model_info = getModelInfo(); cPhs_Step step = dComIfG_resLoad(&mPhase, model_info->mArcName); if (step != cPhs_COMPLEATE_e) { return step; @@ -1895,7 +1895,7 @@ static int daTbox_MoveBGDraw(daTbox_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daTbox_METHODS = { +static DUSK_CONST actor_method_class daTbox_METHODS = { (process_method_func)daTbox_create1st, (process_method_func)daTbox_MoveBGDelete, (process_method_func)daTbox_MoveBGExecute, @@ -1903,7 +1903,7 @@ static actor_method_class daTbox_METHODS = { (process_method_func)daTbox_MoveBGDraw, }; -actor_process_profile_definition g_profile_TBOX = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TBOX = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index f2ac844bce..2f2a3a8276 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -46,9 +46,9 @@ static const cM3dGCylS l_cyl_info[] = { }, }; -static char* l_arcName = "Tbox2"; +static DUSK_CONST char* l_arcName = "Tbox2"; -static char* l_staff_name = "TREASURE"; +static DUSK_CONST char* l_staff_name = "TREASURE"; static dCcD_SrcCyl l_cyl_src = { { @@ -158,7 +158,7 @@ int daTbox2_c::create1st() { } int daTbox2_c::demoProc() { - static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT"}; + static DUSK_CONST char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT"}; int act_idx = dComIfGp_evmng_getMyActIdx(mStaffIdx, action_table, ARRAY_SIZEU(action_table), 0, 0); @@ -449,13 +449,13 @@ static int daTbox2_MoveBGDraw(daTbox2_c* i_this) { return i_this->MoveBGDraw(); } -static actor_method_class daTbox2_METHODS = { +static DUSK_CONST actor_method_class daTbox2_METHODS = { (process_method_func)daTbox2_create1st, (process_method_func)daTbox2_MoveBGDelete, (process_method_func)daTbox2_MoveBGExecute, (process_method_func)NULL, (process_method_func)daTbox2_MoveBGDraw, }; -actor_process_profile_definition g_profile_TBOX2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TBOX2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 4, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index e3ab3aed8e..69b61b8168 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -56,13 +56,13 @@ static int daTboxSw_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daTboxSw_Method = { +static DUSK_CONST actor_method_class l_daTboxSw_Method = { (process_method_func)daTboxSw_Create, (process_method_func)daTboxSw_Delete, (process_method_func)daTboxSw_Execute, (process_method_func)NULL, (process_method_func)daTboxSw_Draw, }; -actor_process_profile_definition g_profile_TBOX_SW = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TBOX_SW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index cfe4003158..5ff7dad881 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -447,7 +447,7 @@ void dDlst_daTitle_c::draw() { Scr->draw(0.0f, 0.0f, ctx); } -static actor_method_class l_daTitle_Method = { +static DUSK_CONST actor_method_class l_daTitle_Method = { (process_method_func)daTitle_Create, (process_method_func)daTitle_Delete, (process_method_func)daTitle_Execute, @@ -455,7 +455,7 @@ static actor_method_class l_daTitle_Method = { (process_method_func)daTitle_Draw, }; -actor_process_profile_definition g_profile_TITLE = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_TITLE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index e1eedb10c0..ad731fb08a 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -146,13 +146,13 @@ static int daVrbox_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daVrbox_Method = { +static DUSK_CONST actor_method_class l_daVrbox_Method = { (process_method_func)daVrbox_Create, (process_method_func)daVrbox_Delete, (process_method_func)daVrbox_Execute, (process_method_func)daVrbox_IsDelete, (process_method_func)daVrbox_Draw, }; -actor_process_profile_definition g_profile_VRBOX = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_VRBOX = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index a980eeb61f..b2681bc438 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -451,13 +451,13 @@ static int daVrbox2_Create(fopAc_ac_c* i_this) { return phase; } -static actor_method_class l_daVrbox2_Method = { +static DUSK_CONST actor_method_class l_daVrbox2_Method = { (process_method_func)daVrbox2_Create, (process_method_func)daVrbox2_Delete, (process_method_func)daVrbox2_Execute, (process_method_func)daVrbox2_IsDelete, (process_method_func)daVrbox2_Draw, }; -actor_process_profile_definition g_profile_VRBOX2 = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_VRBOX2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index a80953cbb5..be37c25955 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -12,7 +12,7 @@ void daWarpBug_c::create_init() {} -static char* l_arcName = "WarpBug"; +static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "WarpBug"; int daWarpBug_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "kisei.bmd"); @@ -152,13 +152,13 @@ static int daWarpBug_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -static actor_method_class l_daWarpBug_Method = { +static DUSK_CONST actor_method_class l_daWarpBug_Method = { (process_method_func)daWarpBug_Create, (process_method_func)daWarpBug_Delete, (process_method_func)daWarpBug_Execute, (process_method_func)daWarpBug_IsDelete, (process_method_func)daWarpBug_Draw, }; -actor_process_profile_definition g_profile_WarpBug = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_WarpBug = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 980da689f5..4954bf94ce 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -282,7 +282,7 @@ static int daYkgrIsDelete(void* param_0) { return 1; } -static actor_method_class daYkgrMethodTable = { +static DUSK_CONST actor_method_class daYkgrMethodTable = { daYkgrCreate, daYkgrDelete, daYkgrExecute, @@ -290,7 +290,7 @@ static actor_method_class daYkgrMethodTable = { daYkgrDraw, }; -actor_process_profile_definition g_profile_Ykgr = { +DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Ykgr = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 0de75747f2..4a77816cb8 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -10233,7 +10233,7 @@ bool dCamera_c::eventCamera(s32 param_0) { int var_r29 = -1; typedef bool (dCamera_c::*func)(); - func l_func[] = { + DUSK_CONSTEXPR func l_func[] = { &dCamera_c::pauseEvCamera, &dCamera_c::pauseEvCamera, &dCamera_c::talktoEvCamera, @@ -10270,7 +10270,7 @@ bool dCamera_c::eventCamera(s32 param_0) { &dCamera_c::maptoolIdEvCamera, }; - static char* ActionNames[34] = { + static DUSK_CONSTEXPR char DUSK_CONST* ActionNames[34] = { "PAUSE", "WAIT", "TALK", @@ -11627,7 +11627,7 @@ static leafdraw_method_class method = { (process_method_func)camera_draw, }; -camera_process_profile_definition g_profile_CAMERA = { +DUSK_PROFILE camera_process_profile_definition DUSK_CONST g_profile_CAMERA = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 11, /* List Prio */ fpcPi_CURRENT_e, @@ -11648,7 +11648,7 @@ camera_process_profile_definition g_profile_CAMERA = { 0, }; -camera_process_profile_definition g_profile_CAMERA2 = { +DUSK_PROFILE camera_process_profile_definition DUSK_CONST g_profile_CAMERA2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 11, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index cbcd32ccf7..6392048bfb 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -248,7 +248,7 @@ static leafdraw_method_class l_dEnvSe_Method = { (process_method_func)dEnvSe_Draw, }; -kankyo_process_profile_definition g_profile_ENVSE = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_ENVSE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index fad6d1a523..67cda5863b 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -83,7 +83,7 @@ int dCamera_c::EndEventCamera(int param_1) { return 0; } -int dCamera_c::searchEventArgData(char* i_eventName) { +int dCamera_c::searchEventArgData(DUSK_CONST char* i_eventName) { int i; bool found_event = false; @@ -101,7 +101,7 @@ int dCamera_c::searchEventArgData(char* i_eventName) { return found_event ? i : -1; } -bool dCamera_c::getEvIntData(int* i_data, char* i_event) { +bool dCamera_c::getEvIntData(int* i_data, DUSK_CONST char* i_event) { if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); if (index == -1) { @@ -134,7 +134,7 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event) { return 1; } -bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) { +bool dCamera_c::getEvFloatData(f32* i_data, DUSK_CONST char* i_event) { if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); if (index == -1) { @@ -163,7 +163,7 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) { return 1; } -int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) { +int dCamera_c::getEvFloatListData(f32** i_data, DUSK_CONST char* i_event) { int num = 0; if (chkFlag(0x20000000)) { @@ -195,7 +195,7 @@ int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) { return num; } -int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) { +int dCamera_c::getEvXyzListData(cXyz** i_data, DUSK_CONST char* i_event) { int num = 0; if (chkFlag(0x20000000)) { @@ -227,8 +227,8 @@ int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) { return num; } -char* dCamera_c::getEvStringPntData(char* i_event) { - char* string = NULL; +char DUSK_CONST* dCamera_c::getEvStringPntData(DUSK_CONST char* i_event) { + char DUSK_CONST* string = NULL; if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); @@ -258,7 +258,7 @@ char* dCamera_c::getEvStringPntData(char* i_event) { return string; } -bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) { +bool dCamera_c::getEvIntData(int* i_data, DUSK_CONST char* i_event, int param_2) { if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); if (index == -1) { @@ -287,7 +287,7 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) { return 1; } -bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) { +bool dCamera_c::getEvFloatData(f32* i_data, DUSK_CONST char* i_event, f32 param_2) { if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); if (index == -1) { @@ -315,7 +315,7 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) { return 1; } -bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) { +bool dCamera_c::getEvXyzData(cXyz* i_data, DUSK_CONST char* i_event, cXyz param_2) { if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); if (index == -1) { @@ -345,9 +345,9 @@ bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) { #if TARGET_PC template -bool dCamera_c::getEvStringData(char (&i_data)[N], char* i_event, char* param_2) { +bool dCamera_c::getEvStringData(char (&i_data)[N], char DUSK_CONST* i_event, char DUSK_CONST* param_2) { #else -bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) { +bool dCamera_c::getEvStringData(char* i_data, char DUSK_CONST* i_event, char DUSK_CONST* param_2) { #endif if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); @@ -378,11 +378,11 @@ bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) { #if TARGET_PC // Used in another TU, so force instantiation to avoid linker issues. -template bool dCamera_c::getEvStringData(char (&i_data)[12], char* i_event, char* param_2); +template bool dCamera_c::getEvStringData(char (&i_data)[12], DUSK_CONST char* i_event, char DUSK_CONST* param_2); #endif -char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) { - char* string = NULL; +char DUSK_CONST* dCamera_c::getEvStringPntData(DUSK_CONST char* i_event, char DUSK_CONST* param_1) { + char DUSK_CONST* string = NULL; if (chkFlag(0x20000000)) { int index = searchEventArgData(i_event); @@ -412,8 +412,8 @@ char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) { return string; } -fopAc_ac_c* dCamera_c::getEvActor(char* i_event) { - char* string = getEvStringPntData(i_event); +fopAc_ac_c* dCamera_c::getEvActor(DUSK_CONST char* i_event) { + char DUSK_CONST* string = getEvStringPntData(i_event); if (string == NULL) { return NULL; } @@ -452,7 +452,7 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event) { return actor; } -fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) { +fopAc_ac_c* dCamera_c::getEvActor(DUSK_CONST char* i_event, char DUSK_CONST* param_1) { char string[16]; string[0] = 0; getEvStringData(string, i_event, param_1); @@ -3397,7 +3397,7 @@ bool dCamera_c::fixedFramesEvCamera() { fframes_p->field_0x38 = 9999; int substanceNum; - char* key = "Centers"; + char DUSK_CONST* key = "Centers"; if ((substanceNum = dComIfGp_evmng_getMySubstanceNum(mEventData.mStaffIdx, key)) != 0) { fframes_p->field_0x1c[1] = dComIfGp_evmng_getMyXyzP(mEventData.mStaffIdx, key); if (fframes_p->field_0x38 > substanceNum) { @@ -3500,7 +3500,7 @@ bool dCamera_c::bSplineEvCamera() { if (mCurCamStyleTimer == 0) { bSpline->field_0x1c = 0; bSpline->field_0x10 = 9999; - char* key = "Centers"; + char DUSK_CONST* key = "Centers"; int iVar1 = getEvXyzListData(&bSpline->mCenters, key); if (iVar1 != 0) { if (bSpline->field_0x10 > iVar1) { diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 3eba7aa041..3ae3becd93 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -231,7 +231,7 @@ int dEvt_control_c::commonCheck(dEvt_order_c* order, u16 condition, u16 command) } int dEvt_control_c::talkCheck(dEvt_order_c* order) { - char* eventname = "DEFAULT_TALK"; + DUSK_CONST char* eventname = "DEFAULT_TALK"; fopAc_ac_c* actor = order->mpTargetActor; if ((fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)actor)->checkNoAttention()) || (fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)actor)->checkNoAttention()) || @@ -851,7 +851,7 @@ void dEvt_control_c::setSkipProc(void* skipActor, dEvt_SkipCb skipCb, int skipPa mSkipParameter = skipParameter; } -void dEvt_control_c::setSkipZev(void* skipActor, char* eventName) { +void dEvt_control_c::setSkipZev(void* skipActor, DUSK_CONST char* eventName) { setSkipProc(skipActor, dEv_defaultSkipZev, 1); SAFE_STRCPY(mSkipEventName, eventName); } @@ -1307,7 +1307,7 @@ dEvt_info_c::dEvt_info_c() { mIndex = 0; } -void dEvt_info_c::setEventName(char* name) { +void dEvt_info_c::setEventName(DUSK_CONST char* name) { if (name == NULL) { mEventId = -1; } else { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index d1d56be90f..9da313c239 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -330,7 +330,7 @@ int dEvent_manager_c::create() { return 1; } -bool dEvent_manager_c::setObjectArchive(char* arcname) { +bool dEvent_manager_c::setObjectArchive(DUSK_CONST char* arcname) { void* rt = NULL; if (arcname != NULL) { @@ -920,7 +920,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, const char* eventName, u8 m dEvDtBase_c actor_event; if (type < BASE_ROOM0 || BASE_ROOM5 < type || actorRoomNo == mEventList[type].roomNo()) { if (actor != NULL && type == BASE_ACTOR) { - char* arcname = actor->eventInfo.getArchiveName(); + DUSK_CONST char* arcname = actor->eventInfo.getArchiveName(); if (arcname != NULL) { char* data = (char*)dComIfG_getObjectRes(arcname, DataFileName); actor_event.init(data, -1); @@ -1288,7 +1288,7 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* actor, s16 evCompositId) { dEvDtBase_c eventBase; if (getTypeCompositId(evCompositId) == 2 && actor != NULL) { - char* arcname = actor->eventInfo.getArchiveName(); + DUSK_CONST char* arcname = actor->eventInfo.getArchiveName(); if (arcname != NULL) { char* data = (char*)dComIfG_getObjectRes(arcname, DataFileName); eventBase.init(data, -1); diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 40962abf0a..72b6ffb372 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -1668,7 +1668,7 @@ void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) { void dFile_select_c::setSaveDataForCopySel() { static u64 l_tagName101[2] = {MULTI_CHAR('w_nun01'), MULTI_CHAR('w_nun02')}; - static char* l_numTex[3] = {"tt_1_metal_40x40.bti", "tt_2_metal_40x40.bti", + static DUSK_CONST char* l_numTex[3] = {"tt_1_metal_40x40.bti", "tt_2_metal_40x40.bti", "tt_3_metal_40x40.bti"}; SaveDataBuf* pSave = mSaveData; int notSelectedIndex = 0; diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 870fb00f14..7d421a187c 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -517,7 +517,7 @@ static leafdraw_method_class l_dGameover_Method = { (process_method_func)dGameover_Draw, }; -msg_process_profile_definition g_profile_GAMEOVER = { +DUSK_PROFILE msg_process_profile_definition DUSK_CONST g_profile_GAMEOVER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index b93ab14211..f986808068 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -170,7 +170,7 @@ static leafdraw_method_class l_dkWmark_Method = { (process_method_func)dkWmark_Draw, }; -kankyo_process_profile_definition g_profile_WMARK = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_WMARK = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 70efec89a2..20685ea675 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -133,7 +133,7 @@ static leafdraw_method_class l_dkWpillar_Method = { (process_method_func)dkWpillar_Draw, }; -kankyo_process_profile_definition g_profile_WPILLAR = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_WPILLAR = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 9, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 468f694b32..36949adc76 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -8346,7 +8346,7 @@ static leafdraw_method_class l_dKy_Method = { (process_method_func)dKy_Draw, }; -kankyo_process_profile_definition g_profile_KANKYO = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_KANKYO = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, @@ -8361,8 +8361,8 @@ kankyo_process_profile_definition g_profile_KANKYO = { }; static void dummy_str_0x40a0() { - char* str1 = "ステージが変わったときかなぁ～？？？"; - char* str2 = "POINTLIGHT RECALL![%f][%f][%f]"; + DUSK_CONST char* str1 = "ステージが変わったときかなぁ～？？？"; + DUSK_CONST char* str2 = "POINTLIGHT RECALL![%f][%f][%f]"; } void dKy_setLight_init() { diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 77c2a92769..396ab9cb9d 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -274,7 +274,7 @@ static leafdraw_method_class l_dThunder_Method = { (process_method_func)dThunder_Draw, }; -kankyo_process_profile_definition g_profile_KY_THUNDER = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_KY_THUNDER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 7, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 4f64365901..984478f74d 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -143,7 +143,7 @@ static leafdraw_method_class l_dKyeff_Method = { (process_method_func)dKyeff_Draw, }; -kankyo_process_profile_definition g_profile_KYEFF = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_KYEFF = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 2fb6b42588..c23138f60c 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -43,7 +43,7 @@ static leafdraw_method_class l_dKyeff2_Method = { (process_method_func)dKyeff2_Draw, }; -kankyo_process_profile_definition g_profile_KYEFF2 = { +DUSK_PROFILE kankyo_process_profile_definition DUSK_CONST g_profile_KYEFF2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index e9b477d1ea..0755c4de17 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -37,7 +37,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" typedef void (dMenu_Collect2D_c::*initFunc)(); -static initFunc init[] = { +static DUSK_CONSTEXPR initFunc init[] = { &dMenu_Collect2D_c::wait_init, &dMenu_Collect2D_c::save_open_init, &dMenu_Collect2D_c::save_move_init, &dMenu_Collect2D_c::save_close_init, &dMenu_Collect2D_c::option_open_init, &dMenu_Collect2D_c::option_move_init, @@ -50,7 +50,7 @@ static initFunc init[] = { &dMenu_Collect2D_c::insect_close_init}; typedef void (dMenu_Collect2D_c::*processFunc)(); -static processFunc process[] = { +static DUSK_CONSTEXPR processFunc process[] = { &dMenu_Collect2D_c::wait_proc, &dMenu_Collect2D_c::save_open_proc, &dMenu_Collect2D_c::save_move_proc, &dMenu_Collect2D_c::save_close_proc, &dMenu_Collect2D_c::option_open_proc, &dMenu_Collect2D_c::option_move_proc, @@ -2644,13 +2644,13 @@ void dMenu_Collect3D_c::createMaskModel() { static const f32 m_kamen_offset_x[5] = {-14.0f, -14.0f, -14.0f, 1.3f, 6.5f}; static const f32 m_kamen_offset_y[5] = {0.0f, 0.0f, 0.0f, 22.0f, 30.0f}; static const f32 m_kamen_scale[5] = {2.6f, 2.6f, 2.2f, 1.8f, 1.8f}; - static char* bck_name[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* bck_name[4] = { "md_mask_parts_spin_1.bck", "md_mask_parts_spin_2.bck", "md_mask_parts_spin_3.bck", "md_mask_parts_spin_4.bck", }; - static char* brk_name[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* brk_name[4] = { "md_mask_parts_spin_1.brk", "md_mask_parts_spin_2_3.brk", "md_mask_parts_spin_2_3.brk", @@ -2687,13 +2687,13 @@ void dMenu_Collect3D_c::createMirrorModel() { static const f32 m_mirror_offset_x[5] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; static const f32 m_mirror_offset_y[5] = {4.0f, 4.0f, 4.0f, 4.0f, 4.0f}; static const f32 m_mirror_scale[5] = {0.6f, 0.6f, 0.6f, 0.6f, 0.6f}; - static char* bck_name[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* bck_name[4] = { "kageri_mirrer_spin_1.bck", "kageri_mirrer_spin_2.bck", "kageri_mirrer_spin_3.bck", "kageri_mirrer_spin_4.bck", }; - static char* brk_name[4] = { + static DUSK_CONSTEXPR char DUSK_CONST* brk_name[4] = { "kageri_mirrer_spin_1.brk", "kageri_mirrer_spin_2_3_4.brk", "kageri_mirrer_spin_2_3_4.brk", diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index b8a69ddc55..813427f35e 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -2844,7 +2844,7 @@ void dMenu_Fmap_c::tableArrowPosInit(bool param_0) { break; } - static char* stage_name[4] = {"F_SP115", "F_SP113", "F_SP109", "F_SP108"}; + static DUSK_CONST char* stage_name[4] = {"F_SP115", "F_SP113", "F_SP109", "F_SP108"}; SAFE_STRCPY(mMarkedStageName, stage_name[iVar5]); if (param_0) { @@ -2873,7 +2873,7 @@ void dMenu_Fmap_c::yamibossArrowPosInit() { void dMenu_Fmap_c::howlArrowPosInit() { u8 type = dMeter2Info_getGoldWolfMapType(); - static char* stage_name[6] = {"F_SP104", "F_SP122", "F_SP122", "F_SP124", "F_SP111", "F_SP116"}; + static DUSK_CONST char* stage_name[6] = {"F_SP104", "F_SP122", "F_SP122", "F_SP124", "F_SP111", "F_SP116"}; SAFE_STRCPY(mMarkedStageName, stage_name[type - 2]); static const int i_swBit[6] = {0x41, 0x29, 0x2a, 0x32, 0x79, 0x32}; f32 icon_x, icon_z; diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index e2e7b4e91f..2be79d053e 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1771,7 +1771,7 @@ static leafdraw_method_class l_dMw_Method = { (process_method_func)dMw_Draw, }; -msg_process_profile_definition g_profile_MENUWINDOW = { +DUSK_PROFILE msg_process_profile_definition DUSK_CONST g_profile_MENUWINDOW = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 097cde7c37..7675bbfb0a 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -3100,7 +3100,7 @@ static leafdraw_method_class l_dMeter2_Method = { (process_method_func)dMeter2_Draw, }; -msg_process_profile_definition g_profile_METER2 = { +DUSK_PROFILE msg_process_profile_definition DUSK_CONST g_profile_METER2 = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index d4cff01f31..3e74db8f71 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -2555,7 +2555,7 @@ static leafdraw_method_class l_dMsgObject_Method = { (process_method_func)dMsgObject_Draw, }; -msg_process_profile_definition g_profile_MSG_OBJECT = { +DUSK_PROFILE msg_process_profile_definition DUSK_CONST g_profile_MSG_OBJECT = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 216135b10c..68d0732481 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -277,7 +277,7 @@ bool dMsgScrn3Select_c::isSelect() { return mProcess == PROC_SELECT_e ? TRUE : FALSE; } -void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { +void dMsgScrn3Select_c::setString(DUSK_CONST char* mpText0, DUSK_CONST char* mpText1, DUSK_CONST char* mpText2) { if (mpTmSel_c[0] != NULL) { JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() > strlen(mpText0)); @@ -306,7 +306,7 @@ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { } } -void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2) { +void dMsgScrn3Select_c::setRubyString(DUSK_CONST char* pText0, DUSK_CONST char* pText1, DUSK_CONST char* pText2) { if (mpTmrSel_c[0] != NULL) { JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() > strlen(pText0)); diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index f402f8983b..5488b76648 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -103,7 +103,7 @@ void dMsgScrnBase_c::drawOutFont(f32 param_0, f32 param_1, f32 param_2) { mpOutFont->draw(NULL, param_0, param_1, param_2); } -void dMsgScrnBase_c::setString(char* mpText, char* i_stringB) { +void dMsgScrnBase_c::setString(char DUSK_CONST* mpText, char DUSK_CONST* i_stringB) { for (int i = 0; i < 7; i++) { if (mpTm_c[i] != NULL) { JUT_ASSERT(262, ((J2DTextBox*)(mpTm_c[i]->getPanePtr()))->getStringAllocByte() > strlen(mpText)); @@ -116,7 +116,7 @@ void dMsgScrnBase_c::setString(char* mpText, char* i_stringB) { } } -void dMsgScrnBase_c::setRubyString(char* mpText) { +void dMsgScrnBase_c::setRubyString(char DUSK_CONST* mpText) { for (int i = 0; i < 3; i++) { if (mpTmr_c[i] != NULL) { JUT_ASSERT(288, ((J2DTextBox*)(mpTmr_c[i]->getPanePtr()))->getStringAllocByte() > strlen(mpText)); diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index 43732cf4be..a378f982a0 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -132,7 +132,7 @@ static leafdraw_method_class l_dOvlpFd_Method = { (process_method_func)dOvlpFd_Draw, }; -overlap_process_profile_definition g_profile_OVERLAP0 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP0 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -146,7 +146,7 @@ overlap_process_profile_definition g_profile_OVERLAP0 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP1 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP1 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -160,7 +160,7 @@ overlap_process_profile_definition g_profile_OVERLAP1 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP6 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP6 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -174,7 +174,7 @@ overlap_process_profile_definition g_profile_OVERLAP6 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP7 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP7 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -188,7 +188,7 @@ overlap_process_profile_definition g_profile_OVERLAP7 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP8 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP8 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -202,7 +202,7 @@ overlap_process_profile_definition g_profile_OVERLAP8 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP9 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP9 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -216,7 +216,7 @@ overlap_process_profile_definition g_profile_OVERLAP9 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP10 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP10 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, @@ -230,7 +230,7 @@ overlap_process_profile_definition g_profile_OVERLAP10 = { /* Fade SubMtd */ &l_dOvlpFd_Method, }; -overlap_process_profile_definition g_profile_OVERLAP11 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP11 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index c6c6cc735e..64a63a298c 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -245,7 +245,7 @@ static leafdraw_method_class l_dOvlpFd2_Method = { (process_method_func)dOvlpFd2_Draw, }; -overlap_process_profile_definition g_profile_OVERLAP2 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP2 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 2, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 0b3c03db2b..60bea1337f 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -249,7 +249,7 @@ static leafdraw_method_class l_dOvlpFd3_Method = { (process_method_func)dOvlpFd3_Draw, }; -overlap_process_profile_definition g_profile_OVERLAP3 = { +DUSK_PROFILE overlap_process_profile_definition DUSK_CONST g_profile_OVERLAP3 = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index 5cf1fdfa32..68f4dd8d3a 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -27,7 +27,7 @@ u16 dPa_name::s_o_id[14] = { dPa_RM(ID_ZI_S_O_WAKIMIZU_C), }; -char* dPa_name::getName(u32 i_id) { +DUSK_CONST char* dPa_name::getName(u32 i_id) { if ((i_id & 0xFFFF1FFF) >= ID_PARTICLE_MAX) { return NULL; } @@ -35,7 +35,7 @@ char* dPa_name::getName(u32 i_id) { return jpaName[i_id]; } -char* dPa_name::jpaName[] = { +DUSK_CONST char* dPa_name::jpaName[] = { "AK_JN_M_breakFaceRock00.jpa", "AK_JN_M_breakGreatRock00.jpa", "AK_JN_M_breakLittleRock00.jpa", diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index db0cfa1387..570dfac577 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -1796,7 +1796,7 @@ static scene_method_class l_dScnLogo_Method = { (process_method_func)dScnLogo_Draw, }; -scene_process_profile_definition g_profile_LOGO_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_LOGO_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 34f02908bb..40f2105120 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -2004,7 +2004,7 @@ static scene_method_class l_dScnMenu_Method = { (process_method_func)dScnMenu_Draw, }; -scene_process_profile_definition g_profile_MENU_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_MENU_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, @@ -2017,7 +2017,7 @@ scene_process_profile_definition g_profile_MENU_SCENE = { /* Scene SubMtd */ &l_dScnMenu_Method, }; #else -scene_process_profile_definition g_profile_MENU_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_MENU_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 92f5a6c518..d0e33adce4 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -46,7 +46,7 @@ void dSn_HIO_c::genMessage(JORMContext* mctx) { } #endif -static s32 phase_1(char* i_resName) { +static s32 phase_1(DUSK_CONST char* i_resName) { mDoAud_bgmStart(-1); if (dComIfG_setObjectRes(i_resName, (u8)0, NULL) == 0) { return cPhs_ERROR_e; @@ -55,7 +55,7 @@ static s32 phase_1(char* i_resName) { return cPhs_NEXT_e; } -static s32 phase_2(char* i_resName) { +static s32 phase_2(DUSK_CONST char* i_resName) { int rt = dComIfG_syncObjectRes(i_resName); if (rt < 0) { return cPhs_ERROR_e; @@ -68,13 +68,13 @@ static s32 phase_2(char* i_resName) { } } -static s32 resLoad(request_of_phase_process_class* i_phase, char* i_resName) { +static s32 resLoad(request_of_phase_process_class* i_phase, char DUSK_CONST* i_resName) { static request_of_phase_process_fn l_method[2] = { (request_of_phase_process_fn)phase_1, (request_of_phase_process_fn)phase_2 }; - return dComLbG_PhaseHandler(i_phase, l_method, i_resName); + return dComLbG_PhaseHandler(i_phase, l_method, IF_DUSK((void*)) i_resName); } s32 dScnName_c::create() { @@ -472,7 +472,7 @@ static scene_method_class l_dScnName_Method = { (process_method_func)dScnName_Draw, }; -scene_process_profile_definition g_profile_NAME_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_NAME_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, @@ -486,7 +486,7 @@ scene_process_profile_definition g_profile_NAME_SCENE = { 0, }; -scene_process_profile_definition g_profile_NAMEEX_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_NAMEEX_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 4445d9d1bb..0e84b060db 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -1636,7 +1636,7 @@ static scene_method_class l_dScnPly_Method = { (process_method_func)dScnPly_Draw, }; -scene_process_profile_definition g_profile_PLAY_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_PLAY_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, @@ -1649,7 +1649,7 @@ scene_process_profile_definition g_profile_PLAY_SCENE = { /* Scene SubMtd */ &l_dScnPly_Method, }; -scene_process_profile_definition g_profile_OPENING_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_OPENING_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 259bc37e3b..dd34f09fe2 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -47,7 +47,7 @@ static int getResetArchiveBank(int i_roomNo, const u8** o_bankIDList) { const u8* pbank = *o_bankIDList; for (int i = 0; i < bankNum; pbank++, i++) { char* arcBank = dStage_roomControl_c::getArcBank(i); - char* name = ""; + DUSK_CONST char* name = ""; int id = *pbank; if (id != 0xFF) { @@ -511,7 +511,7 @@ static scene_method_class l_dScnRoom_Method = { (process_method_func)dScnRoom_Draw, }; -scene_process_profile_definition g_profile_ROOM_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_ROOM_SCENE = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 0, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 16a29a437e..ec626eca3d 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_scene.h" #include "f_pc/f_pc_leaf.h" -scene_process_profile_definition g_profile_WARNING_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_WARNING_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, @@ -22,7 +22,7 @@ scene_process_profile_definition g_profile_WARNING_SCENE = { /* Scene SubMtd */ NULL, }; -scene_process_profile_definition g_profile_WARNING2_SCENE = { +DUSK_PROFILE scene_process_profile_definition DUSK_CONST g_profile_WARNING2_SCENE = { /* Layer ID */ fpcLy_ROOT_e, /* List ID */ 1, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index 1268865cb6..640f8072cd 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -20,35 +20,35 @@ dSelect_cursorHIO_c::dSelect_cursorHIO_c() { } dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) { - static char* blo_name[4] = { + static DUSK_CONST char* blo_name[4] = { "zelda_select_cursor_4parts.blo", "zelda_store_select_icon.blo", "zelda_map_screen_portal_icon.blo", "zelda_map_screen_batsumark.blo", }; - static char* bck_name[4] = { + static DUSK_CONST char* bck_name[4] = { "", "zelda_store_select_icon.bck", "", "", }; - static char* bpk_name[4] = { + static DUSK_CONST char* bpk_name[4] = { "zelda_select_cursor_4parts.bpk", "zelda_store_select_icon.bpk", "zelda_map_screen_portal_icon.bpk", "zelda_map_screen_batsumark.bpk", }; - static char* btk_name[4] = { + static DUSK_CONST char* btk_name[4] = { "zelda_select_cursor_4parts.btk", "zelda_store_select_icon.btk", "", "", }; - static char* btk2_name[4] = { + static DUSK_CONST char* btk2_name[4] = { "", "zelda_store_select_icon_02.btk", "", diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 8bc5cac570..1b4febc9f4 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1650,7 +1650,7 @@ static leafdraw_method_class l_dTimer_Method = { (process_method_func)dTimer_Draw, }; -msg_process_profile_definition g_profile_TIMER = { +DUSK_PROFILE msg_process_profile_definition DUSK_CONST g_profile_TIMER = { /* Layer ID */ fpcLy_CURRENT_e, /* List ID */ 12, /* List Prio */ fpcPi_CURRENT_e, diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index d0c89605d3..b628ebe9dd 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -254,7 +254,7 @@ static int fopAc_Draw(void* i_this) { print_error_check_c error_check(actor, print_error_check_c::sDRAW); #endif - ret = fpcLf_DrawMethod((leafdraw_method_class*)actor->sub_method, actor); + ret = fpcLf_DrawMethod((leafdraw_method_class DUSK_CONST*)actor->sub_method, actor); #if DEBUG } @@ -335,7 +335,7 @@ static int fopAc_Execute(void* i_this) { print_error_check_c error_check(actor, print_error_check_c::sEXECUTE); #endif - ret = fpcMtd_Execute((process_method_class*)actor->sub_method, actor); + ret = fpcMtd_Execute((process_method_class DUSK_CONST*)actor->sub_method, actor); #if DEBUG } @@ -443,7 +443,7 @@ static int fopAc_Create(void* i_this) { actor_process_profile_definition* profile = (actor_process_profile_definition*)fpcM_GetProfile(i_this); actor->actor_type = fpcM_MakeOfType(&g_fopAc_type); - actor->sub_method = (profile_method_class*)profile->sub_method; + actor->sub_method = (profile_method_class DUSK_CONST*)profile->sub_method; fopAcTg_Init(&actor->actor_tag, actor); fopAcTg_ToActorQ(&actor->actor_tag); diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 7f6d6df802..6737e58f67 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -14,7 +14,7 @@ s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) { return fpcDwPi_Get(&i_leaf->draw_priority); } -int fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) { +int fpcLf_DrawMethod(leafdraw_method_class DUSK_CONST* i_methods, void* i_process) { return fpcMtd_Method(i_methods->draw_method, i_process); } @@ -74,7 +74,7 @@ int fpcLf_Create(leafdraw_class* i_leaf) { return ret; } -leafdraw_method_class g_fpcLf_Method = { +leafdraw_method_class DUSK_CONST g_fpcLf_Method = { (process_method_func)fpcLf_Create, (process_method_func)fpcLf_Delete, (process_method_func)fpcLf_Execute, (process_method_func)fpcLf_IsDelete, (process_method_func)fpcLf_Draw, diff --git a/src/f_pc/f_pc_method.cpp b/src/f_pc/f_pc_method.cpp index 36c347f297..b25a06203a 100644 --- a/src/f_pc/f_pc_method.cpp +++ b/src/f_pc/f_pc_method.cpp @@ -12,18 +12,18 @@ int fpcMtd_Method(process_method_func i_method, void* i_process) { return 1; } -int fpcMtd_Execute(process_method_class* i_methods, void* i_process) { +int fpcMtd_Execute(process_method_class DUSK_CONST* i_methods, void* i_process) { return fpcMtd_Method(i_methods->execute_method, i_process); } -int fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) { +int fpcMtd_IsDelete(process_method_class DUSK_CONST* i_methods, void* i_process) { return fpcMtd_Method(i_methods->is_delete_method, i_process); } -int fpcMtd_Delete(process_method_class* i_methods, void* i_process) { +int fpcMtd_Delete(process_method_class DUSK_CONST* i_methods, void* i_process) { return fpcMtd_Method(i_methods->delete_method, i_process); } -int fpcMtd_Create(process_method_class* i_methods, void* i_process) { +int fpcMtd_Create(process_method_class DUSK_CONST* i_methods, void* i_process) { return fpcMtd_Method(i_methods->create_method, i_process); } diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp index e6d2933ada..e248873a07 100644 --- a/src/f_pc/f_pc_profile.cpp +++ b/src/f_pc/f_pc_profile.cpp @@ -8,15 +8,15 @@ #ifndef __MWERKS__ // Forward declare the static list from f_pc_profile_lst.cpp -extern process_profile_definition* g_fpcPfLst_ProfileList[]; +extern process_profile_definition DUSK_CONST* DUSK_CONST g_fpcPfLst_ProfileList[]; // On PC: Direct pointer to static array -process_profile_definition** g_fpcPf_ProfileList_p = g_fpcPfLst_ProfileList; +process_profile_definition DUSK_CONST* DUSK_CONST* DUSK_CONST g_fpcPf_ProfileList_p = g_fpcPfLst_ProfileList; #else // On Console: Pointer initialized by REL module prolog process_profile_definition** g_fpcPf_ProfileList_p; #endif -process_profile_definition* fpcPf_Get(s16 i_profname) { +process_profile_definition DUSK_CONST* fpcPf_Get(s16 i_profname) { int index = i_profname; return g_fpcPf_ProfileList_p[index]; } diff --git a/src/f_pc/f_pc_profile_lst.cpp b/src/f_pc/f_pc_profile_lst.cpp index b55847533c..39fbd2068e 100644 --- a/src/f_pc/f_pc_profile_lst.cpp +++ b/src/f_pc/f_pc_profile_lst.cpp @@ -811,7 +811,7 @@ extern "C" void ModuleEpilog() { } #else -process_profile_definition* g_fpcPfLst_ProfileList[] = { +process_profile_definition DUSK_CONST* DUSK_CONST g_fpcPfLst_ProfileList[] = { &g_profile_OVERLAP0.base.base, &g_profile_OVERLAP1.base.base, &g_profile_OVERLAP3.base.base, From 42d9dd23c0db36ce34b40025418e71b49554af08 Mon Sep 17 00:00:00 2001 From: Olivia!! Date: Thu, 28 May 2026 07:35:29 +0200 Subject: [PATCH 06/16] Add option for inverting Direct Select (#1841) Adds a new subheading under Input for gameplay-related settings. It's at the bottom because players probably will want to configure their camera more than they care about ornery gameplay details. The one and only toggle there right now is to invert the function of the L-trigger on the Item Wheel. It renders the on-screen text properly if inverted too, meaning with it on the game does tell you that holding L will rotate and moving the stick without holding L will direct select. --- include/dusk/settings.h | 1 + src/d/d_menu_ring.cpp | 55 ++++++++++++++++++++++++++++++++++++++++ src/dusk/settings.cpp | 2 ++ src/dusk/ui/settings.cpp | 4 +++ 4 files changed, 62 insertions(+) diff --git a/include/dusk/settings.h b/include/dusk/settings.h index 923a1e9fc6..c002f3b65b 100644 --- a/include/dusk/settings.h +++ b/include/dusk/settings.h @@ -208,6 +208,7 @@ struct UserSettings { ConfigVar debugFlyCam; ConfigVar debugFlyCamLockEvents; ConfigVar allowBackgroundInput; + ConfigVar swapDirectSelect; // Cheats ConfigVar infiniteHearts; diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 5cdb8fbc04..a468ba889e 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -31,6 +31,7 @@ #if TARGET_PC #include "dusk/game_clock.h" +#include "dusk/settings.h" #endif typedef void (dMenu_Ring_c::*initFunc)(); @@ -349,11 +350,33 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i } for (i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN + #if TARGET_PC + J2DTextBox* fc_TextBox; + if (dusk::getSettings().game.swapDirectSelect) { + fc_TextBox = (J2DTextBox*)mpScreen->search(c_text1[i]); + mpScreen->search(fc_text1[i])->hide(); + } else { + fc_TextBox = (J2DTextBox*)mpScreen->search(c_text[i]); + mpScreen->search(fc_text[i])->hide(); + } + #else J2DTextBox* fc_TextBox = (J2DTextBox*)mpScreen->search(c_text[i]); mpScreen->search(fc_text[i])->hide(); + #endif #else + #if TARGET_PC + J2DTextBox* fc_TextBox; + if (dusk::getSettings().game.swapDirectSelect) { + fc_TextBox = (J2DTextBox*)mpScreen->search(fc_text1[i]); + mpScreen->search(c_text1[i])->hide(); + } else { + fc_TextBox = (J2DTextBox*)mpScreen->search(fc_text[i]); + mpScreen->search(c_text[i])->hide(); + } + #else J2DTextBox* fc_TextBox = (J2DTextBox*)mpScreen->search(fc_text[i]); mpScreen->search(c_text[i])->hide(); + #endif #endif fc_TextBox->setFont(mDoExt_getMesgFont()); fc_TextBox->setString(0x40, ""); @@ -361,11 +384,33 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i } for (i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN + #if TARGET_PC + J2DTextBox* fc1_TextBox; + if (dusk::getSettings().game.swapDirectSelect) { + fc1_TextBox = (J2DTextBox*)mpScreen->search(c_text[i]); + mpScreen->search(fc_text[i])->hide(); + } else { + fc1_TextBox = (J2DTextBox*)mpScreen->search(c_text1[i]); + mpScreen->search(fc_text1[i])->hide(); + } + #else J2DTextBox* fc1_TextBox = (J2DTextBox*)mpScreen->search(c_text1[i]); mpScreen->search(fc_text1[i])->hide(); + #endif #else + #if TARGET_PC + J2DTextBox* fc1_TextBox; + if (dusk::getSettings().game.swapDirectSelect) { + fc1_TextBox = (J2DTextBox*)mpScreen->search(fc_text[i]); + mpScreen->search(c_text[i])->hide(); + } else { + fc1_TextBox = (J2DTextBox*)mpScreen->search(fc_text1[i]); + mpScreen->search(c_text1[i])->hide(); + } + #else J2DTextBox* fc1_TextBox = (J2DTextBox*)mpScreen->search(fc_text1[i]); mpScreen->search(c_text1[i])->hide(); + #endif #endif fc1_TextBox->setFont(mDoExt_getMesgFont()); fc1_TextBox->setString(0x40, ""); @@ -852,7 +897,12 @@ u8 dMenu_Ring_c::getStickInfo(STControl* i_stick) { } if (mCurrentSlot != val2) { + #ifdef TARGET_PC + if ((mDoCPd_c::getHoldL(PAD_1) && !dusk::getSettings().game.swapDirectSelect) || + (!mDoCPd_c::getHoldL(PAD_1) && dusk::getSettings().game.swapDirectSelect)) { + #else if (mDoCPd_c::getHoldL(PAD_1)) { + #endif mDirectSelectCursorPos.x = mItemSlotPosX[mCurrentSlot]; mDirectSelectCursorPos.z = mItemSlotPosY[mCurrentSlot]; mCurrentSlot = val2; @@ -1433,7 +1483,12 @@ void dMenu_Ring_c::drawItem2() { } void dMenu_Ring_c::stick_wait_init() { + #ifdef TARGET_PC + if ((mDoCPd_c::getHoldL(PAD_1) && !dusk::getSettings().game.swapDirectSelect) || + (!mDoCPd_c::getHoldL(PAD_1) && dusk::getSettings().game.swapDirectSelect)) { + #else if (mDoCPd_c::getHoldL(PAD_1) != 0) { + #endif if (mDirectSelectActive) { mWaitFrames = g_ringHIO.mDirectSelectWaitFrames; } else { diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index ef639e2b05..2aa628887d 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -96,6 +96,7 @@ UserSettings g_userSettings = { .debugFlyCam {"game.debugFlyCam", false}, .debugFlyCamLockEvents {"game.debugFlyCamLockEvents", true}, .allowBackgroundInput {"game.allowBackgroundInput", true}, + .swapDirectSelect {"game.swapDirectSelect", false}, // Cheats .infiniteHearts {"game.infiniteHearts", false}, @@ -286,6 +287,7 @@ void registerSettings() { Register(g_userSettings.game.debugFlyCam); Register(g_userSettings.game.debugFlyCamLockEvents); Register(g_userSettings.game.allowBackgroundInput); + Register(g_userSettings.game.swapDirectSelect); Register(g_userSettings.backend.isoPath); Register(g_userSettings.backend.isoVerification); diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index 0a3cf26a1f..185bf5681d 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -1030,6 +1030,10 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { "Invert vertical gyro aiming.", [] { return !gyro_enabled(); }); addOption("Invert Gyro Yaw", getSettings().game.gyroInvertYaw, "Invert horizontal gyro aiming.", [] { return !gyro_enabled(); }); + + leftPane.add_section("Gameplay"); + addOption("Swap Direct Select Input", getSettings().game.swapDirectSelect, + "Swap the controls for using Direct Select on the item wheel, making Direct Select the default and holding L to scroll the wheel."); leftPane.add_section("Tools"); addOption("Turbo Key", getSettings().game.enableTurboKeybind, From e7e04b7c15b73100d260c240408295da378dede2 Mon Sep 17 00:00:00 2001 From: Giorgio Mendieta <31053658+GiorgioMendieta@users.noreply.github.com> Date: Thu, 28 May 2026 07:39:30 +0200 Subject: [PATCH 07/16] Skip CI build jobs on documentation-only changes (#1768) * feat: don't build on PRs that only change documents * fix: ignore docs/** on push --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c0cc1b846..88e20dcdf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,12 @@ on: paths-ignore: - '*.md' - '*LICENSE' + - 'docs/**' pull_request: + paths-ignore: + - '*.md' + - '*LICENSE' + - 'docs/**' concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('run-{0}', github.run_id) }} From e70fef06509d540ba6fd1ad4a307f35e9850abef Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 28 May 2026 07:49:54 +0200 Subject: [PATCH 08/16] SafeStringCopy log fix (#1858) * Fix logging on SafeStringCopy overflow failure * Fix CRASH() macro to not take varargs Didn't work, probably a remnant of a different iteration I made. * Fix ValidateChannel CRASH call --------- Co-authored-by: Luke Street --- include/global.h | 2 +- src/dusk/audio/DuskDsp.cpp | 7 +++---- src/dusk/string.cpp | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/global.h b/include/global.h index 170461ea5f..2a8e182bfa 100644 --- a/include/global.h +++ b/include/global.h @@ -225,7 +225,7 @@ using std::isnan; #define IS_REF_NONNULL(r) (1) #endif -#define CRASH(msg, ...) OSPanic(__FILE__, __LINE__, "%s", msg, ##__VA_ARGS__) +#define CRASH(msg) OSPanic(__FILE__, __LINE__, "%s", msg) // Some basic macros that are more convenient than putting down #if blocks for one-line changes. #if TARGET_PC diff --git a/src/dusk/audio/DuskDsp.cpp b/src/dusk/audio/DuskDsp.cpp index 697371702f..ca4d079e92 100644 --- a/src/dusk/audio/DuskDsp.cpp +++ b/src/dusk/audio/DuskDsp.cpp @@ -85,10 +85,9 @@ static bool ValidateChannelWaveFormat(const JASDsp::TChannel& channel) { */ static void ValidateChannel(const JASDsp::TChannel& channel) { if (!ValidateChannelWaveFormat(channel)) { - CRASH( - "Unable to handle channel format: %02x, %02x\n", - channel.mSamplesPerBlock, - channel.mBytesPerBlock); + const auto msg = fmt::format("Unable to handle channel format: {:02x}, {:02x}\n", + channel.mSamplesPerBlock, channel.mBytesPerBlock); + CRASH(msg.c_str()); } } diff --git a/src/dusk/string.cpp b/src/dusk/string.cpp index e40094ef70..7666f9d9ae 100644 --- a/src/dusk/string.cpp +++ b/src/dusk/string.cpp @@ -45,10 +45,10 @@ void SafeStringCopy(char* buffer, size_t bufSize, const char* src) { const auto srcSize = strlen(src); if (srcSize > bufSize - 1) [[unlikely]] { const auto msg = fmt::format( - "Destination buffer too small! Need %d, have %d", + "Destination buffer too small! Need {}, have {}", srcSize + 1, bufSize); - CRASH("%s", msg.c_str()); + CRASH(msg.c_str()); } strncpyProxy(buffer, src, bufSize); From c10e41f02ed5357941817fca3db4ac79ffce6f98 Mon Sep 17 00:00:00 2001 From: JaxonKEKW <39291630+JaxonKEKW@users.noreply.github.com> Date: Wed, 27 May 2026 23:52:31 -0600 Subject: [PATCH 09/16] Scale Memory Card at Widescreen, fix Name Select screen (#1828) * Improve Widescreen/Ultrawide Collection/File Select Menus Re-scale (unstretch) and center elements of the Collection Screen/File Select details screen for Widescreen/Ultrawide * Fix oversight Fix default behavior * Support ultrawide on Collection menu, target PC support ultrawide instead of reverting to default behavior wrap logic in target PC ifdefs (both changed functions themselves are still behind them as a whole as well) and use old function behavior otherwise * Fix icon overshift at ultrawide Icon shifted too much at ultrawide Move redundant duplicate line * Finished Collection/File Select screen changes Added settings for the scaling mode (GameCube, Wii, Dusklight) Depending on the setting in the Interface menu (Dusklight preset automatically sets scaling to Dusklight option, Classic preset sets to Gamecube, Wii/all old behavior available as well) Collection and File Select screens get scaled differently Fixed backdrop behind slots on File Select with Dusklight setting (the Magic Armor background slot seeming too low on all aspects is vanilla behavior) Fixed Fused Shadow/Mirror size and position with Dusklight setting All logic is behind TARGET_PC gates (not the logic specifically, but the functions themselves have always been) Changes dSelect_cursor_c::refreshAspectScale to take a parameter so the scale of the selection cursor can be reset to default (only ever called in TARGET_PC functions or wrapped in gates) * Ultrawide oversight * Update d_file_select.cpp copy paste oopsie * Update d_file_select.cpp im tired, never tested msvc * Menu Scaling Mode changed definitions to be more open ended header additions now in TARGET_PC ifdefs fixed/added scaling for Save/Option buttons in Collection menu with Dusklight setting, stopped scaling just the text * Update settings.cpp * Scale Memory Card screen, fix GC name screen Scales the Memory Card screen (text only) on Wii and Dusklight scaling settings, GC already keeps default scaling Fixes oversight on Name selection screen on GC settings (all textboxes/letters were getting scaled down) * deleted line oopsie * cleaning * fix stupid Moved cachedPanes to each 'wide' function because they're static and only being used there anyway --- include/d/d_file_select.h | 56 +++++++++--------- include/d/d_menu_collect.h | 63 ++++++++++---------- include/d/d_name.h | 28 +++++++++ src/d/d_file_select.cpp | 33 ++++------- src/d/d_menu_collect.cpp | 3 +- src/d/d_name.cpp | 117 ++++++++++++++++++++++++------------- 6 files changed, 175 insertions(+), 125 deletions(-) diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h index d219a5a11e..d478126b38 100644 --- a/include/d/d_file_select.h +++ b/include/d/d_file_select.h @@ -11,42 +11,40 @@ class dFile_info_c; class J2DPicture; + #if TARGET_PC -static bool cachedPanes = false; - -struct PaneCache { - u64 tag; - f32 origTransX; - f32 origTransY; - bool cached; -}; - static PaneCache mSelDtPanes[] = { - {MULTI_CHAR('tate_n0'), 0.0f, false}, - {MULTI_CHAR('tate_n1'), 0.0f, false}, - {MULTI_CHAR('ken_n0'), 0.0f, false}, - {MULTI_CHAR('ken_n1'), 0.0f, false}, - {MULTI_CHAR('fuku_n0'), 0.0f, false}, - {MULTI_CHAR('fuku_n1'), 0.0f, false}, - {MULTI_CHAR('fuku_n2'), 0.0f, false}, - {MULTI_CHAR('gray_n'), 0.0f, false}, - {MULTI_CHAR('b_base'), 0.0f, false}, - {MULTI_CHAR('b_base1'), 0.0f, false}, + {MULTI_CHAR('tate_n0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('tate_n1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('ken_n0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('ken_n1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fuku_n0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fuku_n1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fuku_n2'), 0.0f, 0.0f, false}, + {MULTI_CHAR('gray_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('b_base'), 0.0f, 0.0f, false}, + {MULTI_CHAR('b_base1'), 0.0f, 0.0f, false}, }; static PaneCache fileSelPanes[] = { - {MULTI_CHAR('w_uzu00'), 0.0f, false}, - {MULTI_CHAR('w_uzu01'), 0.0f, false}, - {MULTI_CHAR('w_uzu02'), 0.0f, false}, - {MULTI_CHAR('w_uzu03'), 0.0f, false}, - {MULTI_CHAR('w_uzu04'), 0.0f, false}, - {MULTI_CHAR('w_uzu05'), 0.0f, false}, - {MULTI_CHAR('w_uzu06'), 0.0f, false}, - {MULTI_CHAR('w_uzu07'), 0.0f, false}, - {MULTI_CHAR('w_uzu08'), 0.0f, false}, - {MULTI_CHAR('w_uzu09'), 0.0f, false}, + {MULTI_CHAR('w_uzu00'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu01'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu02'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu03'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu04'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu05'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu06'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu07'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu08'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_uzu09'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_er_msg'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_er_msE'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_er_msR'), 0.0f, 0.0f, false}, + {MULTI_CHAR('er_for0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('er_for1'), 0.0f, 0.0f, false}, }; #endif + class dDlst_FileSel_c : public dDlst_base_c { public: void draw(); diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h index d259027a65..28a095896e 100644 --- a/include/d/d_menu_collect.h +++ b/include/d/d_menu_collect.h @@ -15,9 +15,8 @@ class dMenu_Fishing_c; class dMenu_Skill_c; class dMenu_Insect_c; class dSelect_cursor_c; -#if TARGET_PC -static bool cachedPanes = false; +#if TARGET_PC struct PaneCache { u64 tag; f32 origTransX; @@ -26,36 +25,36 @@ struct PaneCache { }; static PaneCache mpScreenPanes[] = { - {MULTI_CHAR('sa_tex_n'), 0.0f, false}, - {MULTI_CHAR('op_tex_n'), 0.0f, false}, - {MULTI_CHAR('heart_n'), 0.0f, false}, - {MULTI_CHAR('wolf_n'), 0.0f, false}, - {MULTI_CHAR('item_0_n'), 0.0f, false}, - {MULTI_CHAR('item_1_n'), 0.0f, false}, - {MULTI_CHAR('item_2_n'), 0.0f, false}, - {MULTI_CHAR('fish_3_n'), 0.0f, false}, - {MULTI_CHAR('lett_4_n'), 0.0f, false}, - {MULTI_CHAR('maki_5_n'), 0.0f, false}, - {MULTI_CHAR('fuku_n0'), 0.0f, false}, - {MULTI_CHAR('fuku_n1'), 0.0f, false}, - {MULTI_CHAR('fuku_n2'), 0.0f, false}, - {MULTI_CHAR('tate_n0'), 0.0f, false}, - {MULTI_CHAR('tate_n1'), 0.0f, false}, - {MULTI_CHAR('ken_n0'), 0.0f, false}, - {MULTI_CHAR('ken_n1'), 0.0f, false}, - {MULTI_CHAR('kabu_6n'), 0.0f, false}, - {MULTI_CHAR('t_t00'), 0.0f, false}, - {MULTI_CHAR('f_t00'), 0.0f, false}, - {MULTI_CHAR('itemn_n'), 0.0f, false}, - {MULTI_CHAR('infotxtn'), 0.0f, false}, - {MULTI_CHAR('sa_op_n'), 0.0f, false}, - {MULTI_CHAR('title_n'), 0.0f, false}, - {MULTI_CHAR('menu_n'), 0.0f, false}, - {MULTI_CHAR('w_er_n'), 0.0f, false}, - {MULTI_CHAR('center_n'), 0.0f, false}, - {MULTI_CHAR('info_n'), 0.0f, false}, - {MULTI_CHAR('lavel_n'), 0.0f, false}, - {MULTI_CHAR('modelbgn'), 0.0f, false}, + {MULTI_CHAR('sa_tex_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('op_tex_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('heart_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('wolf_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('item_0_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('item_1_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('item_2_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fish_3_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('lett_4_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('maki_5_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fuku_n0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fuku_n1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('fuku_n2'), 0.0f, 0.0f, false}, + {MULTI_CHAR('tate_n0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('tate_n1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('ken_n0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('ken_n1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('kabu_6n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('t_t00'), 0.0f, 0.0f, false}, + {MULTI_CHAR('f_t00'), 0.0f, 0.0f, false}, + {MULTI_CHAR('itemn_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('infotxtn'), 0.0f, 0.0f, false}, + {MULTI_CHAR('sa_op_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('title_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('menu_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('w_er_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('center_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('info_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('lavel_n'), 0.0f, 0.0f, false}, + {MULTI_CHAR('modelbgn'), 0.0f, 0.0f, false}, }; #endif diff --git a/include/d/d_name.h b/include/d/d_name.h index ddd99127c6..68a4930baf 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -12,6 +12,34 @@ class J2DTextBox; class JUTFont; class STControl; +#if TARGET_PC +struct PaneCache { + u64 tag; + f32 origTransX; + f32 origTransY; + bool cached; +}; + +static PaneCache l_tagName[] = { + {MULTI_CHAR('m_00_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_00_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_01_3'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m_01_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_02_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_2'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m03_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m03_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_04_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_1'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m_05_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_05_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_06_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_0'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m_07_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_07_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_08_4'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m_09_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_09_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_10_3'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m_10_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m_11_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_0'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_2'), 0.0f, 0.0f, false}, + {MULTI_CHAR('m12_3'), 0.0f, 0.0f, false}, {MULTI_CHAR('m12_4'), 0.0f, 0.0f, false}, {MULTI_CHAR('p_end_2'), 0.0f, 0.0f, false}, {MULTI_CHAR('p_end_1'), 0.0f, 0.0f, false}, {MULTI_CHAR('p_end_0'), 0.0f, 0.0f, false}, +}; + +static PaneCache l_nameTagName[] = { + {MULTI_CHAR('name_00'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_01'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_02'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_03'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_04'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_05'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_06'), 0.0f, 0.0f, false}, {MULTI_CHAR('name_07'), 0.0f, 0.0f, false}, +}; + +static PaneCache l_nameCurTagName[] = { + {MULTI_CHAR('s__n_00'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_01'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_02'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_03'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_04'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_05'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_06'), 0.0f, 0.0f, false}, {MULTI_CHAR('s__n_07'), 0.0f, 0.0f, false}, +}; +#endif + class dNm_HIO_c { public: dNm_HIO_c(); diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 72b6ffb372..7ba3fac836 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -3752,6 +3752,7 @@ bool dFile_select_c::yesnoWakuAlpahAnm(u8 param_1) { #if TARGET_PC void dFile_select_c::fileSelectWide() { + static bool cachedPanes = false; // Get pre-scale values for each pane if (!cachedPanes) { for (PaneCache& entry : mSelDtPanes) { @@ -3853,17 +3854,11 @@ void dFile_select_c::fileSelectWide() { mSelDt.ScrDt->search(MULTI_CHAR('fuku_n1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); mSelDt.ScrDt->search(MULTI_CHAR('fuku_n2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - // Spirals - fileSel.Scr->search(MULTI_CHAR('w_uzu00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu03'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu04'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu05'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu06'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu07'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu08'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu09'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + // Spirals & Memory Card Text + for (PaneCache& entry : fileSelPanes) { + J2DPane* pane = fileSel.Scr->search(entry.tag); + pane->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + } // Selection Cursor if (mSelIcon) { @@ -3953,17 +3948,11 @@ void dFile_select_c::fileSelectWide() { mSelIcon2->refreshAspectScale(mDoGph_gInf_c::hudAspectScaleUp); } - // Spirals - fileSel.Scr->search(MULTI_CHAR('w_uzu00'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu01'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu02'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu03'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu04'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu05'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu06'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu07'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu08'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - fileSel.Scr->search(MULTI_CHAR('w_uzu09'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + // Spirals & Memory Card Text + for (PaneCache& entry : fileSelPanes) { + J2DPane* pane = fileSel.Scr->search(entry.tag); + pane->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + } break; } } diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 0755c4de17..7ac70e4a7b 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -97,6 +97,7 @@ dMenu_Collect2D_c::~dMenu_Collect2D_c() { #if TARGET_PC void dMenu_Collect2D_c::menuCollectWide() { + static bool cachedPanes = false; // Get pre-scale values for each pane if (!cachedPanes) { for (PaneCache& entry : mpScreenPanes) { @@ -236,7 +237,7 @@ void dMenu_Collect2D_c::menuCollectWide() { // Fused Shadow/Mirror Background J2DPane* modelbgn = mpScreen->search(MULTI_CHAR('modelbgn')); - static f32 modelbgnTransX_orig = modelbgn->getTranslateX(); // Get pre-scale value + static f32 modelbgnTransX_orig = modelbgn->getTranslateX(); modelbgn->setBasePosition(J2DBasePosition_0); modelbgn->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.3f); f32 modelbgn_scaleFactor = 1.0f + 0.16f * (mDoGph_gInf_c::hudAspectScaleDown - 1.0f); diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index e4c2a0f8f0..6e3f8bca89 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -1430,51 +1430,86 @@ void dName_c::selectCursorPosSet(int row) { #if TARGET_PC void dName_c::nameWide() { - // Resize Select Icon - #if TARGET_PC - if (mSelIcon) { - mSelIcon->refreshAspectScale(mDoGph_gInf_c::hudAspectScaleUp); - } - #endif - - // List of Characters Box - static u64 l_tagName[65] = { - MULTI_CHAR('m_00_0'), MULTI_CHAR('m_00_1'), MULTI_CHAR('m_00_2'), MULTI_CHAR('m_00_3'), MULTI_CHAR('m_00_4'), MULTI_CHAR('m_01_0'), MULTI_CHAR('m_01_1'), MULTI_CHAR('m_01_2'), MULTI_CHAR('m_01_3'), - MULTI_CHAR('m_01_4'), MULTI_CHAR('m_02_0'), MULTI_CHAR('m_02_1'), MULTI_CHAR('m_02_2'), MULTI_CHAR('m_02_3'), MULTI_CHAR('m_02_4'), MULTI_CHAR('m03_0'), MULTI_CHAR('m03_1'), MULTI_CHAR('m03_2'), - MULTI_CHAR('m03_3'), MULTI_CHAR('m03_4'), MULTI_CHAR('m_04_0'), MULTI_CHAR('m_04_1'), MULTI_CHAR('m_04_2'), MULTI_CHAR('m_04_3'), MULTI_CHAR('m_04_4'), MULTI_CHAR('m_05_0'), MULTI_CHAR('m_05_1'), - MULTI_CHAR('m_05_2'), MULTI_CHAR('m_05_3'), MULTI_CHAR('m_05_4'), MULTI_CHAR('m_06_0'), MULTI_CHAR('m_06_1'), MULTI_CHAR('m_06_2'), MULTI_CHAR('m_06_3'), MULTI_CHAR('m_06_4'), MULTI_CHAR('m_07_0'), - MULTI_CHAR('m_07_1'), MULTI_CHAR('m_07_2'), MULTI_CHAR('m_07_3'), MULTI_CHAR('m_07_4'), MULTI_CHAR('m_08_0'), MULTI_CHAR('m_08_1'), MULTI_CHAR('m_08_2'), MULTI_CHAR('m_08_3'), MULTI_CHAR('m_08_4'), - MULTI_CHAR('m_09_0'), MULTI_CHAR('m_09_1'), MULTI_CHAR('m_09_2'), MULTI_CHAR('m_09_3'), MULTI_CHAR('m_09_4'), MULTI_CHAR('m_10_0'), MULTI_CHAR('m_10_1'), MULTI_CHAR('m_10_2'), MULTI_CHAR('m_10_3'), - MULTI_CHAR('m_10_4'), MULTI_CHAR('m_11_0'), MULTI_CHAR('m_11_1'), MULTI_CHAR('m_11_2'), MULTI_CHAR('m_11_3'), MULTI_CHAR('m_11_4'), MULTI_CHAR('m12_0'), MULTI_CHAR('m12_1'), MULTI_CHAR('m12_2'), - MULTI_CHAR('m12_3'), MULTI_CHAR('m12_4'), - }; - - for (u32 i = 0; i < 65; i++) { - nameIn.NameInScr->search(l_tagName[i])->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + static bool cachedPanes = false; + // Get pre-scale values for each pane + if (!cachedPanes) { + for (PaneCache& entry : l_tagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + if (!entry.cached) { + entry.origTransX = pane->getTranslateX(); + entry.origTransY = pane->getTranslateY(); + entry.cached = true; + } + } + for (PaneCache& entry : l_nameTagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + if (!entry.cached) { + entry.origTransX = pane->getTranslateX(); + entry.origTransY = pane->getTranslateY(); + entry.cached = true; + } + } + for (PaneCache& entry : l_nameCurTagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + if (!entry.cached) { + entry.origTransX = pane->getTranslateX(); + entry.origTransY = pane->getTranslateY(); + entry.cached = true; + } + } + cachedPanes = true; } - // "END" Text - nameIn.NameInScr->search(MULTI_CHAR('p_end_2'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - nameIn.NameInScr->search(MULTI_CHAR('p_end_1'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - nameIn.NameInScr->search(MULTI_CHAR('p_end_0'))->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); - - // Letters being typed - static u64 l_nameTagName[8] = { - MULTI_CHAR('name_00'), MULTI_CHAR('name_01'), MULTI_CHAR('name_02'), MULTI_CHAR('name_03'), MULTI_CHAR('name_04'), MULTI_CHAR('name_05'), MULTI_CHAR('name_06'), MULTI_CHAR('name_07'), - }; - - for (u32 i = 0; i < 8; i++) { - nameIn.NameInScr->search(l_nameTagName[i])->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + // Reset all panes + nameIn.NameInScr->scale(1.0f, 1.0f); + nameIn.NameInScr->translate(0.0f, 0.0f); + for (PaneCache& entry : l_tagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + pane->setBasePosition(J2DBasePosition_4); + pane->scale(1.0f, 1.0f); + pane->translate(entry.origTransX, entry.origTransY); + } + for (PaneCache& entry : l_nameTagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + pane->setBasePosition(J2DBasePosition_4); + pane->scale(1.0f, 1.0f); + pane->translate(entry.origTransX, entry.origTransY); + } + for (PaneCache& entry : l_nameCurTagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + pane->setBasePosition(J2DBasePosition_4); + pane->scale(1.0f, 1.0f); + pane->translate(entry.origTransX, entry.origTransY); } - // Underscores when typing below letters - static u64 l_nameCurTagName[8] = { - MULTI_CHAR('s__n_00'), MULTI_CHAR('s__n_01'), MULTI_CHAR('s__n_02'), MULTI_CHAR('s__n_03'), MULTI_CHAR('s__n_04'), MULTI_CHAR('s__n_05'), MULTI_CHAR('s__n_06'), MULTI_CHAR('s__n_07'), - }; - - for (u32 i = 0; i < 8; i++) { - nameIn.NameInScr->search(l_nameCurTagName[i]) - ->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + switch (dusk::getSettings().game.menuScalingMode) { + case (dusk::MenuScaling::GameCube): + // Selection Cursor + if (mSelIcon) { + mSelIcon->refreshAspectScale(1.0f); + } + break; + default: // Wii and Dusklight + // List of Characters Box + for (PaneCache& entry : l_tagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + pane->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + } + // Letters being typed + for (PaneCache& entry : l_nameTagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + pane->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + } + // Underscores when typing below letters + for (PaneCache& entry : l_nameCurTagName) { + J2DPane* pane = nameIn.NameInScr->search(entry.tag); + pane->scale(mDoGph_gInf_c::hudAspectScaleDown, 1.0f); + } + // Selection Cursor + if (mSelIcon) { + mSelIcon->refreshAspectScale(mDoGph_gInf_c::hudAspectScaleUp); + } + break; } } #endif From 6592d95199e9879397de9ffbd74aee252d3b49f6 Mon Sep 17 00:00:00 2001 From: Jairinho Date: Thu, 28 May 2026 01:53:14 -0400 Subject: [PATCH 10/16] Allow independent X and Y sensitivity for free camera (#1431) Co-authored-by: Luke Street --- include/dusk/settings.h | 3 ++- src/d/d_camera.cpp | 4 ++-- src/dusk/settings.cpp | 6 ++++-- src/dusk/ui/settings.cpp | 7 +++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/dusk/settings.h b/include/dusk/settings.h index c002f3b65b..de6637080b 100644 --- a/include/dusk/settings.h +++ b/include/dusk/settings.h @@ -204,7 +204,8 @@ struct UserSettings { ConfigVar invertFirstPersonYAxis; ConfigVar invertAirSwimX; ConfigVar invertAirSwimY; - ConfigVar freeCameraSensitivity; + ConfigVar freeCameraXSensitivity; + ConfigVar freeCameraYSensitivity; ConfigVar debugFlyCam; ConfigVar debugFlyCamLockEvents; ConfigVar allowBackgroundInput; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 4a77816cb8..8e7e48949a 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -7665,8 +7665,8 @@ bool dCamera_c::freeCamera() { mCamParam.mManualMode = 1; camMovement = camMovement.normalize(); camMovement.y *= dusk::getSettings().game.invertCameraYAxis ? 1.0f : -1.0f; - mCamParam.freeXAngle += camMovement.x * magnitude * dusk::getSettings().game.freeCameraSensitivity * 5.0f; - mCamParam.freeYAngle += camMovement.y * magnitude * dusk::getSettings().game.freeCameraSensitivity * 5.0f; + mCamParam.freeXAngle += camMovement.x * magnitude * dusk::getSettings().game.freeCameraXSensitivity * 5.0f; + mCamParam.freeYAngle += camMovement.y * magnitude * dusk::getSettings().game.freeCameraYSensitivity * 5.0f; } fopAc_ac_c* player = dComIfGp_getPlayer(0); diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index 2aa628887d..464a1ff2b2 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -92,7 +92,8 @@ UserSettings g_userSettings = { .invertFirstPersonYAxis {"game.invertFirstPersonYAxis", false}, .invertAirSwimX {"game.invertAirSwimX", false}, .invertAirSwimY {"game.invertAirSwimY", false}, - .freeCameraSensitivity {"game.freeCameraSensitivity", 1.0f}, + .freeCameraXSensitivity {"game.freeCameraXSensitivity", 1.0f}, + .freeCameraYSensitivity {"game.freeCameraYSensitivity", 1.0f}, .debugFlyCam {"game.debugFlyCam", false}, .debugFlyCamLockEvents {"game.debugFlyCamLockEvents", true}, .allowBackgroundInput {"game.allowBackgroundInput", true}, @@ -224,7 +225,8 @@ void registerSettings() { Register(g_userSettings.game.invertFirstPersonYAxis); Register(g_userSettings.game.invertAirSwimX); Register(g_userSettings.game.invertAirSwimY); - Register(g_userSettings.game.freeCameraSensitivity); + Register(g_userSettings.game.freeCameraXSensitivity); + Register(g_userSettings.game.freeCameraYSensitivity); Register(g_userSettings.game.minimalHUD); Register(g_userSettings.game.pauseOnFocusLost); Register(g_userSettings.game.enableDiscordPresence); diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index 185bf5681d..a164de0089 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -950,8 +950,11 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { addOption("Invert Camera Y Axis", getSettings().game.invertCameraYAxis, "Invert vertical camera movement when Free Camera is enabled.", [] { return !getSettings().game.freeCamera; }); - config_percent_select(leftPane, rightPane, getSettings().game.freeCameraSensitivity, - "Free Camera Sensitivity", "Adjusts twin-stick camera sensitivity.", 50, 200, 5, + config_percent_select(leftPane, rightPane, getSettings().game.freeCameraXSensitivity, + "Free Camera X Sensitivity", "Adjusts twin-stick camera X axis sensitivity.", 50, 200, 5, + [] { return !getSettings().game.freeCamera; }); + config_percent_select(leftPane, rightPane, getSettings().game.freeCameraYSensitivity, + "Free Camera Y Sensitivity", "Adjusts twin-stick camera Y axis sensitivity.", 50, 200, 5, [] { return !getSettings().game.freeCamera; }); addOption("Invert First Person X Axis", getSettings().game.invertFirstPersonXAxis, "Invert horizontal movement while aiming with items or first person camera. Applies only to the control stick (the gyroscope can be inverted in Input settings)."); From 71961dae85b232078c7984720bc5c32d0fe68c12 Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 28 May 2026 08:04:23 +0200 Subject: [PATCH 11/16] feat: Make gamepad status lighting optional (#1705) * feat: Status Lighting option * wip: rename to "Enable Controller LED" * wip: setting for all four ports individually * wip: fix detection + code cleanup * wip: increase led speed for dusk preset * wip: use aurora API * bump aurora to 2b07d55 * wip: remove isSupported + fix namespace comment * wip: add value override to BoolButton * Style nit & remove unused * Undo change --------- Co-authored-by: Luke Street --- include/dusk/gamepad_color.h | 5 +- include/dusk/settings.h | 1 + src/dusk/gamepad_color.cpp | 178 +++++++++++++++++------------- src/dusk/settings.cpp | 10 ++ src/dusk/ui/bool_button.cpp | 9 +- src/dusk/ui/bool_button.hpp | 2 + src/dusk/ui/controller_config.cpp | 28 ++++- src/f_ap/f_ap_game.cpp | 2 +- 8 files changed, 153 insertions(+), 82 deletions(-) diff --git a/include/dusk/gamepad_color.h b/include/dusk/gamepad_color.h index c7cfc1e716..0524b0b98d 100644 --- a/include/dusk/gamepad_color.h +++ b/include/dusk/gamepad_color.h @@ -3,6 +3,9 @@ #ifndef GAMEPAD_COLOR_H #define GAMEPAD_COLOR_H -void handleGamepadColor(); +namespace dusk::input { + void handleGamepadColor(); + bool pad_has_led(int port) noexcept; +} #endif \ No newline at end of file diff --git a/include/dusk/settings.h b/include/dusk/settings.h index de6637080b..f48f5862ca 100644 --- a/include/dusk/settings.h +++ b/include/dusk/settings.h @@ -209,6 +209,7 @@ struct UserSettings { ConfigVar debugFlyCam; ConfigVar debugFlyCamLockEvents; ConfigVar allowBackgroundInput; + std::array, 4> enableLED; ConfigVar swapDirectSelect; // Cheats diff --git a/src/dusk/gamepad_color.cpp b/src/dusk/gamepad_color.cpp index cba32da632..9fea8fd769 100644 --- a/src/dusk/gamepad_color.cpp +++ b/src/dusk/gamepad_color.cpp @@ -5,102 +5,124 @@ #include #include -cXyz currentGamepadColor = {0, 0, 0}; -cXyz finalGamepadColor = {0, 0, 0}; -cXyz additionalGamepadColor = {0, 0, 0}; +#include "ui/controller_config.hpp" -float lerpSpeed = 0.0f; +#include -const cXyz duskColor = {50, 50, -50}; -const cXyz noColor = {0, 0, 0}; +namespace dusk::input { -cXyz LerpColor(cXyz a, cXyz b, float t) { - return {std::lerp(a.x, b.x, t), std::lerp(a.y, b.y, t), std::lerp(a.z, b.z, t)}; -} +namespace { + cXyz currentColor = {0, 0, 0}; + float lerpSpeed = 0.0f; -void FadeLED(cXyz newColor, float speed) { - finalGamepadColor = newColor; - lerpSpeed = speed / 30.0f; -} + enum ColorVariations : u8 { + NO_COLOR = 0, + DUSK_COLOR = 1, + ZHINT = 2, + LINK_WOLF = 3, + LINK_CASUAL = 4, + LINK_KOKIRI = 5, + LINK_ZORA = 6, + LINK_MAGIC = 7, + LINK_MAGIC_HEAVY = 8, + }; -void SetLED(cXyz newColor) { - currentGamepadColor = newColor; - finalGamepadColor = newColor; -} + struct ColorSetting { + cXyz color; + float speed; + }; -void SetGamepadAdditionalColor(cXyz addColor) { - additionalGamepadColor.x = addColor.x; - additionalGamepadColor.y = addColor.y; - additionalGamepadColor.z = addColor.z; -} + const ColorSetting kColorTable[] = { + /* 0: NO_COLOR */ { {0, 0, 0}, 2.0f }, + /* 1: DUSK_COLOR */ { {50, 50, -50}, 2.0f }, + /* 2: ZHINT */ { {50, 50, 175}, 2.0f }, + /* 3: LINK_WOLF */ { {115, 115, 75}, 5.0f }, + /* 4: LINK_CASUAL */ { {235, 230, 115}, 5.0f }, + /* 5: LINK_KOKIRI */ { {0, 100, 0}, 5.0f }, + /* 6: LINK_ZORA */ { {0, 0, 100}, 5.0f }, + /* 7: LINK_MAGIC */ { {100, 0, 5}, 5.0f }, + /* 8: LINK_MAGIC_HEAVY */ { {5, 100, 100}, 5.0f }, + }; -void handleGamepadColor() { - bool setColor = false; - - fopAc_ac_c* zhint = dComIfGp_att_getZHint(); - if (zhint != NULL) { - FadeLED({50, 50, 175}, 2.0f); - setColor = true; + cXyz LerpColor(const cXyz a, const cXyz b, const float t) { + return {std::lerp(a.x, b.x, t), std::lerp(a.y, b.y, t), std::lerp(a.z, b.z, t)}; } - daPy_py_c* player = daPy_getPlayerActorClass(); - daAlink_c* link = daAlink_getAlinkActorClass(); + void clamp(cXyz& color) { + color.x = std::clamp(color.x, 0.0f, 255.0f); + color.y = std::clamp(color.y, 0.0f, 255.0f); + color.z = std::clamp(color.z, 0.0f, 255.0f); + } + + ColorSetting getColorSetting() { + const fopAc_ac_c* zHint = dComIfGp_att_getZHint(); + if (zHint != nullptr) { + return kColorTable[ZHINT]; + } + + const daAlink_c* link = daAlink_getAlinkActorClass(); + + if (link == nullptr) + return kColorTable[DUSK_COLOR]; - if (link != nullptr && !setColor) { if (link->checkWolf()) { - FadeLED({115, 115, 75}, 5.0f); - setColor = true; - } else { - switch (dComIfGs_getSelectEquipClothes()) { - case dItemNo_WEAR_KOKIRI_e: - FadeLED({0, 100, 0}, 5.0f); - setColor = true; - break; - case dItemNo_WEAR_ZORA_e: - FadeLED({0, 0, 100}, 5.0f); - setColor = true; - break; - case dItemNo_ARMOR_e: - if (link->checkMagicArmorHeavy()) { - FadeLED({5, 100, 100}, 5.0f); - } else { - FadeLED({100, 0, 5}, 5.0f); - } - setColor = true; - break; - case dItemNo_WEAR_CASUAL_e: - FadeLED({235, 230, 115}, 5.0f); - setColor = true; - break; + return kColorTable[LINK_WOLF]; + } + + switch (dComIfGs_getSelectEquipClothes()) { + case dItemNo_WEAR_KOKIRI_e: + return kColorTable[LINK_KOKIRI]; + case dItemNo_WEAR_ZORA_e: + return kColorTable[LINK_ZORA]; + case dItemNo_ARMOR_e: + if (link->checkMagicArmorHeavy()) { + return kColorTable[LINK_MAGIC_HEAVY]; } + + return kColorTable[LINK_MAGIC]; + case dItemNo_WEAR_CASUAL_e: + return kColorTable[LINK_CASUAL]; + default: + return kColorTable[LINK_KOKIRI]; } } - if (dKy_darkworld_check()) { - SetGamepadAdditionalColor(duskColor); - } else { - SetGamepadAdditionalColor(noColor); + cXyz getAdditionalColor() { + if (dKy_darkworld_check()) { + return kColorTable[DUSK_COLOR].color; + } + + return kColorTable[NO_COLOR].color; } - f32 finalRed = finalGamepadColor.x + additionalGamepadColor.x; - f32 finalGreen = finalGamepadColor.y + additionalGamepadColor.y; - f32 finalBlue = finalGamepadColor.z + additionalGamepadColor.z; +} // namespace - if (finalRed > 255) - finalRed = 255; - if (finalRed < 0) - finalRed = 0; +bool pad_has_led(const int port) noexcept { + if (port > PAD_MAX_CONTROLLERS || port < 0) + return false; - if (finalGreen > 255) - finalGreen = 255; - if (finalGreen < 0) - finalGreen = 0; + return PADHasLED(port); +} - if (finalBlue > 255) - finalBlue = 255; - if (finalBlue < 0) - finalBlue = 0; +void handleGamepadColor() { + auto [color, speed] = getColorSetting(); + const cXyz additionalColor = getAdditionalColor(); + cXyz finalColor = color + additionalColor; + lerpSpeed = speed / 30.0f; - currentGamepadColor = LerpColor(currentGamepadColor, cXyz{finalRed, finalGreen, finalBlue}, lerpSpeed); - PADSetColor(PAD_CHAN0, (u8)currentGamepadColor.x, (u8)currentGamepadColor.y, (u8)currentGamepadColor.z); -} \ No newline at end of file + clamp(finalColor); + currentColor = LerpColor(currentColor, finalColor, lerpSpeed); + + for (int i = 0; i < 4; i++) { + if (pad_has_led(i) && getSettings().game.enableLED[i]) { + PADSetColor( + i, + static_cast(currentColor.x), + static_cast(currentColor.y), + static_cast(currentColor.z) + ); + } + } +} + +} // namespace dusk::input \ No newline at end of file diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index 464a1ff2b2..3bea017e2c 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -97,6 +97,12 @@ UserSettings g_userSettings = { .debugFlyCam {"game.debugFlyCam", false}, .debugFlyCamLockEvents {"game.debugFlyCamLockEvents", true}, .allowBackgroundInput {"game.allowBackgroundInput", true}, + .enableLED { + ConfigVar{"game.enableLED_port0", true}, + ConfigVar{"game.enableLED_port1", true}, + ConfigVar{"game.enableLED_port2", true}, + ConfigVar{"game.enableLED_port3", true}, + }, .swapDirectSelect {"game.swapDirectSelect", false}, // Cheats @@ -289,6 +295,10 @@ void registerSettings() { Register(g_userSettings.game.debugFlyCam); Register(g_userSettings.game.debugFlyCamLockEvents); Register(g_userSettings.game.allowBackgroundInput); + Register(g_userSettings.game.enableLED[0]); + Register(g_userSettings.game.enableLED[1]); + Register(g_userSettings.game.enableLED[2]); + Register(g_userSettings.game.enableLED[3]); Register(g_userSettings.game.swapDirectSelect); Register(g_userSettings.backend.isoPath); diff --git a/src/dusk/ui/bool_button.cpp b/src/dusk/ui/bool_button.cpp index 2ed088542a..564818b85b 100644 --- a/src/dusk/ui/bool_button.cpp +++ b/src/dusk/ui/bool_button.cpp @@ -12,7 +12,8 @@ BoolButton::BoolButton(Rml::Element* parent, Props props) .icon = std::move(props.icon), }), mGetValue(std::move(props.getValue)), mSetValue(std::move(props.setValue)), - mIsDisabled(std::move(props.isDisabled)), mIsModified(std::move(props.isModified)) {} + mIsDisabled(std::move(props.isDisabled)), mIsModified(std::move(props.isModified)), + mValueOverride(std::move(props.valueOverride)) {} bool BoolButton::modified() const { if (mIsModified) { @@ -29,6 +30,12 @@ bool BoolButton::disabled() const { } Rml::String BoolButton::format_value() { + if (mValueOverride) { + if (std::string value = mValueOverride(); !value.empty()) { + return value; + } + } + return mGetValue() ? "On" : "Off"; } diff --git a/src/dusk/ui/bool_button.hpp b/src/dusk/ui/bool_button.hpp index a6bd133c44..96b0743a16 100644 --- a/src/dusk/ui/bool_button.hpp +++ b/src/dusk/ui/bool_button.hpp @@ -12,6 +12,7 @@ public: std::function setValue; std::function isDisabled; std::function isModified; + std::function valueOverride; }; BoolButton(Rml::Element* parent, Props props); @@ -28,6 +29,7 @@ private: std::function mSetValue; std::function mIsDisabled; std::function mIsModified; + std::function mValueOverride; }; } // namespace dusk::ui diff --git a/src/dusk/ui/controller_config.cpp b/src/dusk/ui/controller_config.cpp index 20c599ecfd..20e9ef62d5 100644 --- a/src/dusk/ui/controller_config.cpp +++ b/src/dusk/ui/controller_config.cpp @@ -17,6 +17,7 @@ #include "dusk/action_bindings.h" #include "dusk/config.hpp" +#include "dusk/gamepad_color.h" namespace dusk::ui { namespace { @@ -254,7 +255,9 @@ ControllerConfigWindow::ControllerConfigWindow(bool prelaunch) { event.StopPropagation(); } }, - true); + true + ); + if (auto* context = mDocument != nullptr ? mDocument->GetContext() : nullptr) { if (auto* root = context->GetRootElement()) { mListeners.emplace_back(std::make_unique( @@ -312,6 +315,28 @@ void ControllerConfigWindow::build_port_tab(Rml::Element* content, int port) { addPageButton(Page::Actions, "Custom Action Bindings", [] {return Rml::String(">"); }, [] { return false; }); leftPane.add_section("Options"); + leftPane.register_control(leftPane.add_child(BoolButton::Props{ + .key = "Enable LED Status", + .getValue = + [port] { + return getSettings().game.enableLED[port].getValue(); + }, + .setValue = + [port](const bool value) { + getSettings().game.enableLED[port].setValue(value); + }, + .isDisabled = [port] { + return !input::pad_has_led(port); + }, + .valueOverride = [port] { + if (!input::pad_has_led(port)) + return "Not Supported"; + + return ""; + }}), + rightPane, [](Pane& pane) { + pane.add_text("Sets the controller's lighting color based on the game's state."); + }); leftPane.register_control(leftPane.add_child(BoolButton::Props{ .key = "Enable Dead Zones", .getValue = @@ -379,6 +404,7 @@ void ControllerConfigWindow::render_page(Pane& pane, int port, Page page) { PADSetKeyboardActive(static_cast(port), FALSE); PADSerializeMappings(); ClearAllActionBindings(port); + refresh_controller_page(); }); pane.add_button({ diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 0ee76c325b..e2e8a61168 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -743,7 +743,7 @@ static void fapGm_AfterRecord() { BOOL isRecording = false; static void duskExecute() { - handleGamepadColor(); + dusk::input::handleGamepadColor(); updateAutoSave(); if (dusk::getSettings().game.recordingMode) { From 477192f3c277d40d9bf919f21a2fbf7293133717 Mon Sep 17 00:00:00 2001 From: Flash Computer Date: Wed, 27 May 2026 23:16:50 -0700 Subject: [PATCH 12/16] Fixed being unable to break through the water surface with the moonjump cheat (#1320) * Speed Vector for Link and Epona added to the Player Info debug ImGUI window for debugging. * Fix being unable to moonjump through water surface * Revert "Speed Vector for Link and Epona added to the Player Info debug ImGUI window for debugging." This reverts commit d87cad3b37872f0668b6d8883665971bda7950b6. --- src/d/actor/d_a_alink.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 34690accab..d4ff320282 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -13461,7 +13461,12 @@ void daAlink_c::autoGroundHit() { } } } else if (checkModeFlg(0x40000) && checkNoResetFlg0(FLG0_UNK_80) && current.pos.y > mWaterY && current.pos.y - mWaterY < 1000.0f) { - current.pos.y = mWaterY; +#if TARGET_PC + if(!(dusk::getSettings().game.moonJump && (mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getHoldA(PAD_1)))) +#endif + { + current.pos.y = mWaterY; + } } if (checkReinRide() || checkSpinnerRide()) { From 62c19c0f64705215f02da068618d5cdee28ad4a1 Mon Sep 17 00:00:00 2001 From: Olivia!! Date: Thu, 28 May 2026 08:25:45 +0200 Subject: [PATCH 13/16] Adds a new cheat that let you transform from the start of the game. (#1241) * Adds a new cheat that let you transform from the start of the game. * Preserves transformation when passing loadzones similar to having shadow crystal * standards compliance * code compliance with decomp --- include/dusk/settings.h | 1 + src/d/actor/d_a_alink_dusk.cpp | 6 +++--- src/d/actor/d_a_midna.cpp | 16 ++++++++++------ src/d/d_com_inf_game.cpp | 6 +++++- src/dusk/settings.cpp | 2 ++ src/dusk/ui/settings.cpp | 2 ++ 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/include/dusk/settings.h b/include/dusk/settings.h index f48f5862ca..e36f0b9f24 100644 --- a/include/dusk/settings.h +++ b/include/dusk/settings.h @@ -230,6 +230,7 @@ struct UserSettings { ConfigVar fastSpinner; ConfigVar freeMagicArmor; ConfigVar invincibleEnemies; + ConfigVar transformWithoutShadowCrystal; // Technical ConfigVar restoreWiiGlitches; diff --git a/src/d/actor/d_a_alink_dusk.cpp b/src/d/actor/d_a_alink_dusk.cpp index 8c1d415ae0..ef14eadd9f 100644 --- a/src/d/actor/d_a_alink_dusk.cpp +++ b/src/d/actor/d_a_alink_dusk.cpp @@ -72,7 +72,7 @@ void daAlink_c::handleQuickTransform() { } // Check to see if Link has the ability to transform. - if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077)) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::M_077) && !dusk::getSettings().game.transformWithoutShadowCrystal) { return; } @@ -102,7 +102,7 @@ void daAlink_c::handleQuickTransform() { } // Ensure that the Z Button is not dimmed - if (meterDrawPtr->getButtonZAlpha() != 1.f) { + if (meterDrawPtr->getButtonZAlpha() != 1.f && !dusk::getSettings().game.transformWithoutShadowCrystal) { Z2GetAudioMgr()->seStart(Z2SE_SYS_ERROR, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); return; } @@ -122,7 +122,7 @@ void daAlink_c::handleQuickTransform() { bool canTransform = false; if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn()) { - if (checkMidnaRide()) { + if (checkMidnaRide() || dusk::getSettings().game.transformWithoutShadowCrystal) { if ((checkWolf() && (checkModeFlg(MODE_UNK_1000) || dComIfGp_checkPlayerStatus0(0, 0x10))) || (!checkWolf() && diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 3082fc6a71..b33229e08c 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3106,14 +3106,18 @@ void daMidna_c::setMidnaNoDrawFlg() { BOOL daMidna_c::checkMetamorphoseEnableBase() { BOOL tmp; - if (!daAlink_getAlinkActorClass()->checkMidnaRide() || (g_env_light.mEvilInitialized & 0x80) || - /* dSv_event_flag_c::M_077 - Main Event - Get shadow crystal (can now transform) */ - !dComIfGs_isEventBit(0xD04) || #if TARGET_PC - (fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &tmp) && - !dusk::getSettings().game.canTransformAnywhere) + if (((!daAlink_getAlinkActorClass()->checkMidnaRide() || (g_env_light.mEvilInitialized & 0x80) || + /* dSv_event_flag_c::M_077 - Main Event - Get shadow crystal (can now transform) */ + !dComIfGs_isEventBit(0xD04)) && + !dusk::getSettings().game.transformWithoutShadowCrystal) || + (fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &tmp) && + !dusk::getSettings().game.canTransformAnywhere) #else - fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &tmp) + if (!daAlink_getAlinkActorClass()->checkMidnaRide() || (g_env_light.mEvilInitialized & 0x80) || + /* dSv_event_flag_c::M_077 - Main Event - Get shadow crystal (can now transform) */ + !dComIfGs_isEventBit(0xD04) || + fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &tmp) #endif ) { diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 93fc15ca8f..3e881e63f8 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -2843,7 +2843,11 @@ BOOL dComIfGs_Wolf_Change_Check() { BOOL is_wolf = false; // Transforming Unlocked - if (dComIfGs_isEventBit(0x0D04)) { + if (dComIfGs_isEventBit(0x0D04) +#if TARGET_PC + || dusk::getSettings().game.transformWithoutShadowCrystal +#endif + ) { is_wolf = dComIfGs_getTransformStatus(); } else if (dComIfGs_isTransformLV(0) && !dComIfGs_isDarkClearLV(0)) { is_wolf = true; diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index 3bea017e2c..cc8d54a517 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -123,6 +123,7 @@ UserSettings g_userSettings = { .fastSpinner {"game.fastSpinner", false}, .freeMagicArmor {"game.freeMagicArmor", false}, .invincibleEnemies {"game.invincibleEnemies", false}, + .transformWithoutShadowCrystal {"game.transformWithoutShadowCrystal", false}, // Technical .restoreWiiGlitches {"game.restoreWiiGlitches", false}, @@ -208,6 +209,7 @@ void registerSettings() { // Game Register(g_userSettings.game.language); Register(g_userSettings.game.enableQuickTransform); + Register(g_userSettings.game.transformWithoutShadowCrystal); Register(g_userSettings.game.hideTvSettingsScreen); Register(g_userSettings.game.biggerWallets); Register(g_userSettings.game.noReturnRupees); diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index a164de0089..42b0fa65e5 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -1288,6 +1288,8 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { "Lets the magic armor work without consuming rupees."); addCheat("Invincible Enemies", getSettings().game.invincibleEnemies, "Prevents enemies from taking damage."); + addCheat("Transform without Shadow Crystal", getSettings().game.transformWithoutShadowCrystal, + "Allows Link to transform without the Shadow Crystal (Only using Quick Transform.)"); }); add_tab("Interface", [this](Rml::Element* content) { From 21e0491d434179fc1eef48cc54d4eca12c738699 Mon Sep 17 00:00:00 2001 From: Giorgio Mendieta <31053658+GiorgioMendieta@users.noreply.github.com> Date: Thu, 28 May 2026 08:28:20 +0200 Subject: [PATCH 14/16] Preview texture replacements without the menu obstructing the view (#1599) * feat: Change texture replacement from config_bool_select to graphics_tuner_control * fix: add kTextureReplacementHelpText * fix: remove unused header --- src/dusk/ui/graphics_tuner.cpp | 9 +++++++++ src/dusk/ui/graphics_tuner.hpp | 1 + src/dusk/ui/settings.cpp | 20 +++++++++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/dusk/ui/graphics_tuner.cpp b/src/dusk/ui/graphics_tuner.cpp index f91c300a75..22f0013a49 100644 --- a/src/dusk/ui/graphics_tuner.cpp +++ b/src/dusk/ui/graphics_tuner.cpp @@ -4,6 +4,7 @@ #include "m_Do/m_Do_audio.h" #include +#include #include #include #include @@ -54,6 +55,8 @@ int get_value(GraphicsOption option) { 100); case GraphicsOption::DepthOfFieldMode: return static_cast(getSettings().game.depthOfFieldMode.getValue()); + case GraphicsOption::TextureReplacements: + return getSettings().game.enableTextureReplacements.getValue(); } return 0; } @@ -94,6 +97,10 @@ void set_value(GraphicsOption option, int value) { case GraphicsOption::BloomMultiplier: getSettings().game.bloomMultiplier.setValue(std::clamp(value, 0, 100) / 100.0f); break; + case GraphicsOption::TextureReplacements: + getSettings().game.enableTextureReplacements.setValue(static_cast(value)); + aurora_set_texture_replacements_enabled(static_cast(value)); + break; } } @@ -231,6 +238,8 @@ Rml::String format_graphics_setting_value(GraphicsOption option, int value) { break; case GraphicsOption::BloomMultiplier: return fmt::format("{}%", value); + case GraphicsOption::TextureReplacements: + return static_cast(value) ? "On" : "Off"; } return ""; } diff --git a/src/dusk/ui/graphics_tuner.hpp b/src/dusk/ui/graphics_tuner.hpp index 2f5b9c5611..03b3d2f1c0 100644 --- a/src/dusk/ui/graphics_tuner.hpp +++ b/src/dusk/ui/graphics_tuner.hpp @@ -46,6 +46,7 @@ enum class GraphicsOption { BloomMode, BloomMultiplier, DepthOfFieldMode, + TextureReplacements, }; Rml::String format_graphics_setting_value(GraphicsOption option, int value); diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index 42b0fa65e5..99dee7ace7 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -13,7 +13,6 @@ #include "dusk/imgui/ImGuiEngine.hpp" #include "dusk/io.hpp" #include "dusk/livesplit.h" -#include "dusk/main.h" #include "dusk/discord_presence.hpp" #include "graphics_tuner.hpp" #include "m_Do/m_Do_main.h" @@ -376,6 +375,8 @@ const Rml::String kDepthOfFieldHelpText = const Rml::String kUnlockFramerateHelpText = "
Uses inter-frame interpolation to enable higher frame rates.

May introduce minor " "visual artifacts or animation glitches."; +const Rml::String kTextureReplacementHelpText = + "Enable installed texture replacements."; int float_setting_percent(ConfigVar& var) { return static_cast(var.getValue() * 100.0f + 0.5f); @@ -859,12 +860,17 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { mPrelaunch); leftPane.add_section("Rendering"); - config_bool_select(leftPane, rightPane, getSettings().game.enableTextureReplacements, - { - .key = "Use Texture Pack", - .helpText = "Enable installed texture replacements.", - .onChange = [](bool value) { aurora_set_texture_replacements_enabled(value); }, - }); + graphics_tuner_control(*this, leftPane, rightPane, + getSettings().game.enableTextureReplacements, + GraphicsTunerProps{ + .option = GraphicsOption::TextureReplacements, + .title = "Enable Texture Replacements", + .helpText = kTextureReplacementHelpText, + .valueMin = static_cast(false), + .valueMax = static_cast(true), + .defaultValue = static_cast(false), + }, + mPrelaunch); leftPane.register_control( leftPane.add_select_button({ .key = "Unlock Framerate", From c3c8d459e838d1f65de24549867fc0a8c7ee9c51 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Thu, 28 May 2026 09:29:23 -0600 Subject: [PATCH 15/16] =?UTF-8?q?Revert=20"Fixed=20being=20unable=20to=20b?= =?UTF-8?q?reak=20through=20the=20water=20surface=20with=20the=20moonju?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 477192f3c277d40d9bf919f21a2fbf7293133717. --- src/d/actor/d_a_alink.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index d4ff320282..34690accab 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -13461,12 +13461,7 @@ void daAlink_c::autoGroundHit() { } } } else if (checkModeFlg(0x40000) && checkNoResetFlg0(FLG0_UNK_80) && current.pos.y > mWaterY && current.pos.y - mWaterY < 1000.0f) { -#if TARGET_PC - if(!(dusk::getSettings().game.moonJump && (mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getHoldA(PAD_1)))) -#endif - { - current.pos.y = mWaterY; - } + current.pos.y = mWaterY; } if (checkReinRide() || checkSpinnerRide()) { From e5c032f6e606cedfc4920a8f159fdb27a39bba24 Mon Sep 17 00:00:00 2001 From: Sirius902 <10891979+Sirius902@users.noreply.github.com> Date: Thu, 28 May 2026 18:15:56 -0700 Subject: [PATCH 16/16] fix: item and talk rendering (#1896) --- include/d/d_msg_scrn_item.h | 4 ++-- include/d/d_msg_scrn_talk.h | 4 ++-- src/d/d_msg_scrn_item.cpp | 4 ++-- src/d/d_msg_scrn_talk.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/d/d_msg_scrn_item.h b/include/d/d_msg_scrn_item.h index 4b0e55cbd9..865071a2af 100644 --- a/include/d/d_msg_scrn_item.h +++ b/include/d/d_msg_scrn_item.h @@ -17,8 +17,8 @@ struct dMsgScrnItem_c : public dMsgScrnBase_c { void arwAnimeMove(); void dotAnimeInit(); void dotAnimeMove(); - void setSelectString(char*, char*, char*); - void setSelectRubyString(char*, char*, char*); + void setSelectString(char DUSK_CONST*, char DUSK_CONST*, char DUSK_CONST*); + void setSelectRubyString(char DUSK_CONST*, char DUSK_CONST*, char DUSK_CONST*); bool isSelect(); void selectAnimeInit(u8, u8, f32, u8); bool selectAnimeMove(u8, u8, bool); diff --git a/include/d/d_msg_scrn_talk.h b/include/d/d_msg_scrn_talk.h index 05b187e709..1c8283ad44 100644 --- a/include/d/d_msg_scrn_talk.h +++ b/include/d/d_msg_scrn_talk.h @@ -17,8 +17,8 @@ struct dMsgScrnTalk_c : public dMsgScrnBase_c { void arwAnimeMove(); void dotAnimeInit(); void dotAnimeMove(); - void setSelectString(char*, char*, char*); - void setSelectRubyString(char*, char*, char*); + void setSelectString(char DUSK_CONST*, char DUSK_CONST*, char DUSK_CONST*); + void setSelectRubyString(char DUSK_CONST*, char DUSK_CONST*, char DUSK_CONST*); bool isSelect(); void selectAnimeInit(u8, u8, f32, u8); bool selectAnimeMove(u8, u8, bool); diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 672700682d..26a741e320 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -504,11 +504,11 @@ void dMsgScrnItem_c::dotAnimeMove() { mpArrow_c->dotAnimeMove(); } -void dMsgScrnItem_c::setSelectString(char* param_0, char* param_1, char* param_2) { +void dMsgScrnItem_c::setSelectString(char DUSK_CONST* param_0, char DUSK_CONST* param_1, char DUSK_CONST* param_2) { mpSelect_c->setString(param_0, param_1, param_2); } -void dMsgScrnItem_c::setSelectRubyString(char* param_0, char* param_1, char* param_2) { +void dMsgScrnItem_c::setSelectRubyString(char DUSK_CONST* param_0, char DUSK_CONST* param_1, char DUSK_CONST* param_2) { mpSelect_c->setRubyString(param_0, param_1, param_2); } diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index ace5abd3bb..5cf1b184da 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -383,13 +383,13 @@ void dMsgScrnTalk_c::dotAnimeMove() { mpArrow_c->dotAnimeMove(); } -void dMsgScrnTalk_c::setSelectString(char* param_0, char* param_1, char* param_2) { +void dMsgScrnTalk_c::setSelectString(char DUSK_CONST* param_0, char DUSK_CONST* param_1, char DUSK_CONST* param_2) { if (mpSelect_c != NULL) { mpSelect_c->setString(param_0, param_1, param_2); } } -void dMsgScrnTalk_c::setSelectRubyString(char* param_0, char* param_1, char* param_2) { +void dMsgScrnTalk_c::setSelectRubyString(char DUSK_CONST* param_0, char DUSK_CONST* param_1, char DUSK_CONST* param_2) { if (mpSelect_c != NULL) { mpSelect_c->setRubyString(param_0, param_1, param_2); }