From fc4d1cc39ccfe6d6614fbe5bada6d5691dc21e95 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 10 Mar 2021 17:24:51 +1000 Subject: [PATCH] Implement enums for lang references --- src/assets/files/setup/setupame.c | 166 +++--- src/assets/files/setup/setupark.c | 96 ++-- src/assets/files/setup/setupate.c | 28 +- src/assets/files/setup/setupazt.c | 74 +-- src/assets/files/setup/setupcave.c | 106 ++-- src/assets/files/setup/setupdam.c | 88 +-- src/assets/files/setup/setupdepo.c | 116 ++-- src/assets/files/setup/setupdish.c | 224 ++++---- src/assets/files/setup/setupear.c | 154 +++--- src/assets/files/setup/setupeld.c | 100 ++-- src/assets/files/setup/setupimp.c | 104 ++-- src/assets/files/setup/setuplee.c | 96 ++-- src/assets/files/setup/setuplip.c | 204 +++---- src/assets/files/setup/setuplue.c | 120 ++-- src/assets/files/setup/setuppam.c | 80 +-- src/assets/files/setup/setuppete.c | 92 +-- src/assets/files/setup/setuprit.c | 114 ++-- src/assets/files/setup/setupsev.c | 26 +- src/assets/files/setup/setupsho.c | 96 ++-- src/assets/files/setup/setupstat.c | 22 +- src/assets/files/setup/setuptra.c | 142 ++--- src/assets/files/setup/setupwax.c | 38 +- src/assets/firingrange.c | 38 +- src/game/activemenu/activemenu.c | 22 +- src/game/bondeyespy.c | 2 +- src/game/bondview.c | 32 +- src/game/cheats.c | 162 +++--- src/game/chr/chraicommands.c | 20 +- src/game/core.c | 2 +- src/game/credits.c | 198 +++---- src/game/data/ailists.c | 6 +- src/game/endscreen.c | 134 ++--- src/game/game_00c490.c | 2 +- src/game/game_010b20.c | 12 +- src/game/game_011110.c | 4 +- src/game/game_0f09f0.c | 72 +-- src/game/game_102240.c | 608 ++++++++++---------- src/game/game_107fb0.c | 258 ++++----- src/game/game_10c9c0.c | 128 ++--- src/game/game_190260.c | 30 +- src/game/game_19aa80.c | 60 +- src/game/inventory/items.c | 862 ++++++++++++++--------------- src/game/menu/items.c | 92 +-- src/game/mplayer/ingame.c | 100 ++-- src/game/mplayer/mplayer.c | 314 +++++------ src/game/mplayer/scenarios.c | 162 +++--- src/game/mplayer/setup.c | 536 +++++++++--------- src/game/mpstats.c | 14 +- src/game/objectives/objectives.c | 8 +- src/game/propobj.c | 110 ++-- src/game/sight.c | 20 +- src/game/title.c | 10 +- src/game/training/menus.c | 176 +++--- src/game/training/training.c | 278 +++++----- src/include/constants.h | 139 ----- src/include/lang.h | 162 ++++++ src/include/lang/ame.h | 116 ++++ src/include/lang/arch.h | 5 + src/include/lang/arec.h | 5 + src/include/lang/ark.h | 80 +++ src/include/lang/ash.h | 5 + src/include/lang/ate.h | 20 + src/include/lang/azt.h | 52 ++ src/include/lang/cat.h | 5 + src/include/lang/cave.h | 72 +++ src/include/lang/crad.h | 5 + src/include/lang/cryp.h | 5 + src/include/lang/dam.h | 52 ++ src/include/lang/depo.h | 88 +++ src/include/lang/dest.h | 5 + src/include/lang/dish.h | 132 +++++ src/include/lang/ear.h | 112 ++++ src/include/lang/eld.h | 56 ++ src/include/lang/gun.h | 248 +++++++++ src/include/lang/imp.h | 68 +++ src/include/lang/jun.h | 5 + src/include/lang/lam.h | 5 + src/include/lang/lee.h | 60 ++ src/include/lang/len.h | 5 + src/include/lang/lip.h | 112 ++++ src/include/lang/lue.h | 80 +++ src/include/lang/misc.h | 480 ++++++++++++++++ src/include/lang/mp1.h | 5 + src/include/lang/mp10.h | 5 + src/include/lang/mp11.h | 5 + src/include/lang/mp12.h | 5 + src/include/lang/mp13.h | 5 + src/include/lang/mp14.h | 5 + src/include/lang/mp15.h | 5 + src/include/lang/mp16.h | 5 + src/include/lang/mp17.h | 5 + src/include/lang/mp18.h | 5 + src/include/lang/mp19.h | 5 + src/include/lang/mp2.h | 5 + src/include/lang/mp20.h | 5 + src/include/lang/mp3.h | 5 + src/include/lang/mp4.h | 5 + src/include/lang/mp5.h | 5 + src/include/lang/mp6.h | 5 + src/include/lang/mp7.h | 5 + src/include/lang/mp8.h | 5 + src/include/lang/mp9.h | 5 + src/include/lang/mpmenu.h | 500 +++++++++++++++++ src/include/lang/mpweapons.h | 268 +++++++++ src/include/lang/oat.h | 5 + src/include/lang/old.h | 5 + src/include/lang/options.h | 500 +++++++++++++++++ src/include/lang/pam.h | 52 ++ src/include/lang/pete.h | 80 +++ src/include/lang/propobj.h | 56 ++ src/include/lang/ref.h | 5 + src/include/lang/rit.h | 92 +++ src/include/lang/run.h | 5 + src/include/lang/sev.h | 20 + src/include/lang/sevb.h | 12 + src/include/lang/sevx.h | 5 + src/include/lang/sevxb.h | 5 + src/include/lang/sho.h | 60 ++ src/include/lang/silo.h | 5 + src/include/lang/stat.h | 16 + src/include/lang/title.h | 156 ++++++ src/include/lang/tra.h | 92 +++ src/include/lang/uff.h | 5 + src/include/lang/wax.h | 32 ++ src/include/types.h | 1 + 125 files changed, 7497 insertions(+), 3517 deletions(-) create mode 100644 src/include/lang.h create mode 100644 src/include/lang/ame.h create mode 100644 src/include/lang/arch.h create mode 100644 src/include/lang/arec.h create mode 100644 src/include/lang/ark.h create mode 100644 src/include/lang/ash.h create mode 100644 src/include/lang/ate.h create mode 100644 src/include/lang/azt.h create mode 100644 src/include/lang/cat.h create mode 100644 src/include/lang/cave.h create mode 100644 src/include/lang/crad.h create mode 100644 src/include/lang/cryp.h create mode 100644 src/include/lang/dam.h create mode 100644 src/include/lang/depo.h create mode 100644 src/include/lang/dest.h create mode 100644 src/include/lang/dish.h create mode 100644 src/include/lang/ear.h create mode 100644 src/include/lang/eld.h create mode 100644 src/include/lang/gun.h create mode 100644 src/include/lang/imp.h create mode 100644 src/include/lang/jun.h create mode 100644 src/include/lang/lam.h create mode 100644 src/include/lang/lee.h create mode 100644 src/include/lang/len.h create mode 100644 src/include/lang/lip.h create mode 100644 src/include/lang/lue.h create mode 100644 src/include/lang/misc.h create mode 100644 src/include/lang/mp1.h create mode 100644 src/include/lang/mp10.h create mode 100644 src/include/lang/mp11.h create mode 100644 src/include/lang/mp12.h create mode 100644 src/include/lang/mp13.h create mode 100644 src/include/lang/mp14.h create mode 100644 src/include/lang/mp15.h create mode 100644 src/include/lang/mp16.h create mode 100644 src/include/lang/mp17.h create mode 100644 src/include/lang/mp18.h create mode 100644 src/include/lang/mp19.h create mode 100644 src/include/lang/mp2.h create mode 100644 src/include/lang/mp20.h create mode 100644 src/include/lang/mp3.h create mode 100644 src/include/lang/mp4.h create mode 100644 src/include/lang/mp5.h create mode 100644 src/include/lang/mp6.h create mode 100644 src/include/lang/mp7.h create mode 100644 src/include/lang/mp8.h create mode 100644 src/include/lang/mp9.h create mode 100644 src/include/lang/mpmenu.h create mode 100644 src/include/lang/mpweapons.h create mode 100644 src/include/lang/oat.h create mode 100644 src/include/lang/old.h create mode 100644 src/include/lang/options.h create mode 100644 src/include/lang/pam.h create mode 100644 src/include/lang/pete.h create mode 100644 src/include/lang/propobj.h create mode 100644 src/include/lang/ref.h create mode 100644 src/include/lang/rit.h create mode 100644 src/include/lang/run.h create mode 100644 src/include/lang/sev.h create mode 100644 src/include/lang/sevb.h create mode 100644 src/include/lang/sevx.h create mode 100644 src/include/lang/sevxb.h create mode 100644 src/include/lang/sho.h create mode 100644 src/include/lang/silo.h create mode 100644 src/include/lang/stat.h create mode 100644 src/include/lang/title.h create mode 100644 src/include/lang/tra.h create mode 100644 src/include/lang/uff.h create mode 100644 src/include/lang/wax.h diff --git a/src/assets/files/setup/setupame.c b/src/assets/files/setup/setupame.c index 01752cb52..a07edea9c 100644 --- a/src/assets/files/setup/setupame.c +++ b/src/assets/files/setup/setupame.c @@ -150,42 +150,42 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_AME(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_AME(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_AME(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_AME(3)) + briefing(BRIEFINGTYPE_LOCATION, L_AME_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_AME_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_AME_002) + briefing(BRIEFINGTYPE_TEXT_A, L_AME_003) - beginobjective(0, L_AME(16), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable internal security hub" + beginobjective(0, L_AME_016, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable internal security hub" complete_flags(STAGEFLAG_SECURITYHUB_COMPLETE) fail_flags(STAGEFLAG_SECURITYHUB_MINES_WASTED) fail_flags(STAGEFLAG_SECURITYHUB_DESTROYED) endobjective - beginobjective(1, L_AME(17), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Obtain keycode necklace" + beginobjective(1, L_AME_017, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Obtain keycode necklace" require_object_collected(OBJ_NECKLACE) fail_flags(STAGEFLAG_DOORSWITCH_DESTROYED) fail_flags(STAGEFLAG_CIVILIANS_KILLED) endobjective - beginobjective(2, L_AME(18), (DIFFBIT_PA | DIFFBIT_PD)) // "Download project files" + beginobjective(2, L_AME_018, (DIFFBIT_PA | DIFFBIT_PD)) // "Download project files" complete_flags(STAGEFLAG_DOWNLOAD_COMPLETE) fail_flags(STAGEFLAG_PROGRAMMER_DEAD) fail_flags(STAGEFLAG_DELETED_WITHOUT_DOWNLOAD) fail_flags(STAGEFLAG_PC_DESTROYED) endobjective - beginobjective(3, L_AME(19), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable external comms hub" + beginobjective(3, L_AME_019, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable external comms hub" complete_flags(STAGEFLAG_EXTCOMMSHUB_COMPLETE) fail_flags(STAGEFLAG_EXTCOMMSHUB_MINES_WASTED) fail_flags(STAGEFLAG_EXTCOMMSHUB_DESTROYED) endobjective - beginobjective(4, L_AME(20), DIFFBIT_A) // "Gain entrance to laboratory" + beginobjective(4, L_AME_020, DIFFBIT_A) // "Gain entrance to laboratory" complete_flags(STAGEFLAG_LAB_LIFT_LOCATED) fail_flags(STAGEFLAG_CIVILIANS_KILLED) endobjective - beginobjective(5, L_AME(20), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain entrance to laboratory" + beginobjective(5, L_AME_020, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain entrance to laboratory" complete_flags(STAGEFLAG_LAB_LIFT_LOCATED) endobjective @@ -553,27 +553,27 @@ u32 props[] = { tag(0x31, 1) weapon(0x0180, MODEL_CHRECMMINE, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_ECMMINE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0035, L_AME(58), L_AME(59), L_AME(60), L_AME(61), L_AME(62), 0x0000, 0x0000) // "Obtain ECM Mines." + rename_object(-1, 0x0035, L_AME_058, L_AME_059, L_AME_060, L_AME_061, L_AME_062, 0x0000, 0x0000) // "Obtain ECM Mines." tag(0x32, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0036, L_AME(63), L_AME(64), L_AME(65), L_AME(66), L_AME(67), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x0036, L_AME_063, L_AME_064, L_AME_065, L_AME_066, L_AME_067, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x3e, 1) weapon(0x0180, MODEL_CHRECMMINE, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_ECMMINE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0035, L_AME(58), L_AME(59), L_AME(60), L_AME(61), L_AME(62), 0x0000, 0x0000) // "Obtain ECM Mines." + rename_object(-1, 0x0035, L_AME_058, L_AME_059, L_AME_060, L_AME_061, L_AME_062, 0x0000, 0x0000) // "Obtain ECM Mines." tag(0x3f, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0036, L_AME(63), L_AME(64), L_AME(65), L_AME(66), L_AME(67), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x0036, L_AME_063, L_AME_064, L_AME_065, L_AME_066, L_AME_067, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x00, 1) key(0x0100, MODEL_CHRCHAIN, CHR_CASS, 0x01244000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000020) #if VERSION >= VERSION_NTSC_1_0 // ...................vv - rename_object(-1, 0x0050, L_AME(11), L_AME(12), L_AME(13), L_AME(14), L_AME(15), 0x0000, 0x0000) // "Obtain De Vries' necklace." + rename_object(-1, 0x0050, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015, 0x0000, 0x0000) // "Obtain De Vries' necklace." #else - rename_object(-1, 0x004f, L_AME(11), L_AME(12), L_AME(13), L_AME(14), L_AME(15), 0x0000, 0x0000) // "Obtain De Vries' necklace." + rename_object(-1, 0x004f, L_AME_011, L_AME_012, L_AME_013, L_AME_014, L_AME_015, 0x0000, 0x0000) // "Obtain De Vries' necklace." #endif stdobject(0x0100, MODEL_DD_STONEDESK, 0x0134, 0x000205e1, 0x00204000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) @@ -1271,9 +1271,9 @@ u8 func040f_cass[] = { label(0x5c) #if VERSION >= VERSION_NTSC_1_0 - speak(CHR_TARGET, L_AME(21), 0x0af4, CHANNEL_6, COLOR_04_ORANGE) // "Who are you and what are you doing here?" + speak(CHR_TARGET, L_AME_021, 0x0af4, CHANNEL_6, COLOR_04_ORANGE) // "Who are you and what are you doing here?" #else - speak(CHR_TARGET, L_AME(21), 0x12f4, CHANNEL_6, COLOR_04_ORANGE) // "Who are you and what are you doing here?" + speak(CHR_TARGET, L_AME_021, 0x12f4, CHANNEL_6, COLOR_04_ORANGE) // "Who are you and what are you doing here?" #endif restart_timer chr_do_animation(ANIM_TALKING_0098, 0, 193, 0x18, 0x10, CHR_SELF, 2) @@ -1321,9 +1321,9 @@ u8 func040f_cass[] = { label(0x2c) #if VERSION >= VERSION_NTSC_1_0 - speak(CHR_TARGET, L_AME(23), 0x0af5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me, foolish child!" + speak(CHR_TARGET, L_AME_023, 0x0af5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me, foolish child!" #else - speak(CHR_TARGET, L_AME(23), 0x12f5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me, foolish child!" + speak(CHR_TARGET, L_AME_023, 0x12f5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me, foolish child!" #endif chr_do_animation(ANIM_TALKING_00A0, 0, 193, 0x18, 0x10, CHR_SELF, 2) @@ -1347,9 +1347,9 @@ u8 func040f_cass[] = { label(0x2c) chr_do_animation(ANIM_TALKING_00A3, 0, 193, 0x18, 0x10, CHR_SELF, 2) #if VERSION >= VERSION_NTSC_1_0 - speak(CHR_TARGET, L_AME(24), 0x0af6, CHANNEL_6, COLOR_04_ORANGE) // "Don't you know who I am?" + speak(CHR_TARGET, L_AME_024, 0x0af6, CHANNEL_6, COLOR_04_ORANGE) // "Don't you know who I am?" #else - speak(CHR_TARGET, L_AME(24), 0x12f6, CHANNEL_6, COLOR_04_ORANGE) // "Don't you know who I am?" + speak(CHR_TARGET, L_AME_024, 0x12f6, CHANNEL_6, COLOR_04_ORANGE) // "Don't you know who I am?" #endif beginloop(0x68) @@ -1400,9 +1400,9 @@ u8 func040f_cass[] = { label(0x2c) #if VERSION >= VERSION_NTSC_1_0 - speak(CHR_TARGET, L_AME(25), 0x0af7, CHANNEL_6, COLOR_04_ORANGE) // "Let's see how you deal with security." + speak(CHR_TARGET, L_AME_025, 0x0af7, CHANNEL_6, COLOR_04_ORANGE) // "Let's see how you deal with security." #else - speak(CHR_TARGET, L_AME(25), 0x12f7, CHANNEL_6, COLOR_04_ORANGE) // "Let's see how you deal with security." + speak(CHR_TARGET, L_AME_025, 0x12f7, CHANNEL_6, COLOR_04_ORANGE) // "Let's see how you deal with security." #endif label(0x06) chr_do_animation(ANIM_PUSH_BUTTON, 0, 193, 0x10, 0x10, CHR_SELF, 2) @@ -1511,7 +1511,7 @@ u8 func0411_secretary[] = { restart_timer if_chr_weapon_equipped(CHR_TARGET, WEAPON_NONE, /*goto*/ 0x2c) if_chr_weapon_equipped(CHR_TARGET, WEAPON_UNARMED, /*goto*/ 0x2c) - speak(CHR_TARGET, L_AME(22), 0x1aed, CHANNEL_5, COLOR_07_RED) // "Look out! She's got a gun." + speak(CHR_TARGET, L_AME_022, 0x1aed, CHANNEL_5, COLOR_07_RED) // "Look out! She's got a gun." label(0x2c) chr_do_animation(ANIM_SURRENDER_002E, 0, 193, 0x18, 0x10, CHR_SELF, 2) @@ -1605,7 +1605,7 @@ u8 func0414_programmer[] = { goto_next(0x2c) label(0x90) - speak(CHR_TARGET, L_AME(53), 0x12fe, CHANNEL_3, COLOR_03_RED) // "Don't shoot, don't shoot!" + speak(CHR_TARGET, L_AME_053, 0x12fe, CHANNEL_3, COLOR_03_RED) // "Don't shoot, don't shoot!" label(0x2c) restart_timer @@ -1675,7 +1675,7 @@ u8 func0414_programmer[] = { // speaks. label(0x2c) restart_timer - speak(CHR_TARGET, L_AME(68), VERSION >= VERSION_NTSC_1_0 ? 0x8104 : 0x8103, CHANNEL_3, COLOR_03_RED) // "Yes, yes, I agree. Personality is expendable in th..." + speak(CHR_TARGET, L_AME_068, VERSION >= VERSION_NTSC_1_0 ? 0x8104 : 0x8103, CHANNEL_3, COLOR_03_RED) // "Yes, yes, I agree. Personality is expendable in th..." restart_timer chr_do_animation(ANIM_TALKING_00A0, 0, 193, 0x10, 0x10, CHR_SELF, 2) @@ -1693,7 +1693,7 @@ u8 func0414_programmer[] = { yield yield yield - speak(CHR_TARGET, L_AME(69), VERSION >= VERSION_NTSC_1_0 ? 0x8105 : 0x8104, CHANNEL_3, COLOR_03_RED) // "No, I can start the process from my office termina..." + speak(CHR_TARGET, L_AME_069, VERSION >= VERSION_NTSC_1_0 ? 0x8105 : 0x8104, CHANNEL_3, COLOR_03_RED) // "No, I can start the process from my office termina..." restart_timer beginloop(0x0e) @@ -1707,7 +1707,7 @@ u8 func0414_programmer[] = { endloop(0x0e) label(0x06) - speak(CHR_TARGET, L_AME(70), VERSION >= VERSION_NTSC_1_0 ? 0x8106 : 0x8105, CHANNEL_3, COLOR_03_RED) // "I'll begin at once. Goodbye." + speak(CHR_TARGET, L_AME_070, VERSION >= VERSION_NTSC_1_0 ? 0x8106 : 0x8105, CHANNEL_3, COLOR_03_RED) // "I'll begin at once. Goodbye." beginloop(0x0f) if_sound_finished(CHANNEL_3, /*goto*/ 0x06) @@ -1761,7 +1761,7 @@ u8 func0414_programmer[] = { label(0x06) if_stage_flag_eq(STAGEFLAG_TALKED_TO_PROGRAMMER, TRUE, /*goto*/ 0x06) - speak(CHR_TARGET, L_AME(36), 0x1300, CHANNEL_3, COLOR_03_RED) // "HELP - Intruder!" + speak(CHR_TARGET, L_AME_036, 0x1300, CHANNEL_3, COLOR_03_RED) // "HELP - Intruder!" chr_do_animation(ANIM_SURRENDER_002E, 0, 193, 0x18, 0x10, CHR_SELF, 2) beginloop(0xa3) @@ -1783,11 +1783,11 @@ u8 func0414_programmer[] = { if_stage_flag_eq(STAGEFLAG_PROGRAMMER_RAN_TO_GUARD, TRUE, /*goto*/ 0x06) label(0x2c) - speak(CHR_TARGET, L_AME(79), VERSION >= VERSION_NTSC_1_0 ? 0x8107 : 0x8106, CHANNEL_3, COLOR_03_RED) // "Security... Help me!" + speak(CHR_TARGET, L_AME_079, VERSION >= VERSION_NTSC_1_0 ? 0x8107 : 0x8106, CHANNEL_3, COLOR_03_RED) // "Security... Help me!" goto_next(0xa1) label(0x06) - speak(CHR_TARGET, L_AME(38), VERSION >= VERSION_NTSC_1_0 ? 0x8108 : 0x8107, CHANNEL_3, COLOR_03_RED) // "HELP, HELP!" + speak(CHR_TARGET, L_AME_038, VERSION >= VERSION_NTSC_1_0 ? 0x8108 : 0x8107, CHANNEL_3, COLOR_03_RED) // "HELP, HELP!" label(0xa1) restart_timer set_stage_flag(STAGEFLAG_PROGRAMMER_RAN_TO_GUARD) @@ -1838,17 +1838,17 @@ u8 func0414_programmer[] = { endloop(0xa6) label(0xa7) - speak(CHR_TARGET, L_AME(38), VERSION >= VERSION_NTSC_1_0 ? 0x8108 : 0x8107, CHANNEL_3, COLOR_03_RED) // "HELP, HELP!" + speak(CHR_TARGET, L_AME_038, VERSION >= VERSION_NTSC_1_0 ? 0x8108 : 0x8107, CHANNEL_3, COLOR_03_RED) // "HELP, HELP!" increase_squadron_alertness(100) endloop(0x99) label(LABEL_JO_SPEAK) restart_timer if_stage_flag_eq(STAGEFLAG_TALKED_TO_PROGRAMMER, TRUE, /*goto*/ 0x2c) - speak(CHR_TARGET, L_AME(72), 0x7322, CHANNEL_3, COLOR_09_BLUE) // "I've got a password problem, and you're the man to..." + speak(CHR_TARGET, L_AME_072, 0x7322, CHANNEL_3, COLOR_09_BLUE) // "I've got a password problem, and you're the man to..." goto_next(0x06) label(0x2c) - speak(CHR_TARGET, L_AME(71), 0x7323, CHANNEL_3, COLOR_09_BLUE) // "Move it!" + speak(CHR_TARGET, L_AME_071, 0x7323, CHANNEL_3, COLOR_09_BLUE) // "Move it!" label(0x06) set_stage_flag(STAGEFLAG_TALKED_TO_PROGRAMMER) try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x9b) @@ -1868,11 +1868,11 @@ u8 func0414_programmer[] = { label(0x06) if_stage_flag_eq(STAGEFLAG_TALKED_TO_PROGRAMMER, TRUE, /*goto*/ 0x2c) - speak(CHR_TARGET, L_AME(35), 0x12ff, CHANNEL_5, COLOR_03_RED) // "I'll do what you want!" + speak(CHR_TARGET, L_AME_035, 0x12ff, CHANNEL_5, COLOR_03_RED) // "I'll do what you want!" set_stage_flag(STAGEFLAG_TALKED_TO_PROGRAMMER) goto_next(0x06) label(0x2c) - speak(CHR_TARGET, L_AME(73), 0x12fe, CHANNEL_5, COLOR_03_RED) // "Don't shoot, don't shoot!" + speak(CHR_TARGET, L_AME_073, 0x12fe, CHANNEL_5, COLOR_03_RED) // "Don't shoot, don't shoot!" label(0x06) chr_do_animation(ANIM_DONT_SHOOT, 0, -1, 0x10, 0x10, CHR_SELF, 2) @@ -1900,7 +1900,7 @@ u8 func0414_programmer[] = { label(LABEL_NEAR_LAPTOPGUN_ROOM) stop_chr - speak(CHR_TARGET, L_AME(39), 0x12ff, CHANNEL_3, COLOR_03_RED) // "I'll do what you want..." + speak(CHR_TARGET, L_AME_039, 0x12ff, CHANNEL_3, COLOR_03_RED) // "I'll do what you want..." restart_timer label(0x06) walk_to_pad(0x0062) @@ -1913,10 +1913,10 @@ u8 func0414_programmer[] = { restart_timer if_stage_flag_eq(STAGEFLAG_PC_DESTROYED, TRUE, /*goto*/ LABEL_PC_BROKEN) if_detected_chr(CHR_TARGET, /*goto*/ 0x2c) - speak(CHR_TARGET, L_AME(40), 0x1301, CHANNEL_3, COLOR_03_RED) // "Logging on now..." + speak(CHR_TARGET, L_AME_040, 0x1301, CHANNEL_3, COLOR_03_RED) // "Logging on now..." goto_next(0x06) label(0x2c) - speak(CHR_TARGET, L_AME(109), 0x1304, CHANNEL_3, COLOR_03_RED) // "I...I'm logging on now." + speak(CHR_TARGET, L_AME_109, 0x1304, CHANNEL_3, COLOR_03_RED) // "I...I'm logging on now." label(0x06) chr_do_animation(ANIM_STANDING_TYPE_ONE_HAND, 0, 193, 0x18, 0x10, CHR_SELF, 2) speak(CHR_TARGET, -1, VERSION >= VERSION_NTSC_1_0 ? 0x8116 : 0x8115, -1, COLOR_00_GREEN) @@ -1931,10 +1931,10 @@ u8 func0414_programmer[] = { chr_do_animation(ANIM_PUSH_BUTTON, 0, 193, 0x18, 0x10, CHR_SELF, 2) set_stage_flag(STAGEFLAG_PROGRAMMER_LOGGED_IN) if_detected_chr(CHR_TARGET, /*goto*/ 0x2c) - speak(CHR_TARGET, L_AME(41), 0x1302, CHANNEL_3, COLOR_03_RED) // "Okay, I'm in..." + speak(CHR_TARGET, L_AME_041, 0x1302, CHANNEL_3, COLOR_03_RED) // "Okay, I'm in..." goto_next(0x06) label(0x2c) - speak(CHR_TARGET, L_AME(108), 0x1305, CHANNEL_3, COLOR_03_RED) // "Right, I'm in..." + speak(CHR_TARGET, L_AME_108, 0x1305, CHANNEL_3, COLOR_03_RED) // "Right, I'm in..." label(0x06) speak(CHR_TARGET, -1, VERSION >= VERSION_NTSC_1_0 ? 0x8117 : 0x8116, -1, COLOR_00_GREEN) @@ -1949,7 +1949,7 @@ u8 func0414_programmer[] = { set_stage_flag(STAGEFLAG_PERSONALITY_DELETED) set_chr_maxdamage(CHR_SELF, 1) chr_do_animation(ANIM_TALKING_003D, 0, 193, 0x18, 0x10, CHR_SELF, 2) - speak(CHR_TARGET, L_AME(42), 0x1303, CHANNEL_3, COLOR_03_RED) // "Goodbye, Dr. Caroll." + speak(CHR_TARGET, L_AME_042, 0x1303, CHANNEL_3, COLOR_03_RED) // "Goodbye, Dr. Caroll." if_stage_flag_eq(STAGEFLAG_DOWNLOAD_COMPLETE, TRUE, /*goto*/ 0x2c) set_stage_flag(STAGEFLAG_DELETED_WITHOUT_DOWNLOAD) label(0x2c) @@ -1963,7 +1963,7 @@ u8 func0414_programmer[] = { label(LABEL_PC_BROKEN) set_self_flag_bankx(CHRFLAG0_CANT_ALERT_GROUP, BANK_0) - speak(CHR_TARGET, L_AME(98), 0x1289, CHANNEL_3, COLOR_03_RED) // "You vandal, you've broken it!" + speak(CHR_TARGET, L_AME_098, 0x1289, CHANNEL_3, COLOR_03_RED) // "You vandal, you've broken it!" do_preset_animation(-1) beginloop(0xc6) @@ -2061,23 +2061,23 @@ u8 func100e_check_ecm_mines[] = { label(0x08) reset_timer - show_hudmsg(CHR_BOND, L_AME(29)) // "ECM Mine placed correctly." + show_hudmsg(CHR_BOND, L_AME_029) // "ECM Mine placed correctly." yield mute_channel(CHANNEL_0) assign_sound(VERSION >= VERSION_NTSC_1_0 ? 0x8113 : 0x8112, CHANNEL_0) control_sound_from_object(CHANNEL_0, OBJ_SECURITYHUB, TRUE) - show_hudmsg(CHR_BOND, L_AME(76)) // "Internal security system temporarily disabled." + show_hudmsg(CHR_BOND, L_AME_076) // "Internal security system temporarily disabled." set_stage_flag(STAGEFLAG_SECURITYHUB_COMPLETE) reloop(0x00) label(0x0a) reset_timer - show_hudmsg(CHR_BOND, L_AME(29)) // "ECM Mine placed correctly." + show_hudmsg(CHR_BOND, L_AME_029) // "ECM Mine placed correctly." yield mute_channel(CHANNEL_1) assign_sound(VERSION >= VERSION_NTSC_1_0 ? 0x8113 : 0x8112, CHANNEL_1) control_sound_from_object(CHANNEL_1, OBJ_EXTCOMMSHUB, TRUE) - show_hudmsg(CHR_BOND, L_AME(77)) // "External communications hub disabled." + show_hudmsg(CHR_BOND, L_AME_077) // "External communications hub disabled." set_stage_flag(STAGEFLAG_EXTCOMMSHUB_COMPLETE) reloop(0x00) @@ -2146,13 +2146,13 @@ u8 func100e_check_ecm_mines[] = { set_stage_flag(STAGEFLAG_EXTCOMMSHUB_MINES_WASTED) label(0x8c) - show_hudmsg(CHR_BOND, L_AME(28)) // "Badly placed ECM Mine." + show_hudmsg(CHR_BOND, L_AME_028) // "Badly placed ECM Mine." reloop(0x00) // Mines wasted with both hubs remaining label(0x8d) - show_hudmsg(CHR_BOND, L_AME(28)) // "Badly placed ECM Mine." - show_hudmsg(CHR_BOND, L_AME(32)) // "CANNOT complete all objectives." + show_hudmsg(CHR_BOND, L_AME_028) // "Badly placed ECM Mine." + show_hudmsg(CHR_BOND, L_AME_032) // "CANNOT complete all objectives." set_stage_flag(STAGEFLAG_SECURITYHUB_MINES_WASTED) set_stage_flag(STAGEFLAG_EXTCOMMSHUB_MINES_WASTED) reloop(0x00) @@ -2177,7 +2177,7 @@ u8 func1004_check_lab_lift_located[] = { label(0x2c) if_stage_flag_eq(STAGEFLAG_LAB_LIFT_LOCATED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_P1P2, L_AME(78)) // "Laboratory lift located." + show_hudmsg(CHR_P1P2, L_AME_078) // "Laboratory lift located." set_stage_flag(STAGEFLAG_LAB_LIFT_LOCATED) label(0x2c) yield @@ -2216,7 +2216,7 @@ u8 func1006_check_programmer_dead[] = { label(0x2c) if_stage_flag_eq(STAGEFLAG_PROGRAMMER_LOGGED_IN, TRUE, /*goto*/ 0x06) - show_hudmsg(CHR_BOND, L_AME(57)) // "Critical mission personnel killed." + show_hudmsg(CHR_BOND, L_AME_057) // "Critical mission personnel killed." set_stage_flag(STAGEFLAG_PROGRAMMER_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2247,7 +2247,7 @@ u8 func1007_uplinking[] = { label(0xc0) if_chr_weapon_equipped(CHR_TARGET, WEAPON_DATAUPLINK, /*goto*/ 0x2c) - show_hudmsg(CHR_TARGET, L_AME(49)) // "Unable to download - Data Uplink needed." + show_hudmsg(CHR_TARGET, L_AME_049) // "Unable to download - Data Uplink needed." call_rng if_rand_lt(60, /*goto*/ 0x0d) if_rand_lt(120, /*goto*/ 0x0e) @@ -2281,7 +2281,7 @@ u8 func1007_uplinking[] = { label(0x2c) if_stage_flag_eq(STAGEFLAG_PROGRAMMER_LOGGED_IN, TRUE, /*goto*/ 0xae) restart_timer - show_hudmsg(CHR_TARGET, L_AME(46)) // "ACCESS DENIED - password needed." + show_hudmsg(CHR_TARGET, L_AME_046) // "ACCESS DENIED - password needed." assign_sound(0x01c0, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_PC, FALSE) @@ -2294,7 +2294,7 @@ u8 func1007_uplinking[] = { goto_first(0x04) label(0xae) - show_hudmsg(CHR_TARGET, L_AME(44)) // "File download initiated." + show_hudmsg(CHR_TARGET, L_AME_044) // "File download initiated." assign_sound(0x01bf, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_PC, TRUE) restart_timer @@ -2310,13 +2310,13 @@ u8 func1007_uplinking[] = { mute_channel(CHANNEL_7) assign_sound(0x01c1, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_PC, TRUE) - show_hudmsg(CHR_TARGET, L_AME(45)) // "File download completed." + show_hudmsg(CHR_TARGET, L_AME_045) // "File download completed." yield set_stage_flag(STAGEFLAG_DOWNLOAD_COMPLETE) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) - show_hudmsg(CHR_TARGET, L_AME(74)) // "Datalink broken - connection terminated." + show_hudmsg(CHR_TARGET, L_AME_074) // "Datalink broken - connection terminated." mute_channel(CHANNEL_7) assign_sound(0x01c0, CHANNEL_6) play_sound_from_object(CHANNEL_6, OBJ_PC, 0x012c, 0x0190) @@ -2331,7 +2331,7 @@ u8 func1007_uplinking[] = { reloop(0x04) label(0x12) - show_hudmsg(CHR_TARGET, L_AME(75)) // "Datalink error - incomplete file download." + show_hudmsg(CHR_TARGET, L_AME_075) // "Datalink error - incomplete file download." mute_channel(CHANNEL_7) assign_sound(0x01c0, CHANNEL_6) play_sound_from_object(CHANNEL_6, OBJ_PC, 0x012c, 0x0190) @@ -2373,9 +2373,9 @@ u8 func1008_doorswitch[] = { label(0x2c) play_sound(0x00ba, -1) #if VERSION >= VERSION_NTSC_1_0 - show_hudmsg(CHR_P1P2, L_AME(47)) // "Door unlocked." + show_hudmsg(CHR_P1P2, L_AME_047) // "Door unlocked." #else - show_hudmsg(CHR_BOND, L_AME(47)) // "Door unlocked." + show_hudmsg(CHR_BOND, L_AME_047) // "Door unlocked." #endif set_stage_flag(STAGEFLAG_OFFICE_DOOR_UNLOCKED) unlock_door(OBJ_OFFICEDOOR1, 0x01) @@ -2404,12 +2404,12 @@ u8 func1009_check_civilians_killed[] = { endloop(0x04) label(0x2c) - show_hudmsg(CHR_BOND, L_AME(55)) // "Unacceptable civilian casualties." + show_hudmsg(CHR_BOND, L_AME_055) // "Unacceptable civilian casualties." set_stage_flag(STAGEFLAG_CIVILIANS_KILLED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x09) - show_hudmsg(CHR_BOND, L_AME(57)) // "Critical mission personnel killed." + show_hudmsg(CHR_BOND, L_AME_057) // "Critical mission personnel killed." set_stage_flag(STAGEFLAG_CIVILIANS_KILLED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2504,7 +2504,7 @@ u8 func100d_check_objects_destroyed[] = { if_object_in_good_condition(OBJ_SECURITYHUB, /*goto*/ 0x2c) set_stage_flag(STAGEFLAG_SECURITYHUB_DESTROYED) mute_channel(CHANNEL_0) - show_hudmsg(CHR_BOND, L_AME(54)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_AME_054) // "Critical mission object destroyed." // PA only - check door switch label(0x2c) @@ -2513,7 +2513,7 @@ u8 func100d_check_objects_destroyed[] = { if_stage_flag_eq(STAGEFLAG_DOORSWITCH_DESTROYED, TRUE, /*goto*/ 0x2c) if_object_in_good_condition(OBJ_DOORSWITCH, /*goto*/ 0x2c) set_stage_flag(STAGEFLAG_DOORSWITCH_DESTROYED) - show_hudmsg(CHR_BOND, L_AME(54)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_AME_054) // "Critical mission object destroyed." // PA only - check PC label(0x2c) @@ -2523,7 +2523,7 @@ u8 func100d_check_objects_destroyed[] = { if_objective_failed(2, /*goto*/ 0x2c) if_object_in_good_condition(OBJ_PC, /*goto*/ 0x2c) set_stage_flag(STAGEFLAG_PC_DESTROYED) - show_hudmsg(CHR_BOND, L_AME(54)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_AME_054) // "Critical mission object destroyed." // Check comms hub label(0x2c) @@ -2531,7 +2531,7 @@ u8 func100d_check_objects_destroyed[] = { if_object_in_good_condition(OBJ_EXTCOMMSHUB, /*goto*/ 0x2c) set_stage_flag(STAGEFLAG_EXTCOMMSHUB_DESTROYED) mute_channel(CHANNEL_1) - show_hudmsg(CHR_BOND, L_AME(54)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_AME_054) // "Critical mission object destroyed." label(0x2c) endloop(0x04) @@ -3375,7 +3375,7 @@ u8 func1011_check_hubs_activated[] = { reloop(0x04) label(0x08) - show_hudmsg(CHR_BOND, L_AME(80)) // "ECM Mine needed to disable security hub." + show_hudmsg(CHR_BOND, L_AME_080) // "ECM Mine needed to disable security hub." restart_timer beginloop(0x09) @@ -3383,7 +3383,7 @@ u8 func1011_check_hubs_activated[] = { endloop(0x09) label(0x0a) - show_hudmsg(CHR_BOND, L_AME(81)) // "ECM Mine needed to disable comms hub." + show_hudmsg(CHR_BOND, L_AME_081) // "ECM Mine needed to disable comms hub." restart_timer beginloop(0x0b) @@ -3475,7 +3475,7 @@ u8 func1013_msg_commshubnearby[] = { endloop(0x04) label(0x2c) - speak(CHR_BOND, L_AME(93), VERSION >= VERSION_NTSC_1_0 ? 0x8170 : 0x8169, CHANNEL_6, COLOR_09_BLUE) // "We're getting a positive reading - the internal co..." + speak(CHR_BOND, L_AME_093, VERSION >= VERSION_NTSC_1_0 ? 0x8170 : 0x8169, CHANNEL_6, COLOR_09_BLUE) // "We're getting a positive reading - the internal co..." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3490,7 +3490,7 @@ u8 func1014_msg_officefloor[] = { endloop(0x04) label(0x2c) - speak(CHR_BOND, L_AME(94), VERSION >= VERSION_NTSC_1_0 ? 0x8171 : 0x816a, CHANNEL_6, COLOR_09_BLUE) // "You're on the same floor as Cassandra's office." + speak(CHR_BOND, L_AME_094, VERSION >= VERSION_NTSC_1_0 ? 0x8171 : 0x816a, CHANNEL_6, COLOR_09_BLUE) // "You're on the same floor as Cassandra's office." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3504,7 +3504,7 @@ u8 func1015_msg_securityroom[] = { endloop(0x04) label(0x2c) - speak(CHR_BOND, L_AME(95), 0x73a2, CHANNEL_6, COLOR_09_BLUE) // "The other hub has got to be in the Security Room." + speak(CHR_BOND, L_AME_095, 0x73a2, CHANNEL_6, COLOR_09_BLUE) // "The other hub has got to be in the Security Room." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3516,7 +3516,7 @@ u8 func1016_msg_basementelevator[] = { endloop(0x04) label(0x2c) - speak(CHR_BOND, L_AME(96), VERSION >= VERSION_NTSC_1_0 ? 0x8172 : 0x816b, CHANNEL_6, COLOR_09_BLUE) // "The basement elevator must be around there somewhe..." + speak(CHR_BOND, L_AME_096, VERSION >= VERSION_NTSC_1_0 ? 0x8172 : 0x816b, CHANNEL_6, COLOR_09_BLUE) // "The basement elevator must be around there somewhe..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3577,7 +3577,7 @@ u8 func0422_intro_speaking[] = { endloop(0xb6) label(0x2c) - speak(CHR_BOND, L_AME(100), 0x73e4, CHANNEL_6, COLOR_09_BLUE) // "Why the big hurry?" + speak(CHR_BOND, L_AME_100, 0x73e4, CHANNEL_6, COLOR_09_BLUE) // "Why the big hurry?" beginloop(0x08) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3585,7 +3585,7 @@ u8 func0422_intro_speaking[] = { endloop(0x08) label(0x2c) - speak(CHR_BOND, L_AME(101), 0x73e5, CHANNEL_6, COLOR_06_WHITE) // "If Dr. Caroll is not extracted tonight, dataDyne w..." + speak(CHR_BOND, L_AME_101, 0x73e5, CHANNEL_6, COLOR_06_WHITE) // "If Dr. Caroll is not extracted tonight, dataDyne w..." beginloop(0x09) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3593,7 +3593,7 @@ u8 func0422_intro_speaking[] = { endloop(0x09) label(0x2c) - speak(CHR_BOND, L_AME(102), 0x73e6, CHANNEL_6, COLOR_09_BLUE) // "Are they all expendable?" + speak(CHR_BOND, L_AME_102, 0x73e6, CHANNEL_6, COLOR_09_BLUE) // "Are they all expendable?" beginloop(0x0a) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3601,7 +3601,7 @@ u8 func0422_intro_speaking[] = { endloop(0x0a) label(0x2c) - speak(CHR_BOND, L_AME(103), 0x73e7, CHANNEL_6, COLOR_06_WHITE) // "Don't joke! You have to be careful, Joanna. Code k..." + speak(CHR_BOND, L_AME_103, 0x73e7, CHANNEL_6, COLOR_06_WHITE) // "Don't joke! You have to be careful, Joanna. Code k..." beginloop(0x0b) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3609,7 +3609,7 @@ u8 func0422_intro_speaking[] = { endloop(0x0b) label(0x2c) - speak(CHR_BOND, L_AME(104), 0x73e8, CHANNEL_6, COLOR_09_BLUE) // "What's the target location?" + speak(CHR_BOND, L_AME_104, 0x73e8, CHANNEL_6, COLOR_09_BLUE) // "What's the target location?" beginloop(0x0c) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3617,7 +3617,7 @@ u8 func0422_intro_speaking[] = { endloop(0x0c) label(0x2c) - speak(CHR_BOND, L_AME(105), 0x73e9, CHANNEL_6, COLOR_06_WHITE) // "Work your way down the building to the ground leve..." + speak(CHR_BOND, L_AME_105, 0x73e9, CHANNEL_6, COLOR_06_WHITE) // "Work your way down the building to the ground leve..." beginloop(0x0d) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3625,7 +3625,7 @@ u8 func0422_intro_speaking[] = { endloop(0x0d) label(0x2c) - speak(CHR_BOND, L_AME(106), 0x73ea, CHANNEL_6, COLOR_09_BLUE) // "How will I recognize him?" + speak(CHR_BOND, L_AME_106, 0x73ea, CHANNEL_6, COLOR_09_BLUE) // "How will I recognize him?" beginloop(0x0e) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3633,7 +3633,7 @@ u8 func0422_intro_speaking[] = { endloop(0x0e) label(0x2c) - speak(CHR_BOND, L_AME(107), 0x73eb, CHANNEL_6, COLOR_06_WHITE) // "We don't have an image record, and we can't find a..." + speak(CHR_BOND, L_AME_107, 0x73eb, CHANNEL_6, COLOR_06_WHITE) // "We don't have an image record, and we can't find a..." beginloop(0x0f) if_stage_flag_eq(STAGEFLAG_STOP_INTRO, TRUE, /*goto*/ 0x06) @@ -3781,7 +3781,7 @@ u8 func101d_disable_cameras[] = { unset_object_flag(OBJ_CAMERA6, OBJFLAG_DEACTIVATED) label(0x06) - show_hudmsg(CHR_BOND, L_AME(97)) // "Security system is now back online." + show_hudmsg(CHR_BOND, L_AME_097) // "Security system is now back online." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3790,7 +3790,7 @@ u8 func101d_disable_cameras[] = { * @unregistered */ u8 unregistered_function7[] = { - show_hudmsg(CHR_BOND, L_AME(99)) // "2023 AD, 2214 Hours Lucerne Tower - dataDyne HQ" + show_hudmsg(CHR_BOND, L_AME_099) // "2023 AD, 2214 Hours Lucerne Tower - dataDyne HQ" set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/assets/files/setup/setupark.c b/src/assets/files/setup/setupark.c index be4992e85..c3c009788 100644 --- a/src/assets/files/setup/setupark.c +++ b/src/assets/files/setup/setupark.c @@ -94,29 +94,29 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_ARK(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_ARK(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_ARK(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_ARK(3)) + briefing(BRIEFINGTYPE_LOCATION, L_ARK_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_ARK_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_ARK_002) + briefing(BRIEFINGTYPE_TEXT_A, L_ARK_003) - beginobjective(0, L_ARK(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Access foyer elevator" + beginobjective(0, L_ARK_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Access foyer elevator" complete_flags(STAGEFLAG_ACCESSED_FOYER_ELEVATOR) endobjective - beginobjective(1, L_ARK(10), (DIFFBIT_PA | DIFFBIT_PD)) // "Reactivate office elevator" + beginobjective(1, L_ARK_010, (DIFFBIT_PA | DIFFBIT_PD)) // "Reactivate office elevator" complete_flags(STAGEFLAG_ELEVATOR_UNLOCKED) fail_flags(STAGEFLAG_ELEVATOR_PC_DESTROYED) endobjective - beginobjective(2, L_ARK(11), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Destroy dataDyne hovercopter" + beginobjective(2, L_ARK_011, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Destroy dataDyne hovercopter" complete_flags(STAGEFLAG_HOVERCOPTER_DESTROYED) endobjective - beginobjective(3, L_ARK(12), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Defeat Cassandra's bodyguards" + beginobjective(3, L_ARK_012, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Defeat Cassandra's bodyguards" complete_flags(STAGEFLAG_OBJECTIVE_BODYGUARDS_DEAD) endobjective - beginobjective(4, L_ARK(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rendezvous at helipad" + beginobjective(4, L_ARK_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rendezvous at helipad" complete_flags(STAGEFLAG_REACHED_HELIPAD) fail_flags(STAGEFLAG_DRCAROLL_DEAD) endobjective @@ -360,10 +360,10 @@ u32 props[] = { tag(0x09, -1) tag(0x0e, 1) stdobject(0x0100, MODEL_CHRNIGHTSIGHT, 0xffff, 0x012405e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x2d, L_ARK(27), L_ARK(28), L_ARK(29), L_ARK(30), L_ARK(31), 0x0000, 0x0000) // "Obtain Night Vision." + rename_object(-1, 0x2d, L_ARK_027, L_ARK_028, L_ARK_029, L_ARK_030, L_ARK_031, 0x0000, 0x0000) // "Obtain Night Vision." tag(0x17, 1) stdobject(0x0100, MODEL_CHRNIGHTSIGHT, 0xffff, 0x012405e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x2d, L_ARK(27), L_ARK(28), L_ARK(29), L_ARK(30), L_ARK(31), 0x0000, 0x0000) // "Obtain Night Vision." + rename_object(-1, 0x2d, L_ARK_027, L_ARK_028, L_ARK_029, L_ARK_030, L_ARK_031, 0x0000, 0x0000) // "Obtain Night Vision." chr(0x00000400, 0x00, 0x0210, BODY_DRCAROLL, HEAD_RANDOM, AILIST_INIT_DRCAROLL, -1, -1, 1000, 100, 0x00000000, 0x00000000, TEAM_ALLY, SQUADRON_00, -1, 0, 0x00000000) chr(0x00000200, 0x01, 0x0215, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_SHOCK, -1, -1, 1000, 7, 0x00014400, 0x00000000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0x00000000) weapon(0x0100, MODEL_CHRCMP150, 0x0001, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_CMP150, 0x00ffffff, 0x00000000) @@ -429,7 +429,7 @@ u32 props[] = { chr(0x00000200, 0x22, 0x007e, BODY_DDSHOCK, HEAD_DDSHOCK, AILIST_INIT_SHOCK, -1, -1, 1000, 9, 0x80012400, 0x00000000, TEAM_ENEMY, SQUADRON_01, -1, 0, 0x00000000) weapon(0x0100, MODEL_CHRCMP150, 0x0022, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_CMP150, 0x00ffffff, 0x00000000) key(0x0080, MODEL_KEYCARD, 0x0022, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000040) - rename_object(-1, 0x4c, L_ARK(55), L_ARK(56), L_ARK(57), L_ARK(58), L_ARK(59), 0x0000, 0x0000) // "Obtain alpha key card." + rename_object(-1, 0x4c, L_ARK_055, L_ARK_056, L_ARK_057, L_ARK_058, L_ARK_059, 0x0000, 0x0000) // "Obtain alpha key card." conditional_scenery(1, 0, 2) door(0x0100, MODEL_DD_AC_UNEXP, 0x019b, 0x13520d00, 0x20304300, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00010000, 0x03e80000, 0x03e80000, 0x00010000, 0x00000000, 0x00000080, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) stdobject(0x0100, MODEL_DD_AC_EXP, 0x019d, 0x031204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) @@ -1327,7 +1327,7 @@ u8 func1002_check_accessed_foyer_elevator[] = { label(0x00) set_stage_flag(STAGEFLAG_ACCESSED_FOYER_ELEVATOR) - show_hudmsg(CHR_TARGET, L_ARK(33)) // "Foyer elevator accessed." + show_hudmsg(CHR_TARGET, L_ARK_033) // "Foyer elevator accessed." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1393,13 +1393,13 @@ u8 func1004_elevator_unlocking[] = { label(0x28) if_stage_flag_eq(STAGEFLAG_ELEVATOR_UNLOCKED, TRUE, /*goto*/ 0x00) set_stage_flag(STAGEFLAG_ELEVATOR_PC_DESTROYED) - show_hudmsg(CHR_BOND, L_ARK(45)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_ARK_045) // "Critical mission object destroyed." label(0x00) set_ailist(CHR_SELF, GAILIST_IDLE) // Computer activated label(0x20) - show_hudmsg(CHR_TARGET, L_ARK(14)) // "Accessing elevator controls..." + show_hudmsg(CHR_TARGET, L_ARK_014) // "Accessing elevator controls..." assign_sound(0x8116, CHANNEL_6) control_sound_from_object(CHANNEL_6, 0x01, TRUE) restart_timer @@ -1438,7 +1438,7 @@ u8 func1004_elevator_unlocking[] = { play_sound(0x81b0, -1) unlock_door(0x02, 0x01) unlock_door(0x03, 0x01) - show_hudmsg(CHR_TARGET, L_ARK(34)) // "Office elevator door has been unlocked." + show_hudmsg(CHR_TARGET, L_ARK_034) // "Office elevator door has been unlocked." set_stage_flag(STAGEFLAG_ELEVATOR_UNLOCKED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1482,7 +1482,7 @@ u8 func1005_check_bodyguards_dead[] = { label(0x20) label(0x26) - show_hudmsg(CHR_BOND, L_ARK(36)) // "Cassandra's bodyguards have been defeated." + show_hudmsg(CHR_BOND, L_ARK_036) // "Cassandra's bodyguards have been defeated." set_stage_flag(STAGEFLAG_OBJECTIVE_BODYGUARDS_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1493,7 +1493,7 @@ u8 func1006_check_hovercopter_destroyed[] = { beginloop(0x1f) if_object_in_good_condition(OBJ_HOVERCOPTER, /*goto*/ 0x00) - show_hudmsg(CHR_BOND, L_ARK(35)) // "DataDyne Hovercopter eliminated." + show_hudmsg(CHR_BOND, L_ARK_035) // "DataDyne Hovercopter eliminated." set_stage_flag(STAGEFLAG_HOVERCOPTER_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x00) @@ -1526,18 +1526,18 @@ u8 func100e_drcaroll_warnings[] = { // Dead label(0x21) label(0x00) - show_hudmsg(CHR_BOND, L_ARK(16)) // "Dr. Caroll has been killed!" + show_hudmsg(CHR_BOND, L_ARK_016) // "Dr. Caroll has been killed!" set_stage_flag(STAGEFLAG_DRCAROLL_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) // Shield under 100 label(0x30) - show_hudmsg(CHR_BOND, L_ARK(17)) // "Dr. Caroll is under attack!" + show_hudmsg(CHR_BOND, L_ARK_017) // "Dr. Caroll is under attack!" set_stage_flag(STAGEFLAG_DRCAROLL_ATTACKED) reloop(0x1f) label(0x31) - show_hudmsg(CHR_BOND, L_ARK(18)) // "Dr. Caroll has been damaged!" + show_hudmsg(CHR_BOND, L_ARK_018) // "Dr. Caroll has been damaged!" set_stage_flag(STAGEFLAG_DRCAROLL_DAMAGED) endloop(0x1f) @@ -1665,7 +1665,7 @@ u8 func0409_tech_conversation[] = { label(0x20) dprint 'T','E','C','H',' ','2',' ','L','O','O','P','\n',0, chr_do_animation(ANIM_TALKING_00A0, 0, -1, 0x10, 0x14, CHR_SELF, 2) - speak(CHR_PRESET, L_ARK(37), 0x811d, CHANNEL_7, COLOR_06_WHITE) // "That's not how it goes." + speak(CHR_PRESET, L_ARK_037, 0x811d, CHANNEL_7, COLOR_06_WHITE) // "That's not how it goes." restart_timer beginloop(0x21) @@ -1687,7 +1687,7 @@ u8 func0409_tech_conversation[] = { label(0x20) chr_do_animation(ANIM_TWO_GUN_HOLD, 0, -1, 0x10, 0x14, CHR_SELF, 2) chr_do_animation(ANIM_TALKING_00A0, -1, -1, 0x02, 0x14, 0x10, 2) - speak(CHR_PRESET, L_ARK(38), 0x8120, CHANNEL_7, COLOR_08_RED) // "Yes, it is." + speak(CHR_PRESET, L_ARK_038, 0x8120, CHANNEL_7, COLOR_08_RED) // "Yes, it is." beginloop(0x22) if_saw_injury(0x00, /*goto*/ 0x33) @@ -1708,7 +1708,7 @@ u8 func0409_tech_conversation[] = { label(0x20) chr_do_animation(ANIM_TALKING_00A0, 0, -1, 0x10, 0x14, CHR_SELF, 2) chr_do_animation(0x0205, -1, -1, 0x02, 0x14, 0x10, 2) - speak(CHR_PRESET, L_ARK(39), 0x811e, CHANNEL_7, COLOR_06_WHITE) // "Give it to me - you're doing it wrong." + speak(CHR_PRESET, L_ARK_039, 0x811e, CHANNEL_7, COLOR_06_WHITE) // "Give it to me - you're doing it wrong." beginloop(0x23) if_saw_injury(0x00, /*goto*/ 0x33) @@ -1729,7 +1729,7 @@ u8 func0409_tech_conversation[] = { label(0x20) chr_do_animation(ANIM_TWO_GUN_HOLD, 0, -1, 0x10, 0x14, CHR_SELF, 2) chr_do_animation(ANIM_TALKING_00A0, -1, -1, 0x02, 0x14, 0x10, 2) - speak(CHR_PRESET, L_ARK(40), 0x8121, CHANNEL_7, COLOR_08_RED) // "Stop annoying me." + speak(CHR_PRESET, L_ARK_040, 0x8121, CHANNEL_7, COLOR_08_RED) // "Stop annoying me." beginloop(0x24) if_saw_injury(0x00, /*goto*/ 0x33) @@ -1751,7 +1751,7 @@ u8 func0409_tech_conversation[] = { chr_do_animation(ANIM_TWO_GUN_HOLD, 0, -1, 0x10, 0x14, CHR_SELF, 2) chr_do_animation(ANIM_TALKING_00A0, -1, -1, 0x02, 0x14, CHR_RLSHOCK, 2) chr_do_animation(0x0206, -1, -1, 0x02, 0x14, 0x10, 2) - speak(CHR_PRESET, L_ARK(41), 0x8123, CHANNEL_7, COLOR_09_BLUE) // "Will you just hurry up!" + speak(CHR_PRESET, L_ARK_041, 0x8123, CHANNEL_7, COLOR_09_BLUE) // "Will you just hurry up!" beginloop(0x25) if_saw_injury(0x00, /*goto*/ 0x33) @@ -1791,7 +1791,7 @@ u8 func0409_tech_conversation[] = { increase_squadron_alertness(100) open_door(0x04) restart_timer - speak(CHR_TARGET, L_ARK(42), 0x811f, CHANNEL_7, COLOR_06_WHITE) // "Oh, no...too late." + speak(CHR_TARGET, L_ARK_042, 0x811f, CHANNEL_7, COLOR_06_WHITE) // "Oh, no...too late." chr_do_animation(ANIM_SURRENDER_002E, 0, 193, 0x18, 0x10, CHR_SELF, 2) beginloop(0x34) @@ -1885,7 +1885,7 @@ u8 func040a_tech2[] = { label(0x20) chr_do_animation(ANIM_SURRENDER_002E, 0, -1, 0x18, 0x0a, CHR_SELF, 2) - speak(CHR_TARGET, L_ARK(43), 0x8122, CHANNEL_7, COLOR_08_RED) // "She's here..." + speak(CHR_TARGET, L_ARK_043, 0x8122, CHANNEL_7, COLOR_08_RED) // "She's here..." beginloop(0x22) if_sound_finished(CHANNEL_7, /*goto*/ 0x35) @@ -1985,7 +1985,7 @@ u8 func040d_cass[] = { label(0x00) restart_timer - speak(CHR_TARGET, L_ARK(32), 0x80ff, CHANNEL_6, COLOR_04_ORANGE) // "We meet again, girl!" + speak(CHR_TARGET, L_ARK_032, 0x80ff, CHANNEL_6, COLOR_04_ORANGE) // "We meet again, girl!" chr_do_animation(ANIM_TALKING_00A0, 0, 193, 0x10, 0x10, CHR_SELF, 2) beginloop(0x27) @@ -1995,7 +1995,7 @@ u8 func040d_cass[] = { label(0x00) restart_timer - speak(CHR_TARGET, L_ARK(20), 0x80fe, CHANNEL_6, COLOR_04_ORANGE) // "You've become quite an annoyance..." + speak(CHR_TARGET, L_ARK_020, 0x80fe, CHANNEL_6, COLOR_04_ORANGE) // "You've become quite an annoyance..." chr_do_animation(ANIM_TALKING_00A3, 0, 193, 0x10, 0x14, CHR_SELF, 2) beginloop(0x28) @@ -2011,13 +2011,13 @@ u8 func040d_cass[] = { endloop(0x29) label(0x20) - speak(CHR_TARGET, L_ARK(44), 0x8101, CHANNEL_6, COLOR_04_ORANGE) // "Get her!" + speak(CHR_TARGET, L_ARK_044, 0x8101, CHANNEL_6, COLOR_04_ORANGE) // "Get her!" chr_do_animation(ANIM_TALKING_00A3, 0, 193, 0x10, 0x10, CHR_SELF, 2) goto_next(0x20) label(0x00) restart_timer - speak(CHR_TARGET, L_ARK(21), 0x8100, CHANNEL_6, COLOR_04_ORANGE) // "Good night, Ms. Dark." + speak(CHR_TARGET, L_ARK_021, 0x8100, CHANNEL_6, COLOR_04_ORANGE) // "Good night, Ms. Dark." chr_do_animation(ANIM_TALKING_00A0, 0, 193, 0x10, 0x10, CHR_SELF, 2) beginloop(0x2a) @@ -2343,10 +2343,10 @@ u8 func100d_intro[] = { play_sound(0x0427, -1) wait_until(540, 0x64) - speak(CHR_BOND, L_ARK(60), 0x7bf3, CHANNEL_7, COLOR_06_WHITE) // "Sound the alarm - she's here!" + speak(CHR_BOND, L_ARK_060, 0x7bf3, CHANNEL_7, COLOR_06_WHITE) // "Sound the alarm - she's here!" wait_until(640, 0x65) - speak(CHR_BOND, L_ARK(61), 0x73f4, CHANNEL_7, COLOR_09_BLUE) // "Lights out!" + speak(CHR_BOND, L_ARK_061, 0x73f4, CHANNEL_7, COLOR_09_BLUE) // "Lights out!" wait_until(690, 0x66) play_sound(0x0428, -1) @@ -2364,7 +2364,7 @@ u8 func100d_intro[] = { close_door(0x0c) wait_until(1000, 0x6b) - speak(CHR_BOND, L_ARK(62), 0x73f5, CHANNEL_7, COLOR_09_BLUE) // "What the...?" + speak(CHR_BOND, L_ARK_062, 0x73f5, CHANNEL_7, COLOR_09_BLUE) // "What the...?" beginloop(0x21) if_camera_animating(/*goto*/ 0x20) @@ -2484,27 +2484,27 @@ u8 func0412_outro[] = { outro_wait_until(90, 0x7f) outro_wait_until(120, 0x60) - speak(CHR_P1P2, L_ARK(63), 0x73f6, CHANNEL_7, COLOR_04_ORANGE) // "Going somewhere?" + speak(CHR_P1P2, L_ARK_063, 0x73f6, CHANNEL_7, COLOR_04_ORANGE) // "Going somewhere?" outro_wait_until(188, 0x61) play_sound(0x01d9, -1) outro_wait_until(350, 0x62) - speak(CHR_P1P2, L_ARK(64), 0x73f7, CHANNEL_7, COLOR_09_BLUE) // "Something I can do for you, old woman?" + speak(CHR_P1P2, L_ARK_064, 0x73f7, CHANNEL_7, COLOR_09_BLUE) // "Something I can do for you, old woman?" outro_wait_until(500, 0x63) - speak(CHR_P1P2, L_ARK(65), 0x73f8, CHANNEL_7, COLOR_04_ORANGE) // "Return our sapient immediately! You don't know wha..." + speak(CHR_P1P2, L_ARK_065, 0x73f8, CHANNEL_7, COLOR_04_ORANGE) // "Return our sapient immediately! You don't know wha..." outro_wait_until(720, 0x64) play_sound(0x0424, -1) outro_wait_until(740, 0x65) - speak(CHR_P1P2, L_ARK(66), 0x73f9, CHANNEL_7, COLOR_09_BLUE) // "Yes I do. I'm leaving." + speak(CHR_P1P2, L_ARK_066, 0x73f9, CHANNEL_7, COLOR_09_BLUE) // "Yes I do. I'm leaving." outro_wait_until(858, 0x73) outro_wait_until(980, 0x66) - speak(CHR_P1P2, L_ARK(67), 0x73fa, CHANNEL_7, COLOR_04_ORANGE) // "One more chance! Give it back, and you could come ..." + speak(CHR_P1P2, L_ARK_067, 0x73fa, CHANNEL_7, COLOR_04_ORANGE) // "One more chance! Give it back, and you could come ..." outro_wait_until(990, 0x68) play_sound(0x804f, -1) @@ -2534,7 +2534,7 @@ u8 func0412_outro[] = { set_chr_shooting_in_cutscene(CHR_OUTRO_GUARD2, FALSE) outro_wait_until(1425, 0x6c) - speak(CHR_P1P2, L_ARK(68), 0x73fb, CHANNEL_7, COLOR_09_BLUE) // "Sorry! Gotta shoot." + speak(CHR_P1P2, L_ARK_068, 0x73fb, CHANNEL_7, COLOR_09_BLUE) // "Sorry! Gotta shoot." outro_wait_until(1447, 0x6d) play_sound(0x80ca, -1) @@ -2575,7 +2575,7 @@ u8 func0412_outro[] = { play_sound(0x0425, -1) outro_wait_until(1940, 0x77) - speak(CHR_P1P2, L_ARK(69), 0x73fc, CHANNEL_7, COLOR_03_RED) // "You must get the sapient back. We cannot proceed w..." + speak(CHR_P1P2, L_ARK_069, 0x73fc, CHANNEL_7, COLOR_03_RED) // "You must get the sapient back. We cannot proceed w..." outro_wait_until(1944, 0x76) play_sound(0x80c4, -1) @@ -2587,7 +2587,7 @@ u8 func0412_outro[] = { play_sound(0x80c6, -1) outro_wait_until(2190, 0x78) - speak(CHR_P1P2, L_ARK(70), 0x73fd, CHANNEL_7, COLOR_04_ORANGE) // "I know that!" + speak(CHR_P1P2, L_ARK_070, 0x73fd, CHANNEL_7, COLOR_04_ORANGE) // "I know that!" outro_wait_until(2300, 0x79) play_sound(0x80c7, -1) @@ -2604,7 +2604,7 @@ u8 func0412_outro[] = { outro_wait_until(2344, 0x7b) outro_wait_until(2393, 0x7c) - speak(CHR_P1P2, L_ARK(71), 0x73fe, CHANNEL_7, COLOR_04_ORANGE) // "I also know who to talk to... Mr. Carrington." + speak(CHR_P1P2, L_ARK_071, 0x73fe, CHANNEL_7, COLOR_04_ORANGE) // "I also know who to talk to... Mr. Carrington." outro_wait_until(2497, 0x7d) @@ -2716,7 +2716,7 @@ u8 func1012_msg_lockeddown[] = { endloop(0x1f) label(0x20) - speak(CHR_BOND, L_ARK(51), 0x8176, CHANNEL_6, COLOR_09_BLUE) // "They've locked down the ground floor - get to the ..." + speak(CHR_BOND, L_ARK_051, 0x8176, CHANNEL_6, COLOR_09_BLUE) // "They've locked down the ground floor - get to the ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2736,7 +2736,7 @@ u8 func1013_msg_thatcopter[] = { endloop(0x21) label(0x20) - speak(CHR_BOND, L_ARK(52), 0x8177, CHANNEL_6, COLOR_09_BLUE) // "That copter needs to be taken out, or the jumpship..." + speak(CHR_BOND, L_ARK_052, 0x8177, CHANNEL_6, COLOR_09_BLUE) // "That copter needs to be taken out, or the jumpship..." label(0x26) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2762,7 +2762,7 @@ u8 func1014_msg_cantleaveany[] = { if_chr_death_animation_finished(CHR_BOND, /*goto*/ 0x26) if_chr_dead(CHR_BOND, /*goto*/ 0x26) if_chr_knockedout(CHR_BOND, /*goto*/ 0x26) - speak(CHR_BOND, L_ARK(53), 0x73aa, CHANNEL_6, COLOR_09_BLUE) // "I can't leave any bodyguards standing." + speak(CHR_BOND, L_ARK_053, 0x73aa, CHANNEL_6, COLOR_09_BLUE) // "I can't leave any bodyguards standing." label(0x26) if_chr_death_animation_finished(CHR_BOND, /*goto*/ 0x27) @@ -2796,7 +2796,7 @@ u8 func1015_msg_jumpshipwaiting[] = { endloop(0x1f) label(0x20) - speak(CHR_BOND, L_ARK(54), 0x8178, CHANNEL_6, COLOR_09_BLUE) // "Don't keep the jumpship waiting - get back to the ..." + speak(CHR_BOND, L_ARK_054, 0x8178, CHANNEL_6, COLOR_09_BLUE) // "Don't keep the jumpship waiting - get back to the ..." label(0x00) set_ailist(CHR_SELF, GAILIST_IDLE) diff --git a/src/assets/files/setup/setupate.c b/src/assets/files/setup/setupate.c index 85036c2d6..127704033 100644 --- a/src/assets/files/setup/setupate.c +++ b/src/assets/files/setup/setupate.c @@ -42,20 +42,20 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_ATE(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_ATE(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_ATE(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_ATE(3)) + briefing(BRIEFINGTYPE_LOCATION, L_ATE_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_ATE_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_ATE_002) + briefing(BRIEFINGTYPE_TEXT_A, L_ATE_003) - beginobjective(0, L_ATE(4), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Defeat dataDyne guard" + beginobjective(0, L_ATE_004, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Defeat dataDyne guard" complete_flags(STAGEFLAG_GUARD_DEAD) endobjective - beginobjective(1, L_ATE(5), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Defeat Jonathan Dark" + beginobjective(1, L_ATE_005, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Defeat Jonathan Dark" complete_flags(STAGEFLAG_JONATHAN_DEAD) endobjective - beginobjective(2, L_ATE(6), (DIFFBIT_PA | DIFFBIT_PD)) // "Defeat Trent Easton" + beginobjective(2, L_ATE_006, (DIFFBIT_PA | DIFFBIT_PD)) // "Defeat Trent Easton" complete_flags(STAGEFLAG_TRENT_DEAD) endobjective @@ -102,10 +102,10 @@ u8 func1002_first_walk[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - show_hudmsg_middle(0x00, COLOR_02_WHITE, L_ATE(7)) // "THE DUEL" + show_hudmsg_middle(0x00, COLOR_02_WHITE, L_ATE_007) // "THE DUEL" chr_do_animation(ANIM_RELOAD, -1, -1, 0x06, 0x00, CHR_GUARD, 2) label(0x2d) - show_hudmsg(CHR_BOND, L_ATE(12)) // "Opponent skill level: AGENT" + show_hudmsg(CHR_BOND, L_ATE_012) // "Opponent skill level: AGENT" // Wait for camera to stop animating restart_timer @@ -169,7 +169,7 @@ u8 func1007_second_walk[] = { chr_do_animation(ANIM_GRAB_CROTCH, -1, -1, 0x06, 0x00, CHR_JONATHAN, 2) label(0x2d) - show_hudmsg(CHR_BOND, L_ATE(13)) // "Opponent skill level: SPECIAL AGENT" + show_hudmsg(CHR_BOND, L_ATE_013) // "Opponent skill level: SPECIAL AGENT" restart_timer beginloop(0x08) @@ -249,7 +249,7 @@ u8 func1008_third_walk[] = { set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) chr_do_animation(ANIM_HEAD_ROLL, -1, -1, 0x06, 0x00, CHR_TRENT, 2) label(0x2d) - show_hudmsg(CHR_BOND, L_ATE(14)) // "Opponent skill level: PERFECT AGENT" + show_hudmsg(CHR_BOND, L_ATE_014) // "Opponent skill level: PERFECT AGENT" // Wait for cutscene to finish restart_timer @@ -295,7 +295,7 @@ u8 func1005_main[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_BOND, L_ATE(9)) // "Well done! You were too quick for him!" + show_hudmsg(CHR_BOND, L_ATE_009) // "Well done! You were too quick for him!" set_stage_flag(STAGEFLAG_GUARD_DEAD) restart_timer @@ -322,7 +322,7 @@ u8 func1005_main[] = { endloop(0x09) label(0x2d) - show_hudmsg(CHR_BOND, L_ATE(10)) // "Well done! You were too quick for him!" + show_hudmsg(CHR_BOND, L_ATE_010) // "Well done! You were too quick for him!" set_stage_flag(STAGEFLAG_JONATHAN_DEAD) restart_timer @@ -349,7 +349,7 @@ u8 func1005_main[] = { endloop(0x0c) label(0x2d) - show_hudmsg(CHR_BOND, L_ATE(11)) // "Well done! You were too quick for him!" + show_hudmsg(CHR_BOND, L_ATE_011) // "Well done! You were too quick for him!" set_stage_flag(STAGEFLAG_TRENT_DEAD) restart_timer diff --git a/src/assets/files/setup/setupazt.c b/src/assets/files/setup/setupazt.c index 11b049ec5..a93a91cc9 100644 --- a/src/assets/files/setup/setupazt.c +++ b/src/assets/files/setup/setupazt.c @@ -74,29 +74,29 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_AZT(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_AZT(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_AZT(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_AZT(3)) + briefing(BRIEFINGTYPE_LOCATION, L_AZT_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_AZT_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_AZT_002) + briefing(BRIEFINGTYPE_TEXT_A, L_AZT_003) - beginobjective(0, L_AZT(5), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve Presidential medical scanner" + beginobjective(0, L_AZT_005, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve Presidential medical scanner" require_object_collected(OBJ_MEDICALSCANNER) endobjective - beginobjective(1, L_AZT(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate distress beacon" + beginobjective(1, L_AZT_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate distress beacon" complete_flags(STAGEFLAG_BEACON_ACTIVATED) fail_flags(STAGEFLAG_ESCAPEPOD_DESTROYED) endobjective - beginobjective(2, L_AZT(7), (DIFFBIT_PA | DIFFBIT_PD)) // "Shut down enemy jamming device" + beginobjective(2, L_AZT_007, (DIFFBIT_PA | DIFFBIT_PD)) // "Shut down enemy jamming device" complete_flags(STAGEFLAG_SKEDAR_SHUTTLE_DESTROYED) endobjective - beginobjective(3, L_AZT(8), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retire Presidential clone" + beginobjective(3, L_AZT_008, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retire Presidential clone" complete_flags(STAGEFLAG_CLONE_DEAD) endobjective - beginobjective(4, L_AZT(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate and rescue President" + beginobjective(4, L_AZT_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate and rescue President" complete_flags(STAGEFLAG_PRESIDENT_RESCUED) fail_flags(STAGEFLAG_PRESIDENT_DEAD) endobjective @@ -429,25 +429,25 @@ u8 func1002_intro[] = { wait_until(724, 0x69) - speak(CHR_BOND, L_AZT(32), 0x7759, CHANNEL_10, COLOR_09_BLUE) // "Ahhh... uuhhhh..." + speak(CHR_BOND, L_AZT_032, 0x7759, CHANNEL_10, COLOR_09_BLUE) // "Ahhh... uuhhhh..." wait_until(830, 0x6a) - speak(CHR_BOND, L_AZT(34), 0x7457, CHANNEL_10, COLOR_06_WHITE) // "Agent Dark! Please report!" + speak(CHR_BOND, L_AZT_034, 0x7457, CHANNEL_10, COLOR_06_WHITE) // "Agent Dark! Please report!" wait_until(980, 0x6b) - speak(CHR_BOND, L_AZT(33), 0x775a, CHANNEL_10, COLOR_09_BLUE) // "Ahhh... uhh... owww..." + speak(CHR_BOND, L_AZT_033, 0x775a, CHANNEL_10, COLOR_09_BLUE) // "Ahhh... uhh... owww..." wait_until(1030, 0x6c) - speak(CHR_BOND, L_AZT(35), 0x7458, CHANNEL_10, COLOR_06_WHITE) // "Perfect Dark, come in!" + speak(CHR_BOND, L_AZT_035, 0x7458, CHANNEL_10, COLOR_06_WHITE) // "Perfect Dark, come in!" wait_until(1152, 0x6e) - speak(CHR_BOND, L_AZT(36), 0x7459, CHANNEL_10, COLOR_09_BLUE) // "A-agent Dark reporting in..." + speak(CHR_BOND, L_AZT_036, 0x7459, CHANNEL_10, COLOR_09_BLUE) // "A-agent Dark reporting in..." wait_until(1372, 0x6f) - speak(CHR_BOND, L_AZT(37), 0x745a, CHANNEL_10, COLOR_06_WHITE) // "Agent Dark! Please reply!" + speak(CHR_BOND, L_AZT_037, 0x745a, CHANNEL_10, COLOR_06_WHITE) // "Agent Dark! Please reply!" wait_until(1610, 0x6d) - speak(CHR_BOND, L_AZT(38), 0x745b, CHANNEL_10, COLOR_09_BLUE) // "Something's jamming my transmissions... It's comin..." + speak(CHR_BOND, L_AZT_038, 0x745b, CHANNEL_10, COLOR_09_BLUE) // "Something's jamming my transmissions... It's comin..." wait_until(1875, 0x70) speak(CHR_BOND, -1, 0x8189, CHANNEL_10, COLOR_00_GREEN) @@ -462,7 +462,7 @@ u8 func1002_intro[] = { speak(CHR_BOND, -1, 0x8189, CHANNEL_10, COLOR_00_GREEN) wait_until(2000, 0x74) - speak(CHR_BOND, L_AZT(39), 0x745c, CHANNEL_10, COLOR_09_BLUE) // "I'd better find the jamming device and check that ..." + speak(CHR_BOND, L_AZT_039, 0x745c, CHANNEL_10, COLOR_09_BLUE) // "I'd better find the jamming device and check that ..." wait_until(2116, 0x75) speak(CHR_BOND, -1, 0x8188, CHANNEL_7, COLOR_00_GREEN) @@ -618,10 +618,10 @@ u8 func0402_outro[] = { play_sound(0x0595, CHANNEL_6) wait_until(248, 0x6b) - speak(CHR_BOND, L_AZT(40), 0x745d, CHANNEL_10, COLOR_09_BLUE) // "How are you feeling, Mr. President?" + speak(CHR_BOND, L_AZT_040, 0x745d, CHANNEL_10, COLOR_09_BLUE) // "How are you feeling, Mr. President?" wait_until(414, 0x6c) - speak(CHR_BOND, L_AZT(41), 0x745e, CHANNEL_10, COLOR_08_RED) // "Better now, young lady. Today, I think, will take ..." + speak(CHR_BOND, L_AZT_041, 0x745e, CHANNEL_10, COLOR_08_RED) // "Better now, young lady. Today, I think, will take ..." wait_until(490, 0x6e) play_sound(0x0596, CHANNEL_5) @@ -639,7 +639,7 @@ u8 func0402_outro[] = { play_sound(0x0597, CHANNEL_7) wait_until(1200, 0x70) - speak(CHR_BOND, L_AZT(42), 0x745f, CHANNEL_10, COLOR_09_BLUE) // "Just one thing, sir? What is the Pelagic II that T..." + speak(CHR_BOND, L_AZT_042, 0x745f, CHANNEL_10, COLOR_09_BLUE) // "Just one thing, sir? What is the Pelagic II that T..." wait_until(1474, 0x74) play_sound(0x0525, CHANNEL_5) @@ -655,7 +655,7 @@ u8 func0402_outro[] = { play_sound(0x00f8, CHANNEL_10) wait_until(1626, 0x73) - speak(CHR_BOND, L_AZT(43), 0x7460, CHANNEL_10, COLOR_08_RED) // "It's a U.S. government deep sea research vessel, o..." + speak(CHR_BOND, L_AZT_043, 0x7460, CHANNEL_10, COLOR_08_RED) // "It's a U.S. government deep sea research vessel, o..." wait_until(1807, 0x79) play_sound(0x0595, CHANNEL_7) @@ -685,16 +685,16 @@ u8 func0402_outro[] = { play_sound(0x8188, CHANNEL_7) wait_until(2450, 0x7b) - speak(CHR_BOND, L_AZT(44), 0x7461, CHANNEL_10, COLOR_09_BLUE) // "Trent has a lot to answer for, but I don't think w..." + speak(CHR_BOND, L_AZT_044, 0x7461, CHANNEL_10, COLOR_09_BLUE) // "Trent has a lot to answer for, but I don't think w..." wait_until(3150, 0x83) - speak(CHR_BOND, L_AZT(45), 0x7462, CHANNEL_10, COLOR_03_RED) // "You have failed, Easton. You are a flawed device, ..." + speak(CHR_BOND, L_AZT_045, 0x7462, CHANNEL_10, COLOR_03_RED) // "You have failed, Easton. You are a flawed device, ..." wait_until(3380, 0x88) play_sound(0x818a, CHANNEL_7) wait_until(3580, 0x87) - speak(CHR_BOND, L_AZT(46), 0x7463, CHANNEL_10, COLOR_05_GREEN) // "Just try it, you Scandinavian freak!" + speak(CHR_BOND, L_AZT_046, 0x7463, CHANNEL_10, COLOR_05_GREEN) // "Just try it, you Scandinavian freak!" wait_until(3747, 0x84) play_sound(0x8189, CHANNEL_5) @@ -713,7 +713,7 @@ u8 func0402_outro[] = { play_sound(0x052a, CHANNEL_10) wait_until(4200, 0x78) - speak(CHR_BOND, L_AZT(47), 0x7464, CHANNEL_10, COLOR_05_GREEN) // "Noooooooo!!!" + speak(CHR_BOND, L_AZT_047, 0x7464, CHANNEL_10, COLOR_05_GREEN) // "Noooooooo!!!" wait_until(4240, 0x93) play_sound(0x05c0, CHANNEL_10) @@ -791,7 +791,7 @@ u8 func1003_msg_therestheescapepod[] = { endloop(0x06) label(0x31) - speak(CHR_P1P2, L_AZT(10), 0x73cc, CHANNEL_6, COLOR_09_BLUE) // "There's the escape pod." + speak(CHR_P1P2, L_AZT_010, 0x73cc, CHANNEL_6, COLOR_09_BLUE) // "There's the escape pod." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -803,7 +803,7 @@ u8 func1004_msg_maybetheresabeacon[] = { // Unreachable label(0x31) - speak(CHR_BOND, L_AZT(11), 0x73cd, CHANNEL_6, COLOR_09_BLUE) // "Maybe there's a beacon in there." + speak(CHR_BOND, L_AZT_011, 0x73cd, CHANNEL_6, COLOR_09_BLUE) // "Maybe there's a beacon in there." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -818,7 +818,7 @@ u8 func1005_msg_thejamming[] = { endloop(0x06) label(0x31) - speak(CHR_P1P2, L_AZT(12), 0x73ce, CHANNEL_6, COLOR_09_BLUE) // "The jamming... It's coming from that ship." + speak(CHR_P1P2, L_AZT_012, 0x73ce, CHANNEL_6, COLOR_09_BLUE) // "The jamming... It's coming from that ship." label(0x0f) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -831,7 +831,7 @@ u8 func1006_msg_elvisbeable[] = { endloop(0x06) label(0x31) - speak(CHR_P1P2, L_AZT(13), 0x73cf, CHANNEL_6, COLOR_09_BLUE) // "Elvis... He'll be able to protect the President." + speak(CHR_P1P2, L_AZT_013, 0x73cf, CHANNEL_6, COLOR_09_BLUE) // "Elvis... He'll be able to protect the President." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1056,7 +1056,7 @@ u8 func1008_escapepod[] = { // Pod destroyed mute_channel(CHANNEL_0) - show_hudmsg(CHR_BOND, L_AZT(15)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_AZT_015) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_ESCAPEPOD_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1070,7 +1070,7 @@ u8 func1008_escapepod[] = { label(0x31) assign_sound(0x8115, CHANNEL_0) play_sound_from_object(CHANNEL_0, OBJ_ESCAPEPOD, 0x0320, 0x0640) - show_hudmsg(CHR_P1P2, L_AZT(14)) // "Distress beacon has been activated." + show_hudmsg(CHR_P1P2, L_AZT_014) // "Distress beacon has been activated." set_stage_flag(STAGEFLAG_BEACON_ACTIVATED) endloop(0x06) @@ -1087,7 +1087,7 @@ u8 func1009_check_shuttle_destroyed[] = { beginloop(0x06) if_object_in_good_condition(OBJ_SKEDAR_SHUTTLE, /*goto*/ 0x31) - show_hudmsg(CHR_BOND, L_AZT(21)) // "Jamming device has been shut down." + show_hudmsg(CHR_BOND, L_AZT_021) // "Jamming device has been shut down." set_stage_flag(STAGEFLAG_SKEDAR_SHUTTLE_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x31) @@ -1104,7 +1104,7 @@ u8 func100a_check_president_dead[] = { endloop(0x06) label(0x31) - show_hudmsg(CHR_BOND, L_AZT(22)) // "President has been killed." + show_hudmsg(CHR_BOND, L_AZT_022) // "President has been killed." set_stage_flag(STAGEFLAG_PRESIDENT_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1118,7 +1118,7 @@ u8 func100b_check_clone_dead[] = { endloop(0x06) label(0x31) - show_hudmsg(CHR_BOND, L_AZT(23)) // "Presidential clone has been eliminated." + show_hudmsg(CHR_BOND, L_AZT_023) // "Presidential clone has been eliminated." set_stage_flag(STAGEFLAG_CLONE_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1226,7 +1226,7 @@ u8 func0404_elvis[] = { // Close to player label(0x13) do_preset_animation(-1) - speak(CHR_TARGET, L_AZT(31), 0x12e2, CHANNEL_6, COLOR_04_ORANGE) // "Take this; you should find it useful!" + speak(CHR_TARGET, L_AZT_031, 0x12e2, CHANNEL_6, COLOR_04_ORANGE) // "Take this; you should find it useful!" give_object_to_chr(OBJ_PROXYMINE, CHR_TARGET) beginloop(0x14) @@ -1640,7 +1640,7 @@ u8 func041d_president_running[] = { rebuild_teams rebuild_squadrons if_stage_flag_eq(STAGEFLAG_PRESIDENT_RESCUED, TRUE, /*goto*/ 0x31) - show_hudmsg(CHR_TARGET, L_AZT(25)) // "President has been rescued." + show_hudmsg(CHR_TARGET, L_AZT_025) // "President has been rescued." set_stage_flag(STAGEFLAG_PRESIDENT_RESCUED) label(0x31) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1720,7 +1720,7 @@ u8 func041e_trent_waiting[] = { label(0x08) restart_timer - speak(CHR_P1P2, L_AZT(24), 0x12ca, CHANNEL_6, COLOR_05_GREEN) // "You'll never save him now!" + speak(CHR_P1P2, L_AZT_024, 0x12ca, CHANNEL_6, COLOR_05_GREEN) // "You'll never save him now!" chr_do_animation(ANIM_TALKING_0231, 0, -1, 0x10, 0x10, CHR_SELF, 2) beginloop(0x0a) diff --git a/src/assets/files/setup/setupcave.c b/src/assets/files/setup/setupcave.c index f1a8fcaf1..6be71abc7 100644 --- a/src/assets/files/setup/setupcave.c +++ b/src/assets/files/setup/setupcave.c @@ -95,12 +95,12 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_CAVE(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_CAVE(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_CAVE(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_CAVE(3)) + briefing(BRIEFINGTYPE_LOCATION, L_CAVE_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_CAVE_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_CAVE_002) + briefing(BRIEFINGTYPE_TEXT_A, L_CAVE_003) - beginobjective(0, L_CAVE(5), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Obtain disguise and enter base" + beginobjective(0, L_CAVE_005, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Obtain disguise and enter base" complete_flags(STAGEFLAG_DISGUISED2) complete_flags(STAGEFLAG_ENTERED_BASE) fail_flags(STAGEFLAG_CIVILIANS_KILLED) @@ -111,23 +111,23 @@ u32 props[] = { fail_flags(STAGEFLAG_SECRETARY_DEAD) endobjective - beginobjective(1, L_CAVE(6), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Check in equipment" + beginobjective(1, L_CAVE_006, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Check in equipment" complete_flags(STAGEFLAG_SUITCASE_DEPOSITED) fail_flags(STAGEFLAG_WEAPONS_DETECTED) fail_flags(STAGEFLAG_TROLLEY_SHUT_DOWN_WITHOUT_BRIEFCASE) endobjective - beginobjective(2, L_CAVE(7), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Subvert security monitoring system" + beginobjective(2, L_CAVE_007, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Subvert security monitoring system" complete_flags(STAGEFLAG_SECURITY_SHUT_DOWN) fail_flags(STAGEFLAG_SUITCASE_SCANNED) fail_flags(STAGEFLAG_CONSOLE_DESTROYED) endobjective - beginobjective(3, L_CAVE(8), (DIFFBIT_PA | DIFFBIT_PD)) // "Obtain flight plans from safe" + beginobjective(3, L_CAVE_008, (DIFFBIT_PA | DIFFBIT_PD)) // "Obtain flight plans from safe" require_object_collected(OBJ_FLIGHTPLANS) endobjective - beginobjective(4, L_CAVE(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Board Air Force One" + beginobjective(4, L_CAVE_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Board Air Force One" complete_flags(STAGEFLAG_BOARDED_PLANE) endobjective @@ -261,12 +261,12 @@ u32 props[] = { weapon(0x0100, MODEL_CHRDRAGON, 0x004c, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DRAGON, 0x00ffffff, 0x00000000) tag(0x00, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0x0113, 0x00420001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_SUITCASE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x4d, L_CAVE(10), L_CAVE(11), L_CAVE(12), L_CAVE(13), L_CAVE(14), 0x0000, 0x0000) // "Obtain suitcase." + rename_object(-1, 0x4d, L_CAVE_010, L_CAVE_011, L_CAVE_012, L_CAVE_013, L_CAVE_014, 0x0000, 0x0000) // "Obtain suitcase." tag(0x01, 1) multimonitor(0x0099, MODEL_PD_CONSOLE, 0x0156, 0x000001a1, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03030000) tag(0x02, 1) weapon(0x0080, MODEL_STEWARDESS_TROLLEY, 0x00b6, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DISGUISE41, 0x00ffffff, 0x00000000) - rename_object(-1, 0x41, L_CAVE(15), L_CAVE(16), L_CAVE(17), L_CAVE(18), L_CAVE(19), 0x0000, 0x0000) // "Obtain air stewardess uniform." + rename_object(-1, 0x41, L_CAVE_015, L_CAVE_016, L_CAVE_017, L_CAVE_018, L_CAVE_019, 0x0000, 0x0000) // "Obtain air stewardess uniform." tag(0x06, 1) stdobject(0x0100, MODEL_CHRBRIEFCASE, 0x00c4, 0x014204e1, 0x00086000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x42, 6) @@ -448,7 +448,7 @@ u32 props[] = { hovercar(0x004c, MODEL_TESTERBOT, 0x01c3, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000432, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000) tag(0x03, 1) weapon(0x0040, MODEL_SAFEITEM, 0x00d6, 0x00000008, 0x00000000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_FLIGHTPLANS, 0x00ffffff, 0x00000000) - rename_object(-1, 0x42, L_CAVE(20), L_CAVE(21), L_CAVE(22), L_CAVE(23), L_CAVE(24), 0x0000, 0x0000) // "Obtain flight plans from safe." + rename_object(-1, 0x42, L_CAVE_020, L_CAVE_021, L_CAVE_022, L_CAVE_023, L_CAVE_024, 0x0000, 0x0000) // "Obtain flight plans from safe." tag(0x1f, 1) lift(0x0100, MODEL_DD_LIFTDOOR, 0x0151, 0x035204e8, 0x00304300, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0151, 0x0150, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000071c, 0x0010aaaa, 0x01000000, 0x00000000, 0x00000000, 0x00000000) tag(0x1a, 1) @@ -1237,7 +1237,7 @@ u8 func0407_stewardess[] = { endloop(0x05) label(0x02) - speak(CHR_TARGET, L_CAVE(25), 0x1adc, CHANNEL_4, COLOR_07_RED) // "Look out - it's an intruder..." + speak(CHR_TARGET, L_CAVE_025, 0x1adc, CHANNEL_4, COLOR_07_RED) // "Look out - it's an intruder..." increase_squadron_alertness(100) chr_do_animation(ANIM_SURRENDER_002E, 0, 193, 0x10, 0x10, CHR_SELF, 2) @@ -1300,7 +1300,7 @@ u8 func0407_stewardess[] = { label(0x4a) unset_self_flag_bankx(CHRFLAG0_CAN_EXAMINE_BODY, BANK_0) - speak(CHR_TARGET, L_CAVE(27), 0x1add, CHANNEL_4, COLOR_07_RED) // "Is he OK?" + speak(CHR_TARGET, L_CAVE_027, 0x1add, CHANNEL_4, COLOR_07_RED) // "Is he OK?" stop_chr restart_timer @@ -1316,7 +1316,7 @@ u8 func0407_stewardess[] = { endloop(0x4b) label(0x02) - speak(CHR_TARGET, L_CAVE(28), 0x1ade, CHANNEL_4, COLOR_07_RED) // "I'll go and get some help." + speak(CHR_TARGET, L_CAVE_028, 0x1ade, CHANNEL_4, COLOR_07_RED) // "I'll go and get some help." restart_timer stop_chr @@ -1374,7 +1374,7 @@ u8 func1005_check_civilians_killed[] = { endloop(0x00) label(0x31) - show_hudmsg(CHR_BOND, L_CAVE(26)) // "Innocent civilians have been killed." + show_hudmsg(CHR_BOND, L_CAVE_026) // "Innocent civilians have been killed." set_stage_flag(STAGEFLAG_CIVILIANS_KILLED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1543,7 +1543,7 @@ u8 func0408_secretary[] = { mute_channel(CHANNEL_4) yield label(0x02) - speak(CHR_TARGET, L_CAVE(32), 0x8162, CHANNEL_4, COLOR_06_WHITE) // "Oh, my God!" + speak(CHR_TARGET, L_CAVE_032, 0x8162, CHANNEL_4, COLOR_06_WHITE) // "Oh, my God!" label(0x67) increase_squadron_alertness(100) @@ -1581,7 +1581,7 @@ u8 func0408_secretary[] = { // FIRST TALK // label(0x32) - speak(CHR_TARGET, L_CAVE(29), 0x8161, CHANNEL_4, COLOR_06_WHITE) // "Good afternoon." + speak(CHR_TARGET, L_CAVE_029, 0x8161, CHANNEL_4, COLOR_06_WHITE) // "Good afternoon." chr_do_animation(ANIM_TALKING_0231, 0, 193, 0x18, 0x10, CHR_SELF, 2) restart_timer set_morale(2) @@ -1611,7 +1611,7 @@ u8 func0408_secretary[] = { // WEAPON TALK 1 // label(0x32) - speak(CHR_TARGET, L_CAVE(31), 0x1273, CHANNEL_4, COLOR_06_WHITE) // "You'll have to check that weapon in here." + speak(CHR_TARGET, L_CAVE_031, 0x1273, CHANNEL_4, COLOR_06_WHITE) // "You'll have to check that weapon in here." restart_timer chr_do_animation(ANIM_TALKING_0232, 0, 193, 0x18, 0x10, CHR_SELF, 2) set_morale(3) @@ -1636,7 +1636,7 @@ u8 func0408_secretary[] = { goto_next(0x02) label(0x32) - speak(CHR_TARGET, L_CAVE(33), 0x1274, CHANNEL_4, COLOR_06_WHITE) // "Weapons are not allowed in the base." + speak(CHR_TARGET, L_CAVE_033, 0x1274, CHANNEL_4, COLOR_06_WHITE) // "Weapons are not allowed in the base." restart_timer chr_do_animation(ANIM_TALKING_0233, 0, 193, 0x18, 0x10, CHR_SELF, 2) set_morale(4) @@ -1667,7 +1667,7 @@ u8 func0408_secretary[] = { // Calling security label(0x77) - speak(CHR_TARGET, L_CAVE(34), 0x1276, CHANNEL_4, COLOR_06_WHITE) // "Right, I'm calling security." + speak(CHR_TARGET, L_CAVE_034, 0x1276, CHANNEL_4, COLOR_06_WHITE) // "Right, I'm calling security." set_stage_flag(STAGEFLAG_RECEPTIONIST_CALLED_SECURITY) activate_alarm restart_timer @@ -1687,7 +1687,7 @@ u8 func0408_secretary[] = { // TALK 2 // label(0x31) - speak(CHR_TARGET, L_CAVE(30), 0x1272, CHANNEL_4, COLOR_06_WHITE) // "OK, you know the way from here." + speak(CHR_TARGET, L_CAVE_030, 0x1272, CHANNEL_4, COLOR_06_WHITE) // "OK, you know the way from here." chr_do_animation(0x0232, 0, 193, 0x18, 0x10, CHR_SELF, 2) unlock_door(0x18, 0x02) @@ -1737,7 +1737,7 @@ u8 func1007_console_activation[] = { set_object_image(OBJ_CONSOLE, 0x00, 0x0f) set_object_image(OBJ_CONSOLE, 0x01, 0x0f) set_chr_flag_bankx(0x12, CHRFLAG0_00002000, BANK_0) - show_hudmsg(CHR_P1P2, L_CAVE(35)) // "System shutdown initiated..." + show_hudmsg(CHR_P1P2, L_CAVE_035) // "System shutdown initiated..." mute_channel(CHANNEL_1) assign_sound(0x01b9, CHANNEL_1) control_sound_from_object(CHANNEL_1, OBJ_CONSOLE, TRUE) @@ -1756,7 +1756,7 @@ u8 func1007_console_activation[] = { mute_channel(CHANNEL_1) assign_sound(0x0479, CHANNEL_1) control_sound_from_object(CHANNEL_1, OBJ_CONSOLE, TRUE) - show_hudmsg(CHR_P1P2, L_CAVE(36)) // "Security systems have been shut down." + show_hudmsg(CHR_P1P2, L_CAVE_036) // "Security systems have been shut down." set_stage_flag(STAGEFLAG_SECURITY_SHUT_DOWN) unset_chr_hiddenflag(CHR_BOND, CHRHFLAG_DISGUISED) restart_timer @@ -1953,10 +1953,10 @@ u8 func1009_carousel_activation[] = { // Shut down without depositing label(0x31) if_difficulty_lt(DIFF_SA, /*goto*/ 0x09) - show_hudmsg(CHR_BOND, L_CAVE(66)) // "Hover trolley has been shut down." + show_hudmsg(CHR_BOND, L_CAVE_066) // "Hover trolley has been shut down." set_stage_flag(STAGEFLAG_TROLLEY_SHUT_DOWN_WITHOUT_BRIEFCASE) yield - show_hudmsg(CHR_BOND, L_CAVE(67)) // "Equipment cannot be checked in." + show_hudmsg(CHR_BOND, L_CAVE_067) // "Equipment cannot be checked in." label(0x09) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1966,7 +1966,7 @@ u8 func1009_carousel_activation[] = { endloop(0x00) label(0x02) - show_hudmsg(CHR_P1P2, L_CAVE(38)) // "Suitcase has been deposited." + show_hudmsg(CHR_P1P2, L_CAVE_038) // "Suitcase has been deposited." chr_draw_weapon_in_cutscene(CHR_P1P2, WEAPON_UNARMED) set_stage_flag(STAGEFLAG_SUITCASE_DEPOSITED) play_sound(0x80aa, CHANNEL_7) @@ -2030,7 +2030,7 @@ u8 func100b_suitcase_scanning[] = { // Scanned label(0x02) - show_hudmsg(CHR_BOND, L_CAVE(39)) // "Suitcase has been scanned." + show_hudmsg(CHR_BOND, L_CAVE_039) // "Suitcase has been scanned." set_stage_flag(STAGEFLAG_SUITCASE_SCANNED) // Agent @@ -2093,7 +2093,7 @@ u8 func0409_office1[] = { // Disguised and unarmed-ish label(0x31) chr_do_animation(ANIM_SITTING_0265, 0, -1, 0x14, 0x10, CHR_SELF, 2) - speak(CHR_TARGET, L_CAVE(41), 0x1ae6, CHANNEL_4, COLOR_08_RED) // "Are you new around here?" + speak(CHR_TARGET, L_CAVE_041, 0x1ae6, CHANNEL_4, COLOR_08_RED) // "Are you new around here?" beginloop(0x09) if_saw_injury(0x00, /*goto*/ LABEL_RUN_TO_FOYER) @@ -2130,7 +2130,7 @@ u8 func0409_office1[] = { endloop(0x0b) label(0x02) - speak(CHR_TARGET, L_CAVE(42), 0x1ae7, CHANNEL_4, COLOR_08_RED) // "Hey - give me back my case." + speak(CHR_TARGET, L_CAVE_042, 0x1ae7, CHANNEL_4, COLOR_08_RED) // "Hey - give me back my case." restart_timer increase_squadron_alertness(100) @@ -2154,7 +2154,7 @@ u8 func0409_office1[] = { label(0x72) label(0x02) - speak(CHR_TARGET, L_CAVE(40), 0x1ae5, CHANNEL_4, COLOR_08_RED) // "Hey, you - this is a restricted area." + speak(CHR_TARGET, L_CAVE_040, 0x1ae5, CHANNEL_4, COLOR_08_RED) // "Hey, you - this is a restricted area." increase_squadron_alertness(100) restart_timer chr_do_animation(ANIM_WALK_BACKWARDS, -1, -1, 0x10, 0x10, CHR_SELF, 2) @@ -2172,7 +2172,7 @@ u8 func0409_office1[] = { endloop(0x08) label(0x02) - speak(CHR_TARGET, L_CAVE(44), 0x1ae8, CHANNEL_4, COLOR_08_RED) // "Upstairs...there's an intruder." + speak(CHR_TARGET, L_CAVE_044, 0x1ae8, CHANNEL_4, COLOR_08_RED) // "Upstairs...there's an intruder." increase_squadron_alertness(100) set_stage_flag(STAGEFLAG_DISGUISE_UNCOVERED) activate_alarm @@ -2251,7 +2251,7 @@ u8 func040a_office2[] = { if_chr_dead(CHR_OFFICE1, /*goto*/ 0x02) if_chr_death_animation_finished(CHR_OFFICE1, /*goto*/ 0x02) if_chr_knockedout(CHR_OFFICE1, /*goto*/ 0x02) - speak(CHR_TARGET, L_CAVE(43), 0x1ae9, CHANNEL_4, COLOR_09_BLUE) // "You get security - I'll deal with her..." + speak(CHR_TARGET, L_CAVE_043, 0x1ae9, CHANNEL_4, COLOR_09_BLUE) // "You get security - I'll deal with her..." increase_squadron_alertness(100) restart_timer @@ -2360,12 +2360,12 @@ u8 func100d_laser_panel[] = { label(0x04) assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_LASER_PANEL, TRUE) - show_hudmsg(CHR_P1P2, L_CAVE(45)) // "Laser grid access denied." + show_hudmsg(CHR_P1P2, L_CAVE_045) // "Laser grid access denied." endloop(0x00) label(0x05) set_stage_flag(STAGEFLAG_LASERS_OVERLOADED) - show_hudmsg(CHR_P1P2, L_CAVE(46)) // "Laser grid system has been overloaded." + show_hudmsg(CHR_P1P2, L_CAVE_046) // "Laser grid system has been overloaded." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2394,7 +2394,7 @@ u8 func100e_check_alaskans_killed[] = { endloop(0x00) label(0x31) - show_hudmsg(CHR_BOND, L_CAVE(47)) // "Too many neutral casualties inflicted." + show_hudmsg(CHR_BOND, L_CAVE_047) // "Too many neutral casualties inflicted." set_stage_flag(STAGEFLAG_TOO_MANY_NEUTRALS_KILLED) label(0x02) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2649,7 +2649,7 @@ u8 func0411_takeover_lackey[] = { endloop(0x04) label(0x02) - speak(CHR_TARGET, L_CAVE(65), 0x05bf, CHANNEL_6, COLOR_08_RED) // "We're taking over!!" + speak(CHR_TARGET, L_CAVE_065, 0x05bf, CHANNEL_6, COLOR_08_RED) // "We're taking over!!" beginloop(0x09) if_chr_stopped(/*goto*/ 0x02) @@ -2752,7 +2752,7 @@ u8 func0414_officeworker[] = { label(0x02) do_preset_animation(7) - speak(CHR_TARGET, L_CAVE(54), 0x1b38, CHANNEL_4, COLOR_08_RED) // "Stop them - they're breaking into the safe..." + speak(CHR_TARGET, L_CAVE_054, 0x1b38, CHANNEL_4, COLOR_08_RED) // "Stop them - they're breaking into the safe..." beginloop(0x05) if_sound_finished(CHANNEL_4, /*goto*/ 0x79) @@ -3582,7 +3582,7 @@ u8 func101a_check_disguise_used[] = { endloop(0x00) label(0x31) - show_hudmsg(CHR_P1P2, L_CAVE(49)) // "Disguise worn." + show_hudmsg(CHR_P1P2, L_CAVE_049) // "Disguise worn." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3638,7 +3638,7 @@ u8 func1003_intro[] = { set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) wait_until(30, 0x6d) - speak(CHR_BOND, L_CAVE(55), 0x7447, CHANNEL_7, COLOR_09_BLUE) // "Agent Dark in prop. I can see the main entranc..." + speak(CHR_BOND, L_CAVE_055, 0x7447, CHANNEL_7, COLOR_09_BLUE) // "Agent Dark in prop. I can see the main entranc..." wait_until(312, 0x89) play_sound(0x0594, CHANNEL_10) @@ -3647,13 +3647,13 @@ u8 func1003_intro[] = { play_sound(0x0595, CHANNEL_10) wait_until(580, 0x76) - speak(CHR_BOND, L_CAVE(56), 0x7448, CHANNEL_10, COLOR_06_WHITE) // "Excellent, Joanna. That cable car is your way in....." + speak(CHR_BOND, L_CAVE_056, 0x7448, CHANNEL_10, COLOR_06_WHITE) // "Excellent, Joanna. That cable car is your way in....." wait_until(968, 0x8b) play_sound(0x0596, CHANNEL_10) wait_until(1315, 0x77) - speak(CHR_BOND, L_CAVE(57), 0x77db, CHANNEL_10, COLOR_09_BLUE) // "That they're probably innocent of any involvement ..." + speak(CHR_BOND, L_CAVE_057, 0x77db, CHANNEL_10, COLOR_09_BLUE) // "That they're probably innocent of any involvement ..." wait_until(1411, 0x8e) play_sound(0x04af, CHANNEL_0) @@ -3669,7 +3669,7 @@ u8 func1003_intro[] = { play_sound(0x04ec, CHANNEL_10) wait_until(1900, 0x78) - speak(CHR_BOND, L_CAVE(58), 0x7449, CHANNEL_5, COLOR_06_WHITE) // "I don't know how far the conspiracy has spread thr..." + speak(CHR_BOND, L_CAVE_058, 0x7449, CHANNEL_5, COLOR_06_WHITE) // "I don't know how far the conspiracy has spread thr..." wait_until(1970, 0x8c) play_sound(0x0171, CHANNEL_10) @@ -3734,7 +3734,7 @@ u8 func1003_intro[] = { play_sound(0x0168, CHANNEL_10) wait_until(2700, 0x79) - speak(CHR_BOND, L_CAVE(59), 0x744a, CHANNEL_7, COLOR_09_BLUE) // "Yes, and protect him from his abductors. Do you ha..." + speak(CHR_BOND, L_CAVE_059, 0x744a, CHANNEL_7, COLOR_09_BLUE) // "Yes, and protect him from his abductors. Do you ha..." wait_until(2704, 0xa3) play_sound(0x0161, CHANNEL_10) @@ -3785,7 +3785,7 @@ u8 func1003_intro[] = { play_sound(0x0164, CHANNEL_10) wait_until(3250, 0x7a) - speak(CHR_BOND, L_CAVE(60), 0x744b, CHANNEL_5, COLOR_06_WHITE) // "Only vague suspicions, and I won't distract you wi..." + speak(CHR_BOND, L_CAVE_060, 0x744b, CHANNEL_5, COLOR_06_WHITE) // "Only vague suspicions, and I won't distract you wi..." wait_until(3387, 0xb3) play_sound(0x0166, CHANNEL_10) @@ -3863,7 +3863,7 @@ u8 func101c_msg_nowsyourchance[] = { endloop(0x00) label(0x31) - speak(CHR_BOND, L_CAVE(50), 0x8182, CHANNEL_6, COLOR_09_BLUE) // "Now's your chance! Grab the stewardess's bag and g..." + speak(CHR_BOND, L_CAVE_050, 0x8182, CHANNEL_6, COLOR_09_BLUE) // "Now's your chance! Grab the stewardess's bag and g..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3890,7 +3890,7 @@ u8 func101d_msg_usethatcase[] = { endloop(0x04) label(0x31) - speak(CHR_P1P2, L_CAVE(51), 0x8183, CHANNEL_4, COLOR_09_BLUE) // "Use that case to conceal your equipment." + speak(CHR_P1P2, L_CAVE_051, 0x8183, CHANNEL_4, COLOR_09_BLUE) // "Use that case to conceal your equipment." label(0x09) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -3910,7 +3910,7 @@ u8 func101e_msg_casewillgetstopped[] = { endloop(0x04) label(0x31) - speak(CHR_BOND, L_CAVE(52), 0x8184, CHANNEL_6, COLOR_09_BLUE) // "The case will get stopped unless you do something." + speak(CHR_BOND, L_CAVE_052, 0x8184, CHANNEL_6, COLOR_09_BLUE) // "The case will get stopped unless you do something." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3923,7 +3923,7 @@ u8 func101f_msg_smallerthanithought[] = { endloop(0x00) label(0x31) - speak(CHR_P1P2, L_CAVE(53), 0x73c7, CHANNEL_6, COLOR_09_BLUE) // "So that's Air Force One? ... Huh, smaller than I t..." + speak(CHR_P1P2, L_CAVE_053, 0x73c7, CHANNEL_6, COLOR_09_BLUE) // "So that's Air Force One? ... Huh, smaller than I t..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -4160,7 +4160,7 @@ u8 func1029_lift_doors[] = { label(0x31) if_stage_flag_eq(STAGEFLAG_SECURITY_SHUT_DOWN, TRUE, /*goto*/ 0x05) - show_hudmsg(CHR_P1P2, L_CAVE(61)) // "Lift inoperative - security system is active." + show_hudmsg(CHR_P1P2, L_CAVE_061) // "Lift inoperative - security system is active." restart_timer beginloop(0x04) @@ -4198,7 +4198,7 @@ u8 func102b_check_secretary_dead[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x31) - show_hudmsg(CHR_BOND, L_CAVE(62)) // "Critical mission personnel disabled." + show_hudmsg(CHR_BOND, L_CAVE_062) // "Critical mission personnel disabled." set_stage_flag(STAGEFLAG_SECRETARY_DEAD) label(0x09) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -4229,7 +4229,7 @@ u8 func102d_check_console_destroyed[] = { mute_channel(CHANNEL_1) if_stage_flag_eq(STAGEFLAG_SECURITY_SHUT_DOWN, TRUE, /*goto*/ 0x31) set_stage_flag(STAGEFLAG_CONSOLE_DESTROYED) - show_hudmsg(CHR_BOND, L_CAVE(63)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_CAVE_063) // "Critical mission object destroyed." label(0x31) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -4242,7 +4242,7 @@ u8 func102e_check_base_entered[] = { endloop(0x00) label(0x31) - show_hudmsg(CHR_BOND, L_CAVE(64)) // "Entrance to base secured." + show_hudmsg(CHR_BOND, L_CAVE_064) // "Entrance to base secured." set_stage_flag(STAGEFLAG_ENTERED_BASE) set_ailist(CHR_SELF, GAILIST_IDLE) endlist diff --git a/src/assets/files/setup/setupdam.c b/src/assets/files/setup/setupdam.c index 5470edccd..7dcb923c3 100644 --- a/src/assets/files/setup/setupdam.c +++ b/src/assets/files/setup/setupdam.c @@ -103,22 +103,22 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_DAM(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_DAM(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_DAM(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_DAM(3)) + briefing(BRIEFINGTYPE_LOCATION, L_DAM_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_DAM_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_DAM_002) + briefing(BRIEFINGTYPE_TEXT_A, L_DAM_003) - beginobjective(0, L_DAM(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable primary power source" + beginobjective(0, L_DAM_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable primary power source" complete_flags(STAGEFLAG_REACTOR_SHUT_DOWN) fail_flags(STAGEFLAG_REACTOR_SWITCH_DESTROYED) endobjective - beginobjective(1, L_DAM(7), (DIFFBIT_PA | DIFFBIT_PD)) // "Secure laboratories and research data" + beginobjective(1, L_DAM_007, (DIFFBIT_PA | DIFFBIT_PD)) // "Secure laboratories and research data" complete_flags(STAGEFLAG_COLLECTED_RESEARCH_DATA) fail_flags(STAGEFLAG_LABTECH_DEAD) endobjective - beginobjective(2, L_DAM(5), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Deactivate GPS and autopilot" + beginobjective(2, L_DAM_005, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Deactivate GPS and autopilot" complete_flags(STAGEFLAG_GPS_DISABLED) complete_flags(STAGEFLAG_AUTOPILOT_DISABLED) fail_flags(STAGEFLAG_00000400) @@ -126,12 +126,12 @@ u32 props[] = { fail_flags(STAGEFLAG_JO_KILLED_A_PILOT) endobjective - beginobjective(3, L_DAM(8), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate Moon Pool lift" + beginobjective(3, L_DAM_008, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate Moon Pool lift" complete_flags(STAGEFLAG_MOONPOOL_ACTIVATED) fail_flags(STAGEFLAG_MOONPOOL_SWITCH_DESTROYED) endobjective - beginobjective(4, L_DAM(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rendezvous and escape with Elvis" + beginobjective(4, L_DAM_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rendezvous and escape with Elvis" complete_flags(STAGEFLAG_LOCATED_DIVING_AREA) fail_flags(STAGEFLAG_ELVIS_DEAD) endobjective @@ -507,13 +507,13 @@ u32 props[] = { multimonitor(0x0099, MODEL_COMHUB, 0x01fa, 0x000000e2, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x13131300) tag(0x14, 1) key(0x0080, MODEL_CHRBRIEFCASE, 0x004e, 0x01244000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) - rename_object(-1, 0x43, L_DAM(22), L_DAM(23), L_DAM(24), L_DAM(25), L_DAM(26), 0x0000, 0x0000) // "" + rename_object(-1, 0x43, L_DAM_022, L_DAM_023, L_DAM_024, L_DAM_025, L_DAM_026, 0x0000, 0x0000) // "" tag(0x15, 1) key(0x0080, MODEL_CHRBRIEFCASE, 0x0050, 0x01244000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) - rename_object(-1, 0x43, L_DAM(22), L_DAM(23), L_DAM(24), L_DAM(25), L_DAM(26), 0x0000, 0x0000) // "" + rename_object(-1, 0x43, L_DAM_022, L_DAM_023, L_DAM_024, L_DAM_025, L_DAM_026, 0x0000, 0x0000) // "" tag(0x16, 1) key(0x0080, MODEL_CHRBRIEFCASE, 0x004f, 0x01244000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) - rename_object(-1, 0x43, L_DAM(22), L_DAM(23), L_DAM(24), L_DAM(25), L_DAM(26), 0x0000, 0x0000) // "" + rename_object(-1, 0x43, L_DAM_022, L_DAM_023, L_DAM_024, L_DAM_025, L_DAM_026, 0x0000, 0x0000) // "" tag(0x21, 5) tag(0x22, 5) tag(0x23, 5) @@ -888,7 +888,7 @@ u8 func0c01_outro[] = { play_sound_from_object2(0x0a, OBJ_OUTRO_SUBMARINE, 0x042d, 0x00, 0x00) wait_until(180, 0x3b) - speak(CHR_BOND, L_DAM(39), 0x7465, CHANNEL_10, COLOR_06_WHITE) // "Right. The diving operation has been disrupted on ..." + speak(CHR_BOND, L_DAM_039, 0x7465, CHANNEL_10, COLOR_06_WHITE) // "Right. The diving operation has been disrupted on ..." wait_until(200, 0x48) play_sound(0x0173, CHANNEL_10) @@ -914,7 +914,7 @@ u8 func0c01_outro[] = { play_sound(0x0171, CHANNEL_10) wait_until(570, 0x4f) - speak(CHR_BOND, L_DAM(40), 0x7466, CHANNEL_10, COLOR_09_BLUE) // "I hope the government don't want to use this ship ..." + speak(CHR_BOND, L_DAM_040, 0x7466, CHANNEL_10, COLOR_09_BLUE) // "I hope the government don't want to use this ship ..." wait_until(582, 0x50) play_sound(0x0171, CHANNEL_10) @@ -944,7 +944,7 @@ u8 func0c01_outro[] = { play_sound(0x80a2, CHANNEL_10) wait_until(950, 0x58) - speak(CHR_BOND, L_DAM(41), 0x7467, CHANNEL_10, COLOR_06_WHITE) // "Do you think we were a little heavy-handed?" + speak(CHR_BOND, L_DAM_041, 0x7467, CHANNEL_10, COLOR_06_WHITE) // "Do you think we were a little heavy-handed?" wait_until(1088, 0x59) play_sound(0x80a3, CHANNEL_10) @@ -953,7 +953,7 @@ u8 func0c01_outro[] = { play_sound(0x0176, CHANNEL_10) wait_until(1190, 0x5b) - speak(CHR_BOND, L_DAM(42), 0x7468, CHANNEL_10, COLOR_09_BLUE) // "Naaahhhh." + speak(CHR_BOND, L_DAM_042, 0x7468, CHANNEL_10, COLOR_09_BLUE) // "Naaahhhh." wait_until(1228, 0x5c) play_sound(0x0174, CHANNEL_10) @@ -1025,7 +1025,7 @@ u8 func1004_msg_controlledfrom[] = { endloop(0x00) label(0x07) - speak(CHR_P1P2, L_DAM(11), 0x73d1, CHANNEL_6, COLOR_09_BLUE) // "This must be where the sub's controlled from." + speak(CHR_P1P2, L_DAM_011, 0x73d1, CHANNEL_6, COLOR_09_BLUE) // "This must be where the sub's controlled from." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1037,7 +1037,7 @@ u8 func1005_msg_withoutautopilot[] = { endloop(0x00) label(0x07) - speak(CHR_P1P2, L_DAM(12), 0x73d2, CHANNEL_6, COLOR_09_BLUE) // "Without the autopilot and the GPS, the ship will w..." + speak(CHR_P1P2, L_DAM_012, 0x73d2, CHANNEL_6, COLOR_09_BLUE) // "Without the autopilot and the GPS, the ship will w..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1049,7 +1049,7 @@ u8 func1006_msg_conductoperations[] = { endloop(0x00) label(0x07) - speak(CHR_P1P2, L_DAM(13), 0x73d3, CHANNEL_6, COLOR_09_BLUE) // "They'll be unable to conduct any operations withou..." + speak(CHR_P1P2, L_DAM_013, 0x73d3, CHANNEL_6, COLOR_09_BLUE) // "They'll be unable to conduct any operations withou..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1068,7 +1068,7 @@ u8 unregistered_function2[] = { endloop(0x00) label(0x04) - show_hudmsg(CHR_BOND, L_DAM(16)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_DAM_016) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_00000400) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1096,7 +1096,7 @@ u8 func1009_open_reactor_hatch[] = { label(0x07) hide_object(OBJ_REACTOR_HATCH) set_object_flag2(OBJ_REACTOR_HATCH, OBJFLAG2_INVISIBLE) - show_hudmsg(CHR_P1P2, L_DAM(17)) // "Reactor shutdown control hatch opened." + show_hudmsg(CHR_P1P2, L_DAM_017) // "Reactor shutdown control hatch opened." set_stage_flag(STAGEFLAG_REACTOR_HATCH_OPEN) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1106,7 +1106,7 @@ u8 func100a_reactor_switch[] = { beginloop(0x00) chr_toggle_p1p2(CHR_SELF) if_object_in_good_condition(OBJ_REACTOR_SWITCH, /*goto*/ 0x07) - show_hudmsg(CHR_BOND, L_DAM(36)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_DAM_036) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_REACTOR_SWITCH_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1127,7 +1127,7 @@ u8 func100a_reactor_switch[] = { set_object_image(OBJ_REACTOR_SWITCH, 0x00, 0x12) set_object_image(OBJ_REACTOR_SWITCH, 0x01, 0x12) set_object_image(OBJ_REACTOR_SWITCH, 0x02, 0x12) - show_hudmsg(CHR_P1P2, L_DAM(18)) // "Reactor has been shut down." + show_hudmsg(CHR_P1P2, L_DAM_018) // "Reactor has been shut down." set_stage_flag(STAGEFLAG_REACTOR_SHUT_DOWN) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1149,7 +1149,7 @@ u8 func100b_check_diving_area_located[] = { endloop(0x00) label(0x07) - show_hudmsg(CHR_P1P2, L_DAM(19)) // "Diving control center has been located." + show_hudmsg(CHR_P1P2, L_DAM_019) // "Diving control center has been located." set_stage_flag(STAGEFLAG_LOCATED_DIVING_AREA) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1266,7 +1266,7 @@ u8 func100e_check_labtech_dead[] = { endloop(0x00) label(0x07) - show_hudmsg(CHR_BOND, L_DAM(20)) // "Critical mission personnel killed." + show_hudmsg(CHR_BOND, L_DAM_020) // "Critical mission personnel killed." set_stage_flag(STAGEFLAG_LABTECH_DEAD) label(0x0b) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1290,7 +1290,7 @@ u8 func100f_check_researchdata_collected[] = { endloop(0x00) label(0x07) - show_hudmsg(CHR_BOND, L_DAM(21)) // "Research data has been secured." + show_hudmsg(CHR_BOND, L_DAM_021) // "Research data has been secured." set_stage_flag(STAGEFLAG_COLLECTED_RESEARCH_DATA) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1947,12 +1947,12 @@ u8 func0401_pilot[] = { goto_first(0x0b) label(0x07) - speak(CHR_TARGET, L_DAM(43), 0x7325, CHANNEL_7, COLOR_09_BLUE) // "Pull the plug on that now." + speak(CHR_TARGET, L_DAM_043, 0x7325, CHANNEL_7, COLOR_09_BLUE) // "Pull the plug on that now." set_stage_flag(STAGEFLAG_SAID_PULLTHEPLUG) goto_next(0x0c) label(0x08) - speak(CHR_TARGET, L_DAM(44), 0x7326, CHANNEL_7, COLOR_09_BLUE) // "Switch this thing off." + speak(CHR_TARGET, L_DAM_044, 0x7326, CHANNEL_7, COLOR_09_BLUE) // "Switch this thing off." set_stage_flag(STAGEFLAG_SAID_SWITCHTHINGOFF) goto_next(0x0c) @@ -1963,11 +1963,11 @@ u8 func0401_pilot[] = { label(0x07) set_self_flag_bankx(CHRFLAG0_08000000, BANK_0) if_stage_flag_eq(STAGEFLAG_SAID_SWITCHTHINGOFF, FALSE, /*goto*/ 0x07) - speak(CHR_TARGET, L_DAM(45), 0x128e, CHANNEL_6, COLOR_04_ORANGE) // "I'll shut it down." + speak(CHR_TARGET, L_DAM_045, 0x128e, CHANNEL_6, COLOR_04_ORANGE) // "I'll shut it down." goto_next(0x08) label(0x07) - speak(CHR_TARGET, L_DAM(46), 0x1280, CHANNEL_6, COLOR_04_ORANGE) // "Please don't hurt me." + speak(CHR_TARGET, L_DAM_046, 0x1280, CHANNEL_6, COLOR_04_ORANGE) // "Please don't hurt me." label(0x08) do_preset_animation(-1) @@ -2008,7 +2008,7 @@ u8 func0401_pilot[] = { label(0x07) if_stage_flag_eq(STAGEFLAG_AUTOPILOT_DISABLED, TRUE, /*goto*/ 0x07) - show_hudmsg(CHR_TARGET, L_DAM(14)) // "Autopilot system has been deactivated." + show_hudmsg(CHR_TARGET, L_DAM_014) // "Autopilot system has been deactivated." set_stage_flag(STAGEFLAG_TRIGGER_ANGRY_PILOT) yield yield @@ -2025,7 +2025,7 @@ u8 func0401_pilot[] = { goto_first(0x0b) label(0x07) - show_hudmsg(CHR_TARGET, L_DAM(15)) // "GPS system has been deactivated." + show_hudmsg(CHR_TARGET, L_DAM_015) // "GPS system has been deactivated." set_stage_flag(STAGEFLAG_GPS_DISABLED) surrender goto_first(0x0b) @@ -2064,7 +2064,7 @@ u8 func1011_check_pilots_dead[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x07) - show_hudmsg(CHR_BOND, L_DAM(27)) // "Critical mission personnel have been killed." + show_hudmsg(CHR_BOND, L_DAM_027) // "Critical mission personnel have been killed." set_stage_flag(STAGEFLAG_PILOT_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2120,7 +2120,7 @@ u8 func1012_choose_angry_pilot[] = { // Killed a pilot label(0x08) - show_hudmsg(CHR_BOND, L_DAM(35)) // "Civilians have been killed." + show_hudmsg(CHR_BOND, L_DAM_035) // "Civilians have been killed." set_stage_flag(STAGEFLAG_JO_KILLED_A_PILOT) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2149,7 +2149,7 @@ u8 func0404_angry_pilot[] = { // Alive label(0x04) set_self_flag_bankx(CHRFLAG0_00000004, BANK_0) - speak(CHR_TARGET, L_DAM(47), 0x14dd, CHANNEL_7, COLOR_04_ORANGE) // "Die, you traitors." + speak(CHR_TARGET, L_DAM_047, 0x14dd, CHANNEL_7, COLOR_04_ORANGE) // "Die, you traitors." chr_do_animation(ANIM_DRAW_PISTOL_0245, -1, 120, 0x06, 0x00, CHR_SELF, 3) try_equip_weapon(MODEL_CHRDY357, WEAPON_DY357MAGNUM, 0x00000000, /*goto*/ 0x6c) @@ -2242,7 +2242,7 @@ u8 func1013_lift_switch[] = { endloop(0x00) label(0x07) - show_hudmsg(CHR_P1P2, L_DAM(28)) // "Lift door has been unlocked." + show_hudmsg(CHR_P1P2, L_DAM_028) // "Lift door has been unlocked." unlock_door(0x18, 0x02) unlock_door(0x19, 0x02) open_door(0x18) @@ -2257,7 +2257,7 @@ u8 func1014_moonpool_switch[] = { chr_toggle_p1p2(CHR_SELF) if_object_in_good_condition(OBJ_MOONPOOL_SWITCH, /*goto*/ 0x08) if_difficulty_lt(DIFF_SA, /*goto*/ 0x10) - show_hudmsg(CHR_P1P2, L_DAM(36)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_P1P2, L_DAM_036) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_MOONPOOL_SWITCH_DESTROYED) label(0x10) @@ -2269,7 +2269,7 @@ u8 func1014_moonpool_switch[] = { label(0x07) label(0x07) - show_hudmsg(CHR_P1P2, L_DAM(29)) // "Lift has been activated." + show_hudmsg(CHR_P1P2, L_DAM_029) // "Lift has been activated." set_stage_flag(STAGEFLAG_MOONPOOL_ACTIVATED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2419,7 +2419,7 @@ u8 func101a_badhatchswitches[] = { goto_next(0x04) label(0x04) - show_hudmsg(CHR_P1P2, L_DAM(31)) // "Unlocking sequence has been reset." + show_hudmsg(CHR_P1P2, L_DAM_031) // "Unlocking sequence has been reset." set_stage_flag(STAGEFLAG_HATCHSWITCHES_RESETTING) restart_timer @@ -2473,7 +2473,7 @@ u8 func0415_elvis_at_start[] = { label(0x07) do_preset_animation(-1) - speak(CHR_TARGET, L_DAM(32), 0x14dc, CHANNEL_6, COLOR_06_WHITE) // "You go on ahead, Jo. I'll secure the perimeter. We..." + speak(CHR_TARGET, L_DAM_032, 0x14dc, CHANNEL_6, COLOR_06_WHITE) // "You go on ahead, Jo. I'll secure the perimeter. We..." beginloop(0x0c) if_sound_finished(CHANNEL_6, /*goto*/ 0x07) @@ -2677,7 +2677,7 @@ u8 func101c_check_elvis_dead[] = { endloop(0x00) label(0x07) - show_hudmsg(CHR_BOND, L_DAM(33)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_DAM_033) // "Elvis has been killed." set_stage_flag(STAGEFLAG_ELVIS_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2702,7 +2702,7 @@ u8 func0418_elvis_at_moonpool[] = { if_chr_knockedout(CHR_SELF, /*goto*/ 0x07) do_preset_animation(-1) set_stage_flag(STAGEFLAG_MET_ELVIS) - speak(CHR_P1P2, L_DAM(34), 0x81a4, CHANNEL_6, COLOR_06_WHITE) // "Joanna... What took you so long? Follow me - let's..." + speak(CHR_P1P2, L_DAM_034, 0x81a4, CHANNEL_6, COLOR_06_WHITE) // "Joanna... What took you so long? Follow me - let's..." beginloop(0x0b) if_sound_finished(CHANNEL_6, /*goto*/ 0x07) @@ -2821,12 +2821,12 @@ u8 func101d_alarm_switches[] = { label(0x07) if_alarm_active(/*goto*/ 0x07) activate_alarm - show_hudmsg(CHR_P1P2, L_DAM(37)) // "Alarm has been activated." + show_hudmsg(CHR_P1P2, L_DAM_037) // "Alarm has been activated." goto_next(0x0c) label(0x07) deactivate_alarm - show_hudmsg(CHR_BOND, L_DAM(38)) // "Alarm has been deactivated." + show_hudmsg(CHR_BOND, L_DAM_038) // "Alarm has been deactivated." goto_next(0x0c) label(0x0c) diff --git a/src/assets/files/setup/setupdepo.c b/src/assets/files/setup/setupdepo.c index 0f51c7286..8e95e1965 100644 --- a/src/assets/files/setup/setupdepo.c +++ b/src/assets/files/setup/setupdepo.c @@ -115,17 +115,17 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_DEPO(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_DEPO(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_DEPO(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_DEPO(3)) + briefing(BRIEFINGTYPE_LOCATION, L_DEPO_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_DEPO_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_DEPO_002) + briefing(BRIEFINGTYPE_TEXT_A, L_DEPO_003) - beginobjective(0, L_DEPO(9), (DIFFBIT_PA | DIFFBIT_PD)) // "Disable damping field generator" + beginobjective(0, L_DEPO_009, (DIFFBIT_PA | DIFFBIT_PD)) // "Disable damping field generator" complete_flags(STAGEFLAG_GENERATOR_SHUT_DOWN) fail_flags(STAGEFLAG_GENERATOR_DESTROYED) endobjective - beginobjective(1, L_DEPO(10), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Deactivate laser grid systems" + beginobjective(1, L_DEPO_010, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Deactivate laser grid systems" complete_flags(STAGEFLAG_ALL_LASERS_DISABLED) complete_flags(STAGEFLAG_LASERSET1_DISABLED) complete_flags(STAGEFLAG_LASERSET2_DISABLED) @@ -137,19 +137,19 @@ u32 props[] = { fail_flags(STAGEFLAG_LASERSWITCH4_DESTROYED) endobjective - beginobjective(2, L_DEPO(11), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Holograph meeting conspirators" + beginobjective(2, L_DEPO_011, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Holograph meeting conspirators" complete_flags(STAGEFLAG_MEETING_HOLOGRAPHED) fail_flags(STAGEFLAG_20000000) fail_flags(STAGEFLAG_CONSPIRATORS_ALERTED) fail_flags(STAGEFLAG_00002000) endobjective - beginobjective(3, L_DEPO(12), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve Dr. Caroll backup from safe" + beginobjective(3, L_DEPO_012, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve Dr. Caroll backup from safe" complete_flags(STAGEFLAG_BACKUP_COLLECTED) fail_flags(STAGEFLAG_SAFEKEYPAD_DESTROYED) endobjective - beginobjective(4, L_DEPO(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Exit building" + beginobjective(4, L_DEPO_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Exit building" complete_flags(STAGEFLAG_EXITED_BUILDING) endobjective @@ -164,7 +164,7 @@ u32 props[] = { tag(OBJ_KEYCARD1, 1) key(0x0080, MODEL_KEYCARD, CHR_CLOAK_1A, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000004) - rename_object(-1, 0x0045, L_DEPO(14), L_DEPO(15), L_DEPO(16), L_DEPO(17), L_DEPO(18), 0x0000, 0x0000) // "Obtain alpha key card." + rename_object(-1, 0x0045, L_DEPO_014, L_DEPO_015, L_DEPO_016, L_DEPO_017, L_DEPO_018, 0x0000, 0x0000) // "Obtain alpha key card." // Between cloak rooms chr(0x00004a00, 0x02, 0x005f, BODY_G5_GUARD, HEAD_RANDOM, GAILIST_UNALERTED, 0x0080, -1, 2000, 100, 0x80028204, 0x00000100, TEAM_NONCOMBAT, SQUADRON_04, -1, 0, 0x00010000) @@ -185,7 +185,7 @@ u32 props[] = { tag(OBJ_KEYCARD2, 1) key(0x0080, MODEL_KEYCARD, 0x0003, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000010) - rename_object(-1, 0x0046, L_DEPO(19), L_DEPO(20), L_DEPO(21), L_DEPO(22), L_DEPO(23), 0x0000, 0x0000) // "Obtain alpha key card." + rename_object(-1, 0x0046, L_DEPO_019, L_DEPO_020, L_DEPO_021, L_DEPO_022, L_DEPO_023, 0x0000, 0x0000) // "Obtain alpha key card." // Rest of stage chr(0x00000200, 0x08, 0x002f, BODY_G5_GUARD, HEAD_RANDOM, AILIST_INIT_TYPE1_GUARD, 0x007b, -1, 200, 100, 0x800a8204, 0x00000000, TEAM_NONCOMBAT, SQUADRON_04, -1, 0, 0x00000000) @@ -314,7 +314,7 @@ u32 props[] = { tag(OBJ_BACKUPDISK, 1) stdobject(0x0100, MODEL_ZIGGYCARD, 0x004c, 0x012404e8, 0x00004000, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x0044, L_DEPO(30), L_DEPO(31), L_DEPO(32), L_DEPO(33), L_DEPO(34), 0x0000, 0x0000) // "Obtain DAT tape." + rename_object(-1, 0x0044, L_DEPO_030, L_DEPO_031, L_DEPO_032, L_DEPO_033, L_DEPO_034, 0x0000, 0x0000) // "Obtain DAT tape." tag(OBJ_DECODER, 1) stdobject(0x0200, MODEL_CHRDOORDECODER, 0x0050, 0x00420408, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) @@ -340,11 +340,11 @@ u32 props[] = { tag(OBJ_CMP150_BOND, 1) weapon(0x0100, MODEL_CHRCMP150, 0xffff, 0x40000000, 0x00000000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_REMOTEMINE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0022, L_DEPO(66), L_DEPO(67), L_DEPO(68), L_DEPO(69), L_DEPO(70), 0x0000, 0x0000) // "" + rename_object(-1, 0x0022, L_DEPO_066, L_DEPO_067, L_DEPO_068, L_DEPO_069, L_DEPO_070, 0x0000, 0x0000) // "" tag(OBJ_CMP150_COOP, 1) weapon(0x0100, MODEL_CHRCMP150, 0xffff, 0x40000000, 0x00000000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_REMOTEMINE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0022, L_DEPO(66), L_DEPO(67), L_DEPO(68), L_DEPO(69), L_DEPO(70), 0x0000, 0x0000) // "" + rename_object(-1, 0x0022, L_DEPO_066, L_DEPO_067, L_DEPO_068, L_DEPO_069, L_DEPO_070, 0x0000, 0x0000) // "" glass(0x0100, MODEL_WINDOW, 0x00c0, 0x00000f62, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) glass(0x0100, MODEL_WINDOW, 0x00c1, 0x00000f62, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) @@ -562,7 +562,7 @@ u8 func1008_check_generator[] = { // Destroyed mute_channel(CHANNEL_4) if_difficulty_lt(DIFF_PA, /*goto*/ 0x06) - show_hudmsg(CHR_BOND, L_DEPO(24)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_024) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_GENERATOR_DESTROYED) label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -578,13 +578,13 @@ u8 func1008_check_generator[] = { mute_channel(CHANNEL_0) assign_sound(0x8147, CHANNEL_0) control_sound_from_object(CHANNEL_0, OBJ_GENERATOR, TRUE) - show_hudmsg(CHR_P1P2, L_DEPO(25)) // "Damping field generator shut down." + show_hudmsg(CHR_P1P2, L_DEPO_025) // "Damping field generator shut down." set_stage_flag(STAGEFLAG_GENERATOR_SHUT_DOWN2) set_stage_flag(STAGEFLAG_GENERATOR_SHUT_DOWN) reloop(0x04) label(0x09) - show_hudmsg(CHR_P1P2, L_DEPO(26)) // "Generator cannot be restarted." + show_hudmsg(CHR_P1P2, L_DEPO_026) // "Generator cannot be restarted." endloop(0x04) endlist @@ -599,7 +599,7 @@ u8 func1003_laser_switch_1[] = { if_chr_activated_object(CHR_P1P2, OBJ_LASERSWITCH1, /*goto*/ 0x08) if_object_in_good_condition(OBJ_LASERSWITCH1, /*goto*/ 0x2c) if_stage_flag_eq(STAGEFLAG_LASERSET1_DISABLED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(24)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_024) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_LASERSWITCH1_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -611,7 +611,7 @@ u8 func1003_laser_switch_1[] = { // Deactivated set_object_image(OBJ_LASERSWITCH1, 0x00, 0x14) - show_hudmsg(CHR_P1P2, L_DEPO(27)) // "Laser grid unit shut down." + show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET1_DISABLED) open_door(OBJ_LASER_1A) open_door(OBJ_LASER_1B) @@ -631,7 +631,7 @@ u8 func1003_laser_switch_1[] = { // Activated label(0x09) - show_hudmsg(CHR_P1P2, L_DEPO(28)) // "Laser grid unit activated." + show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET1_DISABLED) set_object_image(OBJ_LASERSWITCH1, 0x00, 0x13) close_door(OBJ_LASER_1A) @@ -665,7 +665,7 @@ u8 func1004_laser_switch_2[] = { if_chr_activated_object(CHR_P1P2, OBJ_LASERSWITCH2, /*goto*/ 0x08) if_object_in_good_condition(OBJ_LASERSWITCH2, /*goto*/ 0x2c) if_stage_flag_eq(STAGEFLAG_LASERSET2_DISABLED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(24)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_024) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_LASERSWITCH2_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -678,7 +678,7 @@ u8 func1004_laser_switch_2[] = { // Deactivated set_object_image(OBJ_LASERSWITCH2, 0x00, 0x14) - show_hudmsg(CHR_P1P2, L_DEPO(27)) // "Laser grid unit shut down." + show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET2_DISABLED) open_door(OBJ_LASER_2A) open_door(OBJ_LASER_2B) @@ -699,7 +699,7 @@ u8 func1004_laser_switch_2[] = { // Activated label(0x09) set_object_image(OBJ_LASERSWITCH2, 0x00, 0x13) - show_hudmsg(CHR_P1P2, L_DEPO(28)) // "Laser grid unit activated." + show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET2_DISABLED) close_door(OBJ_LASER_2A) close_door(OBJ_LASER_2B) @@ -732,7 +732,7 @@ u8 func1005_laser_switch_3[] = { if_chr_activated_object(CHR_P1P2, OBJ_LASERSWITCH3, /*goto*/ 0x08) if_object_in_good_condition(OBJ_LASERSWITCH3, /*goto*/ 0x2c) if_stage_flag_eq(STAGEFLAG_LASERSET3_DISABLED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(24)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_024) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_LASERSWITCH3_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -744,7 +744,7 @@ u8 func1005_laser_switch_3[] = { // Deactivated set_object_image(OBJ_LASERSWITCH3, 0x00, 0x14) - show_hudmsg(CHR_P1P2, L_DEPO(27)) // "Laser grid unit shut down." + show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET3_DISABLED) open_door(OBJ_LASER_3A) open_door(OBJ_LASER_3B) @@ -765,7 +765,7 @@ u8 func1005_laser_switch_3[] = { // Activated label(0x09) set_object_image(OBJ_LASERSWITCH3, 0x00, 0x13) - show_hudmsg(CHR_P1P2, L_DEPO(28)) // "Laser grid unit activated." + show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET3_DISABLED) close_door(OBJ_LASER_3A) close_door(OBJ_LASER_3B) @@ -798,7 +798,7 @@ u8 func1006_laser_switch_4[] = { if_chr_activated_object(CHR_P1P2, OBJ_LASERSWITCH4, /*goto*/ 0x08) if_object_in_good_condition(OBJ_LASERSWITCH4, /*goto*/ 0x2c) if_stage_flag_eq(STAGEFLAG_LASERSET4_DISABLED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(24)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_024) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_LASERSWITCH4_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -810,7 +810,7 @@ u8 func1006_laser_switch_4[] = { // Deactivated set_object_image(OBJ_LASERSWITCH4, 0x00, 0x14) - show_hudmsg(CHR_P1P2, L_DEPO(27)) // "Laser grid unit shut down." + show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down." set_stage_flag(STAGEFLAG_LASERSET4_DISABLED) open_door(OBJ_LASER_4A) open_door(OBJ_LASER_4B) @@ -831,7 +831,7 @@ u8 func1006_laser_switch_4[] = { // Activated label(0x09) set_object_image(OBJ_LASERSWITCH4, 0x00, 0x13) - show_hudmsg(CHR_P1P2, L_DEPO(28)) // "Laser grid unit activated." + show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated." unset_stage_flag(STAGEFLAG_LASERSET4_DISABLED) close_door(OBJ_LASER_4A) close_door(OBJ_LASER_4B) @@ -893,7 +893,7 @@ u8 func1007_init_lasers[] = { if_stage_flag_eq(STAGEFLAG_LASERSET3_DISABLED, FALSE, /*goto*/ 0x2c) if_stage_flag_eq(STAGEFLAG_LASERSET4_DISABLED, FALSE, /*goto*/ 0x2c) if_stage_flag_eq(STAGEFLAG_ALL_LASERS_DISABLED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(29)) // "All laser grid systems shut down." + show_hudmsg(CHR_BOND, L_DEPO_029) // "All laser grid systems shut down." set_stage_flag(STAGEFLAG_ALL_LASERS_DISABLED) label(0x2c) endloop(0x04) @@ -1288,7 +1288,7 @@ u8 func100e_check_conspirators_alerted[] = { set_ailist(CHR_CASS, AILIST_RUN_FROM_MEETING) set_ailist(0x1c, AILIST_RUN_FROM_MEETING) // chr doesn't exist set_ailist(CHR_BLONDE, AILIST_RUN_FROM_MEETING) - show_hudmsg(CHR_BOND, L_DEPO(41)) // "Conspirators have been alerted." + show_hudmsg(CHR_BOND, L_DEPO_041) // "Conspirators have been alerted." // Wait until alarm not active label(0x06) @@ -1317,13 +1317,13 @@ u8 func100f_alarm_switches[] = { label(0x2c) if_stage_flag_eq(STAGEFLAG_ALARM_SOUNDING, TRUE, /*goto*/ 0x06) - show_hudmsg(CHR_P1P2, L_DEPO(42)) // "Alarm activated." + show_hudmsg(CHR_P1P2, L_DEPO_042) // "Alarm activated." set_stage_flag(STAGEFLAG_ALARM_SOUNDING) activate_alarm reloop(0x04) label(0x06) - show_hudmsg(CHR_P1P2, L_DEPO(43)) // "Alarm deactivated." + show_hudmsg(CHR_P1P2, L_DEPO_043) // "Alarm deactivated." unset_stage_flag(STAGEFLAG_ALARM_SOUNDING) deactivate_alarm endloop(0x04) @@ -1336,7 +1336,7 @@ u8 func1010_safe_cracking[] = { beginloop(0x04) chr_toggle_p1p2(CHR_SELF) if_object_in_good_condition(OBJ_SAFEKEYPAD, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(64)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_064) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_SAFEKEYPAD_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -1345,11 +1345,11 @@ u8 func1010_safe_cracking[] = { label(0x2c) if_chr_weapon_equipped(CHR_P1P2, WEAPON_DOORDECODER, /*goto*/ 0x2c) - show_hudmsg(CHR_P1P2, L_DEPO(44)) // "Safe door is locked." + show_hudmsg(CHR_P1P2, L_DEPO_044) // "Safe door is locked." endloop(0x04) label(0x2c) - show_hudmsg(CHR_P1P2, L_DEPO(45)) // "Door Decoder attached." + show_hudmsg(CHR_P1P2, L_DEPO_045) // "Door Decoder attached." remove_weapon_from_inventory(WEAPON_DOORDECODER) move_object_to_pad(OBJ_DECODER, 0x0075) set_stage_flag(STAGEFLAG_DECODER_ATTACHED) @@ -1362,11 +1362,11 @@ u8 func1010_safe_cracking[] = { endloop(0x09) label(0x06) - speak(CHR_BOND, L_DEPO(38), 0x7754, CHANNEL_5, COLOR_00_GREEN) // "INTRUDER ALERT - all security to the vault." + speak(CHR_BOND, L_DEPO_038, 0x7754, CHANNEL_5, COLOR_00_GREEN) // "INTRUDER ALERT - all security to the vault." play_x_track(XREASON_DEFAULT, 10, 180) yield set_countdown_timer(60) - show_hudmsg(CHR_P1P2, L_DEPO(36)) // "Initiating cracking routines." + show_hudmsg(CHR_P1P2, L_DEPO_036) // "Initiating cracking routines." yield show_countdown_timer start_countdown_timer @@ -1381,7 +1381,7 @@ u8 func1010_safe_cracking[] = { beginloop(0x08) if_object_in_good_condition(OBJ_SAFEKEYPAD, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_DEPO(64)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_DEPO_064) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_SAFEKEYPAD_DESTROYED) hide_countdown_timer set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1394,7 +1394,7 @@ u8 func1010_safe_cracking[] = { mute_channel(CHANNEL_1) assign_sound(0x8145, CHANNEL_1) control_sound_from_object(CHANNEL_1, OBJ_SAFEKEYPAD, TRUE) - show_hudmsg(CHR_P1P2, L_DEPO(37)) // "Door Decoder finished - door unlocked." + show_hudmsg(CHR_P1P2, L_DEPO_037) // "Door Decoder finished - door unlocked." unlock_door(OBJ_SAFEDOOR, 0x40) unset_object_flag2(OBJ_SAFEDOOR, OBJFLAG2_AICANNOTUSE) open_door(OBJ_SAFEDOOR) @@ -1429,7 +1429,7 @@ u8 func1012_check_for_end[] = { hide_countdown_timer stop_countdown_timer if_all_objectives_complete(/*goto*/ 0x53) - show_hudmsg(CHR_BOND, L_DEPO(51)) // "Objectives incomplete - MISSION FAILED." + show_hudmsg(CHR_BOND, L_DEPO_051) // "Objectives incomplete - MISSION FAILED." label(0x2c) restart_timer @@ -1859,13 +1859,13 @@ u8 func040e_meeting_cutscene[] = { endloop(0x55) label(0x06) - speak(CHR_BOND, L_DEPO(72), 0x740c, CHANNEL_5, COLOR_04_ORANGE) // "We've recovered the sapient from Carrington and al..." + speak(CHR_BOND, L_DEPO_072, 0x740c, CHANNEL_5, COLOR_04_ORANGE) // "We've recovered the sapient from Carrington and al..." wait_until(752, 0x56) play_sound(0x0161, CHANNEL_6) wait_until(760, 0x57) - speak(CHR_BOND, L_DEPO(73), 0x740d, CHANNEL_7, COLOR_03_RED) // "This will reduce its efficiency. My team will have..." + speak(CHR_BOND, L_DEPO_073, 0x740d, CHANNEL_7, COLOR_03_RED) // "This will reduce its efficiency. My team will have..." wait_until(813, 0x58) play_sound(0x0162, CHANNEL_6) @@ -1892,7 +1892,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0593, CHANNEL_6) wait_until(1684, 0x5d) - speak(CHR_BOND, L_DEPO(74), 0x740e, CHANNEL_5, COLOR_04_ORANGE) // "No one could have predicted that! And I resent bei..." + speak(CHR_BOND, L_DEPO_074, 0x740e, CHANNEL_5, COLOR_04_ORANGE) // "No one could have predicted that! And I resent bei..." wait_until(1780, 0x5e) play_sound_from_object2(CHANNEL_6, 0x3a, 0x01d5, 0x00, 0x00) @@ -1917,7 +1917,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0161, CHANNEL_7) wait_until(2316, 0x65) - speak(CHR_BOND, L_DEPO(75), 0x740f, CHANNEL_7, COLOR_03_RED) // "The President turned down your request for the loa..." + speak(CHR_BOND, L_DEPO_075, 0x740f, CHANNEL_7, COLOR_03_RED) // "The President turned down your request for the loa..." wait_until(2342, 0x67) play_sound(0x0162, CHANNEL_6) @@ -1951,7 +1951,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0161, CHANNEL_5) wait_until(2692, 0x6f) - speak(CHR_BOND, L_DEPO(76), 0x7410, CHANNEL_7, COLOR_03_RED) // "Could it be you overestimated your influence over ..." + speak(CHR_BOND, L_DEPO_076, 0x7410, CHANNEL_7, COLOR_03_RED) // "Could it be you overestimated your influence over ..." wait_until(2705, 0x72) play_sound(0x0161, CHANNEL_6) @@ -1975,7 +1975,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0163, CHANNEL_5) wait_until(3048, 0x79) - speak(CHR_BOND, L_DEPO(77), 0x7411, CHANNEL_7, COLOR_05_GREEN) // "No! Perhaps I underestimated his resolve. We have ..." + speak(CHR_BOND, L_DEPO_077, 0x7411, CHANNEL_7, COLOR_05_GREEN) // "No! Perhaps I underestimated his resolve. We have ..." wait_until(3186, 0x7a) play_sound(0x0164, CHANNEL_6) @@ -2002,7 +2002,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0162, CHANNEL_6) wait_until(4070, 0x82) - speak(CHR_BOND, L_DEPO(78), 0x7412, CHANNEL_7, COLOR_04_ORANGE) // "Ha! Assuming you don't get any interference. If Ca..." + speak(CHR_BOND, L_DEPO_078, 0x7412, CHANNEL_7, COLOR_04_ORANGE) // "Ha! Assuming you don't get any interference. If Ca..." wait_until(4312, 0x84) play_sound(0x0163, CHANNEL_6) @@ -2020,7 +2020,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0161, CHANNEL_7) wait_until(4560, 0x83) - speak(CHR_BOND, L_DEPO(79), 0x7413, CHANNEL_5, COLOR_05_GREEN) // "There will be no outside help for Mr. Carrington. ..." + speak(CHR_BOND, L_DEPO_079, 0x7413, CHANNEL_5, COLOR_05_GREEN) // "There will be no outside help for Mr. Carrington. ..." wait_until(4636, 0x89) play_sound(0x0163, CHANNEL_7) @@ -2029,7 +2029,7 @@ u8 func040e_meeting_cutscene[] = { play_sound(0x0164, CHANNEL_7) wait_until(5272, 0x8b) - speak(CHR_BOND, L_DEPO(80), 0x7414, CHANNEL_5, COLOR_03_RED) // "Then the devices we gave you are working correctly..." + speak(CHR_BOND, L_DEPO_080, 0x7414, CHANNEL_5, COLOR_03_RED) // "Then the devices we gave you are working correctly..." wait_until(5360, 0x8c) play_sound(0x0163, CHANNEL_6) @@ -2180,12 +2180,12 @@ u8 func040f_outro[] = { wait_until(728, 0x56) wait_until(768, 0x73) - speak(CHR_P1P2, L_DEPO(81), 0x7415, CHANNEL_7, COLOR_09_BLUE) // "Agent Dark reporting in! Prepare to receive a down..." + speak(CHR_P1P2, L_DEPO_081, 0x7415, CHANNEL_7, COLOR_09_BLUE) // "Agent Dark reporting in! Prepare to receive a down..." wait_until(1280, 0x59) wait_until(1310, 0x75) - speak(CHR_P1P2, L_DEPO(82), 0x7416, CHANNEL_7, COLOR_06_WHITE) // "No time for that now, Agent Dark. There's been a d..." + speak(CHR_P1P2, L_DEPO_082, 0x7416, CHANNEL_7, COLOR_06_WHITE) // "No time for that now, Agent Dark. There's been a d..." wait_until(1780, 0x76) play_sound(0x0162, CHANNEL_6) @@ -2199,7 +2199,7 @@ u8 func040f_outro[] = { wait_until(2600, 0x5d) wait_until(2630, 0x79) - speak(CHR_P1P2, L_DEPO(83), 0x7417, CHANNEL_7, COLOR_09_BLUE) // "Area 51? But what about the President?" + speak(CHR_P1P2, L_DEPO_083, 0x7417, CHANNEL_7, COLOR_09_BLUE) // "Area 51? But what about the President?" beginloop(0x08) if_camera_animating(/*goto*/ 0x2c) @@ -2621,7 +2621,7 @@ u8 func101e_msg_nowaythrough[] = { endloop(0x04) label(0x2c) - speak(CHR_P1P2, L_DEPO(60), 0x73b4, CHANNEL_6, COLOR_09_BLUE) // "There's no way through while those lasers are acti..." + speak(CHR_P1P2, L_DEPO_060, 0x73b4, CHANNEL_6, COLOR_09_BLUE) // "There's no way through while those lasers are acti..." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2643,7 +2643,7 @@ u8 func101f_msg_meetingroomahead[] = { endloop(0x04) label(0x2c) - speak(CHR_P1P2, L_DEPO(61), 0x73b5, CHANNEL_6, COLOR_09_BLUE) // "That must be the meeting room up ahead. Time to us..." + speak(CHR_P1P2, L_DEPO_061, 0x73b5, CHANNEL_6, COLOR_09_BLUE) // "That must be the meeting room up ahead. Time to us..." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2657,7 +2657,7 @@ u8 func1020_msg_heavilyencrypted[] = { endloop(0x04) label(0x2c) - speak(CHR_P1P2, L_DEPO(62), 0x817c, CHANNEL_6, COLOR_09_BLUE) // "The safe's heavily encrypted. The decoder's gonna ..." + speak(CHR_P1P2, L_DEPO_062, 0x817c, CHANNEL_6, COLOR_09_BLUE) // "The safe's heavily encrypted. The decoder's gonna ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2679,7 +2679,7 @@ u8 func1021_blow_mines[] = { label(0x2c) if_difficulty_lt(DIFF_SA, /*goto*/ 0x2c) - speak(CHR_P1P2, L_DEPO(63), 0x73b7, CHANNEL_6, COLOR_09_BLUE) // "Time to leave! Let's get to the door I set up earl..." + speak(CHR_P1P2, L_DEPO_063, 0x73b7, CHANNEL_6, COLOR_09_BLUE) // "Time to leave! Let's get to the door I set up earl..." set_ailist(CHR_SELF, GAILIST_IDLE) // Agent @@ -2692,7 +2692,7 @@ u8 func1021_blow_mines[] = { goto_next(0x0d) label(0x2c) - speak(CHR_P1P2, L_DEPO(65), 0x81a2, CHANNEL_6, COLOR_09_BLUE) // "Stand back, Joanna. We'll create your escape route..." + speak(CHR_P1P2, L_DEPO_065, 0x81a2, CHANNEL_6, COLOR_09_BLUE) // "Stand back, Joanna. We'll create your escape route..." restart_timer beginloop(0x09) diff --git a/src/assets/files/setup/setupdish.c b/src/assets/files/setup/setupdish.c index 1ef2fb85b..abf77c3fc 100644 --- a/src/assets/files/setup/setupdish.c +++ b/src/assets/files/setup/setupdish.c @@ -821,7 +821,7 @@ u8 func1002_devicetraining_camspy[] = { label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(20)) // "Collect CamSpy from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_020) // "Collect CamSpy from table to begin." restart_timer beginloop(0x86) @@ -844,7 +844,7 @@ u8 func1002_devicetraining_camspy[] = { label(0x8d) remove_hudmsgs if_chr_weapon_equipped(CHR_BOND, WEAPON_EYESPY, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(57)) // "Select the CamSpy. - Hold A Button. - Use Control Stick to change selection. - Highlight CamSpy and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_057) // "Select the CamSpy. - Hold A Button. - Use Control Stick to change selection. - Highlight CamSpy and release A Button." restart_timer beginloop(0x8e) @@ -858,7 +858,7 @@ u8 func1002_devicetraining_camspy[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(21)) // "Locate Info Room PC and holograph it." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_021) // "Locate Info Room PC and holograph it." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -870,7 +870,7 @@ u8 func1002_devicetraining_camspy[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(22)) // "Info Room PC successfully holographed." + show_hudmsg(CHR_BOND, L_DISH_022) // "Info Room PC successfully holographed." restart_timer beginloop(0x0c) @@ -933,7 +933,7 @@ u8 func1003_devicetraining_nightvision[] = { label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(8)) // "Collect Night Vision from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_008) // "Collect Night Vision from table to begin." restart_timer beginloop(0x86) @@ -957,7 +957,7 @@ u8 func1003_devicetraining_nightvision[] = { label(0x8d) remove_hudmsgs if_chr_weapon_equipped(CHR_BOND, WEAPON_NIGHTVISION, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(58)) // "Select the Night Vision. - Hold A Button. - Use Control Stick to change selection. - Highlight Night Vision and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_058) // "Select the Night Vision. - Hold A Button. - Use Control Stick to change selection. - Highlight Night Vision and release A Button." restart_timer beginloop(0x8e) @@ -971,7 +971,7 @@ u8 func1003_devicetraining_nightvision[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(9)) // "Activate the Night Vision. Locate the light switch. Turn the lights back on." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_009) // "Activate the Night Vision. Locate the light switch. Turn the lights back on." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -997,7 +997,7 @@ u8 func1003_devicetraining_nightvision[] = { set_lights_state(0x0026, LIGHTOP_1, 0xff, 0x00, 0x00) set_lights_state(0x0022, LIGHTOP_1, 0xff, 0x00, 0x00) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(23)) // "Lights have been reactivated." + show_hudmsg(CHR_BOND, L_DISH_023) // "Lights have been reactivated." restart_timer beginloop(0x0d) @@ -1066,7 +1066,7 @@ u8 func1004_devicetraining_doordecoder[] = { close_door(0x89) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(24)) // "Collect Door Decoder from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_024) // "Collect Door Decoder from table to begin." restart_timer beginloop(0x86) @@ -1090,7 +1090,7 @@ u8 func1004_devicetraining_doordecoder[] = { label(0x8d) remove_hudmsgs if_chr_weapon_equipped(CHR_BOND, WEAPON_DOORDECODER, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(59)) // "Select the Door Decoder. - Hold A Button. - Use Control Stick to change selection. - Highlight Door Decoder and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_059) // "Select the Door Decoder. - Hold A Button. - Use Control Stick to change selection. - Highlight Door Decoder and release A Button." restart_timer beginloop(0x8e) @@ -1106,7 +1106,7 @@ u8 func1004_devicetraining_doordecoder[] = { if_chr_activated_object(CHR_BOND, 0x35, /*goto*/ 0x2f) label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(25)) // "Use Decoder on door pad to unlock it." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_025) // "Use Decoder on door pad to unlock it." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -1119,7 +1119,7 @@ u8 func1004_devicetraining_doordecoder[] = { label(0x09) if_chr_weapon_equipped(CHR_BOND, WEAPON_DOORDECODER, /*goto*/ 0x06) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(26)) // "You need to be holding the Door Decoder." + show_hudmsg(CHR_BOND, L_DISH_026) // "You need to be holding the Door Decoder." restart_timer beginloop(0x0e) @@ -1140,7 +1140,7 @@ u8 func1004_devicetraining_doordecoder[] = { label(0x06) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(27)) // "Decoder attached. Initiating cracking routines..." + show_hudmsg(CHR_BOND, L_DISH_027) // "Decoder attached. Initiating cracking routines..." unset_object_flag2(0x88, OBJFLAG2_INVISIBLE) assign_sound(0x8144, CHANNEL_1) play_sound_from_object(CHANNEL_1, 0x35, 0x012c, 0x0190) @@ -1164,7 +1164,7 @@ u8 func1004_devicetraining_doordecoder[] = { assign_sound(0x8145, CHANNEL_1) control_sound_from_object(CHANNEL_1, 0x35, TRUE) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(28)) // "Decoding complete. Door has been unlocked." + show_hudmsg(CHR_BOND, L_DISH_028) // "Decoding complete. Door has been unlocked." unlock_door(0x41, 0x40) restart_timer @@ -1239,7 +1239,7 @@ u8 func1005_devicetraining_xray[] = { label(0x59) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(35)) // "Collect X-Ray Scanner from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_035) // "Collect X-Ray Scanner from table to begin." restart_timer beginloop(0x86) @@ -1271,7 +1271,7 @@ u8 func1005_devicetraining_xray[] = { label(0x8d) remove_hudmsgs if_chr_weapon_equipped(CHR_BOND, WEAPON_XRAYSCANNER, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(60)) // "Select the X-Ray Scanner. - Hold A Button. - Use Control Stick to change selection. - Highlight X-Ray Scanner and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_060) // "Select the X-Ray Scanner. - Hold A Button. - Use Control Stick to change selection. - Highlight X-Ray Scanner and release A Button." restart_timer beginloop(0x8e) @@ -1285,7 +1285,7 @@ u8 func1005_devicetraining_xray[] = { label(0x2f) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(36)) // "Find hidden switches to shut down laser grid." + show_hudmsg(CHR_BOND, L_DISH_036) // "Find hidden switches to shut down laser grid." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -1313,7 +1313,7 @@ u8 func1005_devicetraining_xray[] = { label(0x5b) if_object_flag2(0x38, OBJFLAG2_00000001, /*goto*/ 0x87) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(41)) // "Laser Grid 1 has been deactivated." + show_hudmsg(CHR_BOND, L_DISH_041) // "Laser Grid 1 has been deactivated." set_object_image(0x38, 0x00, 0x12) set_object_flag2(0x38, OBJFLAG2_00000001) open_door(0x3a) @@ -1332,7 +1332,7 @@ u8 func1005_devicetraining_xray[] = { if_object_flag2(0x39, OBJFLAG2_00000001, /*goto*/ 0x88) set_object_image(0x39, 0x00, 0x12) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(42)) // "Laser Grid 2 has been deactivated." + show_hudmsg(CHR_BOND, L_DISH_042) // "Laser Grid 2 has been deactivated." set_object_flag2(0x39, OBJFLAG2_00000001) open_door(0x3b) label(0x88) @@ -1376,7 +1376,7 @@ u8 func1005_devicetraining_xray[] = { label(0x2f) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(37)) // "All laser grids have been deactivated." + show_hudmsg(CHR_BOND, L_DISH_037) // "All laser grids have been deactivated." restart_timer beginloop(0x0e) @@ -1450,7 +1450,7 @@ u8 func1006_devicetraining_disguise[] = { label(0x59) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(38)) // "Collect Disguise from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_038) // "Collect Disguise from table to begin." restart_timer beginloop(0x86) @@ -1474,7 +1474,7 @@ u8 func1006_devicetraining_disguise[] = { label(0x8d) remove_hudmsgs if_chr_has_hiddenflag(CHR_BOND, CHRHFLAG_DISGUISED, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(61)) // "Select the Disguise. - Hold A Button. - Use Control Stick to change selection. - Highlight Disguise and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_061) // "Select the Disguise. - Hold A Button. - Use Control Stick to change selection. - Highlight Disguise and release A Button." restart_timer beginloop(0x8e) @@ -1489,7 +1489,7 @@ u8 func1006_devicetraining_disguise[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(39)) // "Fool someone into giving you Cloaking Device." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_039) // "Fool someone into giving you Cloaking Device." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -1502,7 +1502,7 @@ u8 func1006_devicetraining_disguise[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(40)) // "Cloaking Device successfully retrieved." + show_hudmsg(CHR_BOND, L_DISH_040) // "Cloaking Device successfully retrieved." restart_timer beginloop(0x0e) @@ -1520,7 +1520,7 @@ u8 func1006_devicetraining_disguise[] = { label(0x0a) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(47)) // "You're meant to use the Disguise, remember?" + show_hudmsg(CHR_BOND, L_DISH_047) // "You're meant to use the Disguise, remember?" restart_timer beginloop(0x0f) @@ -1592,7 +1592,7 @@ u8 func1007_devicetrainign_ir[] = { label(0x59) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(32)) // "Collect IR Scanner from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_032) // "Collect IR Scanner from table to begin." restart_timer beginloop(0x86) @@ -1621,7 +1621,7 @@ u8 func1007_devicetrainign_ir[] = { label(0x8d) remove_hudmsgs if_player_using_device(CHR_BOND, WEAPON_IRSCANNER, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(62)) // "Select the IR Scanner. - Hold A Button. - Use Control Stick to change selection. - Highlight IR Scanner and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_062) // "Select the IR Scanner. - Hold A Button. - Use Control Stick to change selection. - Highlight IR Scanner and release A Button." restart_timer beginloop(0x8e) @@ -1642,7 +1642,7 @@ u8 func1007_devicetrainign_ir[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(33)) // "Locate secret door using IR Scanner." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_033) // "Locate secret door using IR Scanner." beginloop(0x82) if_player_using_device(CHR_BOND, WEAPON_IRSCANNER, /*goto*/ 0x2f) @@ -1660,7 +1660,7 @@ u8 func1007_devicetrainign_ir[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(34)) // "Secret door has been successfully located." + show_hudmsg(CHR_BOND, L_DISH_034) // "Secret door has been successfully located." restart_timer beginloop(0x0e) @@ -1730,7 +1730,7 @@ u8 func1008_devicetraining_rtracker[] = { label(0x59) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(29)) // "Collect Tracker from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_029) // "Collect Tracker from table to begin." restart_timer beginloop(0x86) @@ -1754,7 +1754,7 @@ u8 func1008_devicetraining_rtracker[] = { label(0x8d) remove_hudmsgs if_player_using_device(CHR_BOND, WEAPON_RTRACKER, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(63)) // "Select the Tracker. - Hold A Button. - Use Control Stick to change selection. - Highlight Tracker and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_063) // "Select the Tracker. - Hold A Button. - Use Control Stick to change selection. - Highlight Tracker and release A Button." restart_timer beginloop(0x8e) @@ -1773,7 +1773,7 @@ u8 func1008_devicetraining_rtracker[] = { move_object_to_pad(0x36, 0x011e) set_object_flag3(0x36, OBJFLAG3_RTRACKED_YELLOW) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(30)) // "Locate IR Scanner using Tracker." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_030) // "Locate IR Scanner using Tracker." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -1785,7 +1785,7 @@ u8 func1008_devicetraining_rtracker[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(31)) // "IR Scanner has been successfully located." + show_hudmsg(CHR_BOND, L_DISH_031) // "IR Scanner has been successfully located." restart_timer beginloop(0x0e) @@ -1861,7 +1861,7 @@ u8 func1009_devicetraining_cloak[] = { label(0x59) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(51)) // "Collect Cloaking Device from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_051) // "Collect Cloaking Device from table to begin." restart_timer beginloop(0x86) @@ -1888,7 +1888,7 @@ u8 func1009_devicetraining_cloak[] = { label(0x8d) remove_hudmsgs if_player_using_device(CHR_BOND, WEAPON_CLOAKINGDEVICE, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(64)) // "Select the Cloaking Device. - Hold A Button. - Use Control Stick to change selection. - Highlight Device and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_064) // "Select the Cloaking Device. - Hold A Button. - Use Control Stick to change selection. - Highlight Device and release A Button." restart_timer beginloop(0x8e) @@ -1904,7 +1904,7 @@ u8 func1009_devicetraining_cloak[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(52)) // "Use Cloaking Device and locate Carrington." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_052) // "Use Cloaking Device and locate Carrington." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -1917,7 +1917,7 @@ u8 func1009_devicetraining_cloak[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(54)) // "Mission complete - Device Training passed!" + show_hudmsg(CHR_BOND, L_DISH_054) // "Mission complete - Device Training passed!" restart_timer beginloop(0x0e) @@ -1934,7 +1934,7 @@ u8 func1009_devicetraining_cloak[] = { label(0x0a) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(55)) // "Mission failed - you have been detected." + show_hudmsg(CHR_BOND, L_DISH_055) // "Mission failed - you have been detected." restart_timer beginloop(0x0f) @@ -2010,7 +2010,7 @@ u8 func100a_devicetraining_ecmmine[] = { label(0x59) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(16)) // "Collect ECM Mine from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_016) // "Collect ECM Mine from table to begin." restart_timer beginloop(0x86) @@ -2034,7 +2034,7 @@ u8 func100a_devicetraining_ecmmine[] = { label(0x8d) remove_hudmsgs if_chr_weapon_equipped(CHR_BOND, WEAPON_ECMMINE, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(65)) // "Select the ECM Mine. - Hold A Button. - Use Control Stick to change selection. - Highlight ECM Mine and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_065) // "Select the ECM Mine. - Hold A Button. - Use Control Stick to change selection. - Highlight ECM Mine and release A Button." restart_timer beginloop(0x8e) @@ -2048,7 +2048,7 @@ u8 func100a_devicetraining_ecmmine[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(17)) // "Locate Hub and throw ECM Mine onto Hub." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_017) // "Locate Hub and throw ECM Mine onto Hub." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -2083,7 +2083,7 @@ u8 func100a_devicetraining_ecmmine[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(19)) // "ECM Mine has been placed correctly." + show_hudmsg(CHR_BOND, L_DISH_019) // "ECM Mine has been placed correctly." restart_timer beginloop(0x0c) @@ -2093,7 +2093,7 @@ u8 func100a_devicetraining_ecmmine[] = { label(0x0a) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(18)) // "ECM Mine has been placed incorrectly." + show_hudmsg(CHR_BOND, L_DISH_018) // "ECM Mine has been placed incorrectly." restart_timer beginloop(0x0d) @@ -2153,7 +2153,7 @@ u8 func100b_devicetraining_uplink[] = { if_chr_activated_object(CHR_BOND, 0x89, /*goto*/ 0x8c) label(0x8c) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(10)) // "Collect Data Uplink from table to begin." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_010) // "Collect Data Uplink from table to begin." restart_timer beginloop(0x86) @@ -2176,7 +2176,7 @@ u8 func100b_devicetraining_uplink[] = { label(0x8d) remove_hudmsgs if_chr_weapon_equipped(CHR_BOND, WEAPON_DATAUPLINK, /*goto*/ 0x2f) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(56)) // "Select the Uplink. - Hold A Button. - Use Control Stick to change selection. - Highlight Data Uplink and release A Button." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_056) // "Select the Uplink. - Hold A Button. - Use Control Stick to change selection. - Highlight Data Uplink and release A Button." restart_timer beginloop(0x8e) @@ -2199,7 +2199,7 @@ u8 func100b_devicetraining_uplink[] = { if_chr_activated_object(CHR_BOND, 0x30, /*goto*/ 0x2f) label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(11)) // "Stand next to the terminal and use the Uplink." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_011) // "Stand next to the terminal and use the Uplink." beginloop(0x82) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -2218,12 +2218,12 @@ u8 func100b_devicetraining_uplink[] = { if_chr_weapon_equipped(CHR_BOND, WEAPON_DATAUPLINK, /*goto*/ 0x2f) play_sound(0x8116, -1) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(12)) // "You need to be holding the Data Uplink." + show_hudmsg(CHR_BOND, L_DISH_012) // "You need to be holding the Data Uplink." goto_first(0x82) label(0x2f) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(13)) // "Connection established..." + show_hudmsg(CHR_BOND, L_DISH_013) // "Connection established..." restart_timer label(0x08) @@ -2264,7 +2264,7 @@ u8 func100b_devicetraining_uplink[] = { assign_sound(0x01c1, CHANNEL_7) control_sound_from_object(CHANNEL_7, 0x30, TRUE) remove_hudmsgs - show_hudmsg(CHR_TARGET, L_DISH(14)) // "Terminal has been successfully hacked." + show_hudmsg(CHR_TARGET, L_DISH_014) // "Terminal has been successfully hacked." beginloop(0x15) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90) @@ -2284,7 +2284,7 @@ u8 func100b_devicetraining_uplink[] = { label(0x09) remove_hudmsgs - show_hudmsg(CHR_BOND, L_DISH(15)) // "Connection broken - too far from PC." + show_hudmsg(CHR_BOND, L_DISH_015) // "Connection broken - too far from PC." mute_channel(CHANNEL_5) assign_sound(0x01c0, CHANNEL_6) control_sound_from_object(CHANNEL_6, 0x30, TRUE) @@ -2493,7 +2493,7 @@ u8 func0429_grimshaw_disguise[] = { endloop(0x58) label(0x06) - speak(CHR_BOND, L_DISH(43), 0x1517, CHANNEL_6, COLOR_09_BLUE) // "I'm here to pick up the equipment." + speak(CHR_BOND, L_DISH_043, 0x1517, CHANNEL_6, COLOR_09_BLUE) // "I'm here to pick up the equipment." beginloop(0x59) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x0d) @@ -2511,7 +2511,7 @@ u8 func0429_grimshaw_disguise[] = { label(0x06) if_chr_has_hiddenflag(CHR_BOND, CHRHFLAG_DISGUISED, /*goto*/ 0x2f) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(44), 0x1518, CHANNEL_6, COLOR_05_GREEN) // "Go away, Joanna. You're not fooling anybody!" + speak(CHR_TARGET, L_DISH_044, 0x1518, CHANNEL_6, COLOR_05_GREEN) // "Go away, Joanna. You're not fooling anybody!" beginloop(0x5c) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x0d) @@ -2524,7 +2524,7 @@ u8 func0429_grimshaw_disguise[] = { label(0x2f) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(45), 0x1519, CHANNEL_6, COLOR_05_GREEN) // "Here you go. Don't drop it now." + speak(CHR_TARGET, L_DISH_045, 0x1519, CHANNEL_6, COLOR_05_GREEN) // "Here you go. Don't drop it now." beginloop(0x5d) if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x0d) @@ -2584,8 +2584,8 @@ u8 func100c_cloak_detection[] = { label(0x06) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) - speak(CHR_TARGET, L_DISH(48), 0x151a, CHANNEL_6, COLOR_05_GREEN) // "You'll have to do better than that, Joanna." - show_hudmsg(CHR_BOND, L_DISH(50)) // "You have been detected by the camera." + speak(CHR_TARGET, L_DISH_048, 0x151a, CHANNEL_6, COLOR_05_GREEN) // "You'll have to do better than that, Joanna." + show_hudmsg(CHR_BOND, L_DISH_050) // "You have been detected by the camera." restart_timer beginloop(0x0a) @@ -2675,7 +2675,7 @@ u8 func042a_carrington_cloak[] = { label(0x06) do_preset_animation(-1) - speak(CHR_BOND, L_DISH(49), 0x151b, CHANNEL_6, COLOR_06_WHITE) // "Joanna, where did you spring from?" + speak(CHR_BOND, L_DISH_049, 0x151b, CHANNEL_6, COLOR_06_WHITE) // "Joanna, where did you spring from?" beginloop(0x59) if_sound_finished(CHANNEL_6, /*goto*/ 0x06) @@ -2690,7 +2690,7 @@ u8 func042a_carrington_cloak[] = { label(0x06) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(53), 0x151c, CHANNEL_6, COLOR_06_WHITE) // "I think we can safely say your training is now complete!" + speak(CHR_TARGET, L_DISH_053, 0x151c, CHANNEL_6, COLOR_06_WHITE) // "I think we can safely say your training is now complete!" beginloop(0x5c) if_sound_finished(CHANNEL_6, /*goto*/ 0x06) @@ -2951,7 +2951,7 @@ u8 func042c_carrington_tour[] = { set_savefile_flag(SAVEFILEFLAG_CI_TOUR_STARTED) do_preset_animation(-1) remove_hudmsgs - speak(CHR_TARGET, L_DISH(66), 0x8029, CHANNEL_6, COLOR_06_WHITE) // "Joanna, it's good to see you." + speak(CHR_TARGET, L_DISH_066, 0x8029, CHANNEL_6, COLOR_06_WHITE) // "Joanna, it's good to see you." restart_timer beginloop(0x57) @@ -2960,7 +2960,7 @@ u8 func042c_carrington_tour[] = { label(0x06) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(67), 0x151d, CHANNEL_6, COLOR_06_WHITE) // "Come with me. I'll walk you round the training rooms." + speak(CHR_TARGET, L_DISH_067, 0x151d, CHANNEL_6, COLOR_06_WHITE) // "Come with me. I'll walk you round the training rooms." restart_timer beginloop(0x59) @@ -2992,7 +2992,7 @@ u8 func042c_carrington_tour[] = { label(0x2f) do_preset_animation(-1) remove_hudmsgs - speak(CHR_TARGET, L_DISH(68), 0x1520, CHANNEL_6, COLOR_06_WHITE) // "The information center is through this door." + speak(CHR_TARGET, L_DISH_068, 0x1520, CHANNEL_6, COLOR_06_WHITE) // "The information center is through this door." restart_timer beginloop(0x5d) @@ -3020,7 +3020,7 @@ u8 func042c_carrington_tour[] = { label(0x2f) set_ailist(0x01, GAILIST_IDLE) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(69), 0x151f, CHANNEL_6, COLOR_06_WHITE) // "In here we have the device lab." + speak(CHR_TARGET, L_DISH_069, 0x151f, CHANNEL_6, COLOR_06_WHITE) // "In here we have the device lab." restart_timer beginloop(0x64) @@ -3076,7 +3076,7 @@ u8 func042c_carrington_tour[] = { label(0x2f) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(70), 0x1521, CHANNEL_6, COLOR_06_WHITE) // "This leads to the simulant training room." + speak(CHR_TARGET, L_DISH_070, 0x1521, CHANNEL_6, COLOR_06_WHITE) // "This leads to the simulant training room." restart_timer beginloop(0x6b) @@ -3112,7 +3112,7 @@ u8 func042c_carrington_tour[] = { label(0x2f) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(71), 0x151e, CHANNEL_6, COLOR_06_WHITE) // "This is the firing range, Jo." + speak(CHR_TARGET, L_DISH_071, 0x151e, CHANNEL_6, COLOR_06_WHITE) // "This is the firing range, Jo." restart_timer beginloop(0x6f) @@ -3164,7 +3164,7 @@ u8 func042c_carrington_tour[] = { label(0x2f) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(72), 0x1522, CHANNEL_6, COLOR_06_WHITE) // "This corridor leads down to the hangar." + speak(CHR_TARGET, L_DISH_072, 0x1522, CHANNEL_6, COLOR_06_WHITE) // "This corridor leads down to the hangar." restart_timer beginloop(0x75) @@ -3182,7 +3182,7 @@ u8 func042c_carrington_tour[] = { label(0x2f) do_preset_animation(-1) - speak(CHR_TARGET, L_DISH(124), 0x17dc, CHANNEL_6, COLOR_06_WHITE) // "Okay, Jo, I'll leave you to prepare for the mission." + speak(CHR_TARGET, L_DISH_124, 0x17dc, CHANNEL_6, COLOR_06_WHITE) // "Okay, Jo, I'll leave you to prepare for the mission." beginloop(0x7a) if_sound_finished(CHANNEL_6, /*goto*/ 0x2f) @@ -3291,7 +3291,7 @@ u8 func1013_msg_hovercrate[] = { set_savefile_flag(SAVEFILEFLAG_HOWTO_HOVERCRATE) #endif remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(73)) // "HOVERCRATE Press B Button next to Hovcrate to grab it..." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_073) // "HOVERCRATE Press B Button next to Hovcrate to grab it..." restart_timer beginloop(0x08) @@ -3300,7 +3300,7 @@ u8 func1013_msg_hovercrate[] = { label(0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(74)) // "Press B Button when crate grabbed to release it." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_074) // "Press B Button when crate grabbed to release it." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3333,7 +3333,7 @@ u8 func1014_msg_hoverbike[] = { set_savefile_flag(SAVEFILEFLAG_HOWTO_HOVERBIKE) #endif remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(75)) // "HOVERBIKE Double tap B Button next to Hovbike to ride it..." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_075) // "HOVERBIKE Double tap B Button next to Hovbike to ride it..." restart_timer beginloop(0x08) @@ -3342,7 +3342,7 @@ u8 func1014_msg_hoverbike[] = { label(0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(76)) // "Double tap B Button when on Hovbike to dismount." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_076) // "Double tap B Button when on Hovbike to dismount." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3373,7 +3373,7 @@ u8 func1015_msg_doors[] = { set_savefile_flag(SAVEFILEFLAG_HOWTO_DOORS) #endif remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(77)) // "OPENING DOORS Press B Button next to door to open it." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_077) // "OPENING DOORS Press B Button next to door to open it." restart_timer beginloop(0x08) @@ -3382,7 +3382,7 @@ u8 func1015_msg_doors[] = { label(0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(78)) // "B Button will also activate any object nearby." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_078) // "B Button will also activate any object nearby." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3414,7 +3414,7 @@ u8 func1016_msg_elevators[] = { set_savefile_flag(SAVEFILEFLAG_HOWTO_ELEVATORS) #endif remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(79)) // "ELEVATORS Press B Button next to door to call elevator." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_079) // "ELEVATORS Press B Button next to door to call elevator." label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3457,7 +3457,7 @@ u8 func1017_msg_terminals[] = { set_savefile_flag(SAVEFILEFLAG_HOWTO_TERMINALS) #endif remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(114)) // "TERMINALS - Press B Button next to terminal to use it." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_114) // "TERMINALS - Press B Button next to terminal to use it." label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3548,12 +3548,12 @@ u8 func101c_holo1_main[] = { if_object_flag2(0x4f, OBJFLAG2_00000001, /*goto*/ 0x2f) label(0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(100)) // "Get the access codes by examining terminals. - Use the codes on the wall terminals." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_100) // "Get the access codes by examining terminals. - Use the codes on the wall terminals." goto_next(0x06) label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(115)) // "Now activate the red terminals on the wall." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_115) // "Now activate the red terminals on the wall." label(0x06) restart_timer @@ -3829,7 +3829,7 @@ u8 func0430_holo1_check_done[] = { label(0x2f) dprint 'D','O','H','4',0, remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(106)) // "Holoprogram 1 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_106) // "Holoprogram 1 has been completed successfully." restart_timer beginloop(0x08) @@ -3901,7 +3901,7 @@ u8 func1022_holo2_main[] = { label(0x2f) label(0x91) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(99)) // "Activate all of the wall switches. - Be quick, as they will quickly reset." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_099) // "Activate all of the wall switches. - Be quick, as they will quickly reset." restart_timer beginloop(0x82) @@ -4032,7 +4032,7 @@ u8 func041b_holo2_part1[] = { label(0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(87)) // "Holoprogram 2 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_087) // "Holoprogram 2 has been completed successfully." restart_timer beginloop(0x08) @@ -4064,7 +4064,7 @@ u8 func042f_holo2_part2[] = { set_stage_flag(STAGEFLAG_HOLO_FAILED) restart_timer remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(105)) // "Training failed - you must face forward." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_105) // "Training failed - you must face forward." set_ailist(CHR_SELF, GAILIST_IDLE) set_object_image(0x54, 0x00, 0x12) set_object_image(0x55, 0x00, 0x12) @@ -4208,7 +4208,7 @@ u8 func1027_holo3_main[] = { label(0x2f) label(0x91) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(98)) // "Activate all the switches." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_098) // "Activate all the switches." restart_timer beginloop(0x82) @@ -4307,7 +4307,7 @@ u8 func102a_holo3_part1[] = { label(0x09) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(95)) // "DUCK - Hold R Button, then press Down C Button to duck." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_095) // "DUCK - Hold R Button, then press Down C Button to duck." restart_timer beginloop(0x0a) @@ -4333,7 +4333,7 @@ u8 func102b_holo3_part2[] = { label(0x09) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(96)) // "CROUCH - When ducking, hold R Button, then press Down C Button to duck." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_096) // "CROUCH - When ducking, hold R Button, then press Down C Button to duck." restart_timer beginloop(0x0a) @@ -4391,7 +4391,7 @@ u8 func041c_holo3_check_done[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x06) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(97)) // "Holoprogram 3 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_097) // "Holoprogram 3 has been completed successfully." restart_timer beginloop(0x08) @@ -4435,18 +4435,18 @@ u8 func1028_holo4_main[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) remove_hudmsgs if_chr_has_chrflag(0x0d, CHRCFLAG_00000040, /*goto*/ 0x61) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(107)) // "Unarmed combat - knock out the target. - Press Z Button repeatedly to punch." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_107) // "Unarmed combat - knock out the target. - Press Z Button repeatedly to punch." goto_next(0x2f) label(0x61) if_chr_has_chrflag(0x0e, CHRCFLAG_00000040, /*goto*/ 0x62) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(108)) // "Now try against a moving target..." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_108) // "Now try against a moving target..." goto_next(0x2f) label(0x62) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(109)) // "And finally against a target that fights back." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_109) // "And finally against a target that fights back." goto_next(0x2f) label(0x2f) @@ -4523,7 +4523,7 @@ u8 func0403_holo4_guard1[] = { try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0277, AILIST_HOLO4_GUARD2, 0x00002210, /*goto*/ 0x08) label(0x08) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(108)) // "Now try against a moving target..." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_108) // "Now try against a moving target..." set_shotlist(GAILIST_IDLE) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -4544,7 +4544,7 @@ u8 func0404_holo4_guard2[] = { try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x027a, AILIST_HOLO4_GUARD3, 0x00002210, /*goto*/ 0x0a) label(0x0a) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(109)) // "And finally against a target that fights back." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_109) // "And finally against a target that fights back." set_shotlist(GAILIST_IDLE) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) @@ -4626,7 +4626,7 @@ u8 func1033_holo4_part1[] = { restart_timer set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(88)) // "Holoprogram 4 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_088) // "Holoprogram 4 has been completed successfully." beginloop(0x08) if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x57) @@ -4677,16 +4677,16 @@ u8 func1029_holo5_main[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) remove_hudmsgs if_chr_has_chrflag(0x10, CHRCFLAG_00000040, /*goto*/ 0x61) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(92)) // "Disarm this live target if you can." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_092) // "Disarm this live target if you can." goto_next(0x2f) label(0x61) if_chr_has_chrflag(0x11, CHRCFLAG_00000040, /*goto*/ 0x62) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(93)) // "Knock out this target - stealth is the key." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_093) // "Knock out this target - stealth is the key." goto_next(0x2f) label(0x62) - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(94)) // "And the final guard..." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_094) // "And the final guard..." goto_next(0x2f) label(0x2f) @@ -4795,7 +4795,7 @@ u8 func0407_holo5_guard1[] = { set_self_chrflag(CHRCFLAG_00000040) set_self_flag_bankx(CHRFLAG0_00008000, BANK_0) surrender - show_hudmsg(CHR_BOND, L_DISH(90)) // "Guard has been successfully disarmed." + show_hudmsg(CHR_BOND, L_DISH_090) // "Guard has been successfully disarmed." beginloop(0x59) try_spawn_chr_at_pad(BODY_DDSHOCK, HEAD_RANDOM, 0x0272, AILIST_HOLO5_INIT_GUARD2, 0x00002210, /*goto*/ 0x2f) @@ -4836,7 +4836,7 @@ u8 func0408_holo5_init_guard2[] = { try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06) label(0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(93)) // "Knock out this target - stealth is the key." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_093) // "Knock out this target - stealth is the key." set_ailist(CHR_SELF, AILIST_HOLO5_GUARD2) endlist }; @@ -4895,7 +4895,7 @@ u8 func040a_holo5_init_guard3[] = { try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x40000000, /*goto*/ 0x06) label(0x06) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(94)) // "And the final guard..." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_094) // "And the final guard..." set_alertness(100) set_ailist(CHR_SELF, AILIST_HOLO5_GUARD3) endlist @@ -4922,7 +4922,7 @@ u8 func040b_holo5_guard3[] = { label(0x2f) restart_timer remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(89)) // "Holoprogram 5 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_089) // "Holoprogram 5 has been completed successfully." beginloop(0x08) if_timer_gt(120, /*goto*/ 0x06) @@ -4983,7 +4983,7 @@ u8 func1034_holo5_part1[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(89)) // "Holoprogram 5 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_089) // "Holoprogram 5 has been completed successfully." beginloop(0x08) if_stage_flag_eq(STAGEFLAG_HOLO_ABORTING, TRUE, /*goto*/ 0x0d) @@ -5049,7 +5049,7 @@ u8 func102e_holo6_main[] = { label(0x91) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(110)) // "Defeat all enemies without getting hit." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_110) // "Defeat all enemies without getting hit." label(0x2f) restart_timer @@ -5194,7 +5194,7 @@ u8 func0416_holo_guard_unarmed_alert[] = { set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) set_stage_flag(STAGEFLAG_HOLO_FAILED) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(111)) // "Training failed - you have been hit." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_111) // "Training failed - you have been hit." restart_timer set_ailist(CHR_SELF, GAILIST_IDLE) @@ -5289,7 +5289,7 @@ u8 func0416_holo_guard_unarmed_alert2[] = { set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) set_stage_flag(STAGEFLAG_HOLO_FAILED) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(111)) // "Training failed - you have been hit." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_111) // "Training failed - you have been hit." restart_timer set_ailist(CHR_SELF, GAILIST_IDLE) @@ -5392,7 +5392,7 @@ u8 func102f_holo1_part1[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(112)) // "Holoprogram 6 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_112) // "Holoprogram 6 has been completed successfully." restart_timer beginloop(0x08) @@ -5462,7 +5462,7 @@ u8 func1030_holo7_main[] = { label(0x91) if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x2f) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(110)) // "Defeat all enemies without getting hit." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_110) // "Defeat all enemies without getting hit." label(0x2f) restart_timer @@ -5628,7 +5628,7 @@ u8 func0419_holo_guard_armed_alert[] = { set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) set_stage_flag(STAGEFLAG_HOLO_FAILED) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(111)) // "Training failed - you have been hit." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_111) // "Training failed - you have been hit." restart_timer set_ailist(CHR_SELF, GAILIST_IDLE) @@ -5717,7 +5717,7 @@ u8 func1031_holo7_part1[] = { if_stage_flag_eq(STAGEFLAG_GENERAL_PURPOSE, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_GENERAL_PURPOSE) remove_hudmsgs - show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(113)) // "Holoprogram 7 has been completed successfully." + show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_113) // "Holoprogram 7 has been completed successfully." restart_timer beginloop(0x08) @@ -5777,42 +5777,42 @@ u8 func1035_manage_music[] = { u8 func1038_msg_pp7[] = { - do_gun_msg(0x1e, L_DISH(116)) // "PP7" + do_gun_msg(0x1e, L_DISH_116) // "PP7" endlist }; u8 func1039_msg_tt33[] = { - do_gun_msg(0x1f, L_DISH(117)) // "TT33" + do_gun_msg(0x1f, L_DISH_117) // "TT33" endlist }; u8 func103a_msg_skorpion[] = { - do_gun_msg(0x20, L_DISH(118)) // "Skorpion" + do_gun_msg(0x20, L_DISH_118) // "Skorpion" endlist }; u8 func103b_msg_ak47[] = { - do_gun_msg(0x21, L_DISH(119)) // "AK47" + do_gun_msg(0x21, L_DISH_119) // "AK47" endlist }; u8 func103c_msg_uzi9mm[] = { - do_gun_msg(0x22, L_DISH(120)) // "Uzi 9mm" + do_gun_msg(0x22, L_DISH_120) // "Uzi 9mm" endlist }; u8 func103d_msg_mp5k[] = { - do_gun_msg(0x23, L_DISH(121)) // "MP5K" + do_gun_msg(0x23, L_DISH_121) // "MP5K" endlist }; u8 func103e_msg_m16[] = { - do_gun_msg(0x24, L_DISH(122)) // "M-16" + do_gun_msg(0x24, L_DISH_122) // "M-16" endlist }; u8 func103f_msg_fnp90[] = { - do_gun_msg(0x25, L_DISH(123)) // "FNP90" + do_gun_msg(0x25, L_DISH_123) // "FNP90" endlist }; diff --git a/src/assets/files/setup/setupear.c b/src/assets/files/setup/setupear.c index 390ed6a9f..2ccd551bf 100644 --- a/src/assets/files/setup/setupear.c +++ b/src/assets/files/setup/setupear.c @@ -106,23 +106,23 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_EAR(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_EAR(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_EAR(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_EAR(3)) + briefing(BRIEFINGTYPE_LOCATION, L_EAR_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_EAR_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_EAR_002) + briefing(BRIEFINGTYPE_TEXT_A, L_EAR_003) - beginobjective(0, L_EAR(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Holograph radioactive isotope" + beginobjective(0, L_EAR_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Holograph radioactive isotope" require_object_holographed(0x39, 0, 0) fail_flags(STAGEFLAG_CAMSPY_DESTROYED) endobjective - beginobjective(1, L_EAR(11), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Start security maintenance cycle" + beginobjective(1, L_EAR_011, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Start security maintenance cycle" complete_flags(STAGEFLAG_BOT_ACTIVE_MAINTENANCE) fail_flags(STAGEFLAG_BOT_ACTIVATION_TERMINAL_DESTROYED) fail_flags(STAGEFLAG_BOT_PROGRAMMING_TERMINAL_DESTROYED) endobjective - beginobjective(2, L_EAR(10), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Shut down experiments" + beginobjective(2, L_EAR_010, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Shut down experiments" complete_flags(STAGEFLAG_SHUT_DOWN_EXPERIMENT1) complete_flags(STAGEFLAG_SHUT_DOWN_EXPERIMENT2) complete_flags(STAGEFLAG_SHUT_DOWN_EXPERIMENT3) @@ -131,14 +131,14 @@ u32 props[] = { fail_flags(STAGEFLAG_00000008) endobjective - beginobjective(3, L_EAR(12), (DIFFBIT_PA | DIFFBIT_PD)) // "Obtain experimental technologies" + beginobjective(3, L_EAR_012, (DIFFBIT_PA | DIFFBIT_PD)) // "Obtain experimental technologies" complete_flags(STAGEFLAG_ALL_ITEMS_COLLECTED) require_object_collected(OBJ_K7AVENGER) require_object_collected(OBJ_NIGHTVISION) require_object_collected(OBJ_SHIELD) endobjective - beginobjective(4, L_EAR(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate Dr. Caroll" + beginobjective(4, L_EAR_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate Dr. Caroll" complete_flags(STAGEFLAG_DRCAROLL_LOCATED) fail_flags(STAGEFLAG_UPLINKPC_DESTROYED) endobjective @@ -566,17 +566,17 @@ u32 props[] = { */ tag(0x05, 1) stdobject(0x0100, MODEL_MISC_IRSPECS, 0x013d, 0x014605e1, 0x00004001, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x2d, L_EAR(45), L_EAR(46), L_EAR(47), L_EAR(48), L_EAR(49), 0x0000, 0x0000) // "Obtain Night Vision." + rename_object(-1, 0x2d, L_EAR_045, L_EAR_046, L_EAR_047, L_EAR_048, L_EAR_049, 0x0000, 0x0000) // "Obtain Night Vision." tag(0x06, 1) stdobject(0x0100, MODEL_CHRSHIELD, 0x0243, 0x01460501, 0x00004001, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x4f, L_EAR(50), L_EAR(51), L_EAR(52), L_EAR(53), L_EAR(54), 0x0000, 0x0000) // "Obtain shield tech item." + rename_object(-1, 0x4f, L_EAR_050, L_EAR_051, L_EAR_052, L_EAR_053, L_EAR_054, 0x0000, 0x0000) // "Obtain shield tech item." tag(0x25, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_EAR(55), L_EAR(56), L_EAR(57), L_EAR(58), L_EAR(59), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x36, L_EAR_055, L_EAR_056, L_EAR_057, L_EAR_058, L_EAR_059, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x48, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_EAR(55), L_EAR(56), L_EAR(57), L_EAR(58), L_EAR(59), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x36, L_EAR_055, L_EAR_056, L_EAR_057, L_EAR_058, L_EAR_059, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x41, 1) autogun(0x0099, MODEL_ROOFGUN, 0x026b, 0x00000004, 0x000000e0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x026e0000, 0x00000000, 0x00004000, 0xffffc000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000da, 0x000a0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000) tag(0x42, 1) @@ -1087,7 +1087,7 @@ u8 func0404_scientist[] = { if_self_flag_bankx_eq(CHRFLAG0_00004000, TRUE, BANK_0, /*goto*/ 0x2f) if_object_in_good_condition(OBJ_GOODTERM3, /*goto*/ 0x19) say_quip(CHR_TARGET, 0x10, 0xff, 0x00, 0xff, 0x81, 0x09, 0x08) - show_hudmsg_top_middle(CHR_TARGET, L_EAR(44), COLOR_00_GREEN) // "It appears someone has broken my PC." + show_hudmsg_top_middle(CHR_TARGET, L_EAR_044, COLOR_00_GREEN) // "It appears someone has broken my PC." goto_next(0x0e) label(0x19) @@ -1137,7 +1137,7 @@ u8 func0404_scientist[] = { goto_next(0x0f) label(0x0f) - show_hudmsg(CHR_TARGET, L_EAR(28)) // "Powering down active systems." + show_hudmsg(CHR_TARGET, L_EAR_028) // "Powering down active systems." speak(CHR_TARGET, 0xffff, 0x8118, CHANNEL_9, COLOR_00_GREEN) // unknown text chr_do_animation(ANIM_STANDING_TYPE_ONE_HAND, 0, 193, 0x10, 0x10, CHR_SELF, 2) @@ -1146,7 +1146,7 @@ u8 func0404_scientist[] = { endloop(0x0d) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(29)) // "Experiment has been shut down." + show_hudmsg(CHR_TARGET, L_EAR_029) // "Experiment has been shut down." stop_chr beginloop(0x0e) @@ -1314,7 +1314,7 @@ u8 func1009_weaponscache[] = { label(0x2f) if_chr_has_hiddenflag(CHR_BOND, CHRHFLAG_PSYCHOSISED, /*goto*/ 0x2f) - show_hudmsg(CHR_TARGET, L_EAR(98)) // "Secret weapons compartment opened." + show_hudmsg(CHR_TARGET, L_EAR_098) // "Secret weapons compartment opened." play_sound(0x00f7, -1) assign_sound(0x043b, CHANNEL_5) control_sound_from_object(CHANNEL_5, OBJ_CMP150_1, TRUE) @@ -1329,7 +1329,7 @@ u8 func1009_weaponscache[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(99)) // "Enemy detected - weapon cache locked." + show_hudmsg(CHR_TARGET, L_EAR_099) // "Enemy detected - weapon cache locked." play_sound(0x00f7, -1) unset_stage_flag(STAGEFLAG_BOT_ACTIVE) unset_stage_flag(STAGEFLAG_BOT_REPROGRAMMED) @@ -1369,25 +1369,25 @@ u8 func1002_bot_activation_terminal[] = { play_sound(0x01ca, -1) assign_sound(0x01c5, CHANNEL_3) play_sound_from_object(CHANNEL_3, OBJ_PURPLEBOT, 0x0258, 0x0320) - show_hudmsg(CHR_TARGET, L_EAR(15)) // "Maintenance robots activated." + show_hudmsg(CHR_TARGET, L_EAR_015) // "Maintenance robots activated." set_stage_flag(STAGEFLAG_BOT_ACTIVE) set_stage_flag(STAGEFLAG_BOT_ACTIVE_NOPROGRAM) reloop(0x04) // Activating after reprogramming label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(15)) // "Maintenance robots activated." + show_hudmsg(CHR_TARGET, L_EAR_015) // "Maintenance robots activated." set_stage_flag(STAGEFLAG_BOT_ACTIVE) yield play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(18)) // "Maintenance cycle activated." + show_hudmsg(CHR_TARGET, L_EAR_018) // "Maintenance cycle activated." set_stage_flag(STAGEFLAG_BOT_ACTIVE_MAINTENANCE) reloop(0x04) // Attempting to deactivate while bot reprogrammed and running label(0x08) play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(20)) // "Operation not allowed - robots busy." + show_hudmsg(CHR_TARGET, L_EAR_020) // "Operation not allowed - robots busy." restart_timer beginloop(0x09) @@ -1399,7 +1399,7 @@ u8 func1002_bot_activation_terminal[] = { // Deactivating label(0x0a) - show_hudmsg(CHR_TARGET, L_EAR(21)) // "Maintenance robots deactivated." + show_hudmsg(CHR_TARGET, L_EAR_021) // "Maintenance robots deactivated." unset_stage_flag(STAGEFLAG_BOT_ACTIVE) unset_stage_flag(STAGEFLAG_BOT_ACTIVE_CLEANING) unset_stage_flag(STAGEFLAG_BOT_ACTIVE_NOPROGRAM) @@ -1409,7 +1409,7 @@ u8 func1002_bot_activation_terminal[] = { label(0x0b) play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(23)) // "Maintenance robot system offline." + show_hudmsg(CHR_TARGET, L_EAR_023) // "Maintenance robot system offline." endloop(0x04) endlist @@ -1444,7 +1444,7 @@ u8 func1003_bot_programming_terminal[] = { // Reprogramming play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(16)) // "Maintenance robots reprogrammed." + show_hudmsg(CHR_TARGET, L_EAR_016) // "Maintenance robots reprogrammed." set_stage_flag(STAGEFLAG_BOT_REPROGRAMMED) if_stage_flag_eq(STAGEFLAG_BOT_ACTIVE, TRUE, /*goto*/ 0x2f) reloop(0x04) @@ -1452,7 +1452,7 @@ u8 func1003_bot_programming_terminal[] = { label(0x2f) yield play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(19)) // "Routine cleaning cycle activated." + show_hudmsg(CHR_TARGET, L_EAR_019) // "Routine cleaning cycle activated." set_stage_flag(STAGEFLAG_BOT_ACTIVE_CLEANING) restart_timer @@ -1466,7 +1466,7 @@ u8 func1003_bot_programming_terminal[] = { // Attempting to reprogram while bot already reprogrammed and running label(0x09) play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(20)) // "Operation not allowed - robots busy." + show_hudmsg(CHR_TARGET, L_EAR_020) // "Operation not allowed - robots busy." restart_timer beginloop(0x0a) @@ -1477,7 +1477,7 @@ u8 func1003_bot_programming_terminal[] = { reloop(0x04) label(0x0b) - show_hudmsg(CHR_TARGET, L_EAR(23)) // "Maintenance robot system offline." + show_hudmsg(CHR_TARGET, L_EAR_023) // "Maintenance robot system offline." endloop(0x04) endlist @@ -1522,7 +1522,7 @@ u8 func1018_item_pickup_messages[] = { goto_next(0x2f) label(0x06) - show_hudmsg(CHR_P1P2, L_EAR(86)) // "Experimental item 1 acquired." + show_hudmsg(CHR_P1P2, L_EAR_086) // "Experimental item 1 acquired." set_stage_flag(STAGEFLAG_HAS_K7AVENGER) label(0x2f) if_stage_flag_eq(STAGEFLAG_HAS_NIGHTVISION, TRUE, /*goto*/ 0x2f) @@ -1530,7 +1530,7 @@ u8 func1018_item_pickup_messages[] = { goto_next(0x2f) label(0x06) - show_hudmsg(CHR_P1P2, L_EAR(87)) // "Experimental item 2 acquired." + show_hudmsg(CHR_P1P2, L_EAR_087) // "Experimental item 2 acquired." set_stage_flag(STAGEFLAG_HAS_NIGHTVISION) label(0x2f) if_stage_flag_eq(STAGEFLAG_HAS_SHIELD, TRUE, /*goto*/ 0x2f) @@ -1538,7 +1538,7 @@ u8 func1018_item_pickup_messages[] = { goto_next(0x2f) label(0x06) - show_hudmsg(CHR_P1P2, L_EAR(88)) // "Experimental item 3 acquired." + show_hudmsg(CHR_P1P2, L_EAR_088) // "Experimental item 3 acquired." set_stage_flag(STAGEFLAG_HAS_SHIELD) label(0x2f) endloop(0x04) @@ -1600,7 +1600,7 @@ u8 func1005_check_unacceptable_casualties[] = { label(0x2f) label(0x0f) set_stage_flag(STAGEFLAG_UNACCEPTABLE_CASUALTIES) - show_hudmsg(CHR_BOND, L_EAR(26)) // "Unacceptable scientist casualties." + show_hudmsg(CHR_BOND, L_EAR_026) // "Unacceptable scientist casualties." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1640,7 +1640,7 @@ u8 func1006_terminal_activation[] = { // Inactive terminal label(0x2f) speak(CHR_TARGET, 0xffff, 0x8118, CHANNEL_9, COLOR_00_GREEN) // unknown text - show_hudmsg(CHR_TARGET, L_EAR(27)) // "Terminal is not active." + show_hudmsg(CHR_TARGET, L_EAR_027) // "Terminal is not active." restart_timer beginloop(0x56) @@ -1661,11 +1661,11 @@ u8 func1006_terminal_activation[] = { endloop(0x56) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(42)) // "Experiment already powered down." + show_hudmsg(CHR_TARGET, L_EAR_042) // "Experiment already powered down." reloop(0x04) label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(28)) // "Powering down active systems." + show_hudmsg(CHR_TARGET, L_EAR_028) // "Powering down active systems." assign_sound(0x01c3, CHANNEL_5) control_sound_from_object(CHANNEL_5, OBJ_GOODTERM1, TRUE) restart_timer @@ -1675,7 +1675,7 @@ u8 func1006_terminal_activation[] = { endloop(0x0a) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(29)) // "Experiment has been shut down." + show_hudmsg(CHR_TARGET, L_EAR_029) // "Experiment has been shut down." set_stage_flag(STAGEFLAG_SHUT_DOWN_EXPERIMENT1) reloop(0x04) @@ -1690,11 +1690,11 @@ u8 func1006_terminal_activation[] = { endloop(0x57) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(42)) // "Experiment already powered down." + show_hudmsg(CHR_TARGET, L_EAR_042) // "Experiment already powered down." goto_first(0x04) label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(28)) // "Powering down active systems." + show_hudmsg(CHR_TARGET, L_EAR_028) // "Powering down active systems." assign_sound(0x01c3, CHANNEL_5) control_sound_from_object(CHANNEL_5, OBJ_GOODTERM2, TRUE) restart_timer @@ -1704,7 +1704,7 @@ u8 func1006_terminal_activation[] = { endloop(0x0e) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(29)) // "Experiment has been shut down." + show_hudmsg(CHR_TARGET, L_EAR_029) // "Experiment has been shut down." set_stage_flag(STAGEFLAG_SHUT_DOWN_EXPERIMENT2) reloop(0x04) @@ -1719,11 +1719,11 @@ u8 func1006_terminal_activation[] = { endloop(0x58) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(42)) // "Experiment already powered down." + show_hudmsg(CHR_TARGET, L_EAR_042) // "Experiment already powered down." reloop(0x04) label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(28)) // "Powering down active systems." + show_hudmsg(CHR_TARGET, L_EAR_028) // "Powering down active systems." assign_sound(0x01c3, CHANNEL_5) control_sound_from_object(CHANNEL_5, OBJ_GOODTERM3, TRUE) restart_timer @@ -1733,7 +1733,7 @@ u8 func1006_terminal_activation[] = { endloop(0x10) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(29)) // "Experiment has been shut down." + show_hudmsg(CHR_TARGET, L_EAR_029) // "Experiment has been shut down." set_stage_flag(STAGEFLAG_SHUT_DOWN_EXPERIMENT3) reloop(0x04) @@ -1741,13 +1741,13 @@ u8 func1006_terminal_activation[] = { label(0x09) if_alarm_active(/*goto*/ 0x06) speak(CHR_TARGET, 0xffff, 0x8118, CHANNEL_9, COLOR_00_GREEN) // unknown text - show_hudmsg(CHR_TARGET, L_EAR(30)) // "Alarm activated." + show_hudmsg(CHR_TARGET, L_EAR_030) // "Alarm activated." set_stage_flag(STAGEFLAG_ALARM1_ACTIVE) activate_alarm reloop(0x04) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(31)) // "Alarm deactivated." + show_hudmsg(CHR_TARGET, L_EAR_031) // "Alarm deactivated." unset_stage_flag(STAGEFLAG_ALARM1_ACTIVE) deactivate_alarm reloop(0x04) @@ -1756,13 +1756,13 @@ u8 func1006_terminal_activation[] = { label(0x0b) if_alarm_active(/*goto*/ 0x06) speak(CHR_TARGET, 0xffff, 0x8118, CHANNEL_9, COLOR_00_GREEN) // unknown text - show_hudmsg(CHR_TARGET, L_EAR(30)) // "Alarm activated." + show_hudmsg(CHR_TARGET, L_EAR_030) // "Alarm activated." set_stage_flag(STAGEFLAG_ALARM2_ACTIVE) activate_alarm reloop(0x04) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(31)) // "Alarm deactivated." + show_hudmsg(CHR_TARGET, L_EAR_031) // "Alarm deactivated." unset_stage_flag(STAGEFLAG_ALARM2_ACTIVE) deactivate_alarm reloop(0x04) @@ -1771,13 +1771,13 @@ u8 func1006_terminal_activation[] = { label(0x0c) if_alarm_active(/*goto*/ 0x06) speak(CHR_TARGET, 0xffff, 0x8118, CHANNEL_9, COLOR_00_GREEN) // unknown text - show_hudmsg(CHR_TARGET, L_EAR(30)) // "Alarm activated." + show_hudmsg(CHR_TARGET, L_EAR_030) // "Alarm activated." set_stage_flag(STAGEFLAG_ALARM3_ACTIVE) activate_alarm reloop(0x04) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(31)) // "Alarm deactivated." + show_hudmsg(CHR_TARGET, L_EAR_031) // "Alarm deactivated." unset_stage_flag(STAGEFLAG_ALARM3_ACTIVE) deactivate_alarm reloop(0x04) @@ -1804,7 +1804,7 @@ u8 func1007_uplink[] = { // Activating a second time speak(CHR_TARGET, 0xffff, 0x8116, CHANNEL_9, COLOR_00_GREEN) // unknown text - show_hudmsg(CHR_TARGET, L_EAR(41)) // "Security door already unlocked." + show_hudmsg(CHR_TARGET, L_EAR_041) // "Security door already unlocked." reloop(0x04) label(0x06) @@ -1812,12 +1812,12 @@ u8 func1007_uplink[] = { // Activated computer without uplink speak(CHR_TARGET, 0xffff, 0x8116, CHANNEL_9, COLOR_00_GREEN) // unknown text - show_hudmsg(CHR_TARGET, L_EAR(36)) // "ACCESS DENIED - security code required." + show_hudmsg(CHR_TARGET, L_EAR_036) // "ACCESS DENIED - security code required." reloop(0x04) // Uplinking label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(60)) // "Connection established." + show_hudmsg(CHR_TARGET, L_EAR_060) // "Connection established." restart_timer // First second of uplinking @@ -1839,7 +1839,7 @@ u8 func1007_uplink[] = { endloop(0x08) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(37)) // "Searching for password." + show_hudmsg(CHR_TARGET, L_EAR_037) // "Searching for password." restart_timer set_stage_flag(STAGEFLAG_UPLINK_SEARCHING) assign_sound(0x01bf, CHANNEL_5) @@ -1861,9 +1861,9 @@ u8 func1007_uplink[] = { mute_channel(CHANNEL_5) assign_sound(0x01c1, CHANNEL_6) control_sound_from_object(CHANNEL_6, OBJ_UPLINKPC, TRUE) - show_hudmsg(CHR_TARGET, L_EAR(39)) // "Password located - bypassing lock." + show_hudmsg(CHR_TARGET, L_EAR_039) // "Password located - bypassing lock." yield - show_hudmsg(CHR_TARGET, L_EAR(17)) // "Security doors unlocked." + show_hudmsg(CHR_TARGET, L_EAR_017) // "Security doors unlocked." set_stage_flag(STAGEFLAG_UPLINK_FINISHED) unlock_door(OBJ_UPLINKDOOR, 0x02) @@ -1878,7 +1878,7 @@ u8 func1007_uplink[] = { // Moved away from PC or switched weapon label(0x09) - show_hudmsg(CHR_TARGET, L_EAR(40)) // "Contact broken - reestablish link." + show_hudmsg(CHR_TARGET, L_EAR_040) // "Contact broken - reestablish link." mute_channel(CHANNEL_5) mute_channel(CHANNEL_6) assign_sound(0x01c0, CHANNEL_6) @@ -1901,7 +1901,7 @@ u8 func1007_uplink[] = { endloop(0x0c) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(85)) // "Connection broken - experiments still active." + show_hudmsg(CHR_TARGET, L_EAR_085) // "Connection broken - experiments still active." mute_channel(CHANNEL_5) mute_channel(CHANNEL_6) assign_sound(0x01c0, CHANNEL_6) @@ -1930,13 +1930,13 @@ u8 func1008_check_bot_terminals_destroyed[] = { if_object_in_good_condition(OBJ_BOT_ACTIVATION_TERMINAL, /*goto*/ 0x2f) set_stage_flag(STAGEFLAG_BOT_ACTIVATION_TERMINAL_DESTROYED) if_difficulty_lt(DIFF_SA, /*goto*/ 0x2f) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." label(0x2f) if_stage_flag_eq(STAGEFLAG_BOT_PROGRAMMING_TERMINAL_DESTROYED, TRUE, /*goto*/ 0x2f) if_object_in_good_condition(OBJ_BOT_PROGRAMMING_TERMINAL, /*goto*/ 0x2f) set_stage_flag(STAGEFLAG_BOT_PROGRAMMING_TERMINAL_DESTROYED) if_difficulty_lt(DIFF_SA, /*goto*/ 0x2f) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." label(0x2f) endloop(0x04) @@ -2055,7 +2055,7 @@ u8 func100b_check_uplink_pc_destroyed[] = { if_stage_flag_eq(STAGEFLAG_UPLINK_FINISHED, TRUE, /*goto*/ 0x08) if_object_in_good_condition(OBJ_UPLINKPC, /*goto*/ 0x2f) set_stage_flag(STAGEFLAG_UPLINKPC_DESTROYED) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." goto_next(0x08) label(0x2f) endloop(0x04) @@ -2202,21 +2202,21 @@ u8 func100e_experiment_terminals_destroyed[] = { if_stage_flag_eq(STAGEFLAG_GOODTERM_DESTROYED, TRUE, /*goto*/ 0x2f) if_stage_flag_eq(STAGEFLAG_SHUT_DOWN_EXPERIMENT1, TRUE, /*goto*/ 0x2f) set_stage_flag(STAGEFLAG_GOODTERM_DESTROYED) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." label(0x2f) if_object_in_good_condition(OBJ_GOODTERM2, /*goto*/ 0x2f) if_stage_flag_eq(STAGEFLAG_GOODTERM_DESTROYED, TRUE, /*goto*/ 0x2f) if_stage_flag_eq(STAGEFLAG_SHUT_DOWN_EXPERIMENT2, TRUE, /*goto*/ 0x2f) set_stage_flag(STAGEFLAG_GOODTERM_DESTROYED) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." label(0x2f) if_object_in_good_condition(0x09, /*goto*/ 0x2f) if_stage_flag_eq(STAGEFLAG_GOODTERM_DESTROYED, TRUE, /*goto*/ 0x2f) if_stage_flag_eq(STAGEFLAG_SHUT_DOWN_EXPERIMENT3, TRUE, /*goto*/ 0x2f) set_stage_flag(STAGEFLAG_GOODTERM_DESTROYED) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." label(0x2f) endloop(0x04) @@ -2566,7 +2566,7 @@ u8 func1415_outro_audio[] = { play_sound(0x0161, CHANNEL_6) outro_wait_until(620, 0x68) - speak(CHR_P1P2, L_EAR(100), 0x73ec, CHANNEL_7, COLOR_09_BLUE) // "Dr. Caroll?" + speak(CHR_P1P2, L_EAR_100, 0x73ec, CHANNEL_7, COLOR_09_BLUE) // "Dr. Caroll?" outro_wait_until(676, 0x67) play_sound(0x0162, CHANNEL_6) @@ -2575,13 +2575,13 @@ u8 func1415_outro_audio[] = { play_sound(0x0163, CHANNEL_5) outro_wait_until(750, 0x6a) - speak(CHR_P1P2, L_EAR(101), 0x73ed, CHANNEL_7, COLOR_09_BLUE) // "Dr. Caroll, are you here?" + speak(CHR_P1P2, L_EAR_101, 0x73ed, CHANNEL_7, COLOR_09_BLUE) // "Dr. Caroll, are you here?" outro_wait_until(864, 0x6b) - speak(CHR_P1P2, L_EAR(102), 0x73ee, CHANNEL_7, COLOR_04_ORANGE) // "Well, is it safe to come out?" + speak(CHR_P1P2, L_EAR_102, 0x73ee, CHANNEL_7, COLOR_04_ORANGE) // "Well, is it safe to come out?" outro_wait_until(1027, 0x6c) - speak(CHR_P1P2, L_EAR(103), 0x73ef, CHANNEL_7, COLOR_09_BLUE) // "Yes, all clear." + speak(CHR_P1P2, L_EAR_103, 0x73ef, CHANNEL_7, COLOR_09_BLUE) // "Yes, all clear." outro_wait_until(1200, 0x6f) mute_channel(CHANNEL_6) @@ -2590,17 +2590,17 @@ u8 func1415_outro_audio[] = { outro_wait_until(1219, 0x70) outro_wait_until(1254, 0x71) - speak(CHR_P1P2, L_EAR(104), 0x73f0, CHANNEL_7, COLOR_09_BLUE) // "Wh..what... you're..." + speak(CHR_P1P2, L_EAR_104, 0x73f0, CHANNEL_7, COLOR_09_BLUE) // "Wh..what... you're..." outro_wait_until(1460, 0x73) - speak(CHR_P1P2, L_EAR(105), 0x73f1, CHANNEL_7, COLOR_04_ORANGE) // "Very professionally done, my dear, but there's no ..." + speak(CHR_P1P2, L_EAR_105, 0x73f1, CHANNEL_7, COLOR_04_ORANGE) // "Very professionally done, my dear, but there's no ..." outro_wait_until(1556, 0x74) mute_channel(CHANNEL_5) play_sound(0x042c, CHANNEL_6) outro_wait_until(1900, 0x75) - speak(CHR_P1P2, L_EAR(106), 0x73f2, CHANNEL_7, COLOR_04_ORANGE) // "Come on. I have vital information, and you must pr..." + speak(CHR_P1P2, L_EAR_106, 0x73f2, CHANNEL_7, COLOR_04_ORANGE) // "Come on. I have vital information, and you must pr..." outro_wait_until(2200, 0x76) play_sound(0x0161, CHANNEL_6) @@ -2744,12 +2744,12 @@ u8 func1013_hatch_pc[] = { label(0x56) play_sound(0x00f7, -1) - show_hudmsg(CHR_TARGET, L_EAR(61)) // "Maintenance hatch is now open." + show_hudmsg(CHR_TARGET, L_EAR_061) // "Maintenance hatch is now open." unlock_door(0x3f, 0x08) reloop(0x04) label(0x2f) - show_hudmsg(CHR_TARGET, L_EAR(62)) // "Maintenance hatch is already open." + show_hudmsg(CHR_TARGET, L_EAR_062) // "Maintenance hatch is already open." restart_timer beginloop(0x57) @@ -2777,7 +2777,7 @@ u8 func0415_radioactivity[] = { reloop(0x04) label(0x06) - show_hudmsg(CHR_TARGET, L_EAR(63)) // "WARNING - radioactive matter detected." + show_hudmsg(CHR_TARGET, L_EAR_063) // "WARNING - radioactive matter detected." restart_timer label(0x08) yield @@ -3056,7 +3056,7 @@ u8 func1019_msg_securitysector[] = { endloop(0x04) label(0x2f) - speak(CHR_P1P2, L_EAR(94), 0x8173, CHANNEL_6, COLOR_09_BLUE) // "That's the highest security sector - Dr. Caroll ha..." + speak(CHR_P1P2, L_EAR_094, 0x8173, CHANNEL_6, COLOR_09_BLUE) // "That's the highest security sector - Dr. Caroll ha..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3069,7 +3069,7 @@ u8 func101a_msg_lotofpower[] = { endloop(0x04) label(0x2f) - speak(CHR_P1P2, L_EAR(95), 0x73a5, CHANNEL_6, COLOR_09_BLUE) // "Something around here's using a lot of power." + speak(CHR_P1P2, L_EAR_095, 0x73a5, CHANNEL_6, COLOR_09_BLUE) // "Something around here's using a lot of power." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3084,7 +3084,7 @@ u8 func101b_msg_reprogram[] = { endloop(0x04) label(0x2f) - speak(CHR_P1P2, L_EAR(96), 0x8174, CHANNEL_6, COLOR_09_BLUE) // "Reprogram that cleaning bot - it'll give you a way..." + speak(CHR_P1P2, L_EAR_096, 0x8174, CHANNEL_6, COLOR_09_BLUE) // "Reprogram that cleaning bot - it'll give you a way..." label(0x08) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3098,7 +3098,7 @@ u8 func101c_msg_radioactive[] = { endloop(0x04) label(0x2f) - speak(CHR_P1P2, L_EAR(97), 0x8175, CHANNEL_6, COLOR_09_BLUE) // "Get out, Jo! The levels are too high. Use the CamS..." + speak(CHR_P1P2, L_EAR_097, 0x8175, CHANNEL_6, COLOR_09_BLUE) // "Get out, Jo! The levels are too high. Use the CamS..." label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3215,7 +3215,7 @@ u8 func101f_check_bot_destroyed[] = { if_chr_in_room(CHR_COOP, 0x00, 0x006a, /*goto*/ 0x06) label(0x0b) - show_hudmsg(CHR_BOND, L_EAR(22)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_EAR_022) // "Critical mission object destroyed." set_stage_flag(STAGEFLAG_00000008) set_stage_flag(STAGEFLAG_00000004) if_stage_flag_eq(STAGEFLAG_HAS_K7AVENGER, TRUE, /*goto*/ 0x2f) diff --git a/src/assets/files/setup/setupeld.c b/src/assets/files/setup/setupeld.c index 08b9ac6e6..85b579eb7 100644 --- a/src/assets/files/setup/setupeld.c +++ b/src/assets/files/setup/setupeld.c @@ -102,37 +102,37 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_ELD(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_ELD(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_ELD(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_ELD(3)) + briefing(BRIEFINGTYPE_LOCATION, L_ELD_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_ELD_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_ELD_002) + briefing(BRIEFINGTYPE_TEXT_A, L_ELD_003) - beginobjective(0, L_ELD(5), (DIFFBIT_A | DIFFBIT_SA)) // "Save the negotiator" + beginobjective(0, L_ELD_005, (DIFFBIT_A | DIFFBIT_SA)) // "Save the negotiator" complete_flags(STAGEFLAG_NEGOTIATOR_ESCAPED) fail_flags(STAGEFLAG_NEGOTIATOR_DEAD) endobjective - beginobjective(1, L_ELD(6), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Eliminate rooftop snipers" + beginobjective(1, L_ELD_006, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Eliminate rooftop snipers" complete_flags(STAGEFLAG_SNIPERS_DEAD) endobjective - beginobjective(2, L_ELD(7), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate wind generator" + beginobjective(2, L_ELD_007, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate wind generator" complete_flags(STAGEFLAG_WINDMILL_ACTIVATED) fail_flags(STAGEFLAG_WINDMILL_SWITCH_DESTROYED) endobjective - beginobjective(3, L_ELD(8), (DIFFBIT_PA | DIFFBIT_PD)) // "Locate and eliminate dataDyne hackers" + beginobjective(3, L_ELD_008, (DIFFBIT_PA | DIFFBIT_PD)) // "Locate and eliminate dataDyne hackers" complete_flags(STAGEFLAG_HACKERS_DEAD) fail_flags(STAGEFLAG_HACKERS_SUCCEEDED) fail_flags(STAGEFLAG_HACKER_PC_DESTROYED) endobjective - beginobjective(4, L_ELD(10), (DIFFBIT_PA | DIFFBIT_PD)) // "Capture dataDyne guard" + beginobjective(4, L_ELD_010, (DIFFBIT_PA | DIFFBIT_PD)) // "Capture dataDyne guard" complete_flags(STAGEFLAG_GUARD_CAPTURED) fail_flags(STAGEFLAG_FORGOT_TO_KO_GUARD) endobjective - beginobjective(5, L_ELD(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rescue Carrington" + beginobjective(5, L_ELD_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rescue Carrington" complete_flags(STAGEFLAG_CARRINGTON_RESCUED) endobjective @@ -609,16 +609,16 @@ u32 props[] = { stdobject(0x0100, MODEL_DROPSHIP, 0xffff, 0x00021401, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x01, 1) weapon(0x0100, MODEL_CHRDATATHIEF, 0x00bf, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_LAPTOPGUN, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0e, L_ELD(27), L_ELD(27), L_ELD(27), L_ELD(27), L_ELD(27), 0x0000, 0x0000) // "PC gun" + rename_object(-1, 0x0e, L_ELD_027, L_ELD_027, L_ELD_027, L_ELD_027, L_ELD_027, 0x0000, 0x0000) // "PC gun" tag(0x89, 1) weapon(0x0100, MODEL_CHRDATATHIEF, 0x00bf, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_LAPTOPGUN, 0x00ffffff, 0x00000000) - rename_object(-1, 0x0e, L_ELD(27), L_ELD(27), L_ELD(27), L_ELD(27), L_ELD(27), 0x0000, 0x0000) // "PC gun" + rename_object(-1, 0x0e, L_ELD_027, L_ELD_027, L_ELD_027, L_ELD_027, L_ELD_027, 0x0000, 0x0000) // "PC gun" tag(0x02, 1) weapon(0x0100, MODEL_CHRDATATHIEF, 0x00c0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_SNIPERRIFLE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x15, L_ELD(28), L_ELD(28), L_ELD(28), L_ELD(28), L_ELD(28), 0x0000, 0x0000) // "Sniper rifle" + rename_object(-1, 0x15, L_ELD_028, L_ELD_028, L_ELD_028, L_ELD_028, L_ELD_028, 0x0000, 0x0000) // "Sniper rifle" tag(0x8a, 1) weapon(0x0100, MODEL_CHRDATATHIEF, 0x00c0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_SNIPERRIFLE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x15, L_ELD(28), L_ELD(28), L_ELD(28), L_ELD(28), L_ELD(28), 0x0000, 0x0000) // "Sniper rifle" + rename_object(-1, 0x15, L_ELD_028, L_ELD_028, L_ELD_028, L_ELD_028, L_ELD_028, 0x0000, 0x0000) // "Sniper rifle" stdobject(0x00cc, MODEL_CV_TABLE, 0x01ef, 0x000205e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x8c, 1) stdobject(0x0100, MODEL_CV_CHAIR4, 0x01f0, 0x000205e1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) @@ -656,7 +656,7 @@ u32 props[] = { door(0x0100, MODEL_AIVILLADOOR2A, 0x0186, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x005a0000, 0x03e80000, 0x012c0000, 0x012c0000, 0x00030000, 0x00000005, 0x00000000, 0x000005dc, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) tag(0x0a, 1) key(0x0080, MODEL_KEYCARD, 0x004b, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000040) - rename_object(-1, 0x4a, L_ELD(30), L_ELD(31), L_ELD(32), L_ELD(33), L_ELD(34), 0x0000, 0x0000) // "Obtain door key." + rename_object(-1, 0x4a, L_ELD_030, L_ELD_031, L_ELD_032, L_ELD_033, L_ELD_034, 0x0000, 0x0000) // "Obtain door key." stdobject(0x0100, MODEL_CV_SOFA, 0x01a5, 0x000005e1, 0x00004100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) stdobject(0x0100, MODEL_CV_SOFA, 0x01a6, 0x000005e1, 0x00004100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) stdobject(0x0100, MODEL_CV_COFFEE_TABLE, 0x01af, 0x000005e1, 0x00004000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) @@ -819,7 +819,7 @@ u8 func1002_intro[] = { wait_until(205, 0xab) - speak(CHR_BOND, L_ELD(39), 0x73ff, CHANNEL_4, COLOR_09_BLUE) // "Agent Dark Mission Log, 1846 hours. Last night we ..." + speak(CHR_BOND, L_ELD_039, 0x73ff, CHANNEL_4, COLOR_09_BLUE) // "Agent Dark Mission Log, 1846 hours. Last night we ..." wait_until(680, 0x66) play_sound(0x0161, CHANNEL_7) @@ -846,7 +846,7 @@ u8 func1002_intro[] = { play_sound(0x0161, CHANNEL_7) wait_until(1100, 0xac) - speak(CHR_BOND, L_ELD(40), 0x7400, CHANNEL_4, COLOR_09_BLUE) // "Unfortunately, we don't have it. Daniel and Dr. Ca..." + speak(CHR_BOND, L_ELD_040, 0x7400, CHANNEL_4, COLOR_09_BLUE) // "Unfortunately, we don't have it. Daniel and Dr. Ca..." wait_until(1118, 0x6e) play_sound(0x0162, CHANNEL_7) @@ -961,7 +961,7 @@ u8 func1002_intro[] = { restart_timer wait_until(50, 0xaa) - speak(CHR_BOND, L_ELD(41), 0x7401, CHANNEL_4, COLOR_09_BLUE) // "Hopefully our phoney negotiator ploy will give me ..." + speak(CHR_BOND, L_ELD_041, 0x7401, CHANNEL_4, COLOR_09_BLUE) // "Hopefully our phoney negotiator ploy will give me ..." restart_timer wait_until(295, 0x89) @@ -1279,7 +1279,7 @@ u8 func0408_outro[] = { play_sound(0x80d1, CHANNEL_6) outro_wait_until1(40, '3', 0x68) - speak(CHR_P1P2, L_ELD(42), 0x7402, CHANNEL_4, COLOR_09_BLUE) // "Sir? Are you injured?" + speak(CHR_P1P2, L_ELD_042, 0x7402, CHANNEL_4, COLOR_09_BLUE) // "Sir? Are you injured?" outro_wait_until1(58, '4', 0xad) play_sound(0x80d2, CHANNEL_7) @@ -1297,7 +1297,7 @@ u8 func0408_outro[] = { play_sound(0x80cc, CHANNEL_7) outro_wait_until1(165, '9', 0xae) - speak(CHR_P1P2, L_ELD(43), 0x7403, CHANNEL_4, COLOR_05_GREEN) // "No, Joanna, I'm okay, but those dataDyne thugs mad..." + speak(CHR_P1P2, L_ELD_043, 0x7403, CHANNEL_4, COLOR_05_GREEN) // "No, Joanna, I'm okay, but those dataDyne thugs mad..." outro_wait_until2(195, '1','0', 0x6d) play_sound(0x80cd, CHANNEL_7) @@ -1319,13 +1319,13 @@ u8 func0408_outro[] = { endloop(0xaf) label(0x06) - speak(CHR_P1P2, L_ELD(44), 0x7404, CHANNEL_4, COLOR_09_BLUE) // "It's not your fault, sir. I should have been quick..." + speak(CHR_P1P2, L_ELD_044, 0x7404, CHANNEL_4, COLOR_09_BLUE) // "It's not your fault, sir. I should have been quick..." outro_wait_until2(956, '1','5', 0xb0) - speak(CHR_P1P2, L_ELD(45), 0x7405, CHANNEL_4, COLOR_05_GREEN) // "Don't blame yourself, Joanna. Dr. Caroll told me t..." + speak(CHR_P1P2, L_ELD_045, 0x7405, CHANNEL_4, COLOR_05_GREEN) // "Don't blame yourself, Joanna. Dr. Caroll told me t..." outro_wait_until2(2280, '2','2', 0xb1) - speak(CHR_P1P2, L_ELD(46), 0x7406, CHANNEL_4, COLOR_09_BLUE) // "That won't be a problem, sir. So, did Dr. Caroll h..." + speak(CHR_P1P2, L_ELD_046, 0x7406, CHANNEL_4, COLOR_09_BLUE) // "That won't be a problem, sir. So, did Dr. Caroll h..." outro_wait_until2(2457, '1','6', 0x71) play_sound(0x80cc, CHANNEL_7) @@ -1334,7 +1334,7 @@ u8 func0408_outro[] = { play_sound(0x80cd, CHANNEL_7) outro_wait_until2(2620, '2','6', 0x7a) - speak(CHR_P1P2, L_ELD(47), 0x7407, CHANNEL_5, COLOR_05_GREEN) // "Oh, yes, indeed. He certainly did, and I'll brief ..." + speak(CHR_P1P2, L_ELD_047, 0x7407, CHANNEL_5, COLOR_05_GREEN) // "Oh, yes, indeed. He certainly did, and I'll brief ..." outro_wait_until2(2730, '1','8', 0x73) play_sound(0x80ce, CHANNEL_7) @@ -1438,7 +1438,7 @@ u8 func1004_check_negotiator[] = { endloop(0x04) label(0x06) - show_hudmsg(CHR_BOND, L_ELD(11)) // "Negotiator has been killed." + show_hudmsg(CHR_BOND, L_ELD_011) // "Negotiator has been killed." set_stage_flag(STAGEFLAG_NEGOTIATOR_DEAD) // PA @@ -1680,7 +1680,7 @@ u8 func0403_negotiator[] = { endloop(0x08) label(0x06) - show_hudmsg(CHR_BOND, L_ELD(13)) // "Negotiator has escaped to safety." + show_hudmsg(CHR_BOND, L_ELD_013) // "Negotiator has escaped to safety." set_stage_flag(STAGEFLAG_NEGOTIATOR_ESCAPED) stop_x_track(XREASON_DEFAULT) remove_chr(CHR_SELF) @@ -1953,7 +1953,7 @@ u8 func1006_check_snipers_dead[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_BOND, L_ELD(12)) // "Snipers have been eliminated." + show_hudmsg(CHR_BOND, L_ELD_012) // "Snipers have been eliminated." set_stage_flag(STAGEFLAG_SNIPERS_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1969,7 +1969,7 @@ u8 func1007_cooling_switch[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_COOLING_SWITCH, TRUE) if_stage_flag_eq(STAGEFLAG_COOLING_ACTIVE, TRUE, /*goto*/ 0x06) - show_hudmsg(CHR_P1P2, L_ELD(14)) // "Cooling systems have been activated." + show_hudmsg(CHR_P1P2, L_ELD_014) // "Cooling systems have been activated." set_stage_flag(STAGEFLAG_COOLING_ACTIVE) assign_sound(0x8148, CHANNEL_1) control_sound_from_object(CHANNEL_1, OBJ_COOLING_SWITCH, TRUE) @@ -1989,12 +1989,12 @@ u8 func1007_cooling_switch[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_COOLING_SWITCH, TRUE) if_stage_flag_eq(STAGEFLAG_WINDMILL_ACTIVATED, FALSE, /*goto*/ 0x2d) - show_hudmsg(CHR_P1P2, L_ELD(48)) // "Operation denied - windmill is active." + show_hudmsg(CHR_P1P2, L_ELD_048) // "Operation denied - windmill is active." goto_next(0x67) label(0x2d) assign_sound(0x8149, CHANNEL_1) control_sound_from_object(CHANNEL_1, OBJ_COOLING_SWITCH, TRUE) - show_hudmsg(CHR_P1P2, L_ELD(15)) // "Cooling systems have been deactivated." + show_hudmsg(CHR_P1P2, L_ELD_015) // "Cooling systems have been deactivated." unset_stage_flag(STAGEFLAG_COOLING_ACTIVE) label(0x67) restart_timer @@ -2019,7 +2019,7 @@ u8 func1008_power_switch[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_POWER_SWITCH, TRUE) if_stage_flag_eq(STAGEFLAG_POWER_ACTIVE, TRUE, /*goto*/ 0x06) - show_hudmsg(CHR_P1P2, L_ELD(16)) // "Power systems have been activated." + show_hudmsg(CHR_P1P2, L_ELD_016) // "Power systems have been activated." set_stage_flag(STAGEFLAG_POWER_ACTIVE) assign_sound(0x8148, CHANNEL_0) control_sound_from_object(CHANNEL_0, OBJ_POWER_SWITCH, TRUE) @@ -2039,12 +2039,12 @@ u8 func1008_power_switch[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_POWER_SWITCH, TRUE) if_stage_flag_eq(STAGEFLAG_WINDMILL_ACTIVATED, FALSE, /*goto*/ 0x2d) - show_hudmsg(CHR_P1P2, L_ELD(48)) // "Operation denied - windmill is active." + show_hudmsg(CHR_P1P2, L_ELD_048) // "Operation denied - windmill is active." goto_next(0x67) label(0x2d) assign_sound(0x8149, CHANNEL_0) control_sound_from_object(CHANNEL_0, OBJ_POWER_SWITCH, TRUE) - show_hudmsg(CHR_P1P2, L_ELD(17)) // "Power systems have been deactivated." + show_hudmsg(CHR_P1P2, L_ELD_017) // "Power systems have been deactivated." unset_stage_flag(STAGEFLAG_POWER_ACTIVE) label(0x67) restart_timer @@ -2083,7 +2083,7 @@ u8 func1009_windmill_switch[] = { label(0x2d) assign_sound(0x0438, CHANNEL_2) play_sound_from_object(CHANNEL_2, OBJ_WINDMILL_SWITCH, 0x0708, 0x0960) - show_hudmsg(CHR_P1P2, L_ELD(18)) // "Windmill has been reactivated." + show_hudmsg(CHR_P1P2, L_ELD_018) // "Windmill has been reactivated." yield set_stage_flag(STAGEFLAG_WINDMILL_ACTIVATED) set_object_flag2(OBJ_WINDMILL, OBJFLAG2_AICANNOTUSE) @@ -2111,21 +2111,21 @@ u8 func100a_check_switches_destroyed[] = { beginloop(0x04) if_object_in_good_condition(0x03, /*goto*/ 0x2d) if_stage_flag_eq(STAGEFLAG_COOLING_ACTIVE, TRUE, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_ELD(21)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_ELD_021) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_WINDMILL_SWITCH_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) if_object_in_good_condition(0x04, /*goto*/ 0x2d) if_stage_flag_eq(STAGEFLAG_POWER_ACTIVE, TRUE, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_ELD(21)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_ELD_021) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_WINDMILL_SWITCH_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) if_object_in_good_condition(0x05, /*goto*/ 0x2d) if_stage_flag_eq(STAGEFLAG_WINDMILL_ACTIVATED, TRUE, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_ELD(21)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_ELD_021) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_WINDMILL_SWITCH_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2165,7 +2165,7 @@ u8 func100b_invoke_hackers[] = { endloop(0x08) label(0x06) - speak(CHR_BOND, L_ELD(22), 0x819f, CHANNEL_4, COLOR_05_GREEN) // "Joanna! It's Grimshaw. We've got hackers at the vi..." + speak(CHR_BOND, L_ELD_022, 0x819f, CHANNEL_4, COLOR_05_GREEN) // "Joanna! It's Grimshaw. We've got hackers at the vi..." set_stage_flag(STAGEFLAG_HACKERS_STARTED) set_object_flag3(0x0b, OBJFLAG3_RTRACKED_YELLOW) set_object_flag3(0x0d, OBJFLAG3_RTRACKED_YELLOW) @@ -2195,7 +2195,7 @@ u8 func100b_invoke_hackers[] = { // Timer expired label(0x06) - show_hudmsg(CHR_BOND, L_ELD(23)) // "Hackers have uploaded vital data." + show_hudmsg(CHR_BOND, L_ELD_023) // "Hackers have uploaded vital data." set_stage_flag(STAGEFLAG_HACKERS_SUCCEEDED) // Hackers dead @@ -2279,7 +2279,7 @@ u8 func100c_check_hackers_dead[] = { label(0x2d) if_stage_flag_eq(STAGEFLAG_HACKERS_SUCCEEDED, TRUE, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_ELD(24)) // "Hackers have been eliminated." + show_hudmsg(CHR_BOND, L_ELD_024) // "Hackers have been eliminated." set_stage_flag(STAGEFLAG_HACKERS_DEAD) // Hackers succeeded @@ -2300,7 +2300,7 @@ u8 func100e_check_objectives_complete[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_P1P2, L_ELD(25)) // "Carrington has been rescued." + show_hudmsg(CHR_P1P2, L_ELD_025) // "Carrington has been rescued." set_stage_flag(STAGEFLAG_CARRINGTON_RESCUED) yield yield @@ -2309,7 +2309,7 @@ u8 func100e_check_objectives_complete[] = { hide_countdown_timer stop_countdown_timer if_all_objectives_complete(/*goto*/ 0x5c) - show_hudmsg(CHR_BOND, L_ELD(26)) // "All objectives not completed - mission failed." + show_hudmsg(CHR_BOND, L_ELD_026) // "All objectives not completed - mission failed." // If all objectives aren't complete, the player is shown the message, but // if the objective completes within the next 4 seconds you pass the level @@ -2397,7 +2397,7 @@ u8 func1013_check_guard_subdued[] = { // Captured someone label(0x06) if_stage_flag_eq(STAGEFLAG_GUARD_CAPTURED, TRUE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_ELD(29)) // "Enemy guard has been subdued." + show_hudmsg(CHR_BOND, L_ELD_029) // "Enemy guard has been subdued." label(0x2e) unset_stage_flag(STAGEFLAG_FORGOT_TO_KO_GUARD) yield @@ -2487,7 +2487,7 @@ u8 func1015_check_computers_destroyed[] = { endloop(0x04) label(0x08) - show_hudmsg(CHR_BOND, L_ELD(21)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_ELD_021) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_HACKER_PC_DESTROYED) label(0x09) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2541,7 +2541,7 @@ u8 func1016_msg_generator[] = { endloop(0x04) label(0x2d) - speak(CHR_P1P2, L_ELD(35), 0x73ac, CHANNEL_6, COLOR_09_BLUE) // "If I get the wind generator back online, I'll get ..." + speak(CHR_P1P2, L_ELD_035, 0x73ac, CHANNEL_6, COLOR_09_BLUE) // "If I get the wind generator back online, I'll get ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2565,7 +2565,7 @@ u8 func1017_msg_gottobequick[] = { endloop(0x08) label(0x06) - speak(CHR_BOND, L_ELD(36), 0x73ad, CHANNEL_6, COLOR_09_BLUE) // "I've got to be quick, or they'll kill the negotiat..." + speak(CHR_BOND, L_ELD_036, 0x73ad, CHANNEL_6, COLOR_09_BLUE) // "I've got to be quick, or they'll kill the negotiat..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2587,7 +2587,7 @@ u8 func1018_msg_hidingdaniel[] = { endloop(0x08) label(0x2d) - speak(CHR_P1P2, L_ELD(37), 0x73ae, CHANNEL_6, COLOR_09_BLUE) // "Here's where they must be holding Daniel." + speak(CHR_P1P2, L_ELD_037, 0x73ae, CHANNEL_6, COLOR_09_BLUE) // "Here's where they must be holding Daniel." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2605,7 +2605,7 @@ u8 func1019_msg_hackershavetobestopped[] = { endloop(0x08) label(0x2d) - speak(CHR_BOND, L_ELD(38), 0x73af, CHANNEL_6, COLOR_09_BLUE) // "Those hackers have to be stopped before I rescue D..." + speak(CHR_BOND, L_ELD_038, 0x73af, CHANNEL_6, COLOR_09_BLUE) // "Those hackers have to be stopped before I rescue D..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2928,7 +2928,7 @@ u8 func101d_dual_cmp150[] = { label(0x2d) pause_timer - play_sound(L_ARCH(198), -1) // "My gun!" + play_sound(0x04c6, -1) // "My gun!" beginloop(0x08) if_chr_death_animation_finished(0x06, /*goto*/ 0x2d) @@ -3211,7 +3211,7 @@ u8 func1025_check_basement_entered_without_subdue[] = { endloop(0x04) label(0x06) - show_hudmsg(CHR_P1P2, L_ELD(49)) // "Mission unsuccessful - enemy guard not captured." + show_hudmsg(CHR_P1P2, L_ELD_049) // "Mission unsuccessful - enemy guard not captured." set_stage_flag(STAGEFLAG_FORGOT_TO_KO_GUARD) label(0x0d) diff --git a/src/assets/files/setup/setupimp.c b/src/assets/files/setup/setupimp.c index efc44361e..206eb96d7 100644 --- a/src/assets/files/setup/setupimp.c +++ b/src/assets/files/setup/setupimp.c @@ -158,12 +158,12 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_IMP(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_IMP(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_IMP(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_IMP(3)) + briefing(BRIEFINGTYPE_LOCATION, L_IMP_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_IMP_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_IMP_002) + briefing(BRIEFINGTYPE_TEXT_A, L_IMP_003) - beginobjective(0, L_IMP(5), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Reactivate automatic defenses" + beginobjective(0, L_IMP_005, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Reactivate automatic defenses" complete_flags(STAGEFLAG_AUTOGUN1_ACTIVE) complete_flags(STAGEFLAG_AUTOGUN2_ACTIVE) complete_flags(STAGEFLAG_AUTOGUN3_ACTIVE) @@ -171,21 +171,21 @@ u32 props[] = { fail_flags(STAGEFLAG_00000001) endobjective - beginobjective(1, L_IMP(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Release hostages" + beginobjective(1, L_IMP_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Release hostages" complete_flags(STAGEFLAG_ENOUGH_HOSTAGES_SAVED) fail_flags(STAGEFLAG_TOO_MANY_HOSTAGES_KILLED) endobjective - beginobjective(2, L_IMP(7), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve experimental weapon" + beginobjective(2, L_IMP_007, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve experimental weapon" require_object_collected(OBJ_RCP120) fail_flags(STAGEFLAG_FR_PC_DESTROYED) endobjective - beginobjective(3, L_IMP(8), (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy sensitive information" + beginobjective(3, L_IMP_008, (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy sensitive information" complete_flags(STAGEFLAG_SAFEINFO_DESTROYED) endobjective - beginobjective(4, L_IMP(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Deactivate bomb" + beginobjective(4, L_IMP_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Deactivate bomb" complete_flags(STAGEFLAG_BOMB_AIRBORNE) fail_flags(STAGEFLAG_BOMB_EXPLODING_ON_GROUND) fail_flags(STAGEFLAG_CARRINGTON_DEAD) @@ -414,13 +414,13 @@ u32 props[] = { weapon(0x0180, MODEL_CHRRCP120, 0x011a, 0x00100008, 0x00000000, 0x20400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_RCP120, 0x00ffffff, 0x00000000) tag(0x09, 1) stdobject(0x0480, MODEL_SENSITIVEINFO, 0x010f, 0x000204e8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x4e, L_IMP(10), L_IMP(11), L_IMP(12), L_IMP(13), L_IMP(14), 0x0000, 0x0000) // "Obtain sensitive info." + rename_object(-1, 0x4e, L_IMP_010, L_IMP_011, L_IMP_012, L_IMP_013, L_IMP_014, 0x0000, 0x0000) // "Obtain sensitive info." tag(0x4f, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_IMP(57), L_IMP(58), L_IMP(59), L_IMP(60), L_IMP(61), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x36, L_IMP_057, L_IMP_058, L_IMP_059, L_IMP_060, L_IMP_061, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x50, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_IMP(57), L_IMP(58), L_IMP(59), L_IMP(60), L_IMP(61), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x36, L_IMP_057, L_IMP_058, L_IMP_059, L_IMP_060, L_IMP_061, 0x0000, 0x0000) // "Obtain Data Uplink." door(0x0100, MODEL_INSTFRONTDOOR, 0x018f, 0x10000600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000008, 0x00000384, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000300, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) door(0x0100, MODEL_INSTFRONTDOOR, 0x0190, 0x10000600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000008, 0x00000384, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) door(0x0100, MODEL_DOOR2_G5, 0x0168, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x00010000, 0x0001aaaa, 0x0001aaaa, 0x00000222, 0x00060000, 0x00000000, 0x00000258, 0x00000000, 0x00000000, 0x00000000, 0x012c0320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000300, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) @@ -782,7 +782,7 @@ u8 func1004_check_hostages_killed[] = { label(0x08) if_stage_flag_eq(STAGEFLAG_ENOUGH_HOSTAGES_SAVED, TRUE, /*goto*/ 0x2e) set_stage_flag(STAGEFLAG_TOO_MANY_HOSTAGES_KILLED) - show_hudmsg(CHR_BOND, L_IMP(16)) // "Too many hostages killed." + show_hudmsg(CHR_BOND, L_IMP_016) // "Too many hostages killed." label(0x2e) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -798,7 +798,7 @@ u8 func1005_check_safeinfo_destroyed[] = { endloop(0x04) label(0x08) - show_hudmsg(CHR_BOND, L_IMP(18)) // "Sensitive information has been destroyed." + show_hudmsg(CHR_BOND, L_IMP_018) // "Sensitive information has been destroyed." set_stage_flag(STAGEFLAG_SAFEINFO_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1035,7 +1035,7 @@ u8 func0c01_outro[] = { play_sound(0x0162, CHANNEL_10) wait_until(570, 0x71) - speak(CHR_BOND, L_IMP(49), 0x747d, CHANNEL_10, COLOR_09_BLUE) // "Get clear! I'll hold them off... You can come back..." + speak(CHR_BOND, L_IMP_049, 0x747d, CHANNEL_10, COLOR_09_BLUE) // "Get clear! I'll hold them off... You can come back..." wait_until(847, 0x87) play_sound(0x0161, CHANNEL_10) @@ -1063,7 +1063,7 @@ u8 func0c01_outro[] = { label(0x08) set_chr_shooting_in_cutscene(CHR_BOND, FALSE) - speak(CHR_BOND, L_IMP(50), 0x747e, CHANNEL_10, COLOR_09_BLUE) // "At least, I hope you can." + speak(CHR_BOND, L_IMP_050, 0x747e, CHANNEL_10, COLOR_09_BLUE) // "At least, I hope you can." wait_until(1018, 0x8c) set_chr_shooting_in_cutscene(CHR_BOND, TRUE) @@ -1190,7 +1190,7 @@ u8 func1002_intro[] = { set_cutscene_weapon(0x1a, WEAPON_AR34, WEAPON_NONE) wait_until(4, 0x71) - speak(CHR_BOND, L_IMP(41), 0x7475, CHANNEL_10, COLOR_06_WHITE) // "All ready, Joanna? We can't keep the Maian delegat..." + speak(CHR_BOND, L_IMP_041, 0x7475, CHANNEL_10, COLOR_06_WHITE) // "All ready, Joanna? We can't keep the Maian delegat..." wait_until(72, 0x72) play_sound(0x0161, CHANNEL_10) @@ -1199,7 +1199,7 @@ u8 func1002_intro[] = { play_sound(0x0162, CHANNEL_10) wait_until(450, 0x74) - speak(CHR_BOND, L_IMP(42), 0x7476, CHANNEL_10, COLOR_09_BLUE) // "Am I ready? What do you mean? I was ready half an ..." + speak(CHR_BOND, L_IMP_042, 0x7476, CHANNEL_10, COLOR_09_BLUE) // "Am I ready? What do you mean? I was ready half an ..." wait_until(688, 0x76) play_sound(0x0163, CHANNEL_10) @@ -1208,7 +1208,7 @@ u8 func1002_intro[] = { play_sound(0x0164, CHANNEL_10) wait_until(800, 0x75) - speak(CHR_BOND, L_IMP(43), 0x7477, CHANNEL_10, COLOR_06_WHITE) // "But you know how it is, Joanna... I had to make su..." + speak(CHR_BOND, L_IMP_043, 0x7477, CHANNEL_10, COLOR_06_WHITE) // "But you know how it is, Joanna... I had to make su..." wait_until(822, 0x78) play_sound(0x0165, CHANNEL_10) @@ -1250,7 +1250,7 @@ u8 func1002_intro[] = { play_sound(0x0165, CHANNEL_10) wait_until(1160, 0x82) - speak(CHR_BOND, L_IMP(44), 0x7478, CHANNEL_10, COLOR_09_BLUE) // "They should keep you away from mirrors. Nervous?" + speak(CHR_BOND, L_IMP_044, 0x7478, CHANNEL_10, COLOR_09_BLUE) // "They should keep you away from mirrors. Nervous?" wait_until(1170, 0x86) play_sound(0x0166, CHANNEL_10) @@ -1262,7 +1262,7 @@ u8 func1002_intro[] = { play_sound(0x0168, CHANNEL_10) wait_until(1440, 0x89) - speak(CHR_BOND, L_IMP(45), 0x7479, CHANNEL_10, COLOR_06_WHITE) // "Very. I've waited for this moment for so many year..." + speak(CHR_BOND, L_IMP_045, 0x7479, CHANNEL_10, COLOR_06_WHITE) // "Very. I've waited for this moment for so many year..." wait_until(1442, 0x8a) play_sound(0x0162, CHANNEL_10) @@ -1295,7 +1295,7 @@ u8 func1002_intro[] = { play_sound(0x00b5, CHANNEL_10) wait_until(2410, 0x94) - speak(CHR_BOND, L_IMP(46), 0x747a, CHANNEL_10, COLOR_06_WHITE) // "Where did that come from?" + speak(CHR_BOND, L_IMP_046, 0x747a, CHANNEL_10, COLOR_06_WHITE) // "Where did that come from?" wait_until(2416, 0x95) play_sound(0x0165, CHANNEL_10) @@ -1313,7 +1313,7 @@ u8 func1002_intro[] = { play_sound(0x00b2, CHANNEL_10) wait_until(2628, 0x9b) - speak(CHR_BOND, L_IMP(47), 0x747b, CHANNEL_10, COLOR_09_BLUE) // "It was up on ground level..." + speak(CHR_BOND, L_IMP_047, 0x747b, CHANNEL_10, COLOR_09_BLUE) // "It was up on ground level..." wait_until(2804, 0x9c) play_sound(0x00b5, CHANNEL_10) @@ -1330,7 +1330,7 @@ u8 func1002_intro[] = { play_sound(0x0168, CHANNEL_10) wait_until(2970, 0x9d) - speak(CHR_BOND, L_IMP(48), 0x747c, CHANNEL_10, COLOR_09_BLUE) // "Looks like someone doesn't know when to quit. We'v..." + speak(CHR_BOND, L_IMP_048, 0x747c, CHANNEL_10, COLOR_09_BLUE) // "Looks like someone doesn't know when to quit. We'v..." wait_until(2984, 0xa1) play_sound(0x0165, CHANNEL_10) @@ -1572,7 +1572,7 @@ u8 func100c_check_carrington_dead[] = { endloop(0x04) label(0x2e) - show_hudmsg(CHR_BOND, L_IMP(19)) // "Carrington has been killed." + show_hudmsg(CHR_BOND, L_IMP_019) // "Carrington has been killed." set_stage_flag(STAGEFLAG_CARRINGTON_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2636,7 +2636,7 @@ u8 func1013_check_hostages_saved[] = { // All rooms done label(0x2e) if_stage_flag_eq(STAGEFLAG_TOO_MANY_HOSTAGES_KILLED, TRUE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_IMP(17)) // "Hostages have been saved." + show_hudmsg(CHR_BOND, L_IMP_017) // "Hostages have been saved." set_stage_flag(STAGEFLAG_ENOUGH_HOSTAGES_SAVED) label(0x2e) @@ -2677,7 +2677,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer if_difficulty_lt(DIFF_SA, /*goto*/ 0x0d) - speak(CHR_BOND, L_IMP(20), 0x8193, CHANNEL_6, COLOR_06_WHITE) // "Joanna - we're under attack." + speak(CHR_BOND, L_IMP_020, 0x8193, CHANNEL_6, COLOR_06_WHITE) // "Joanna - we're under attack." beginloop(0x0b) carrington_sanity_checks @@ -2685,7 +2685,7 @@ u8 func1014_carrington_messages[] = { endloop(0x0b) label(0x08) - speak(CHR_BOND, L_IMP(21), 0x8194, CHANNEL_6, COLOR_06_WHITE) // "Get the guns back on line - hurry." + speak(CHR_BOND, L_IMP_021, 0x8194, CHANNEL_6, COLOR_06_WHITE) // "Get the guns back on line - hurry." beginloop(0x0c) carrington_sanity_checks @@ -2713,7 +2713,7 @@ u8 func1014_carrington_messages[] = { label(0xda) restart_timer - speak(CHR_BOND, L_IMP(22), 0x8195, CHANNEL_6, COLOR_06_WHITE) // "The Skedar have taken hostages." + speak(CHR_BOND, L_IMP_022, 0x8195, CHANNEL_6, COLOR_06_WHITE) // "The Skedar have taken hostages." beginloop(0x0e) carrington_sanity_checks @@ -2722,7 +2722,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer - speak(CHR_BOND, L_IMP(23), 0x8196, CHANNEL_6, COLOR_06_WHITE) // "Get up to the offices and save them." + speak(CHR_BOND, L_IMP_023, 0x8196, CHANNEL_6, COLOR_06_WHITE) // "Get up to the offices and save them." beginloop(0x0f) carrington_sanity_checks @@ -2750,7 +2750,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer - speak(CHR_BOND, L_IMP(24), 0x8197, CHANNEL_6, COLOR_06_WHITE) // "They're using a new form of shield technology." + speak(CHR_BOND, L_IMP_024, 0x8197, CHANNEL_6, COLOR_06_WHITE) // "They're using a new form of shield technology." beginloop(0x11) carrington_sanity_checks @@ -2759,7 +2759,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer - speak(CHR_BOND, L_IMP(25), 0x8198, CHANNEL_6, COLOR_06_WHITE) // "Foster was working on a new weapon which may be us..." + speak(CHR_BOND, L_IMP_025, 0x8198, CHANNEL_6, COLOR_06_WHITE) // "Foster was working on a new weapon which may be us..." beginloop(0x12) carrington_sanity_checks @@ -2785,7 +2785,7 @@ u8 func1014_carrington_messages[] = { unset_object_flag(OBJ_SAFEINFO, OBJFLAG_INVINCIBLE) #endif restart_timer - speak(CHR_BOND, L_IMP(26), 0x8199, CHANNEL_6, COLOR_06_WHITE) // "Damn it. My office... If they get access..." + speak(CHR_BOND, L_IMP_026, 0x8199, CHANNEL_6, COLOR_06_WHITE) // "Damn it. My office... If they get access..." beginloop(0xc1) carrington_sanity_checks @@ -2794,7 +2794,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer - speak(CHR_BOND, L_IMP(27), 0x819a, CHANNEL_6, COLOR_06_WHITE) // "Get there first, Jo, and destroy the files." + speak(CHR_BOND, L_IMP_027, 0x819a, CHANNEL_6, COLOR_06_WHITE) // "Get there first, Jo, and destroy the files." beginloop(0xc2) carrington_sanity_checks @@ -2845,7 +2845,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer - speak(CHR_BOND, L_IMP(28), 0x819b, CHANNEL_6, COLOR_06_WHITE) // "Things are desperate. They've planted a bomb." + speak(CHR_BOND, L_IMP_028, 0x819b, CHANNEL_6, COLOR_06_WHITE) // "Things are desperate. They've planted a bomb." beginloop(0xc5) carrington_sanity_checks @@ -2854,7 +2854,7 @@ u8 func1014_carrington_messages[] = { label(0x08) restart_timer - speak(CHR_BOND, L_IMP(29), 0x819c, CHANNEL_6, COLOR_06_WHITE) // "Find it and get it out of the building." + speak(CHR_BOND, L_IMP_029, 0x819c, CHANNEL_6, COLOR_06_WHITE) // "Find it and get it out of the building." beginloop(0xc6) carrington_sanity_checks @@ -2885,7 +2885,7 @@ u8 func1014_carrington_messages[] = { label(0x2e) carrington_sanity_checks restart_timer - speak(CHR_BOND, L_IMP(32), 0x819d, CHANNEL_6, COLOR_06_WHITE) // "Well done, Joanna. We're nearly clear..." + speak(CHR_BOND, L_IMP_032, 0x819d, CHANNEL_6, COLOR_06_WHITE) // "Well done, Joanna. We're nearly clear..." beginloop(0xc9) if_timer_gt(180, /*goto*/ 0x08) @@ -2893,7 +2893,7 @@ u8 func1014_carrington_messages[] = { label(0x08) carrington_sanity_checks - speak(CHR_BOND, L_IMP(33), 0x819e, CHANNEL_6, COLOR_06_WHITE) // "The last dropship is waiting for you. Hurry." + speak(CHR_BOND, L_IMP_033, 0x819e, CHANNEL_6, COLOR_06_WHITE) // "The last dropship is waiting for you. Hurry." beginloop(0xca) if_timer_gt(180, /*goto*/ 0xcb) @@ -2945,14 +2945,14 @@ u8 func1015_firingrange_pc[] = { reloop(0x0a) label(0x2f) - show_hudmsg(CHR_BOND, L_IMP(34)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_IMP_034) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_FR_PC_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x08) play_sound(0x8116, -1) if_objective_complete(1, /*goto*/ 0x08) - show_hudmsg(CHR_P1P2, L_IMP(30)) // "Access denied - authorization failure." + show_hudmsg(CHR_P1P2, L_IMP_030) // "Access denied - authorization failure." restart_timer beginloop(0x0b) @@ -2963,7 +2963,7 @@ u8 func1015_firingrange_pc[] = { endloop(0x0a) label(0x08) - show_hudmsg(CHR_P1P2, L_IMP(31)) // "Emergency overrides have been engaged." + show_hudmsg(CHR_P1P2, L_IMP_031) // "Emergency overrides have been engaged." unset_object_flag(OBJ_RCP120, OBJFLAG_UNCOLLECTABLE) unset_object_flag(OBJ_RCP120_GLASS, OBJFLAG_INVINCIBLE) destroy_object(OBJ_RCP120_GLASS) @@ -3468,7 +3468,7 @@ u8 func101b_msg_autodefenses[] = { label(0x2e) yield yield - speak(CHR_BOND, L_IMP(35), 0x73d8, CHANNEL_6, COLOR_09_BLUE) // "The autodefenses will really help me out." + speak(CHR_BOND, L_IMP_035, 0x73d8, CHANNEL_6, COLOR_09_BLUE) // "The autodefenses will really help me out." label(0x0a) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3492,7 +3492,7 @@ u8 func101c_msg_fosterworkingon[] = { endloop(0x0a) label(0x2e) - speak(CHR_P1P2, L_IMP(36), 0x73d9, CHANNEL_6, COLOR_09_BLUE) // "So this is what Foster was working on." + speak(CHR_P1P2, L_IMP_036, 0x73d9, CHANNEL_6, COLOR_09_BLUE) // "So this is what Foster was working on." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3514,7 +3514,7 @@ u8 func101d_msg_countingonme[] = { endloop(0x0a) label(0x2e) - speak(CHR_BOND, L_IMP(37), 0x73da, CHANNEL_6, COLOR_09_BLUE) // "I'll have to go carefully... The hostages are coun..." + speak(CHR_BOND, L_IMP_037, 0x73da, CHANNEL_6, COLOR_09_BLUE) // "I'll have to go carefully... The hostages are coun..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3527,7 +3527,7 @@ u8 func101e_msg_wontknow[] = { endloop(0x04) label(0x2e) - speak(CHR_BOND, L_IMP(38), 0x73db, CHANNEL_6, COLOR_09_BLUE) // "Well, at least I won't know if I'm doing anything ..." + speak(CHR_BOND, L_IMP_038, 0x73db, CHANNEL_6, COLOR_09_BLUE) // "Well, at least I won't know if I'm doing anything ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3619,7 +3619,7 @@ u8 func1023_check_skeder_shuttle_destroyed[] = { label(0x2e) if_stage_flag_eq(STAGEFLAG_BOMB_AIRBORNE, TRUE, /*goto*/ 0x0f) - show_hudmsg(CHR_BOND, L_IMP(39)) // "The bomb has been detonated..." + show_hudmsg(CHR_BOND, L_IMP_039) // "The bomb has been detonated..." set_stage_flag(STAGEFLAG_BOMB_EXPLODING_ON_GROUND) explosions_around_chr(CHR_BOND) restart_timer @@ -3717,12 +3717,12 @@ u8 func1027_uplink[] = { label(0x08) if_chr_weapon_equipped(CHR_TARGET, WEAPON_DATAUPLINK, /*goto*/ 0x2e) play_sound(0x8116, -1) - show_hudmsg(CHR_TARGET, L_IMP(51)) // "You need the Data Uplink." + show_hudmsg(CHR_TARGET, L_IMP_051) // "You need the Data Uplink." reloop(0x04) // Activated with uplink label(0x2e) - show_hudmsg(CHR_TARGET, L_IMP(52)) // "Connection has been made." + show_hudmsg(CHR_TARGET, L_IMP_052) // "Connection has been made." restart_timer beginloop(0x0a) @@ -3743,7 +3743,7 @@ u8 func1027_uplink[] = { // 1 second since uplink label(0x08) - show_hudmsg(CHR_TARGET, L_IMP(53)) // "Bypassing security systems." + show_hudmsg(CHR_TARGET, L_IMP_053) // "Bypassing security systems." restart_timer assign_sound(0x01bf, CHANNEL_5) control_sound_from_object(CHANNEL_5, OBJ_SKEDAR_SHUTTLE, TRUE) @@ -3769,9 +3769,9 @@ u8 func1027_uplink[] = { mute_channel(CHANNEL_5) assign_sound(0x01c1, CHANNEL_6) control_sound_from_object(CHANNEL_6, OBJ_SKEDAR_SHUTTLE, TRUE) - show_hudmsg(CHR_TARGET, L_IMP(54)) // "Virus has been downloaded successfully." + show_hudmsg(CHR_TARGET, L_IMP_054) // "Virus has been downloaded successfully." yield - show_hudmsg(CHR_TARGET, L_IMP(55)) // "Ship's engines have been activated." + show_hudmsg(CHR_TARGET, L_IMP_055) // "Ship's engines have been activated." set_stage_flag(STAGEFLAG_TRIGGER_SHUTTLE_TAKEOFF) beginloop(0x14) @@ -3784,7 +3784,7 @@ u8 func1027_uplink[] = { // Connection broken label(0x0b) - show_hudmsg(CHR_TARGET, L_IMP(56)) // "Connection to ship has been broken." + show_hudmsg(CHR_TARGET, L_IMP_056) // "Connection to ship has been broken." mute_channel(CHANNEL_5) assign_sound(0x01c0, CHANNEL_6) control_sound_from_object(CHANNEL_6, OBJ_SKEDAR_SHUTTLE, TRUE) diff --git a/src/assets/files/setup/setuplee.c b/src/assets/files/setup/setuplee.c index 04ad50ae4..7df213253 100644 --- a/src/assets/files/setup/setuplee.c +++ b/src/assets/files/setup/setuplee.c @@ -124,31 +124,31 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_LEE(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_LEE(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_LEE(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_LEE(3)) + briefing(BRIEFINGTYPE_LOCATION, L_LEE_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_LEE_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_LEE_002) + briefing(BRIEFINGTYPE_TEXT_A, L_LEE_003) - beginobjective(0, L_LEE(5), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable shield system" + beginobjective(0, L_LEE_005, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable shield system" complete_flags(STAGEFLAG_SHIELDS_DISABLED) fail_flags(STAGEFLAG_AMMO_WASTED) endobjective - beginobjective(1, L_LEE(6), (DIFFBIT_PA | DIFFBIT_PD)) // "Open hangar doors" + beginobjective(1, L_LEE_006, (DIFFBIT_PA | DIFFBIT_PD)) // "Open hangar doors" complete_flags(STAGEFLAG_HANGAR_DOORS_OPEN) fail_flags(STAGEFLAG_HANGAR_DOOR_CONSOLE_DESTROYED) endobjective - beginobjective(2, L_LEE(7), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Access navigational systems" + beginobjective(2, L_LEE_007, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Access navigational systems" complete_flags(STAGEFLAG_NAVIGATION_ROOM_DONE) fail_flags(STAGEFLAG_ELVIS_DEAD) endobjective - beginobjective(3, L_LEE(8), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Sabotage engine systems" + beginobjective(3, L_LEE_008, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Sabotage engine systems" complete_flags(STAGEFLAG_ENGINES_DESTROYED) endobjective - beginobjective(4, L_LEE(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain control of bridge" + beginobjective(4, L_LEE_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain control of bridge" complete_flags(STAGEFLAG_BRIDGE_CAPTURED) endobjective @@ -271,7 +271,7 @@ u32 props[] = { weapon(0x0100, MODEL_CHRMAULER, 0x002c, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_MAULER, 0x00ffffff, 0x00000000) tag(0x4a, 1) key(0x0100, MODEL_CHRCHAIN, 0x0033, 0x01244000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000008) - rename_object(-1, 0x50, L_LEE(50), L_LEE(51), L_LEE(52), L_LEE(53), L_LEE(54), 0x0000, 0x0000) // "Obtain De Vries' necklace." + rename_object(-1, 0x50, L_LEE_050, L_LEE_051, L_LEE_052, L_LEE_053, L_LEE_054, 0x0000, 0x0000) // "Obtain De Vries' necklace." tag(0x3f, 2) tag(0x40, 2) door(0x0100, MODEL_SK_SHIP_DOOR2, 0x016a, 0x10000400, 0x28000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00010000, 0x00010000, 0x00320000, 0x0001aaaa, 0x00008000, 0x00000000, 0x00000080, 0x0000012c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00001d00, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) @@ -561,7 +561,7 @@ u8 func1019_check_shields_lowered[] = { if_object_in_good_condition(OBJ_SHIELDCONSOLE1, /*goto*/ 0x06) if_object_in_good_condition(OBJ_SHIELDCONSOLE2, /*goto*/ 0x06) if_object_in_good_condition(OBJ_SHIELDCONSOLE3, /*goto*/ 0x06) - show_hudmsg(CHR_BOND, L_LEE(10)) // "Ship's shields have been lowered." + show_hudmsg(CHR_BOND, L_LEE_010) // "Ship's shields have been lowered." set_stage_flag(STAGEFLAG_SHIELDS_DISABLED) if_difficulty_lt(DIFF_PA, /*goto*/ 0x09) restart_timer @@ -571,7 +571,7 @@ u8 func1019_check_shields_lowered[] = { endloop(0x08) label(0x2c) - speak(CHR_BOND, L_LEE(17), 0x81a1, CHANNEL_6, COLOR_04_ORANGE) // "You've got to open the hangar doors so we can dock..." + speak(CHR_BOND, L_LEE_017, 0x81a1, CHANNEL_6, COLOR_04_ORANGE) // "You've got to open the hangar doors so we can dock..." set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) @@ -596,7 +596,7 @@ u8 func1004_check_hangar_doors_opened[] = { if_object_in_good_condition(OBJ_HANGARDOORCONSOLE, /*goto*/ 0x2d) // Console destroyed - show_hudmsg(CHR_BOND, L_LEE(48)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_LEE_048) // "Critical mission object destroyed." set_stage_flag(STAGEFLAG_HANGAR_DOOR_CONSOLE_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -612,7 +612,7 @@ u8 func1004_check_hangar_doors_opened[] = { // Console activated label(0x06) if_stage_flag_eq(STAGEFLAG_SHIELDS_DISABLED, TRUE, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_LEE(47)) // "Hangar doors locked - shields still active." + show_hudmsg(CHR_BOND, L_LEE_047) // "Hangar doors locked - shields still active." restart_timer beginloop(0x65) @@ -624,7 +624,7 @@ u8 func1004_check_hangar_doors_opened[] = { // PA - console activated after shields disabled label(0x2c) - show_hudmsg(CHR_P1P2, L_LEE(11)) // "Hangar doors have been opened." + show_hudmsg(CHR_P1P2, L_LEE_011) // "Hangar doors have been opened." set_stage_flag(STAGEFLAG_HANGAR_DOORS_OPEN) // A and SA once shields disabled, or follow through from above @@ -756,7 +756,7 @@ u8 func040e_elvis_give_ar34[] = { rebuild_teams rebuild_squadrons set_stage_flag(STAGEFLAG_MET_ELVIS) - speak(CHR_P1P2, L_LEE(19), 0x12e1, CHANNEL_6, COLOR_04_ORANGE) // "Good to see you, Joanna." + speak(CHR_P1P2, L_LEE_019, 0x12e1, CHANNEL_6, COLOR_04_ORANGE) // "Good to see you, Joanna." chr_do_animation(ANIM_TALKING_0231, 0, -1, 0x10, 0x10, CHR_SELF, 2) beginloop(0x0c) @@ -764,9 +764,9 @@ u8 func040e_elvis_give_ar34[] = { endloop(0x0c) label(0x06) - speak(CHR_P1P2, L_LEE(20), 0x12e2, CHANNEL_6, COLOR_04_ORANGE) // "Take this - you should find it useful..." + speak(CHR_P1P2, L_LEE_020, 0x12e2, CHANNEL_6, COLOR_04_ORANGE) // "Take this - you should find it useful..." give_object_to_chr(OBJ_AR34, CHR_PRESET) - show_hudmsg(CHR_PRESET, L_LEE(21)) // "Received AR34 assault rifle." + show_hudmsg(CHR_PRESET, L_LEE_021) // "Received AR34 assault rifle." restart_timer beginloop(0x0d) @@ -923,8 +923,8 @@ u8 func0409_elvis_follow[] = { label(0x06) do_preset_animation(-1) - show_hudmsg(CHR_BOND, L_LEE(13)) // "Navigational information has been retrieved." - speak(CHR_PRESET, L_LEE(31), 0x12e4, CHANNEL_6, COLOR_04_ORANGE) // "Time to head upwards..." + show_hudmsg(CHR_BOND, L_LEE_013) // "Navigational information has been retrieved." + speak(CHR_PRESET, L_LEE_031, 0x12e4, CHANNEL_6, COLOR_04_ORANGE) // "Time to head upwards..." restart_timer set_stage_flag(STAGEFLAG_NAVIGATION_ROOM_DONE) @@ -966,7 +966,7 @@ u8 func041c_elvis_outside_prebridgelift[] = { set_target_chr(CHR_PRESET) set_stage_flag(STAGEFLAG_SAID_GO_ON_AHEAD) if_stage_flag_eq(STAGEFLAG_ENTERED_BRIDGELIFT, TRUE, /*goto*/ 0x2c) - speak(CHR_PRESET, L_LEE(26), 0x14dc, CHANNEL_6, COLOR_04_ORANGE) // "You go on ahead, Jo. I'll secure the perimeter. We..." + speak(CHR_PRESET, L_LEE_026, 0x14dc, CHANNEL_6, COLOR_04_ORANGE) // "You go on ahead, Jo. I'll secure the perimeter. We..." label(0x2c) run_to_pad(0x0063) @@ -1022,7 +1022,7 @@ u8 func040a_elvis_go_to_hangar_lift[] = { // At player label(0x06) - speak(CHR_BOND, L_LEE(22), 0x12e4, CHANNEL_6, COLOR_04_ORANGE) // "Time to head upwards. I'll take this lift; you tak..." + speak(CHR_BOND, L_LEE_022, 0x12e4, CHANNEL_6, COLOR_04_ORANGE) // "Time to head upwards. I'll take this lift; you tak..." chr_do_animation(ANIM_TALKING_0231, 0, -1, 0x10, 0x10, CHR_SELF, 2) set_morale(50) @@ -1084,7 +1084,7 @@ u8 func041b_elvis_at_bridge[] = { reloop(0x09) label(0x2c) - speak(CHR_TARGET, L_LEE(24), 0x12e3, CHANNEL_6, COLOR_04_ORANGE) // "Look out, Joanna! I think we've made them angry..." + speak(CHR_TARGET, L_LEE_024, 0x12e3, CHANNEL_6, COLOR_04_ORANGE) // "Look out, Joanna! I think we've made them angry..." set_stage_flag(STAGEFLAG_SAID_LOOKOUT) endloop(0x09) @@ -1112,7 +1112,7 @@ u8 func1005_check_elvis_dead[] = { endloop(0x04) label(0x2c) - show_hudmsg(CHR_BOND, L_LEE(12)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_LEE_012) // "Elvis has been killed." set_stage_flag(STAGEFLAG_ELVIS_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1810,7 +1810,7 @@ u8 func0419_hangar_maian[] = { endloop(0x10) label(0x06) - show_hudmsg(CHR_BOND, L_LEE(13)) // "Navigational information has been retrieved." + show_hudmsg(CHR_BOND, L_LEE_013) // "Navigational information has been retrieved." set_stage_flag(STAGEFLAG_NAVIGATION_ROOM_DONE) goto_first(0x03) @@ -1894,7 +1894,7 @@ u8 func100b_msg_getshieldsdown[] = { endloop(0xc2) label(0x06) - speak(CHR_BOND, L_LEE(16), 0x81a0, CHANNEL_6, COLOR_04_ORANGE) // "Outside, Joanna. Get the shields down and we can h..." + speak(CHR_BOND, L_LEE_016, 0x81a0, CHANNEL_6, COLOR_04_ORANGE) // "Outside, Joanna. Get the shields down and we can h..." set_stage_flag(STAGEFLAG_SAID_GETSHIELDSDOWN) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1918,7 +1918,7 @@ u8 func100c_engineroom[] = { if_chr_knockedout(CHR_ELVIS, /*goto*/ 0x2c) set_ailist(CHR_ELVIS, AILIST_ELVIS_RUN_FROM_ENGINEROOM) play_x_track(XREASON_DEFAULT, 10, 10) - speak(CHR_BOND, L_LEE(46), 0x73d7, CHANNEL_6, COLOR_04_ORANGE) // "We have to get out of here!" + speak(CHR_BOND, L_LEE_046, 0x73d7, CHANNEL_6, COLOR_04_ORANGE) // "We have to get out of here!" label(0x2c) set_countdown_timer(10) show_countdown_timer @@ -1952,7 +1952,7 @@ u8 func100c_engineroom[] = { destroy_object(0x1e) destroy_object(0x1f) destroy_object(0x20) - show_hudmsg(CHR_BOND, L_LEE(23)) // "Engines have been disabled." + show_hudmsg(CHR_BOND, L_LEE_023) // "Engines have been disabled." set_stage_flag(STAGEFLAG_ENGINES_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2478,7 +2478,7 @@ u8 func1010_check_bridge_captured[] = { goto_first(0x09) label(0x2c) - show_hudmsg(CHR_BOND, L_LEE(25)) // "Bridge has been captured." + show_hudmsg(CHR_BOND, L_LEE_025) // "Bridge has been captured." set_stage_flag(STAGEFLAG_BRIDGE_CAPTURED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2580,16 +2580,16 @@ u8 func1003_intro[] = { play_sound(0x0174, CHANNEL_10) wait_until(320, 0x9e) - speak(CHR_BOND, L_LEE(32), 0x747f, CHANNEL_10, COLOR_09_BLUE) // "Oohhh... I'd better not be where I think I am." + speak(CHR_BOND, L_LEE_032, 0x747f, CHANNEL_10, COLOR_09_BLUE) // "Oohhh... I'd better not be where I think I am." wait_until(505, 0x9f) play_sound(0x0427, CHANNEL_10) wait_until(600, 0xa0) - speak(CHR_BOND, L_LEE(33), 0x7480, CHANNEL_10, COLOR_04_ORANGE) // "And it's worse than that, my dear. Just look who y..." + speak(CHR_BOND, L_LEE_033, 0x7480, CHANNEL_10, COLOR_04_ORANGE) // "And it's worse than that, my dear. Just look who y..." wait_until(1000, 0xa1) - speak(CHR_BOND, L_LEE(34), 0x7481, CHANNEL_10, COLOR_09_BLUE) // "You! I thought you'd managed to escape. We found n..." + speak(CHR_BOND, L_LEE_034, 0x7481, CHANNEL_10, COLOR_09_BLUE) // "You! I thought you'd managed to escape. We found n..." wait_until(1018, 0xa2) play_sound(0x0175, CHANNEL_10) @@ -2616,7 +2616,7 @@ u8 func1003_intro[] = { play_sound(0x0172, CHANNEL_10) wait_until(1400, 0xa8) - speak(CHR_BOND, L_LEE(35), 0x7482, CHANNEL_10, COLOR_04_ORANGE) // "You couldn't find me. But there was no hiding from..." + speak(CHR_BOND, L_LEE_035, 0x7482, CHANNEL_10, COLOR_04_ORANGE) // "You couldn't find me. But there was no hiding from..." wait_until(1520, 0x67) play_sound(0x0176, CHANNEL_10) @@ -2645,7 +2645,7 @@ u8 func1003_intro[] = { play_sound(0x0530, CHANNEL_10) wait_until(1870, 0x6f) - speak(CHR_BOND, L_LEE(36), 0x7483, CHANNEL_10, COLOR_04_ORANGE) // "This is it. Wait there! I'll make a distraction; i..." + speak(CHR_BOND, L_LEE_036, 0x7483, CHANNEL_10, COLOR_04_ORANGE) // "This is it. Wait there! I'll make a distraction; i..." wait_until(1874, 0x70) play_sound(0x0174, CHANNEL_10) @@ -2692,7 +2692,7 @@ u8 func1003_intro[] = { play_sound(0x0177, CHANNEL_10) wait_until(2581, 0x7e) - speak(CHR_BOND, L_LEE(37), 0x7484, CHANNEL_10, COLOR_09_BLUE) // "Why are you doing this, Cassandra?" + speak(CHR_BOND, L_LEE_037, 0x7484, CHANNEL_10, COLOR_09_BLUE) // "Why are you doing this, Cassandra?" wait_until(2614, 0x7f) play_sound(0x0171, CHANNEL_10) @@ -2713,7 +2713,7 @@ u8 func1003_intro[] = { play_sound(0x0175, CHANNEL_10) wait_until(2790, 0x85) - speak(CHR_BOND, L_LEE(38), 0x7485, CHANNEL_10, COLOR_04_ORANGE) // "The Skedar used me, Joanna. You are my best chance..." + speak(CHR_BOND, L_LEE_038, 0x7485, CHANNEL_10, COLOR_04_ORANGE) // "The Skedar used me, Joanna. You are my best chance..." wait_until(2792, 0x86) play_sound(0x0172, CHANNEL_10) @@ -2743,7 +2743,7 @@ u8 func1003_intro[] = { wait_until(3313, 0x8d) play_sound(0x052a, CHANNEL_10) - speak(CHR_BOND, L_LEE(39), 0x7c86, CHANNEL_10, COLOR_04_ORANGE) // "Eeeeaaarrrrggghhh!!!" + speak(CHR_BOND, L_LEE_039, 0x7c86, CHANNEL_10, COLOR_04_ORANGE) // "Eeeeaaarrrrggghhh!!!" beginloop(0x08) if_camera_animating(/*goto*/ 0x2c) @@ -2837,7 +2837,7 @@ u8 func0c01_outro[] = { play_sound(0x00fd, CHANNEL_10) wait_until(150, 0xa9) - speak(CHR_BOND, L_LEE(40), 0x7487, CHANNEL_10, COLOR_09_BLUE) // "Wow. That's the first time I've seen another plane..." + speak(CHR_BOND, L_LEE_040, 0x7487, CHANNEL_10, COLOR_09_BLUE) // "Wow. That's the first time I've seen another plane..." wait_until(368, 0x67) play_sound(0x00fa, CHANNEL_10) @@ -2854,10 +2854,10 @@ u8 func0c01_outro[] = { play_sound(0x00fb, CHANNEL_10) wait_until(690, 0x6e) - speak(CHR_BOND, L_LEE(41), 0x7488, CHANNEL_10, COLOR_04_ORANGE) // "Hmmmm?" + speak(CHR_BOND, L_LEE_041, 0x7488, CHANNEL_10, COLOR_04_ORANGE) // "Hmmmm?" wait_until(850, 0x6f) - speak(CHR_BOND, L_LEE(42), 0x7489, CHANNEL_10, COLOR_04_ORANGE) // "I don't... I don't believe it!" + speak(CHR_BOND, L_LEE_042, 0x7489, CHANNEL_10, COLOR_04_ORANGE) // "I don't... I don't believe it!" wait_until(963, 0x70) play_sound(0x80d4, CHANNEL_10) @@ -2869,7 +2869,7 @@ u8 func0c01_outro[] = { play_sound(0x80db, CHANNEL_10) wait_until(1000, 0x72) - speak(CHR_BOND, L_LEE(43), 0x748a, CHANNEL_10, COLOR_09_BLUE) // "Elvis? What is it?" + speak(CHR_BOND, L_LEE_043, 0x748a, CHANNEL_10, COLOR_09_BLUE) // "Elvis? What is it?" wait_until(1030, 0x73) play_sound(0x80da, CHANNEL_10) @@ -2884,7 +2884,7 @@ u8 func0c01_outro[] = { play_sound(0x80da, CHANNEL_10) wait_until(1200, 0x77) - speak(CHR_BOND, L_LEE(44), 0x748b, CHANNEL_10, COLOR_09_BLUE) // "Where are you going?" + speak(CHR_BOND, L_LEE_044, 0x748b, CHANNEL_10, COLOR_09_BLUE) // "Where are you going?" wait_until(1237, 0x78) play_sound(0x80db, CHANNEL_10) @@ -2899,7 +2899,7 @@ u8 func0c01_outro[] = { play_sound(0x80da, CHANNEL_10) wait_until(1301, 0x62) - speak(CHR_BOND, L_LEE(45), 0x748c, CHANNEL_10, COLOR_04_ORANGE) // "We have to get down to the surface! Follow me!" + speak(CHR_BOND, L_LEE_045, 0x748c, CHANNEL_10, COLOR_04_ORANGE) // "We have to get down to the surface! Follow me!" open_door(OBJ_HANGARDOOR1) open_door(OBJ_HANGARDOOR2) open_door(OBJ_HANGARDOOR3) @@ -3116,7 +3116,7 @@ u8 func1013_msg_gottogetshieldsdown[] = { endloop(0x08) label(0x2c) - speak(CHR_BOND, L_LEE(27), 0x73dc, CHANNEL_6, COLOR_09_BLUE) // "I've got to get those shields down to let Elvis in..." + speak(CHR_BOND, L_LEE_027, 0x73dc, CHANNEL_6, COLOR_09_BLUE) // "I've got to get those shields down to let Elvis in..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3137,7 +3137,7 @@ u8 func1014_msg_hangarbaydoors[] = { endloop(0x08) label(0x2c) - speak(CHR_BOND, L_LEE(28), 0x73dd, CHANNEL_6, COLOR_09_BLUE) // "Now only the hangar bay doors are in the way." + speak(CHR_BOND, L_LEE_028, 0x73dd, CHANNEL_6, COLOR_09_BLUE) // "Now only the hangar bay doors are in the way." label(0x09) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -3151,7 +3151,7 @@ u8 func1015_msg_starmaps[] = { endloop(0x04) label(0x2c) - speak(CHR_P1P2, L_LEE(29), 0x73de, CHANNEL_6, COLOR_09_BLUE) // "This machine contains the Skedar star maps." + speak(CHR_P1P2, L_LEE_029, 0x73de, CHANNEL_6, COLOR_09_BLUE) // "This machine contains the Skedar star maps." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3167,7 +3167,7 @@ u8 func1016_msg_ifwecontrolthebridge[] = { unset_chr_chrflag(CHR_BRIDGE1, CHRCFLAG_INVINCIBLE_TO_GUNFIRE) unset_chr_chrflag(CHR_BRIDGE2, CHRCFLAG_INVINCIBLE_TO_GUNFIRE) unset_chr_chrflag(CHR_BRIDGE3, CHRCFLAG_INVINCIBLE_TO_GUNFIRE) - speak(CHR_P1P2, L_LEE(30), 0x73df, CHANNEL_6, COLOR_09_BLUE) // "If we control the bridge, then the ship is ours." + speak(CHR_P1P2, L_LEE_030, 0x73df, CHANNEL_6, COLOR_09_BLUE) // "If we control the bridge, then the ship is ours." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3556,7 +3556,7 @@ u8 func1021_check_ammo_wasted[] = { // Ammo wasted label(0x2c) set_stage_flag(STAGEFLAG_AMMO_WASTED) - show_hudmsg(CHR_BOND, L_LEE(49)) // "Ammo depleted - consoles can't be destroyed." + show_hudmsg(CHR_BOND, L_LEE_049) // "Ammo depleted - consoles can't be destroyed." beginloop(0x66) if_stage_flag_eq(STAGEFLAG_SHIELDS_DISABLED, TRUE, /*goto*/ 0x2c) diff --git a/src/assets/files/setup/setuplip.c b/src/assets/files/setup/setuplip.c index 65cc44592..8ecf2e573 100644 --- a/src/assets/files/setup/setuplip.c +++ b/src/assets/files/setup/setuplip.c @@ -133,34 +133,34 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_LIP(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_LIP(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_LIP(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_LIP(3)) + briefing(BRIEFINGTYPE_LOCATION, L_LIP_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_LIP_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_LIP_002) + briefing(BRIEFINGTYPE_TEXT_A, L_LIP_003) - beginobjective(0, L_LIP(10), (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy computer records" + beginobjective(0, L_LIP_010, (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy computer records" complete_flags(STAGEFLAG_RECORDS_DESTROYED) fail_flags(STAGEFLAG_UPLINK_TERMINAL_DESTROYED) endobjective - beginobjective(1, L_LIP(11), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate conspiracy evidence" + beginobjective(1, L_LIP_011, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate conspiracy evidence" complete_flags(STAGEFLAG_XRAY_DONE) fail_flags(STAGEFLAG_CHAMBER_SWITCH_DESTROYED) endobjective - beginobjective(2, L_LIP(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Obtain and use lab technician disguise" + beginobjective(2, L_LIP_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Obtain and use lab technician disguise" complete_flags(STAGEFLAG_USED_DISGUISE) fail_flags(STAGEFLAG_DISGUISE_UNCOVERED) endobjective - beginobjective(3, L_LIP(12), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain access to autopsy lab" + beginobjective(3, L_LIP_012, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain access to autopsy lab" complete_flags(STAGEFLAG_ENTERED_LAB) require_object_collected(OBJ_KEYCARD) fail_flags(STAGEFLAG_DOORMAN_REJECTED) fail_flags(STAGEFLAG_DOORMAN_DEAD) endobjective - beginobjective(4, L_LIP(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rescue the crash Survivor" + beginobjective(4, L_LIP_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rescue the crash Survivor" complete_flags(STAGEFLAG_RESCUED_ELVIS) fail_flags(STAGEFLAG_ELVIS_DEAD) fail_flags(STAGEFLAG_CRATE_DESTROYED) @@ -304,19 +304,19 @@ u32 props[] = { door_scale(0x00010000) tag(0x00, 1) weapon(0x0180, MODEL_LABCOAT, 0x042b, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DISGUISE40, 0x00ffffff, 0x00000000) - rename_object(-1, 0x40, L_LIP(15), L_LIP(16), L_LIP(17), L_LIP(18), L_LIP(19), 0x0000, 0x0000) // "Obtain lab clothes." + rename_object(-1, 0x40, L_LIP_015, L_LIP_016, L_LIP_017, L_LIP_018, L_LIP_019, 0x0000, 0x0000) // "Obtain lab clothes." tag(0x3e, 1) weapon(0x0180, MODEL_LABCOAT, 0x042c, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DISGUISE40, 0x00ffffff, 0x00000000) - rename_object(-1, 0x40, L_LIP(15), L_LIP(16), L_LIP(17), L_LIP(18), L_LIP(19), 0x0000, 0x0000) // "Obtain lab clothes." + rename_object(-1, 0x40, L_LIP_015, L_LIP_016, L_LIP_017, L_LIP_018, L_LIP_019, 0x0000, 0x0000) // "Obtain lab clothes." tag(0x3f, 1) weapon(0x0180, MODEL_LABCOAT, 0x042d, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DISGUISE40, 0x00ffffff, 0x00000000) - rename_object(-1, 0x40, L_LIP(15), L_LIP(16), L_LIP(17), L_LIP(18), L_LIP(19), 0x0000, 0x0000) // "Obtain lab clothes." + rename_object(-1, 0x40, L_LIP_015, L_LIP_016, L_LIP_017, L_LIP_018, L_LIP_019, 0x0000, 0x0000) // "Obtain lab clothes." tag(0x40, 1) weapon(0x0180, MODEL_LABCOAT, 0x042e, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DISGUISE40, 0x00ffffff, 0x00000000) - rename_object(-1, 0x40, L_LIP(15), L_LIP(16), L_LIP(17), L_LIP(18), L_LIP(19), 0x0000, 0x0000) // "Obtain lab clothes." + rename_object(-1, 0x40, L_LIP_015, L_LIP_016, L_LIP_017, L_LIP_018, L_LIP_019, 0x0000, 0x0000) // "Obtain lab clothes." tag(0x41, 1) weapon(0x0180, MODEL_LABCOAT, 0x042f, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DISGUISE40, 0x00ffffff, 0x00000000) - rename_object(-1, 0x40, L_LIP(15), L_LIP(16), L_LIP(17), L_LIP(18), L_LIP(19), 0x0000, 0x0000) // "Obtain lab clothes." + rename_object(-1, 0x40, L_LIP_015, L_LIP_016, L_LIP_017, L_LIP_018, L_LIP_019, 0x0000, 0x0000) // "Obtain lab clothes." tag(0x03, 1) singlemonitor(0x0033, MODEL_SINISTERSTATION, 0x0428, 0x000005e1, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff03) tag(0x02, 1) @@ -327,10 +327,10 @@ u32 props[] = { singlemonitor(0x0033, MODEL_SINISTERSTATION, 0x0426, 0x000005e1, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff03) tag(0x05, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0x00da, 0x00100001, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_LIP(24), L_LIP(25), L_LIP(26), L_LIP(27), L_LIP(28), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x36, L_LIP_024, L_LIP_025, L_LIP_026, L_LIP_027, L_LIP_028, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x3a, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0x00da, 0x00100001, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_LIP(24), L_LIP(25), L_LIP(26), L_LIP(27), L_LIP(28), 0x0000, 0x0000) // "Obtain Data Uplink." + rename_object(-1, 0x36, L_LIP_024, L_LIP_025, L_LIP_026, L_LIP_027, L_LIP_028, 0x0000, 0x0000) // "Obtain Data Uplink." tag(0x3c, 2) tag(0x3d, 2) singlemonitor(0x0033, MODEL_SINISTERSTATION, 0x03c6, 0x000005e1, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff03) @@ -489,7 +489,7 @@ u32 props[] = { hover_prop(0x00eb, MODEL_HOVERCRATE1, 0x01c7, 0x35100101, 0x80102301, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x02010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000) tag(0x06, 1) key(0x0080, MODEL_KEYCARD, 0x003f, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000020) - rename_object(-1, 0x47, L_LIP(32), L_LIP(33), L_LIP(34), L_LIP(35), L_LIP(36), 0x0000, 0x0000) // "Obtain medlab 2 key card." + rename_object(-1, 0x47, L_LIP_032, L_LIP_033, L_LIP_034, L_LIP_035, L_LIP_036, 0x0000, 0x0000) // "Obtain medlab 2 key card." // @bug: This keycard is given to guard 0x26 rather than being left // unassigned. This breaks the keycard hot potato which is supposed to @@ -497,7 +497,7 @@ u32 props[] = { // there's one guard left, and you can just kill guard 0x26 for it. tag(0x10, 1) key(0x0080, MODEL_KEYCARD, 0x0026, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000080) - rename_object(-1, 0x48, L_LIP(59), L_LIP(60), L_LIP(61), L_LIP(62), L_LIP(63), 0x0000, 0x0000) // "Obtain op room key card." + rename_object(-1, 0x48, L_LIP_059, L_LIP_060, L_LIP_061, L_LIP_062, L_LIP_063, 0x0000, 0x0000) // "Obtain op room key card." stdobject(0x0100, MODEL_A51BOARD, 0x03c4, 0x05120101, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) door(0x0100, MODEL_A51_HORIZ_DOOR_BOT, 0x02bd, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x0000f333, 0x00085555, 0x00085555, 0x00001999, 0x00000004, 0x00000000, 0x0000003c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000100, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) @@ -882,7 +882,7 @@ u8 func1007_check_disguise_collected[] = { u8 func1026_check_records_destroyed[] = { beginloop(0x04) if_object_in_good_condition(0x04, /*goto*/ 0x06) - show_hudmsg(CHR_BOND, L_LIP(14)) // "Research records destroyed." + show_hudmsg(CHR_BOND, L_LIP_014) // "Research records destroyed." set_stage_flag(STAGEFLAG_RECORDS_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) @@ -900,17 +900,17 @@ u8 func1003_uplink_doors[] = { label(0x2d) if_stage_flag_eq(STAGEFLAG_DOOR_VIRUS_DOWNLOADED, FALSE, /*goto*/ 0x06) play_sound(0x8116, -1) - show_hudmsg(CHR_P1P2, L_LIP(48)) // "Virus has already been downloaded." + show_hudmsg(CHR_P1P2, L_LIP_048) // "Virus has already been downloaded." reloop(0x04) label(0x06) if_chr_weapon_equipped(CHR_P1P2, WEAPON_DATAUPLINK, /*goto*/ 0x2d) play_sound(0x8116, -1) - show_hudmsg(CHR_P1P2, L_LIP(20)) // "Access to door control systems denied." + show_hudmsg(CHR_P1P2, L_LIP_020) // "Access to door control systems denied." reloop(0x04) label(0x2d) - show_hudmsg(CHR_P1P2, L_LIP(30)) // "Data Uplink connected." + show_hudmsg(CHR_P1P2, L_LIP_030) // "Data Uplink connected." restart_timer beginloop(0x08) @@ -923,7 +923,7 @@ u8 func1003_uplink_doors[] = { endloop(0x08) label(0x06) - show_hudmsg(CHR_P1P2, L_LIP(49)) // "Initiating virus download." + show_hudmsg(CHR_P1P2, L_LIP_049) // "Initiating virus download." restart_timer assign_sound(0x01bf, CHANNEL_5) control_sound_from_object(CHANNEL_5, 0x02, TRUE) @@ -945,13 +945,13 @@ u8 func1003_uplink_doors[] = { label(0x2d) assign_sound(0x01c1, CHANNEL_5) control_sound_from_object(CHANNEL_5, 0x02, TRUE) - show_hudmsg(CHR_P1P2, L_LIP(23)) // "Virus downloaded to console." + show_hudmsg(CHR_P1P2, L_LIP_023) // "Virus downloaded to console." yield set_stage_flag(STAGEFLAG_DOOR_VIRUS_DOWNLOADED) reloop(0x04) label(0x09) - show_hudmsg(CHR_P1P2, L_LIP(31)) // "Data Uplink connection broken." + show_hudmsg(CHR_P1P2, L_LIP_031) // "Data Uplink connection broken." mute_channel(CHANNEL_5) assign_sound(0x01c0, CHANNEL_6) control_sound_from_object(CHANNEL_6, 0x02, TRUE) @@ -977,17 +977,17 @@ u8 func1004_uplink_lights[] = { label(0x2d) if_stage_flag_eq(STAGEFLAG_LIGHT_VIRUS_DONE, FALSE, /*goto*/ 0x06) play_sound(0x8116, -1) - show_hudmsg(CHR_P1P2, L_LIP(48)) // "Virus has already been downloaded." + show_hudmsg(CHR_P1P2, L_LIP_048) // "Virus has already been downloaded." reloop(0x04) label(0x06) if_chr_weapon_equipped(CHR_P1P2, WEAPON_DATAUPLINK, /*goto*/ 0x2d) play_sound(0x8116, -1) - show_hudmsg(CHR_P1P2, L_LIP(21)) // "Access to light control systems denied." + show_hudmsg(CHR_P1P2, L_LIP_021) // "Access to light control systems denied." reloop(0x04) label(0x2d) - show_hudmsg(CHR_P1P2, L_LIP(30)) // "Data Uplink connected." + show_hudmsg(CHR_P1P2, L_LIP_030) // "Data Uplink connected." restart_timer beginloop(0x08) @@ -1000,7 +1000,7 @@ u8 func1004_uplink_lights[] = { endloop(0x08) label(0x06) - show_hudmsg(CHR_P1P2, L_LIP(49)) // "Initiating virus download." + show_hudmsg(CHR_P1P2, L_LIP_049) // "Initiating virus download." restart_timer assign_sound(0x01bf, CHANNEL_5) control_sound_from_object(CHANNEL_5, 0x01, TRUE) @@ -1022,9 +1022,9 @@ u8 func1004_uplink_lights[] = { label(0x2d) assign_sound(0x01c1, CHANNEL_5) control_sound_from_object(CHANNEL_5, 0x01, TRUE) - show_hudmsg(CHR_P1P2, L_LIP(23)) // "Virus downloaded to console." + show_hudmsg(CHR_P1P2, L_LIP_023) // "Virus downloaded to console." yield - show_hudmsg(CHR_P1P2, L_LIP(88)) // "Lighting systems overloaded." + show_hudmsg(CHR_P1P2, L_LIP_088) // "Lighting systems overloaded." configure_environment(0x00c4, AIENVCMD_ROOM_SETFAULTYLIGHTS, 110) configure_environment(0x00c3, AIENVCMD_ROOM_SETFAULTYLIGHTS, 110) configure_environment(0x00c8, AIENVCMD_ROOM_SETFAULTYLIGHTS, 110) @@ -1042,7 +1042,7 @@ u8 func1004_uplink_lights[] = { reloop(0x04) label(0x09) - show_hudmsg(CHR_P1P2, L_LIP(31)) // "Data Uplink connection broken." + show_hudmsg(CHR_P1P2, L_LIP_031) // "Data Uplink connection broken." mute_channel(CHANNEL_5) assign_sound(0x01c0, CHANNEL_6) control_sound_from_object(CHANNEL_6, 0x01, TRUE) @@ -1068,17 +1068,17 @@ u8 func1005_uplink_autoguns[] = { label(0x2d) if_stage_flag_eq(STAGEFLAG_LIGHT_VIRUS_DONE, FALSE, /*goto*/ 0x06) play_sound(0x8116, -1) - show_hudmsg(CHR_P1P2, L_LIP(48)) // "Virus has already been downloaded." + show_hudmsg(CHR_P1P2, L_LIP_048) // "Virus has already been downloaded." reloop(0x04) label(0x06) if_chr_weapon_equipped(CHR_P1P2, WEAPON_DATAUPLINK, /*goto*/ 0x2d) play_sound(0x8116, -1) - show_hudmsg(CHR_P1P2, L_LIP(22)) // "Access to security control systems denied." + show_hudmsg(CHR_P1P2, L_LIP_022) // "Access to security control systems denied." reloop(0x04) label(0x2d) - show_hudmsg(CHR_P1P2, L_LIP(30)) // "Data Uplink connected." + show_hudmsg(CHR_P1P2, L_LIP_030) // "Data Uplink connected." restart_timer beginloop(0x08) @@ -1091,7 +1091,7 @@ u8 func1005_uplink_autoguns[] = { endloop(0x08) label(0x06) - show_hudmsg(CHR_P1P2, L_LIP(49)) // "Initiating virus download." + show_hudmsg(CHR_P1P2, L_LIP_049) // "Initiating virus download." restart_timer assign_sound(0x01bf, CHANNEL_5) control_sound_from_object(CHANNEL_5, 0x03, TRUE) @@ -1112,14 +1112,14 @@ u8 func1005_uplink_autoguns[] = { label(0x2d) assign_sound(0x01c1, CHANNEL_5) control_sound_from_object(CHANNEL_5, 0x00, TRUE) - show_hudmsg(CHR_P1P2, L_LIP(23)) // "Virus downloaded to console." + show_hudmsg(CHR_P1P2, L_LIP_023) // "Virus downloaded to console." yield - show_hudmsg(CHR_P1P2, L_LIP(105)) // "Automatic Defenses Disabled." + show_hudmsg(CHR_P1P2, L_LIP_105) // "Automatic Defenses Disabled." set_stage_flag(STAGEFLAG_AUTOGUN_VIRUS_DONE) reloop(0x04) label(0x09) - show_hudmsg(CHR_P1P2, L_LIP(31)) // "Data Uplink connection broken." + show_hudmsg(CHR_P1P2, L_LIP_031) // "Data Uplink connection broken." mute_channel(CHANNEL_5) assign_sound(0x01c0, CHANNEL_6) control_sound_from_object(CHANNEL_6, 0x03, TRUE) @@ -1133,7 +1133,7 @@ u8 func1005_uplink_autoguns[] = { mute_channel(CHANNEL_6) reloop(0x04) - show_hudmsg(CHR_P1P2, L_LIP(23)) // "Virus downloaded to console." + show_hudmsg(CHR_P1P2, L_LIP_023) // "Virus downloaded to console." set_stage_flag(STAGEFLAG_AUTOGUN_VIRUS_DONE) endloop(0x04) @@ -1147,7 +1147,7 @@ u8 func1006_check_lab_accessed[] = { endloop(0x04) label(0x06) - show_hudmsg(CHR_P1P2, L_LIP(29)) // "Laboratory accessed successfully." + show_hudmsg(CHR_P1P2, L_LIP_029) // "Laboratory accessed successfully." set_stage_flag(STAGEFLAG_ENTERED_LAB) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1363,7 +1363,7 @@ u8 func0410_labtech_showers_sa_pa[] = { label(0x06) dprint 'T','A','L','K',' ','1','\n',0, - speak(CHR_TARGET, L_LIP(37), 0x1b2d, CHANNEL_4, COLOR_08_RED) // "Who are you?" + speak(CHR_TARGET, L_LIP_037, 0x1b2d, CHANNEL_4, COLOR_08_RED) // "Who are you?" restart_timer try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x64) @@ -1383,7 +1383,7 @@ u8 func0410_labtech_showers_sa_pa[] = { // Jo has clothes label(0x0d) - speak(CHR_TARGET, L_LIP(38), 0x1b2e, CHANNEL_4, COLOR_08_RED) // "Hey - you've got my clothes." + speak(CHR_TARGET, L_LIP_038, 0x1b2e, CHANNEL_4, COLOR_08_RED) // "Hey - you've got my clothes." restart_timer beginloop(0x0e) @@ -1396,7 +1396,7 @@ u8 func0410_labtech_showers_sa_pa[] = { endloop(0x0e) label(0x06) - speak(CHR_TARGET, L_LIP(43), 0x1b32, CHANNEL_4, COLOR_08_RED) // "Give me back my clothes - or else!" + speak(CHR_TARGET, L_LIP_043, 0x1b32, CHANNEL_4, COLOR_08_RED) // "Give me back my clothes - or else!" restart_timer beginloop(0x0f) @@ -1442,14 +1442,14 @@ u8 func0410_labtech_showers_sa_pa[] = { // Jo is in one of many rooms with nothing equipped - attack her label(0x2d) if_self_flag_bankx_eq(CHRFLAG0_00002000, TRUE, BANK_0, /*goto*/ 0x2d) - speak(CHR_TARGET, L_LIP(44), 0x1b33, CHANNEL_4, COLOR_08_RED) // "Right - you've asked for it!" + speak(CHR_TARGET, L_LIP_044, 0x1b33, CHANNEL_4, COLOR_08_RED) // "Right - you've asked for it!" set_self_flag_bankx(CHRFLAG0_00002000, BANK_0) goto_next(0x06) label(0x2d) call_rng if_rand_gt(25, /*goto*/ 0x06) - speak(CHR_TARGET, L_LIP(45), 0x1b34, CHANNEL_4, COLOR_08_RED) // "Give me my clothes." + speak(CHR_TARGET, L_LIP_045, 0x1b34, CHANNEL_4, COLOR_08_RED) // "Give me my clothes." label(0x06) try_run_to_target(/*goto*/ 0x6f) restart_timer @@ -1476,7 +1476,7 @@ u8 func0410_labtech_showers_sa_pa[] = { label(0x53) chr_do_animation(ANIM_SURPRISED_0202, 0, -1, 0x10, 0x10, CHR_SELF, 2) dprint 'T','A','L','K',' ','1','\n',0, - speak(CHR_TARGET, L_LIP(41), 0x8156, CHANNEL_4, COLOR_08_RED) // "Oh, my God - a gun!" + speak(CHR_TARGET, L_LIP_041, 0x8156, CHANNEL_4, COLOR_08_RED) // "Oh, my God - a gun!" restart_timer beginloop(0x0a) @@ -1486,7 +1486,7 @@ u8 func0410_labtech_showers_sa_pa[] = { // Jo in an unknown room, or follow through from seeing weapon label(0x06) restart_timer - speak(CHR_TARGET, L_LIP(39), 0x1b2f, CHANNEL_4, COLOR_08_RED) // "Help - help!" + speak(CHR_TARGET, L_LIP_039, 0x1b2f, CHANNEL_4, COLOR_08_RED) // "Help - help!" try_set_chrpreset_to_unalerted_teammate(0, /*goto*/ 0x06) // No chr in same group - run to pad instead @@ -1504,7 +1504,7 @@ u8 func0410_labtech_showers_sa_pa[] = { endloop(0x0b) label(0x61) - speak(CHR_TARGET, L_LIP(42), 0x1b31, CHANNEL_4, COLOR_08_RED) // "There's an intruder in the complex." + speak(CHR_TARGET, L_LIP_042, 0x1b31, CHANNEL_4, COLOR_08_RED) // "There's an intruder in the complex." set_stage_flag(STAGEFLAG_DISGUISE_UNCOVERED) increase_squadron_alertness(100) stop_chr @@ -1541,7 +1541,7 @@ u8 func1009_disguise_timer[] = { endloop(0x09) label(0x06) - speak(CHR_BOND, L_LIP(46), 0x72ab, CHANNEL_4, COLOR_09_BLUE) // "I don't have much time!!!" + speak(CHR_BOND, L_LIP_046, 0x72ab, CHANNEL_4, COLOR_09_BLUE) // "I don't have much time!!!" if_difficulty_lt(DIFF_SA, /*goto*/ 0x5d) if_difficulty_lt(DIFF_PA, /*goto*/ 0x5f) set_countdown_timer(90) @@ -1584,7 +1584,7 @@ u8 func1009_disguise_timer[] = { activate_alarm yield label(0x2d) - show_hudmsg(CHR_BOND, L_LIP(47)) // "The enemy has discovered the disguise." + show_hudmsg(CHR_BOND, L_LIP_047) // "The enemy has discovered the disguise." set_stage_flag(STAGEFLAG_DISGUISE_UNCOVERED) hide_countdown_timer set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1733,7 +1733,7 @@ u8 func0418_doorman[] = { endloop(0x09) label(0x06) - speak(CHR_TARGET, L_LIP(50), 0x8157, CHANNEL_4, COLOR_08_RED) // "So, you got here at last." + speak(CHR_TARGET, L_LIP_050, 0x8157, CHANNEL_4, COLOR_08_RED) // "So, you got here at last." beginloop(0x0a) if_timer_gt(240, /*goto*/ 0x06) @@ -1746,7 +1746,7 @@ u8 func0418_doorman[] = { // Disguise not used, or uncovered label(0x2d) dprint 'T','A','L','K',' ','1','\n',0, - speak(CHR_TARGET, L_LIP(51), 0x8158, CHANNEL_4, COLOR_08_RED) // "Hey, you're not... SECURITY ALERT!" + speak(CHR_TARGET, L_LIP_051, 0x8158, CHANNEL_4, COLOR_08_RED) // "Hey, you're not... SECURITY ALERT!" restart_timer stop_chr @@ -1756,7 +1756,7 @@ u8 func0418_doorman[] = { label(0x2d) set_stage_flag(STAGEFLAG_DOORMAN_REJECTED) - show_hudmsg(CHR_TARGET, L_LIP(57)) // "Cannot gain access to autopsy lab." + show_hudmsg(CHR_TARGET, L_LIP_057) // "Cannot gain access to autopsy lab." goto_next(0x64) // Disguised @@ -1766,7 +1766,7 @@ u8 func0418_doorman[] = { // Jo has gun equipped label(0x2d) - speak(CHR_TARGET, L_LIP(52), 0x8159, CHANNEL_4, COLOR_08_RED) // "No guns allowed in here - put your weapon away." + speak(CHR_TARGET, L_LIP_052, 0x8159, CHANNEL_4, COLOR_08_RED) // "No guns allowed in here - put your weapon away." restart_timer beginloop(0x0c) @@ -1776,7 +1776,7 @@ u8 func0418_doorman[] = { endloop(0x0c) label(0x06) - speak(CHR_TARGET, L_LIP(53), 0x815a, CHANNEL_4, COLOR_08_RED) // "I won't tell you again - lose the weapon." + speak(CHR_TARGET, L_LIP_053, 0x815a, CHANNEL_4, COLOR_08_RED) // "I won't tell you again - lose the weapon." restart_timer beginloop(0x0d) @@ -1787,16 +1787,16 @@ u8 func0418_doorman[] = { label(0x1b) label(0x06) - speak(CHR_TARGET, L_LIP(54), 0x815b, CHANNEL_4, COLOR_08_RED) // "Right - I'm calling security." + speak(CHR_TARGET, L_LIP_054, 0x815b, CHANNEL_4, COLOR_08_RED) // "Right - I'm calling security." restart_timer label(0x10) set_stage_flag(STAGEFLAG_DOORMAN_REJECTED) - show_hudmsg(CHR_TARGET, L_LIP(57)) // "Cannot gain access to autopsy lab." + show_hudmsg(CHR_TARGET, L_LIP_057) // "Cannot gain access to autopsy lab." goto_next(0x64) // Jo disguised and unarmed label(0x59) - speak(CHR_TARGET, L_LIP(55), 0x815c, CHANNEL_4, COLOR_08_RED) // "Everyone's been waiting for you..." + speak(CHR_TARGET, L_LIP_055, 0x815c, CHANNEL_4, COLOR_08_RED) // "Everyone's been waiting for you..." restart_timer beginloop(0x0e) @@ -1871,7 +1871,7 @@ u8 func100b_check_doorman_dead[] = { if_chr_in_room(CHR_BOND, 0x00, 0x0088, /*goto*/ 0x06) if_chr_in_room(CHR_BOND, 0x00, 0x0089, /*goto*/ 0x06) if_chr_in_room(CHR_BOND, 0x00, 0x008a, /*goto*/ 0x06) - show_hudmsg(CHR_P1P2, L_LIP(56)) // "Critical mission personnel killed." + show_hudmsg(CHR_P1P2, L_LIP_056) // "Critical mission personnel killed." restart_timer beginloop(0x08) @@ -1879,7 +1879,7 @@ u8 func100b_check_doorman_dead[] = { endloop(0x08) label(0x2d) - show_hudmsg(CHR_P1P2, L_LIP(57)) // "Cannot gain access to autopsy lab." + show_hudmsg(CHR_P1P2, L_LIP_057) // "Cannot gain access to autopsy lab." restart_timer set_stage_flag(STAGEFLAG_DOORMAN_DEAD) @@ -1966,7 +1966,7 @@ u8 func041a_labtech_harrysmate[] = { endloop(0x09) label(0x06) - speak(CHR_TARGET, L_LIP(58), 0x1abb, CHANNEL_4, COLOR_08_RED) // "Hey, that's not Harry. It's an intruder." + speak(CHR_TARGET, L_LIP_058, 0x1abb, CHANNEL_4, COLOR_08_RED) // "Hey, that's not Harry. It's an intruder." increase_squadron_alertness(120) restart_timer chr_do_animation(0x002e, 0, -1, 0x18, 0x10, CHR_SELF, 2) @@ -2141,7 +2141,7 @@ u8 func100e_elvis_timer[] = { stop_countdown_timer hide_countdown_timer set_stage_flag(STAGEFLAG_ELVIS_DEAD) - show_hudmsg(CHR_BOND, L_LIP(64)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_LIP_064) // "Elvis has been killed." set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) @@ -2337,7 +2337,7 @@ u8 func0413_mechanic[] = { label(0x06) dprint 'T','A','L','K',' ','1','\n',0, - speak(CHR_BOND, L_LIP(65), 0x80fb, CHANNEL_4, COLOR_08_RED) // "Get the hell out of here!" + speak(CHR_BOND, L_LIP_065, 0x80fb, CHANNEL_4, COLOR_08_RED) // "Get the hell out of here!" restart_timer chr_do_animation(ANIM_SURRENDER_002E, 0, -1, 0x18, 0x10, CHR_SELF, 2) @@ -2449,7 +2449,7 @@ u8 func1013_check_chamber_switch_destroyed[] = { beginloop(0x04) if_object_in_good_condition(OBJ_CHAMBER1_SWITCH, /*goto*/ 0x06) if_stage_flag_eq(STAGEFLAG_CHAMBER1_RAISED, TRUE, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_LIP(68)) // "Mission critical equipment destroyed." + show_hudmsg(CHR_BOND, L_LIP_068) // "Mission critical equipment destroyed." set_stage_flag(STAGEFLAG_CHAMBER_SWITCH_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2485,7 +2485,7 @@ u8 func1014_check_crate_destroyed[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) - show_hudmsg(CHR_BOND, L_LIP(68)) // "Mission critical equipment destroyed." + show_hudmsg(CHR_BOND, L_LIP_068) // "Mission critical equipment destroyed." set_stage_flag(STAGEFLAG_CRATE_DESTROYED) beginloop(0x08) @@ -2497,7 +2497,7 @@ u8 func1014_check_crate_destroyed[] = { label(0x2e) unset_stage_flag(STAGEFLAG_CRATE_DESTROYED) - show_hudmsg(CHR_BOND, L_LIP(89)) // "Alternative entrance to medlabs created." + show_hudmsg(CHR_BOND, L_LIP_089) // "Alternative entrance to medlabs created." set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) @@ -2645,7 +2645,7 @@ u8 func041f_labtech_lights[] = { if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ 0x2d) label(0x06) object_do_animation(0x025a, 0xff, 0x02, 0xffff) - speak(CHR_TARGET, L_LIP(37), 0x8103, CHANNEL_4, COLOR_08_RED) // "Who are you?" + speak(CHR_TARGET, L_LIP_037, 0x8103, CHANNEL_4, COLOR_08_RED) // "Who are you?" #if VERSION >= VERSION_JPN_FINAL label(0x68) @@ -2659,7 +2659,7 @@ u8 func041f_labtech_lights[] = { goto_next(0x06) label(0x2d) - speak(CHR_TARGET, L_LIP(83), 0x127f, CHANNEL_4, COLOR_08_RED) // "Should you be in here?" + speak(CHR_TARGET, L_LIP_083, 0x127f, CHANNEL_4, COLOR_08_RED) // "Should you be in here?" restart_timer do_preset_animation(-1) @@ -2675,7 +2675,7 @@ u8 func041f_labtech_lights[] = { if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISE_UNCOVERED, /*goto*/ 0x06) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ 0x0c) label(0x06) - speak(CHR_TARGET, L_LIP(82), 0x1286, CHANNEL_4, COLOR_08_RED) // "Leave this area now." + speak(CHR_TARGET, L_LIP_082, 0x1286, CHANNEL_4, COLOR_08_RED) // "Leave this area now." restart_timer do_preset_animation(-1) @@ -2766,7 +2766,7 @@ u8 func041f_labtech_lights[] = { endloop(0x0e) label(0x0f) - speak(CHR_TARGET, L_LIP(84), 0x8124, CHANNEL_4, COLOR_08_RED) // "Holy..." + speak(CHR_TARGET, L_LIP_084, 0x8124, CHANNEL_4, COLOR_08_RED) // "Holy..." set_self_flag_bankx(CHRFLAG0_00002000, BANK_0) chr_do_animation(ANIM_SURPRISED_0202, -1, -1, 0x14, 0x0a, CHR_SELF, 2) restart_timer @@ -2909,11 +2909,11 @@ u8 func0420_labtech_doors[] = { label(0x2d) if_self_flag_bankx_eq(CHRFLAG0_00000004, TRUE, BANK_0, /*goto*/ 0x2e) - speak(CHR_BOND, L_LIP(85), 0x1aa6, CHANNEL_4, COLOR_08_RED) // "It's a spy!" + speak(CHR_BOND, L_LIP_085, 0x1aa6, CHANNEL_4, COLOR_08_RED) // "It's a spy!" goto_next(0x2d) label(0x2e) - speak(CHR_BOND, L_LIP(87), 0x1aa5, CHANNEL_4, COLOR_08_RED) // "Imposter!" + speak(CHR_BOND, L_LIP_087, 0x1aa5, CHANNEL_4, COLOR_08_RED) // "Imposter!" label(0x2d) label(0x06) go_to_target_pad(SPEED_JOG) @@ -3105,7 +3105,7 @@ u8 func0422_labtech_records[] = { label(0x06) if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ 0x2d) increase_squadron_alertness(100) - speak(CHR_TARGET, L_LIP(87), 0x1aa5, CHANNEL_4, COLOR_08_RED) // "Imposter!" + speak(CHR_TARGET, L_LIP_087, 0x1aa5, CHANNEL_4, COLOR_08_RED) // "Imposter!" chr_do_animation(0x0202, -1, -1, 0x14, 0x0a, CHR_SELF, 2) restart_timer label(0x79) @@ -3115,7 +3115,7 @@ u8 func0422_labtech_records[] = { label(0x2d) dprint 'T','A','L','K',' ','1','\n',0, - speak(CHR_TARGET, L_LIP(86), 0x04ce, CHANNEL_4, COLOR_08_RED) // "Warn the others..." + speak(CHR_TARGET, L_LIP_086, 0x04ce, CHANNEL_4, COLOR_08_RED) // "Warn the others..." label(0x2d) label(0x06) run_to_pad(0x0108) @@ -3238,7 +3238,7 @@ u8 func1019_chamber1[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_CHAMBER1_SWITCH, TRUE) set_object_image(OBJ_CHAMBER1_SWITCH, 0x00, 0x13) - show_hudmsg(CHR_P1P2, L_LIP(66)) // "Containment unit raised up." + show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up." unset_object_flag(OBJ_CHAMBER1, OBJFLAG_DEACTIVATED) set_stage_flag(STAGEFLAG_CHAMBER1_RAISED) restart_timer @@ -3274,7 +3274,7 @@ u8 func1019_chamber1[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_CHAMBER1_SWITCH, TRUE) set_object_image(OBJ_CHAMBER1_SWITCH, 0x00, 0x12) - show_hudmsg(CHR_P1P2, L_LIP(67)) // "Containment unit lowered down." + show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down." unset_object_flag(OBJ_CHAMBER1, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_CHAMBER1_RAISED) restart_timer @@ -3309,7 +3309,7 @@ u8 func101a_chamber2[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_CHAMBER2_SWITCH, TRUE) set_object_image(OBJ_CHAMBER2_SWITCH, 0x00, 0x13) - show_hudmsg(CHR_P1P2, L_LIP(66)) // "Containment unit raised up." + show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up." unset_object_flag(OBJ_CHAMBER2, OBJFLAG_DEACTIVATED) set_stage_flag(STAGEFLAG_CHAMBER2_RAISED) restart_timer @@ -3334,7 +3334,7 @@ u8 func101a_chamber2[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_CHAMBER2_SWITCH, TRUE) set_object_image(OBJ_CHAMBER2_SWITCH, 0x00, 0x12) - show_hudmsg(CHR_P1P2, L_LIP(67)) // "Containment unit lowered down." + show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down." unset_object_flag(OBJ_CHAMBER2, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_CHAMBER2_RAISED) restart_timer @@ -3395,7 +3395,7 @@ u8 func1020_chamber8[] = { control_sound_from_object(CHANNEL_0, OBJ_CHAMBER8, TRUE) assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_CHAMBER8_SWITCH, TRUE) - show_hudmsg(CHR_P1P2, L_LIP(66)) // "Containment unit raised up." + show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up." set_object_image(OBJ_CHAMBER8_SWITCH, 0x00, 0x13) unset_object_flag(OBJ_CHAMBER8, OBJFLAG_DEACTIVATED) set_stage_flag(STAGEFLAG_CHAMBER8_RAISED) @@ -3421,7 +3421,7 @@ u8 func1020_chamber8[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_CHAMBER8_SWITCH, TRUE) - show_hudmsg(CHR_P1P2, L_LIP(67)) // "Containment unit lowered down." + show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down." set_object_image(OBJ_CHAMBER8_SWITCH, 0x00, 0x12) unset_object_flag(OBJ_CHAMBER8, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_CHAMBER8_RAISED) @@ -3507,7 +3507,7 @@ u8 func1021_xray_scanning[] = { reloop(0x04) label(0x06) - show_hudmsg(CHR_P1P2, L_LIP(74)) // "Scanner target acquired." + show_hudmsg(CHR_P1P2, L_LIP_074) // "Scanner target acquired." restart_timer beginloop(0x08) @@ -3516,12 +3516,12 @@ u8 func1021_xray_scanning[] = { endloop(0x08) label(0x06) - show_hudmsg(CHR_P1P2, L_LIP(75)) // "Target ID confirmed - XT origin." + show_hudmsg(CHR_P1P2, L_LIP_075) // "Target ID confirmed - XT origin." set_stage_flag(STAGEFLAG_XRAY_DONE) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) - show_hudmsg(CHR_P1P2, L_LIP(76)) // "Scanner lock lost." + show_hudmsg(CHR_P1P2, L_LIP_076) // "Scanner lock lost." endloop(0x04) endlist @@ -3695,7 +3695,7 @@ u8 func0c01_outro[] = { play_sound(0x0161, CHANNEL_10) wait_until(380, 0x66) - speak(CHR_P1P2, L_LIP(100), 0x7433, CHANNEL_7, COLOR_09_BLUE) // "Put your hands up and step away from the alien." + speak(CHR_P1P2, L_LIP_100, 0x7433, CHANNEL_7, COLOR_09_BLUE) // "Put your hands up and step away from the alien." wait_until(390, 0x68) play_sound(0x0162, CHANNEL_10) @@ -3709,7 +3709,7 @@ u8 func0c01_outro[] = { play_sound(0x0164, CHANNEL_10) wait_until(580, 0x6c) - speak(CHR_P1P2, L_LIP(102), 0x7435, CHANNEL_7, COLOR_09_BLUE) // "Don't make me tell you again, Doctor. And turn tha..." + speak(CHR_P1P2, L_LIP_102, 0x7435, CHANNEL_7, COLOR_09_BLUE) // "Don't make me tell you again, Doctor. And turn tha..." wait_until(588, 0x6b) play_sound(0x0161, CHANNEL_10) @@ -3786,7 +3786,7 @@ u8 func1002_intro[] = { play_sound(0x0161, CHANNEL_10) wait_until(90, 0x64) - speak(CHR_BOND, L_LIP(90), 0x7429, CHANNEL_5, COLOR_03_RED) // "The problem you have is that there is no way to sn..." + speak(CHR_BOND, L_LIP_090, 0x7429, CHANNEL_5, COLOR_03_RED) // "The problem you have is that there is no way to sn..." wait_until(108, 0x66) play_sound(0x0162, CHANNEL_10) @@ -3801,10 +3801,10 @@ u8 func1002_intro[] = { play_sound(0x0161, CHANNEL_10) wait_until(810, 0x6b) - speak(CHR_BOND, L_LIP(91), 0x742a, CHANNEL_5, COLOR_09_BLUE) // "Doesn't sound like a problem to me. Where are thes..." + speak(CHR_BOND, L_LIP_091, 0x742a, CHANNEL_5, COLOR_09_BLUE) // "Doesn't sound like a problem to me. Where are thes..." wait_until(1104, 0x6c) - speak(CHR_BOND, L_LIP(92), 0x742b, CHANNEL_5, COLOR_03_RED) // "In that crate." + speak(CHR_BOND, L_LIP_092, 0x742b, CHANNEL_5, COLOR_03_RED) // "In that crate." wait_until(1186, 0x6d) play_sound(0x0162, CHANNEL_10) @@ -3823,7 +3823,7 @@ u8 func1002_intro[] = { control_sound_from_object(CHANNEL_1, OBJ_CRATE, TRUE) wait_until(1390, 0x72) - speak(CHR_BOND, L_LIP(93), 0x742c, CHANNEL_5, COLOR_09_BLUE) // "Cute. Very cute." + speak(CHR_BOND, L_LIP_093, 0x742c, CHANNEL_5, COLOR_09_BLUE) // "Cute. Very cute." wait_until(1440, 0x73) play_sound(0x0161, CHANNEL_10) @@ -3835,7 +3835,7 @@ u8 func1002_intro[] = { play_sound(0x0163, CHANNEL_10) wait_until(1597, 0x76) - speak(CHR_BOND, L_LIP(94), 0x742d, CHANNEL_5, COLOR_03_RED) // "By the way, the stores are crawling with guards. I..." + speak(CHR_BOND, L_LIP_094, 0x742d, CHANNEL_5, COLOR_03_RED) // "By the way, the stores are crawling with guards. I..." wait_until(1628, 0x77) play_sound(0x0161, CHANNEL_10) @@ -3859,16 +3859,16 @@ u8 func1002_intro[] = { play_sound(0x0162, CHANNEL_10) wait_until(2017, 0x7e) - speak(CHR_BOND, L_LIP(95), 0x742e, CHANNEL_5, COLOR_09_BLUE) // "Certainly. Any other pearls of wisdom?" + speak(CHR_BOND, L_LIP_095, 0x742e, CHANNEL_5, COLOR_09_BLUE) // "Certainly. Any other pearls of wisdom?" wait_until(2275, 0x7f) - speak(CHR_BOND, L_LIP(96), 0x742f, CHANNEL_5, COLOR_03_RED) // "That crate..." + speak(CHR_BOND, L_LIP_096, 0x742f, CHANNEL_5, COLOR_03_RED) // "That crate..." wait_until(2338, 0x80) - speak(CHR_BOND, L_LIP(97), 0x7430, CHANNEL_5, COLOR_09_BLUE) // "Yes?" + speak(CHR_BOND, L_LIP_097, 0x7430, CHANNEL_5, COLOR_09_BLUE) // "Yes?" wait_until(2409, 0x81) - speak(CHR_BOND, L_LIP(98), 0x7431, CHANNEL_5, COLOR_03_RED) // "It really doesn't like being shot." + speak(CHR_BOND, L_LIP_098, 0x7431, CHANNEL_5, COLOR_03_RED) // "It really doesn't like being shot." wait_until(2440, 0x65) open_door(0x33) @@ -3878,7 +3878,7 @@ u8 func1002_intro[] = { play_sound(0x0172, CHANNEL_10) wait_until(2680, 0x83) - speak(CHR_BOND, L_LIP(99), 0x7432, CHANNEL_5, COLOR_09_BLUE) // "Great. Now, if I can just fight the urge to report..." + speak(CHR_BOND, L_LIP_099, 0x7432, CHANNEL_5, COLOR_09_BLUE) // "Great. Now, if I can just fight the urge to report..." wait_until(2690, 0x84) play_sound(0x0173, CHANNEL_10) @@ -4161,7 +4161,7 @@ u8 func1027_check_disguise_worn[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_BOND, L_LIP(77)) // "Disguise has been worn." + show_hudmsg(CHR_BOND, L_LIP_077) // "Disguise has been worn." set_returnlist(0x00, 0x0401) set_returnlist(0x01, 0x0402) set_returnlist(0x02, 0x0403) @@ -4264,7 +4264,7 @@ u8 func1029_msg_showers[] = { endloop(0x04) label(0x2d) - speak(CHR_BOND, L_LIP(78), 0x73bc, CHANNEL_6, COLOR_09_BLUE) // "The showers... Now, if I can convince someone to p..." + speak(CHR_BOND, L_LIP_078, 0x73bc, CHANNEL_6, COLOR_09_BLUE) // "The showers... Now, if I can convince someone to p..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -4277,7 +4277,7 @@ u8 func102a_msg_temperaturedropping[] = { endloop(0x04) label(0x2d) - speak(CHR_BOND, L_LIP(79), 0x8180, CHANNEL_6, COLOR_09_BLUE) // "The temperature's dropping... You must be close to..." + speak(CHR_BOND, L_LIP_079, 0x8180, CHANNEL_6, COLOR_09_BLUE) // "The temperature's dropping... You must be close to..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -4288,7 +4288,7 @@ u8 func102b_msg_airrecycled[] = { endloop(0x04) label(0x2d) - speak(CHR_BOND, L_LIP(80), 0x73be, CHANNEL_6, COLOR_09_BLUE) // "The air's heavily recycled around here - must be n..." + speak(CHR_BOND, L_LIP_080, 0x73be, CHANNEL_6, COLOR_09_BLUE) // "The air's heavily recycled around here - must be n..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -4299,7 +4299,7 @@ u8 func102c_msg_hurry[] = { endloop(0x04) label(0x2d) - speak(CHR_BOND, L_LIP(81), 0x8181, CHANNEL_6, COLOR_09_BLUE) // "There he is, Jo! Hurry or you'll be too late!" + speak(CHR_BOND, L_LIP_081, 0x8181, CHANNEL_6, COLOR_09_BLUE) // "There he is, Jo! Hurry or you'll be too late!" set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -4710,7 +4710,7 @@ u8 func1036_check_door_terminal_destroyed[] = { beginloop(0x0b) if_object_in_good_condition(OBJ_DOOR_TERMINAL, /*goto*/ 0x2d) if_stage_flag_eq(STAGEFLAG_DOOR_VIRUS_DOWNLOADED, TRUE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_LIP(68)) // "Mission critical equipment destroyed." + show_hudmsg(CHR_BOND, L_LIP_068) // "Mission critical equipment destroyed." set_stage_flag(STAGEFLAG_UPLINK_TERMINAL_DESTROYED) label(0x2e) set_ailist(CHR_SELF, GAILIST_IDLE) diff --git a/src/assets/files/setup/setuplue.c b/src/assets/files/setup/setuplue.c index 501a85d2c..8102185a0 100644 --- a/src/assets/files/setup/setuplue.c +++ b/src/assets/files/setup/setuplue.c @@ -93,33 +93,33 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_LUE(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_LUE(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_LUE(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_LUE(3)) + briefing(BRIEFINGTYPE_LOCATION, L_LUE_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_LUE_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_LUE_002) + briefing(BRIEFINGTYPE_TEXT_A, L_LUE_003) - beginobjective(0, L_LUE(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Shut down air intercept radar" + beginobjective(0, L_LUE_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Shut down air intercept radar" complete_flags(STAGEFLAG_RADAR_SHUT_DOWN) endobjective - beginobjective(1, L_LUE(10), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Plant comms device on antenna" + beginobjective(1, L_LUE_010, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Plant comms device on antenna" complete_flags(STAGEFLAG_COMMSBUG_PLACED) fail_flags(STAGEFLAG_COMMSBUG_MISPLACED) fail_flags(STAGEFLAG_ANTENNA_DESTROYED) endobjective - beginobjective(2, L_LUE(11), (DIFFBIT_PA | DIFFBIT_PD)) // "Disable all robot interceptors" + beginobjective(2, L_LUE_011, (DIFFBIT_PA | DIFFBIT_PD)) // "Disable all robot interceptors" complete_flags(STAGEFLAG_INTERCEPTOR1_DESTROYED) complete_flags(STAGEFLAG_INTERCEPTOR2_DESTROYED) complete_flags(STAGEFLAG_INTERCEPTOR3_DESTROYED) endobjective - beginobjective(3, L_LUE(12), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain access to hangar lift" + beginobjective(3, L_LUE_012, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain access to hangar lift" complete_flags(STAGEFLAG_HANGAR_ACCESSED) fail_flags(STAGEFLAG_LIFT_SWITCHES_DESTROYED) endobjective - beginobjective(4, L_LUE(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Make contact with CI spy" + beginobjective(4, L_LUE_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Make contact with CI spy" complete_flags(STAGEFLAG_MET_JON) endobjective @@ -211,7 +211,7 @@ u32 props[] = { chr(0x00010800, 0x30, 0x0358, BODY_OVERALL, HEAD_RANDOM, AILIST_MECHANIC, -1, -1, 1000, 5, 0x80002400, 0x20000000, TEAM_NONCOMBAT, SQUADRON_07, -1, 0, 0x00000000) tag(0x0a, 1) key(0x0080, MODEL_KEYCARD, 0x0030, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) - rename_object(-1, 0x4b, L_LUE(31), L_LUE(32), L_LUE(33), L_LUE(34), L_LUE(35), 0x0000, 0x0000) // "Obtain lift key card." + rename_object(-1, 0x4b, L_LUE_031, L_LUE_032, L_LUE_033, L_LUE_034, L_LUE_035, 0x0000, 0x0000) // "Obtain lift key card." chr(0x00000200, 0x14, 0x035d, BODY_A51AIRMAN, HEAD_RANDOM, AILIST_DRAGON_UNALERTED, -1, -1, 1000, 100, 0xcc080800, 0x00004000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x00000000) weapon(0x0100, MODEL_CHRDRAGON, 0x0014, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DRAGON, 0x00ffffff, 0x00000000) chr(0x00000200, 0x15, 0x0362, BODY_A51AIRMAN, HEAD_RANDOM, AILIST_DRAGON_UNALERTED, -1, -1, 1000, 100, 0xcc080800, 0x00004000, TEAM_ENEMY, SQUADRON_08, -1, 0, 0x00000000) @@ -340,16 +340,16 @@ u32 props[] = { singlemonitor(0x0100, MODEL_MODEMBOX, 0x0409, 0x10000002, 0x00000800, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff12) tag(0x08, 1) weapon(0x0180, MODEL_CHRBUG, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_COMMSRIDER, 0x00ffffff, 0x00000000) - rename_object(-1, 0x3d, L_LUE(21), L_LUE(22), L_LUE(23), L_LUE(24), L_LUE(25), 0x0000, 0x0000) // "Obtain comms rider." + rename_object(-1, 0x3d, L_LUE_021, L_LUE_022, L_LUE_023, L_LUE_024, L_LUE_025, 0x0000, 0x0000) // "Obtain comms rider." tag(0x36, 1) weapon(0x0180, MODEL_CHRBUG, 0xffff, 0x00100001, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_COMMSRIDER, 0x00ffffff, 0x00000000) - rename_object(-1, 0x3d, L_LUE(21), L_LUE(22), L_LUE(23), L_LUE(24), L_LUE(25), 0x0000, 0x0000) // "Obtain comms rider." + rename_object(-1, 0x3d, L_LUE_021, L_LUE_022, L_LUE_023, L_LUE_024, L_LUE_025, 0x0000, 0x0000) // "Obtain comms rider." tag(0x2e, 1) stdobject(0x0100, MODEL_CHRBUG, 0x035b, 0x012404e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x3b, L_LUE(48), L_LUE(49), L_LUE(50), L_LUE(51), L_LUE(52), 0x0000, 0x0000) // "Obtain explosive." + rename_object(-1, 0x3b, L_LUE_048, L_LUE_049, L_LUE_050, L_LUE_051, L_LUE_052, 0x0000, 0x0000) // "Obtain explosive." tag(0x37, 1) stdobject(0x0100, MODEL_CHRBUG, 0x035b, 0x013004e1, 0x00084000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x3b, L_LUE(48), L_LUE(49), L_LUE(50), L_LUE(51), L_LUE(52), 0x0000, 0x0000) // "Obtain explosive." + rename_object(-1, 0x3b, L_LUE_048, L_LUE_049, L_LUE_050, L_LUE_051, L_LUE_052, 0x0000, 0x0000) // "Obtain explosive." tag(0x09, 1) singlemonitor(0x0100, MODEL_MODEMBOX, 0x0406, 0x10000002, 0x00002001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff13) tag(0x0b, 1) @@ -961,25 +961,25 @@ u8 func140e_check_interceptors_destroyed[] = { if_object_in_good_condition(OBJ_INTERCEPTOR1, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_INTERCEPTOR1_DESTROYED, TRUE, /*goto*/ 0x2e) set_stage_flag(STAGEFLAG_INTERCEPTOR1_DESTROYED) - show_hudmsg(CHR_BOND, L_LUE(19)) // "Robot interceptor disabled." + show_hudmsg(CHR_BOND, L_LUE_019) // "Robot interceptor disabled." label(0x2e) if_object_in_good_condition(OBJ_INTERCEPTOR2, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_INTERCEPTOR2_DESTROYED, TRUE, /*goto*/ 0x2e) set_stage_flag(STAGEFLAG_INTERCEPTOR2_DESTROYED) - show_hudmsg(CHR_BOND, L_LUE(19)) // "Robot interceptor disabled." + show_hudmsg(CHR_BOND, L_LUE_019) // "Robot interceptor disabled." label(0x2e) if_object_in_good_condition(OBJ_INTERCEPTOR3, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_INTERCEPTOR3_DESTROYED, TRUE, /*goto*/ 0x2e) set_stage_flag(STAGEFLAG_INTERCEPTOR3_DESTROYED) - show_hudmsg(CHR_BOND, L_LUE(19)) // "Robot interceptor disabled." + show_hudmsg(CHR_BOND, L_LUE_019) // "Robot interceptor disabled." label(0x2e) if_stage_flag_eq(STAGEFLAG_INTERCEPTOR1_DESTROYED, FALSE, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_INTERCEPTOR2_DESTROYED, FALSE, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_INTERCEPTOR3_DESTROYED, FALSE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_LUE(20)) // "All robot interceptors disabled." + show_hudmsg(CHR_BOND, L_LUE_020) // "All robot interceptors disabled." set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2e) @@ -1005,7 +1005,7 @@ u8 func100c_maingate_switch[] = { play_sound_from_entity(CHANNEL_7, OBJ_MAINGATE_SWITCH, 0x012c, 0x0190, 0x00) set_object_image(OBJ_MAINGATE_SWITCH, 0x00, 0x13) if_door_state(OBJ_MAINGATE1, (DOORSTATE_OPEN | DOORSTATE_OPENING), /*goto*/ 0x2e) - show_hudmsg(CHR_P1P2, L_LUE(43)) // "Main gate has been opened." + show_hudmsg(CHR_P1P2, L_LUE_043) // "Main gate has been opened." open_door(OBJ_MAINGATE1) open_door(OBJ_MAINGATE2) restart_timer @@ -1021,7 +1021,7 @@ u8 func100c_maingate_switch[] = { assign_sound(0x043f, CHANNEL_7) play_sound_from_entity(CHANNEL_7, OBJ_MAINGATE_SWITCH, 0x012c, 0x0190, 0x00) set_object_image(OBJ_MAINGATE_SWITCH, 0x00, 0x12) - show_hudmsg(CHR_P1P2, L_LUE(44)) // "Main gate has been closed." + show_hudmsg(CHR_P1P2, L_LUE_044) // "Main gate has been closed." close_door(OBJ_MAINGATE1) close_door(OBJ_MAINGATE2) restart_timer @@ -1120,7 +1120,7 @@ u8 func1023_check_bug_wasted_coop[] = { u8 func1004_check_antenna_destroyed[] = { beginloop(0x04) if_object_in_good_condition(OBJ_ANTENNA, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_LUE(28)) // "Antenna has been destroyed." + show_hudmsg(CHR_BOND, L_LUE_028) // "Antenna has been destroyed." set_stage_flag(STAGEFLAG_ANTENNA_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2e) @@ -1143,7 +1143,7 @@ u8 func1405_antenna_switch[] = { play_sound_from_object2(CHANNEL_1, OBJ_ANTENNA, 0x00cd, 0x00, 0x02) set_object_image(OBJ_ANTENNA_SWITCH, 0x00, 0x12) unset_object_flag(OBJ_ANTENNA, OBJFLAG_DEACTIVATED) - show_hudmsg(CHR_P1P2, L_LUE(30)) // "Antenna lowered." + show_hudmsg(CHR_P1P2, L_LUE_030) // "Antenna lowered." set_stage_flag(STAGEFLAG_ANTENNA_LOWERED) restart_timer @@ -1167,7 +1167,7 @@ u8 func1405_antenna_switch[] = { set_object_image(OBJ_ANTENNA_SWITCH, 0x00, 0x13) unset_object_flag(OBJ_ANTENNA, OBJFLAG_DEACTIVATED) unset_stage_flag(STAGEFLAG_ANTENNA_LOWERED) - show_hudmsg(CHR_P1P2, L_LUE(29)) // "Antenna raised." + show_hudmsg(CHR_P1P2, L_LUE_029) // "Antenna raised." restart_timer beginloop(0x0a) @@ -1198,7 +1198,7 @@ u8 func1006_lift_switches[] = { assign_sound(0x043f, CHANNEL_7) play_sound_from_entity(CHANNEL_7, OBJ_LIFT1_SWITCH, 0x012c, 0x0190, 0x00) if_chr_has_object(CHR_P1P2, OBJ_KEYCARD, /*goto*/ 0x2e) - show_hudmsg(CHR_P1P2, L_LUE(36)) // "Lift access denied - key card needed." + show_hudmsg(CHR_P1P2, L_LUE_036) // "Lift access denied - key card needed." goto_next(0x0b) label(0x2e) @@ -1209,11 +1209,11 @@ u8 func1006_lift_switches[] = { open_door(0x38) unlock_door(0x0e, 0x02) unlock_door(0x38, 0x02) - show_hudmsg(CHR_P1P2, L_LUE(37)) // "Key card accepted - lift operational." + show_hudmsg(CHR_P1P2, L_LUE_037) // "Key card accepted - lift operational." goto_next(0x0b) label(0x06) - show_hudmsg(CHR_P1P2, L_LUE(38)) // "Lift is fully operational." + show_hudmsg(CHR_P1P2, L_LUE_038) // "Lift is fully operational." goto_next(0x0b) label(0x0a) @@ -1224,7 +1224,7 @@ u8 func1006_lift_switches[] = { #else if_chr_has_object(CHR_BOND, OBJ_KEYCARD, /*goto*/ 0x2e) #endif - show_hudmsg(CHR_P1P2, L_LUE(36)) // "Lift access denied - key card needed." + show_hudmsg(CHR_P1P2, L_LUE_036) // "Lift access denied - key card needed." goto_next(0x0b) label(0x2e) @@ -1237,11 +1237,11 @@ u8 func1006_lift_switches[] = { yield unlock_door(0x0f, 0x02) unlock_door(0x39, 0x02) - show_hudmsg(CHR_P1P2, L_LUE(37)) // "Key card accepted - lift operational." + show_hudmsg(CHR_P1P2, L_LUE_037) // "Key card accepted - lift operational." goto_next(0x0b) label(0x06) - show_hudmsg(CHR_P1P2, L_LUE(38)) // "Lift is fully operational." + show_hudmsg(CHR_P1P2, L_LUE_038) // "Lift is fully operational." goto_next(0x0b) label(0x0b) @@ -1266,7 +1266,7 @@ u8 func1007_check_hangar_accessed[] = { label(0x06) set_stage_flag(STAGEFLAG_HANGAR_ACCESSED) - show_hudmsg(CHR_P1P2, L_LUE(39)) // "Hangar has been accessed." + show_hudmsg(CHR_P1P2, L_LUE_039) // "Hangar has been accessed." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1283,7 +1283,7 @@ u8 func1008_check_end_level[] = { endloop(0x09) label(0x06) - show_hudmsg(CHR_P1P2, L_LUE(40)) // "Met up with CI agent." + show_hudmsg(CHR_P1P2, L_LUE_040) // "Met up with CI agent." set_stage_flag(STAGEFLAG_MET_JON) yield yield @@ -1317,7 +1317,7 @@ u8 func1009_check_radar_shut_down[] = { endloop(0x04) label(0x2e) - show_hudmsg(CHR_BOND, L_LUE(41)) // "Air intercept radar shut down." + show_hudmsg(CHR_BOND, L_LUE_041) // "Air intercept radar shut down." mute_channel(CHANNEL_0) set_stage_flag(STAGEFLAG_RADAR_SHUT_DOWN) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1817,7 +1817,7 @@ u8 func040e_outro[] = { wait_until(1, 0x60) - speak(CHR_P1P2, L_LUE(67), 0x7421, CHANNEL_5, COLOR_07_RED) // "Agent Dark! Over here!" + speak(CHR_P1P2, L_LUE_067, 0x7421, CHANNEL_5, COLOR_07_RED) // "Agent Dark! Over here!" wait_until(46, 0x61) play_sound(0x0171, CHANNEL_7) @@ -1829,7 +1829,7 @@ u8 func040e_outro[] = { play_sound(0x0173, CHANNEL_7) wait_until(150, 0x65) - speak(CHR_P1P2, L_LUE(68), 0x7422, CHANNEL_5, COLOR_09_BLUE) // "There you are! I was beginning to wonder if..." + speak(CHR_P1P2, L_LUE_068, 0x7422, CHANNEL_5, COLOR_09_BLUE) // "There you are! I was beginning to wonder if..." wait_until(188, 0x66) play_sound(0x0174, CHANNEL_6) @@ -1853,7 +1853,7 @@ u8 func040e_outro[] = { play_sound(0x808e, CHANNEL_10) wait_until(406, 0x6c) - speak(CHR_P1P2, L_LUE(69), 0x7423, CHANNEL_5, COLOR_07_RED) // "If what?" + speak(CHR_P1P2, L_LUE_069, 0x7423, CHANNEL_5, COLOR_07_RED) // "If what?" wait_until(410, 0x6a) play_sound(0x0176, CHANNEL_6) @@ -1868,19 +1868,19 @@ u8 func040e_outro[] = { play_sound(0x007d, CHANNEL_10) wait_until(472, 0x6e) - speak(CHR_P1P2, L_LUE(70), 0x7424, CHANNEL_5, COLOR_09_BLUE) // "If you'd been discovered yet. And frankly, if this..." + speak(CHR_P1P2, L_LUE_070, 0x7424, CHANNEL_5, COLOR_09_BLUE) // "If you'd been discovered yet. And frankly, if this..." wait_until(900, 0x70) - speak(CHR_P1P2, L_LUE(71), 0x7425, CHANNEL_5, COLOR_07_RED) // "I was tidying up one of your loose ends." + speak(CHR_P1P2, L_LUE_071, 0x7425, CHANNEL_5, COLOR_07_RED) // "I was tidying up one of your loose ends." wait_until(936, 0x6f) play_sound(0x0178, CHANNEL_7) wait_until(1080, 0x71) - speak(CHR_P1P2, L_LUE(72), 0x7426, CHANNEL_5, COLOR_09_BLUE) // "My loose ends?" + speak(CHR_P1P2, L_LUE_072, 0x7426, CHANNEL_5, COLOR_09_BLUE) // "My loose ends?" wait_until(1180, 0x72) - speak(CHR_P1P2, L_LUE(73), 0x7427, CHANNEL_5, COLOR_07_RED) // "I'm sorry, I didn't realize you wanted him to shoo..." + speak(CHR_P1P2, L_LUE_073, 0x7427, CHANNEL_5, COLOR_07_RED) // "I'm sorry, I didn't realize you wanted him to shoo..." wait_until(1228, 0x73) play_sound(0x0171, CHANNEL_7) @@ -1895,7 +1895,7 @@ u8 func040e_outro[] = { play_sound(0x0174, CHANNEL_6) wait_until(1585, 0x76) - speak(CHR_P1P2, L_LUE(74), 0x7428, CHANNEL_5, COLOR_09_BLUE) // "Okay, okay, forget about it. I'm going to let the ..." + speak(CHR_P1P2, L_LUE_074, 0x7428, CHANNEL_5, COLOR_09_BLUE) // "Okay, okay, forget about it. I'm going to let the ..." wait_until(1588, 0x78) play_sound(0x0175, CHANNEL_7) @@ -1939,18 +1939,18 @@ u8 func0410_intro[] = { set_cutscene_weapon(CHR_BOND, WEAPON_FALCON2, WEAPON_NONE) wait_until(26, 0x60) - speak(CHR_BOND, L_LUE(58), 0x7418, CHANNEL_7, COLOR_06_WHITE) // "Okay, Joanna, take a look at this. Our operative i..." + speak(CHR_BOND, L_LUE_058, 0x7418, CHANNEL_7, COLOR_06_WHITE) // "Okay, Joanna, take a look at this. Our operative i..." wait_until(500, 0x61) - speak(CHR_BOND, L_LUE(59), 0x7419, CHANNEL_7, COLOR_06_WHITE) // "This is your entry point... A deserted helipad on ..." + speak(CHR_BOND, L_LUE_059, 0x7419, CHANNEL_7, COLOR_06_WHITE) // "This is your entry point... A deserted helipad on ..." wait_until(800, 0x62) - speak(CHR_BOND, L_LUE(60), 0x741a, CHANNEL_7, COLOR_06_WHITE) // "The lift down to the hangars and the rendezvous po..." + speak(CHR_BOND, L_LUE_060, 0x741a, CHANNEL_7, COLOR_06_WHITE) // "The lift down to the hangars and the rendezvous po..." wait_until(1200, 0x63) wait_until(1236, 0x64) - speak(CHR_BOND, L_LUE(61), 0x741b, CHANNEL_7, COLOR_06_WHITE) // "Here is the communications antenna. Attach a comms..." + speak(CHR_BOND, L_LUE_061, 0x741b, CHANNEL_7, COLOR_06_WHITE) // "Here is the communications antenna. Attach a comms..." beginloop(0x09) if_camera_animating(/*goto*/ 0x2e) @@ -1991,10 +1991,10 @@ u8 func0410_intro[] = { restart_timer wait_until(186, 0x65) - speak(CHR_BOND, L_LUE(62), 0x81b9, CHANNEL_7, COLOR_09_BLUE) // "Oh, my God!" + speak(CHR_BOND, L_LUE_062, 0x81b9, CHANNEL_7, COLOR_09_BLUE) // "Oh, my God!" wait_until(380, 0x66) - speak(CHR_BOND, L_LUE(63), 0x741d, CHANNEL_7, COLOR_06_WHITE) // "Here is our friend. He appears to be physically un..." + speak(CHR_BOND, L_LUE_063, 0x741d, CHANNEL_7, COLOR_06_WHITE) // "Here is our friend. He appears to be physically un..." beginloop(0x0a) if_camera_animating(/*goto*/ 0x2e) @@ -2032,10 +2032,10 @@ u8 func0410_intro[] = { restart_timer wait_until(416, 0x67) - speak(CHR_BOND, L_LUE(64), 0x741e, CHANNEL_7, COLOR_09_BLUE) // "But who was...?" + speak(CHR_BOND, L_LUE_064, 0x741e, CHANNEL_7, COLOR_09_BLUE) // "But who was...?" wait_until(485, 0x68) - speak(CHR_BOND, L_LUE(65), 0x741f, CHANNEL_7, COLOR_06_WHITE) // "Any questions? No. Good. Away you go to the hangar..." + speak(CHR_BOND, L_LUE_065, 0x741f, CHANNEL_7, COLOR_06_WHITE) // "Any questions? No. Good. Away you go to the hangar..." beginloop(0x0b) if_camera_animating(/*goto*/ 0x2e) @@ -2064,7 +2064,7 @@ u8 func0410_intro[] = { restart_timer wait_until(1, 0x69) - speak(CHR_BOND, L_LUE(66), 0x7420, CHANNEL_10, COLOR_09_BLUE) // "Agent Dark Mission Log, 1028 hours. Against my bet..." + speak(CHR_BOND, L_LUE_066, 0x7420, CHANNEL_10, COLOR_09_BLUE) // "Agent Dark Mission Log, 1028 hours. Against my bet..." wait_until(340, 0x6a) play_sound(0x80d5, CHANNEL_10) @@ -2400,12 +2400,12 @@ u8 func1011_bunker_explosives[] = { label(0x2e) if_chr_weapon_equipped(CHR_P1P2, WEAPON_EXPLOSIVES, /*goto*/ 0x2e) - show_hudmsg(CHR_P1P2, L_LUE(45)) // "Access denied." + show_hudmsg(CHR_P1P2, L_LUE_045) // "Access denied." goto_first(0x04) label(0x2e) unset_object_flag2(OBJ_EXPLOSIVE_BRICK, OBJFLAG2_INVISIBLE) - show_hudmsg(CHR_P1P2, L_LUE(46)) // "Explosive has been placed." + show_hudmsg(CHR_P1P2, L_LUE_046) // "Explosive has been placed." remove_weapon_from_inventory(WEAPON_EXPLOSIVES) set_stage_flag(STAGEFLAG_EXPLOSIVES_PLACED) restart_timer @@ -2419,12 +2419,12 @@ u8 func1011_bunker_explosives[] = { set_countdown_timer(20) if_difficulty_lt(DIFF_SA, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_ANY_LASER_DESTROYED, TRUE, /*goto*/ 0x06) - show_hudmsg(CHR_P1P2, L_LUE(47)) // "Intruder detected - security system online." + show_hudmsg(CHR_P1P2, L_LUE_047) // "Intruder detected - security system online." goto_next(0x06) // Agent label(0x2e) - show_hudmsg(CHR_P1P2, L_LUE(75)) // "Foreign object detected - security alerted." + show_hudmsg(CHR_P1P2, L_LUE_075) // "Foreign object detected - security alerted." label(0x06) play_x_track(XREASON_DEFAULT, 10, 20) yield @@ -2858,7 +2858,7 @@ u8 func101b_msg_airinterceptradar[] = { endloop(0x04) label(0x2e) - speak(CHR_P1P2, L_LUE(53), 0x817d, CHANNEL_6, COLOR_09_BLUE) // "The air intercept radar is controlled from that bu..." + speak(CHR_P1P2, L_LUE_053, 0x817d, CHANNEL_6, COLOR_09_BLUE) // "The air intercept radar is controlled from that bu..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2873,7 +2873,7 @@ u8 func101c_msg_cantthrow[] = { endloop(0x04) label(0x2e) - speak(CHR_P1P2, L_LUE(54), 0x73b9, CHANNEL_6, COLOR_09_BLUE) // "There's the antenna, but... I can't throw a bug th..." + speak(CHR_P1P2, L_LUE_054, 0x73b9, CHANNEL_6, COLOR_09_BLUE) // "There's the antenna, but... I can't throw a bug th..." label(0x0e) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2894,7 +2894,7 @@ u8 func101d_msg_hangarlift[] = { endloop(0x04) label(0x2e) - speak(CHR_P1P2, L_LUE(55), 0x817e, CHANNEL_6, COLOR_09_BLUE) // "The hangar lift is on the other side of that huge ..." + speak(CHR_P1P2, L_LUE_055, 0x817e, CHANNEL_6, COLOR_09_BLUE) // "The hangar lift is on the other side of that huge ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2906,7 +2906,7 @@ u8 func101e_msg_triggerfinger[] = { endloop(0x04) label(0x2e) - speak(CHR_P1P2, L_LUE(56), 0x817f, CHANNEL_6, COLOR_09_BLUE) // "Careful with that trigger finger, Agent Dark - you..." + speak(CHR_P1P2, L_LUE_056, 0x817f, CHANNEL_6, COLOR_09_BLUE) // "Careful with that trigger finger, Agent Dark - you..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2999,7 +2999,7 @@ u8 func1022_check_lift_switches_destroyed[] = { if_stage_flag_eq(STAGEFLAG_LIFT2_CALLED, TRUE, /*goto*/ 0x06) if_object_in_good_condition(OBJ_LIFT1_SWITCH, /*goto*/ 0x2e) if_object_in_good_condition(OBJ_LIFT2_SWITCH, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_LUE(57)) // "Lift access terminals destroyed." + show_hudmsg(CHR_BOND, L_LUE_057) // "Lift access terminals destroyed." set_stage_flag(STAGEFLAG_LIFT_SWITCHES_DESTROYED) goto_next(0x06) @@ -3194,7 +3194,7 @@ u8 func0424_activate_lasers[] = { if_stage_flag_eq(STAGEFLAG_ANY_LASER_DESTROYED, TRUE, /*goto*/ 0x2e) set_stage_flag(STAGEFLAG_ANY_LASER_DESTROYED) if_stage_flag_eq(STAGEFLAG_EXPLOSIVES_PLACED, TRUE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_LUE(47)) // "Intruder detected - security system online." + show_hudmsg(CHR_BOND, L_LUE_047) // "Intruder detected - security system online." // A and SA label(0x2e) @@ -3235,7 +3235,7 @@ u8 func102d_check_antenna_switch_destroyed[] = { label(0x2e) if_stage_flag_eq(STAGEFLAG_ANTENNA_LOWERED, TRUE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_LUE(42)) // "Critical mission object destroyed." + show_hudmsg(CHR_BOND, L_LUE_042) // "Critical mission object destroyed." set_stage_flag(STAGEFLAG_ANTENNA_DESTROYED) label(0x2e) label(0x0e) diff --git a/src/assets/files/setup/setuppam.c b/src/assets/files/setup/setuppam.c index 46c727696..40349dff1 100644 --- a/src/assets/files/setup/setuppam.c +++ b/src/assets/files/setup/setuppam.c @@ -112,29 +112,29 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_PAM(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_PAM(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_PAM(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_PAM(3)) + briefing(BRIEFINGTYPE_LOCATION, L_PAM_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_PAM_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_PAM_002) + briefing(BRIEFINGTYPE_TEXT_A, L_PAM_003) - beginobjective(0, L_PAM(5), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Reactivate teleportals" + beginobjective(0, L_PAM_005, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Reactivate teleportals" complete_flags(STAGEFLAG_TELEPORTALS_ACTIVATED) endobjective - beginobjective(1, L_PAM(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable Cetan megaweapon" + beginobjective(1, L_PAM_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Disable Cetan megaweapon" complete_flags(STAGEFLAG_MEGAWEAPON_DISABLED) fail_flags(STAGEFLAG_FARSIGHT_AMMO_WASTED) endobjective - beginobjective(2, L_PAM(7), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Secure control room" + beginobjective(2, L_PAM_007, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Secure control room" complete_flags(STAGEFLAG_BLONDES_DEAD) endobjective - beginobjective(3, L_PAM(8), (DIFFBIT_PA | DIFFBIT_PD)) // "Restore Dr. Caroll's personality" + beginobjective(3, L_PAM_008, (DIFFBIT_PA | DIFFBIT_PD)) // "Restore Dr. Caroll's personality" complete_flags(STAGEFLAG_DRCAROLL_RESTORED) endobjective - beginobjective(4, L_PAM(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Escape from Cetan ship" + beginobjective(4, L_PAM_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Escape from Cetan ship" complete_flags(STAGEFLAG_ESCAPED) fail_flags(STAGEFLAG_ALLY_DEAD) fail_flags(STAGEFLAG_TIMER_EXPIRED) @@ -556,7 +556,7 @@ u32 props[] = { stdobject(0x0040, MODEL_ZIGGYCARD, 0xffff, 0x00021401, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x74, 1) weapon(0x0180, MODEL_CHRDATATHIEF, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_BACKUPDISK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x44, L_PAM(23), L_PAM(24), L_PAM(25), L_PAM(26), L_PAM(27), 0x0000, 0x0000) // "" + rename_object(-1, 0x44, L_PAM_023, L_PAM_024, L_PAM_025, L_PAM_026, L_PAM_027, 0x0000, 0x0000) // "" tag(0x76, 1) stdobject(0x0100, MODEL_CHRREMOTEMINE, 0xffff, 0x00001401, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x77, 1) @@ -880,7 +880,7 @@ u8 func0402_elvis_follow_and_reactive_teleportals[] = { // In teleport control room label(0x5f) stop_chr - speak(CHR_TARGET, L_PAM(29), 0x14eb, CHANNEL_6, COLOR_04_ORANGE) // "Time to reactivate those teleportals." + speak(CHR_TARGET, L_PAM_029, 0x14eb, CHANNEL_6, COLOR_04_ORANGE) // "Time to reactivate those teleportals." jog_to_pad(0x01c3) beginloop(0x0f) @@ -898,7 +898,7 @@ u8 func0402_elvis_follow_and_reactive_teleportals[] = { label(0x06) say_quip(CHR_BOND, 0x2c, 0xff, 0x03, 0xff, BANK_1, 0x00, 0x00) - show_hudmsg(CHR_BOND, L_PAM(30)) // "Teleportals have been reactivated." + show_hudmsg(CHR_BOND, L_PAM_030) // "Teleportals have been reactivated." set_stage_flag(STAGEFLAG_TELEPORTALS_ACTIVATED) set_self_chrflag(CHRCFLAG_PUSHABLE) play_sound(0x8148, -1) @@ -1039,7 +1039,7 @@ u8 func0404_elvis_follow_and_do_agent_megaweapon[] = { // In Agent megaweapon room label(0x1d) - speak(CHR_TARGET, L_PAM(28), 0x14ec, CHANNEL_6, COLOR_04_ORANGE) // "It looks like this could benefit from a little bit..." + speak(CHR_TARGET, L_PAM_028, 0x14ec, CHANNEL_6, COLOR_04_ORANGE) // "It looks like this could benefit from a little bit..." label(0x5f) set_stage_flag(STAGEFLAG_ELVIS_SAID_SABOTAGE) stop_chr @@ -1062,7 +1062,7 @@ u8 func0404_elvis_follow_and_do_agent_megaweapon[] = { label(0x06) say_quip(CHR_BOND, 0x2c, 0xff, 0x03, 0xff, BANK_1, 0x00, 0x00) set_self_chrflag(CHRCFLAG_PUSHABLE) - show_hudmsg(CHR_BOND, L_PAM(20)) // "Cetan megaweapon has been disabled." + show_hudmsg(CHR_BOND, L_PAM_020) // "Cetan megaweapon has been disabled." set_stage_flag(STAGEFLAG_AGENT_MEGAWEAPON_DISABLED) set_stage_flag(STAGEFLAG_MEGAWEAPON_DISABLED) set_lights_state(0x006c, LIGHTOP_3, 0x64, 0xff, 0x78) @@ -1253,7 +1253,7 @@ u8 func0406_elvis_follow_and_do_sa_megaweapon[] = { label(0x2e) say_quip(CHR_BOND, 0x2c, 0xff, 0x0f, 0xff, BANK_1, 0x00, 0x00) set_self_chrflag(CHRCFLAG_PUSHABLE) - show_hudmsg(CHR_BOND, L_PAM(20)) // "Cetan megaweapon has been disabled." + show_hudmsg(CHR_BOND, L_PAM_020) // "Cetan megaweapon has been disabled." set_stage_flag(STAGEFLAG_MEGAWEAPON_DISABLED) try_equip_weapon(MODEL_CHRMAIANPISTOL, WEAPON_PHOENIX, 0x00000000, /*goto*/ 0x04) label(0x04) @@ -1392,7 +1392,7 @@ u8 func0403_elvis_give_farsight[] = { stop_chr label(0x09) do_preset_animation(5) - speak(CHR_TARGET, L_PAM(18), 0x12ea, CHANNEL_6, COLOR_04_ORANGE) // "Here, take this gun and keep those Skedar off my b..." + speak(CHR_TARGET, L_PAM_018, 0x12ea, CHANNEL_6, COLOR_04_ORANGE) // "Here, take this gun and keep those Skedar off my b..." give_object_to_chr(0x73, CHR_TARGET) yield set_stage_flag(STAGEFLAG_TRIGGER_MINISKEDAR_SPAWNING) @@ -1539,7 +1539,7 @@ u8 func0c01_midcutscene[] = { wait_until(114, 0x63) - speak(CHR_BOND, L_PAM(35), 0x746d, CHANNEL_10, COLOR_09_BLUE) // "Here goes. I just hope dataDyne haven't done anyth..." + speak(CHR_BOND, L_PAM_035, 0x746d, CHANNEL_10, COLOR_09_BLUE) // "Here goes. I just hope dataDyne haven't done anyth..." wait_until(300, 0x64) play_sound(0x0171, CHANNEL_2) @@ -1554,7 +1554,7 @@ u8 func0c01_midcutscene[] = { play_sound(0x04f7, CHANNEL_10) wait_until(490, 0x6b) - speak(CHR_BOND, L_PAM(36), 0x746e, CHANNEL_10, COLOR_04_ORANGE) // "Virus detected." + speak(CHR_BOND, L_PAM_036, 0x746e, CHANNEL_10, COLOR_04_ORANGE) // "Virus detected." wait_until(570, 0x69) @@ -1569,7 +1569,7 @@ u8 func0c01_midcutscene[] = { label(0x06) set_drcaroll_images(CHR_DRCAROLL, DRCAROLLIMAGE_EYESFROWNING, DRCAROLLIMAGE_EYESFROWNING) - speak(CHR_BOND, L_PAM(37), 0x746f, CHANNEL_10, COLOR_09_BLUE) // "Me and my big mouth." + speak(CHR_BOND, L_PAM_037, 0x746f, CHANNEL_10, COLOR_09_BLUE) // "Me and my big mouth." wait_until(700, 0x6d) play_sound(0x0172, CHANNEL_6) @@ -1588,7 +1588,7 @@ u8 func0c01_midcutscene[] = { goto_first(0x71) label(0x06) - speak(CHR_BOND, L_PAM(38), 0x7470, CHANNEL_10, COLOR_04_ORANGE) // "Commencing countermeasures. Commenc..... *** ooOOo..." + speak(CHR_BOND, L_PAM_038, 0x7470, CHANNEL_10, COLOR_04_ORANGE) // "Commencing countermeasures. Commenc..... *** ooOOo..." wait_until_with_images(746, 0x73, DRCAROLLIMAGE_EYESFROWNING, DRCAROLLIMAGE_RANDOM) play_sound(0x0128, CHANNEL_5) @@ -1694,7 +1694,7 @@ u8 func0c01_midcutscene[] = { play_sound(0x0171, CHANNEL_3) wait_until_with_images(1500, 0xd4, DRCAROLLIMAGE_RANDOM, DRCAROLLIMAGE_EYESDEFAULT) - speak(CHR_BOND, L_PAM(39), 0x7471, CHANNEL_10, COLOR_09_BLUE) // "Dr. Caroll? Are you in control again? Can you stop..." + speak(CHR_BOND, L_PAM_039, 0x7471, CHANNEL_10, COLOR_09_BLUE) // "Dr. Caroll? Are you in control again? Can you stop..." set_drcaroll_images(CHR_DRCAROLL, DRCAROLLIMAGE_EYESDEFAULT, DRCAROLLIMAGE_EYESDEFAULT) wait_until(1534, 0xd6) @@ -1707,7 +1707,7 @@ u8 func0c01_midcutscene[] = { play_sound(0x0175, CHANNEL_5) wait_until(1810, 0xe3) - speak(CHR_BOND, L_PAM(40), 0x7472, CHANNEL_10, COLOR_04_ORANGE) // "Yes, I'm back again, my dear. But the program has ..." + speak(CHR_BOND, L_PAM_040, 0x7472, CHANNEL_10, COLOR_04_ORANGE) // "Yes, I'm back again, my dear. But the program has ..." wait_until(1810, 0xe5) play_sound(0x0177, CHANNEL_3) @@ -1717,10 +1717,10 @@ u8 func0c01_midcutscene[] = { wait_until(2378, 0xe9) mute_channel(CHANNEL_7) - speak(CHR_BOND, L_PAM(41), 0x7473, CHANNEL_10, COLOR_09_BLUE) // "What do you mean?" + speak(CHR_BOND, L_PAM_041, 0x7473, CHANNEL_10, COLOR_09_BLUE) // "What do you mean?" wait_until(2510, 0xea) - speak(CHR_BOND, L_PAM(42), 0x7474, CHANNEL_10, COLOR_04_ORANGE) // "When the program has run, I will have control of a..." + speak(CHR_BOND, L_PAM_042, 0x7474, CHANNEL_10, COLOR_04_ORANGE) // "When the program has run, I will have control of a..." wait_until(3126, 0xf5) play_sound(0x012b, CHANNEL_5) @@ -2073,7 +2073,7 @@ u8 func1002_intro[] = { play_sound(0x0171, CHANNEL_7) wait_until(1210, 0x65) - speak(CHR_BOND, L_PAM(31), 0x7469, CHANNEL_10, COLOR_04_ORANGE) // "This doesn't seem normal. No one's around." + speak(CHR_BOND, L_PAM_031, 0x7469, CHANNEL_10, COLOR_04_ORANGE) // "This doesn't seem normal. No one's around." wait_until(1266, 0x66) play_sound(0x0172, CHANNEL_7) @@ -2086,7 +2086,7 @@ u8 func1002_intro[] = { play_sound_from_object2(CHANNEL_5, 0x07, 0x81a9, 0x00, 0x00) wait_until(1522, 0x6c) - speak(CHR_BOND, L_PAM(32), 0x746a, CHANNEL_10, COLOR_09_BLUE) // "No signs of conflict. No spent ammo cases or bulle..." + speak(CHR_BOND, L_PAM_032, 0x746a, CHANNEL_10, COLOR_09_BLUE) // "No signs of conflict. No spent ammo cases or bulle..." wait_until(1548, 0x6d) play_sound(0x0174, CHANNEL_7) @@ -2101,7 +2101,7 @@ u8 func1002_intro[] = { play_sound(0x0177, CHANNEL_7) wait_until(1945, 0x71) - speak(CHR_BOND, L_PAM(33), 0x746b, CHANNEL_10, COLOR_04_ORANGE) // "But there ought to be a rear guard at least. It ma..." + speak(CHR_BOND, L_PAM_033, 0x746b, CHANNEL_10, COLOR_04_ORANGE) // "But there ought to be a rear guard at least. It ma..." wait_until(1958, 0x72) play_sound(0x0178, CHANNEL_7) @@ -2131,7 +2131,7 @@ u8 func1002_intro[] = { play_sound(0x0178, CHANNEL_7) wait_until(2420, 0x7b) - speak(CHR_BOND, L_PAM(34), 0x746c, CHANNEL_10, COLOR_09_BLUE) // "There has to be someone farther inside. Cover me." + speak(CHR_BOND, L_PAM_034, 0x746c, CHANNEL_10, COLOR_09_BLUE) // "There has to be someone farther inside. Cover me." wait_until(2426, 0x7c) play_sound(0x0171, CHANNEL_7) @@ -2258,7 +2258,7 @@ u8 func1006_msg_thiswillhelpus[] = { endloop(0x08) label(0x2e) - speak(CHR_P1P2, L_PAM(10), 0x73d4, CHANNEL_6, COLOR_04_ORANGE) // "This will help us to get round the ship quicker." + speak(CHR_P1P2, L_PAM_010, 0x73d4, CHANNEL_6, COLOR_04_ORANGE) // "This will help us to get round the ship quicker." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2275,7 +2275,7 @@ u8 func1007_msg_antibodymasking[] = { // Unreachable label(0x2e) - speak(CHR_BOND, L_PAM(11), 0x73d5, CHANNEL_6, COLOR_09_BLUE) // "This antibody masking will protect us from the aut..." + speak(CHR_BOND, L_PAM_011, 0x73d5, CHANNEL_6, COLOR_09_BLUE) // "This antibody masking will protect us from the aut..." label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2304,7 +2304,7 @@ u8 func1008_msg_theresdrcaroll[] = { endloop(0x04) label(0x2e) - speak(CHR_BOND, L_PAM(12), 0x73d6, CHANNEL_6, COLOR_04_ORANGE) // "There's Dr. Caroll. Let's see if we can reverse wh..." + speak(CHR_BOND, L_PAM_012, 0x73d6, CHANNEL_6, COLOR_04_ORANGE) // "There's Dr. Caroll. Let's see if we can reverse wh..." // Elvis dead, Dr Caroll dead, or Elvis didn't get teleported label(0x0d) @@ -2328,7 +2328,7 @@ u8 func1009_msg_getoutofhere[] = { endloop(0x08) label(0x2e) - speak(CHR_BOND, L_PAM(13), 0x73d7, CHANNEL_6, COLOR_04_ORANGE) // "We have to get out of here!" + speak(CHR_BOND, L_PAM_013, 0x73d7, CHANNEL_6, COLOR_04_ORANGE) // "We have to get out of here!" label(0x0d) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2569,7 +2569,7 @@ u8 func0415_teleport_bond_to_drcaroll[] = { set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) goto_next(0x63) label(0x07) - show_hudmsg(CHR_BOND, L_PAM(14)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_PAM_014) // "Elvis has been killed." label(0x62) @@ -2940,7 +2940,7 @@ u8 func0418_teleport_coop_to_drcaroll[] = { goto_next(0x63) label(0x07) - show_hudmsg(CHR_BOND, L_PAM(14)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_PAM_014) // "Elvis has been killed." label(0x62) beginloop(0x63) @@ -3306,7 +3306,7 @@ u8 func100c_countdown_timer[] = { // Player escaped label(0x2e) - show_hudmsg(CHR_P1P2, L_PAM(16)) // "Cetan ship evacuation successful." + show_hudmsg(CHR_P1P2, L_PAM_016) // "Cetan ship evacuation successful." set_stage_flag(STAGEFLAG_ESCAPED) restart_timer stop_countdown_timer @@ -3348,7 +3348,7 @@ u8 func100e_check_elvis_dead[] = { endloop(0x04) label(0x2e) - show_hudmsg(CHR_BOND, L_PAM(14)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_PAM_014) // "Elvis has been killed." set_stage_flag(STAGEFLAG_ALLY_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3362,7 +3362,7 @@ u8 func100f_check_drcaroll_dead[] = { endloop(0x04) label(0x2e) - show_hudmsg(CHR_BOND, L_PAM(15)) // "Dr. Caroll has been killed." + show_hudmsg(CHR_BOND, L_PAM_015) // "Dr. Caroll has been killed." set_stage_flag(STAGEFLAG_ALLY_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3982,7 +3982,7 @@ u8 func040a_check_pa_canisters_destroyed[] = { label(0x06) if_stage_flag_eq(STAGEFLAG_MEGAWEAPON_DISABLED, TRUE, /*goto*/ 0x2e) - show_hudmsg(CHR_BOND, L_PAM(43)) // "Cetan megaweapon has been disabled." + show_hudmsg(CHR_BOND, L_PAM_043) // "Cetan megaweapon has been disabled." set_stage_flag(STAGEFLAG_MEGAWEAPON_DISABLED) label(0x2e) open_door(0x0f) @@ -4217,7 +4217,7 @@ u8 func1022_control_room[] = { goto_first(0x04) label(0x2e) - show_hudmsg(CHR_P1P2, L_PAM(21)) // "Control Room has been secured." + show_hudmsg(CHR_P1P2, L_PAM_021) // "Control Room has been secured." set_stage_flag(STAGEFLAG_BLONDES_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -4737,7 +4737,7 @@ u8 func102d_check_farsight_ammo_wasted[] = { endloop(0x63) label(0x2e) - show_hudmsg(CHR_BOND, L_PAM(44)) // "Ammo wasted - unable to disable megaweapon." + show_hudmsg(CHR_BOND, L_PAM_044) // "Ammo wasted - unable to disable megaweapon." set_stage_flag(STAGEFLAG_FARSIGHT_AMMO_WASTED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x0d) diff --git a/src/assets/files/setup/setuppete.c b/src/assets/files/setup/setuppete.c index 352f06087..37183329e 100644 --- a/src/assets/files/setup/setuppete.c +++ b/src/assets/files/setup/setuppete.c @@ -110,17 +110,17 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_PETE(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_PETE(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_PETE(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_PETE(3)) + briefing(BRIEFINGTYPE_LOCATION, L_PETE_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_PETE_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_PETE_002) + briefing(BRIEFINGTYPE_TEXT_A, L_PETE_003) - beginobjective(0, L_PETE(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve drop point equipment" + beginobjective(0, L_PETE_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Retrieve drop point equipment" require_object_collected(OBJ_BRIEFCASE1) require_object_collected(OBJ_BRIEFCASE2) endobjective - beginobjective(1, L_PETE(10), (DIFFBIT_PA | DIFFBIT_PD)) // "Attach tracer to limousine" + beginobjective(1, L_PETE_010, (DIFFBIT_PA | DIFFBIT_PD)) // "Attach tracer to limousine" complete_flags(STAGEFLAG_TRACERBUG_PLACED) fail_flags(STAGEFLAG_TRACERBUG_WASTED) fail_flags(STAGEFLAG_LIMO_DESTROYED) @@ -128,18 +128,18 @@ u32 props[] = { fail_flags(STAGEFLAG_TRACERBUG_SPOTTED) endobjective - beginobjective(2, L_PETE(11), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Prepare escape route" + beginobjective(2, L_PETE_011, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Prepare escape route" complete_flags(STAGEFLAG_MINE_PLACED) fail_flags(STAGEFLAG_MINE_WASTED) endobjective - beginobjective(3, L_PETE(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Create vehicular diversion" + beginobjective(3, L_PETE_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Create vehicular diversion" complete_flags(STAGEFLAG_DIVERSION_CREATED) fail_flags(STAGEFLAG_TAXI_DESTROYED) fail_flags(STAGEFLAG_ROBOT_DESTROYED) endobjective - beginobjective(4, L_PETE(14), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain entry to G5 building" + beginobjective(4, L_PETE_014, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain entry to G5 building" complete_flags(STAGEFLAG_IN_ELEVATOR) fail_flags(STAGEFLAG_CIVILIAN_DEAD) fail_flags(STAGEFLAG_ELEVATOR_SEALED) @@ -212,24 +212,24 @@ u32 props[] = { stdobject(0x0100, MODEL_POLICECAR, 0xffff, 0x00021501, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x06, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0x00a6, 0x00422001, 0x00000001, 0x20400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_REMOTEMINE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x22, L_PETE(38), L_PETE(39), L_PETE(40), L_PETE(41), L_PETE(42), 0x0000, 0x0000) // "Obtain Remote Mine." + rename_object(-1, 0x22, L_PETE_038, L_PETE_039, L_PETE_040, L_PETE_041, L_PETE_042, 0x0000, 0x0000) // "Obtain Remote Mine." tag(0x0f, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0xffff, 0x00000001, 0x00000001, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_TRACERBUG, 0x00ffffff, 0x00000000) - rename_object(-1, 0x3e, L_PETE(43), L_PETE(44), L_PETE(45), L_PETE(46), L_PETE(47), 0x0000, 0x0000) // "Obtain Tracer Bug." + rename_object(-1, 0x3e, L_PETE_043, L_PETE_044, L_PETE_045, L_PETE_046, L_PETE_047, 0x0000, 0x0000) // "Obtain Tracer Bug." tag(0x1d, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0xffff, 0x00000001, 0x00000001, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_TRACERBUG, 0x00ffffff, 0x00000000) - rename_object(-1, 0x3e, L_PETE(43), L_PETE(44), L_PETE(45), L_PETE(46), L_PETE(47), 0x0000, 0x0000) // "Obtain Tracer Bug." + rename_object(-1, 0x3e, L_PETE_043, L_PETE_044, L_PETE_045, L_PETE_046, L_PETE_047, 0x0000, 0x0000) // "Obtain Tracer Bug." tag(0x0e, 1) singlemonitor(0x0019, MODEL_G5_LASER_SWITCH, 0x00eb, 0x00000002, 0x00002301, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff13) tag(0x07, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0x00a6, 0x00462001, 0x00000001, 0x20400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_DATAUPLINK, 0x00ffffff, 0x00000000) - rename_object(-1, 0x36, L_PETE(49), L_PETE(50), L_PETE(51), L_PETE(52), L_PETE(53), 0x0000, 0x0000) // "Obtain Reprogrammer." + rename_object(-1, 0x36, L_PETE_049, L_PETE_050, L_PETE_051, L_PETE_052, L_PETE_053, 0x0000, 0x0000) // "Obtain Reprogrammer." tag(0x1b, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0x001c, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_FALCON2_SCOPE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x04, L_PETE(55), L_PETE(56), L_PETE(57), L_PETE(58), L_PETE(59), 0x0000, 0x0000) // "Obtain Remote Mine." + rename_object(-1, 0x04, L_PETE_055, L_PETE_056, L_PETE_057, L_PETE_058, L_PETE_059, 0x0000, 0x0000) // "Obtain Remote Mine." tag(0x1e, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0x001c, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_FALCON2_SCOPE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x04, L_PETE(55), L_PETE(56), L_PETE(57), L_PETE(58), L_PETE(59), 0x0000, 0x0000) // "Obtain Remote Mine." + rename_object(-1, 0x04, L_PETE_055, L_PETE_056, L_PETE_057, L_PETE_058, L_PETE_059, 0x0000, 0x0000) // "Obtain Remote Mine." tag(0x1f, 1) stdobject(0x0100, MODEL_CHRBRIEFCASE, 0x009c, 0x012004e1, 0x00086000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x0a, 1) @@ -774,7 +774,7 @@ u8 func100f_check_mine[] = { label(0x03) set_stage_flag(STAGEFLAG_MINE_PLACED) - show_hudmsg(CHR_P1P2, L_PETE(15)) // "Mine placed correctly." + show_hudmsg(CHR_P1P2, L_PETE_015) // "Mine placed correctly." // Check that the player hasn't detonated the mine beginloop(0x2d) @@ -786,12 +786,12 @@ u8 func100f_check_mine[] = { label(0x04) set_stage_flag(STAGEFLAG_MINE_WASTED) - show_hudmsg(CHR_P1P2, L_PETE(72)) // "Remote Mine has been wasted." + show_hudmsg(CHR_P1P2, L_PETE_072) // "Remote Mine has been wasted." set_ailist(CHR_SELF, GAILIST_IDLE) label(0x07) set_stage_flag(STAGEFLAG_MINE_WASTED) - show_hudmsg(CHR_P1P2, L_PETE(16)) // "Mine placed incorrectly." + show_hudmsg(CHR_P1P2, L_PETE_016) // "Mine placed incorrectly." label(0x0a) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -806,17 +806,17 @@ u8 func1026_uplink[] = { label(0x03) if_stage_flag_eq(STAGEFLAG_TAXI_REPROGRAMMED, FALSE, /*goto*/ 0x04) - show_hudmsg(CHR_P1P2, L_PETE(17)) // "Virus already downloaded into NavComp." + show_hudmsg(CHR_P1P2, L_PETE_017) // "Virus already downloaded into NavComp." reloop(0x10) label(0x04) if_chr_weapon_equipped(CHR_P1P2, WEAPON_DATAUPLINK, /*goto*/ 0x03) - show_hudmsg(CHR_P1P2, L_PETE(18)) // "Hovcab is unresponsive - need Reprogrammer." + show_hudmsg(CHR_P1P2, L_PETE_018) // "Hovcab is unresponsive - need Reprogrammer." reloop(0x10) // Uplinking label(0x03) - show_hudmsg(CHR_P1P2, L_PETE(19)) // "Accessing hovercab navigation systems." + show_hudmsg(CHR_P1P2, L_PETE_019) // "Accessing hovercab navigation systems." assign_sound(0x0456, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_TAXI, TRUE) restart_timer @@ -827,9 +827,9 @@ u8 func1026_uplink[] = { endloop(0x05) label(0x04) - show_hudmsg(CHR_P1P2, L_PETE(20)) // "Virus downloaded successfully." + show_hudmsg(CHR_P1P2, L_PETE_020) // "Virus downloaded successfully." yield - show_hudmsg(CHR_P1P2, L_PETE(21)) // "Hovercab navigation systems reprogrammed." + show_hudmsg(CHR_P1P2, L_PETE_021) // "Hovercab navigation systems reprogrammed." mute_channel(CHANNEL_7) assign_sound(0x01c1, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_TAXI, TRUE) @@ -839,7 +839,7 @@ u8 func1026_uplink[] = { // Moved away while uplinking label(0x06) - show_hudmsg(CHR_P1P2, L_PETE(22)) // "Connection to hovercab broken." + show_hudmsg(CHR_P1P2, L_PETE_022) // "Connection to hovercab broken." mute_channel(CHANNEL_7) yield yield @@ -906,7 +906,7 @@ u8 func040d_limo[] = { if_stage_flag_eq(STAGEFLAG_TRACERBUG_PLACED, TRUE, /*goto*/ 0x03) if_difficulty_lt(DIFF_PA, /*goto*/ 0x03) set_stage_flag(STAGEFLAG_LIMO_ESCAPED) - show_hudmsg(CHR_BOND, L_PETE(28)) // "DataDyne limo has escaped." + show_hudmsg(CHR_BOND, L_PETE_028) // "DataDyne limo has escaped." label(0x03) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1095,7 +1095,7 @@ u8 func1005_check_things_destroyed[] = { set_stage_flag(STAGEFLAG_LIMO_DESTROYED) mute_channel(CHANNEL_1) if_difficulty_lt(DIFF_SA, /*goto*/ 0x03) - show_hudmsg(CHR_BOND, L_PETE(25)) // "Mission critical vehicle destroyed." + show_hudmsg(CHR_BOND, L_PETE_025) // "Mission critical vehicle destroyed." // Check taxi label(0x03) @@ -1104,7 +1104,7 @@ u8 func1005_check_things_destroyed[] = { if_object_in_good_condition(OBJ_TAXI, /*goto*/ 0x03) mute_channel(CHANNEL_0) set_stage_flag(STAGEFLAG_TAXI_DESTROYED) - show_hudmsg(CHR_BOND, L_PETE(25)) // "Mission critical vehicle destroyed." + show_hudmsg(CHR_BOND, L_PETE_025) // "Mission critical vehicle destroyed." // Check robot label(0x03) @@ -1122,7 +1122,7 @@ u8 func1005_check_things_destroyed[] = { label(0x04) set_stage_flag(STAGEFLAG_ROBOT_DESTROYED) - show_hudmsg(CHR_BOND, L_PETE(25)) // "Mission critical vehicle destroyed." + show_hudmsg(CHR_BOND, L_PETE_025) // "Mission critical vehicle destroyed." label(0x03) endloop(0x10) @@ -1169,7 +1169,7 @@ u8 func1006_check_for_end[] = { if_all_objectives_complete(/*goto*/ 0x05) // Objectives failed - show_hudmsg(CHR_P1P2, L_PETE(26)) // "MISSION FAILED" + show_hudmsg(CHR_P1P2, L_PETE_026) // "MISSION FAILED" label(0x03) restart_timer @@ -1637,7 +1637,7 @@ u8 func0413_bugspotter[] = { assign_sound(0x044a, CHANNEL_6) play_sound_from_entity(CHANNEL_6, CHR_SELF, 0x0bb8, 0x1770, 0x01) set_stage_flag(STAGEFLAG_TRACERBUG_SPOTTED) - show_hudmsg(CHR_BOND, L_PETE(67)) // "Tracer Bug has been spotted." + show_hudmsg(CHR_BOND, L_PETE_067) // "Tracer Bug has been spotted." // Wait for talking animation to finish beginloop(0x05) @@ -1934,7 +1934,7 @@ u8 func100a_check_cia2_dead[] = { label(0x05) set_stage_flag(STAGEFLAG_CIVILIAN_DEAD) - show_hudmsg(CHR_BOND, L_PETE(29)) // "Mission failed - unacceptable civilian casualties." + show_hudmsg(CHR_BOND, L_PETE_029) // "Mission failed - unacceptable civilian casualties." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2209,7 +2209,7 @@ u8 func041e_sealer1[] = { set_stage_flag(STAGEFLAG_ELEVATOR_SEALED) assign_sound(0x0469, CHANNEL_6) play_sound_from_entity(CHANNEL_6, CHR_SELF, 0x0bb8, 0x1770, 0x01) - show_hudmsg(CHR_BOND, L_PETE(33)) // "Elevator access sealed." + show_hudmsg(CHR_BOND, L_PETE_033) // "Elevator access sealed." chr_do_animation(ANIM_STANDING_TYPE_ONE_HAND, 0, 193, 0x10, 0x10, CHR_SELF, 2) beginloop(0x06) @@ -2229,7 +2229,7 @@ u8 func100d_spawn_alarm_responders[] = { label(0x03) restart_timer - play_sound(L_MP13(240), -1) // "Attention all personnel" + play_sound(0x7af0, -1) // "Attention all personnel" beginloop(0x1d) if_timer_gt(200, /*goto*/ 0x03) @@ -2237,7 +2237,7 @@ u8 func100d_spawn_alarm_responders[] = { label(0x03) restart_timer - play_sound(L_MP13(241), -1) // "Locate and apprehend fugitive" + play_sound(0x7af1, -1) // "Locate and apprehend fugitive" beginloop(0x1e) if_timer_gt(120, /*goto*/ 0x03) @@ -2472,12 +2472,12 @@ u8 func1010_elevator_switch[] = { lock_door(0x10, 0x02) lock_door(0x11, 0x02) if_stage_flag_eq(STAGEFLAG_ELEVATOR_SEALED, TRUE, /*goto*/ 0x04) - show_hudmsg(CHR_P1P2, L_PETE(33)) // "Elevator access sealed." + show_hudmsg(CHR_P1P2, L_PETE_033) // "Elevator access sealed." set_stage_flag(STAGEFLAG_ELEVATOR_SEALED) goto_first(0x10) label(0x04) - show_hudmsg(CHR_P1P2, L_PETE(48)) // "Elevator door cannot be reopened." + show_hudmsg(CHR_P1P2, L_PETE_048) // "Elevator door cannot be reopened." goto_first(0x10) endlist @@ -2509,7 +2509,7 @@ u8 func1014_crash[] = { move_object_to_pad(OBJ_MINE1, 0x0029) destroy_object(OBJ_MINE1) set_stage_flag(STAGEFLAG_DIVERSION_CREATED) - show_hudmsg(CHR_BOND, L_PETE(54)) // "Diversion has been created." + show_hudmsg(CHR_BOND, L_PETE_054) // "Diversion has been created." destroy_object(OBJ_TAXI) restart_timer @@ -2552,16 +2552,16 @@ u8 func040a_intro_sfx[] = { wait_until(30, 0x55) - speak(CHR_BOND, L_PETE(68), 0x7408, CHANNEL_7, COLOR_05_GREEN) // "We suspect the G5 Corporation is just a front for ..." + speak(CHR_BOND, L_PETE_068, 0x7408, CHANNEL_7, COLOR_05_GREEN) // "We suspect the G5 Corporation is just a front for ..." wait_until(1060, 0x56) - speak(CHR_BOND, L_PETE(69), 0x7409, CHANNEL_7, COLOR_09_BLUE) // "Just who is this help you keep referring to?" + speak(CHR_BOND, L_PETE_069, 0x7409, CHANNEL_7, COLOR_09_BLUE) // "Just who is this help you keep referring to?" wait_until(1260, 0x57) - speak(CHR_BOND, L_PETE(70), 0x740a, CHANNEL_7, COLOR_05_GREEN) // "Not now, Joanna. Time for radio silence. Good luck..." + speak(CHR_BOND, L_PETE_070, 0x740a, CHANNEL_7, COLOR_05_GREEN) // "Not now, Joanna. Time for radio silence. Good luck..." wait_until(1488, 0x58) - speak(CHR_BOND, L_PETE(71), 0x740b, CHANNEL_7, COLOR_09_BLUE) // "Thanks a lot." + speak(CHR_BOND, L_PETE_071, 0x740b, CHANNEL_7, COLOR_09_BLUE) // "Thanks a lot." label(0x2d) yield @@ -2955,7 +2955,7 @@ u8 func101a_msg_onlyplace[] = { endloop(0x10) label(0x03) - speak(CHR_P1P2, L_PETE(60), 0x8179, CHANNEL_6, COLOR_09_BLUE) // "The only place we could secure the equipment was a..." + speak(CHR_P1P2, L_PETE_060, 0x8179, CHANNEL_6, COLOR_09_BLUE) // "The only place we could secure the equipment was a..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -2975,7 +2975,7 @@ u8 func101b_msg_blockedupdoors[] = { endloop(0x05) label(0x03) - speak(CHR_P1P2, L_PETE(61), 0x73b1, CHANNEL_6, COLOR_09_BLUE) // "Either of those blocked-up doors will do as an esc..." + speak(CHR_P1P2, L_PETE_061, 0x73b1, CHANNEL_6, COLOR_09_BLUE) // "Either of those blocked-up doors will do as an esc..." label(0x0a) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2998,7 +2998,7 @@ u8 func101c_msg_reprogramthattaxi[] = { endloop(0x05) label(0x03) - speak(CHR_P1P2, L_PETE(62), 0x817a, CHANNEL_6, COLOR_09_BLUE) // "Reprogram that taxi - it's a Mark 2 and should be ..." + speak(CHR_P1P2, L_PETE_062, 0x817a, CHANNEL_6, COLOR_09_BLUE) // "Reprogram that taxi - it's a Mark 2 and should be ..." label(0x0a) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3011,7 +3011,7 @@ u8 func101d_msg_pointofingress[] = { endloop(0x10) label(0x03) - speak(CHR_P1P2, L_PETE(63), 0x817b, CHANNEL_6, COLOR_09_BLUE) // "That car park lift is your only point of ingress." + speak(CHR_P1P2, L_PETE_063, 0x817b, CHANNEL_6, COLOR_09_BLUE) // "That car park lift is your only point of ingress." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3040,7 +3040,7 @@ u8 func101e_check_sealer_guards_dead[] = { label(0x03) if_stage_flag_eq(STAGEFLAG_DIVERSION_CREATED, TRUE, /*goto*/ 0x03) - show_hudmsg(CHR_BOND, L_PETE(66)) // "An alternative diversion has been created!" + show_hudmsg(CHR_BOND, L_PETE_066) // "An alternative diversion has been created!" unset_stage_flag(STAGEFLAG_TAXI_DESTROYED) unset_stage_flag(STAGEFLAG_ROBOT_DESTROYED) set_stage_flag(STAGEFLAG_DIVERSION_CREATED) diff --git a/src/assets/files/setup/setuprit.c b/src/assets/files/setup/setuprit.c index d9d838820..c0e319fb6 100644 --- a/src/assets/files/setup/setuprit.c +++ b/src/assets/files/setup/setuprit.c @@ -130,34 +130,34 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_RIT(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_RIT(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_RIT(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_RIT(3)) + briefing(BRIEFINGTYPE_LOCATION, L_RIT_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_RIT_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_RIT_002) + briefing(BRIEFINGTYPE_TEXT_A, L_RIT_003) - beginobjective(0, L_RIT(5), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate and retrieve equipment" + beginobjective(0, L_RIT_005, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate and retrieve equipment" require_object_collected(OBJ_EQUIPMENT) fail_flags(STAGEFLAG_EQUIPMENT_SWITCH_DESTROYED) endobjective - beginobjective(1, L_RIT(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate President" + beginobjective(1, L_RIT_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate President" complete_flags(STAGEFLAG_PRESIDENT_STARTED_RUNNING) fail_flags(STAGEFLAG_PRESIDENT_CALLED_SECURITY) endobjective - beginobjective(2, L_RIT(7), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Get President to escape capsule" + beginobjective(2, L_RIT_007, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Get President to escape capsule" complete_flags(STAGEFLAG_PRESIDENT_AT_POD) fail_flags(STAGEFLAG_PRESIDENT_DEAD) fail_flags(STAGEFLAG_KILLED_NEUTRALS) fail_flags(STAGEFLAG_POD_DESTROYED) endobjective - beginobjective(3, L_RIT(8), (DIFFBIT_PA | DIFFBIT_PD)) // "Secure Air Force One flight path" + beginobjective(3, L_RIT_008, (DIFFBIT_PA | DIFFBIT_PD)) // "Secure Air Force One flight path" complete_flags(STAGEFLAG_PLANE_STABILIZED) fail_flags(STAGEFLAG_AUTOPILOT_DESTROYED) endobjective - beginobjective(4, L_RIT(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Detach UFO from Air Force One" + beginobjective(4, L_RIT_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Detach UFO from Air Force One" complete_flags(STAGEFLAG_UFO_ATTACHMENT_DAMAGED) fail_flags(STAGEFLAG_BOTH_MINES_WASTED) fail_flags(STAGEFLAG_PLANE_CRASHED) @@ -256,12 +256,12 @@ u32 props[] = { door(0x0100, MODEL_AF1_DOORBIG2, 0x0102, 0x10000400, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000e666, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000020, 0x0000012c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000800, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) door(0x0100, MODEL_AF1_DOORBIG2, 0x0103, 0x10000400, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000e666, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000020, 0x0000012c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) key(0x0080, MODEL_KEYCARD, 0x000e, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000004) - rename_object(-1, 0x49, L_RIT(55), L_RIT(56), L_RIT(57), L_RIT(58), L_RIT(59), 0x0000, 0x0000) // "" + rename_object(-1, 0x49, L_RIT_055, L_RIT_056, L_RIT_057, L_RIT_058, L_RIT_059, 0x0000, 0x0000) // "" key(0x0080, MODEL_KEYCARD, 0x000f, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000020) - rename_object(-1, 0x49, L_RIT(55), L_RIT(56), L_RIT(57), L_RIT(58), L_RIT(59), 0x0000, 0x0000) // "" + rename_object(-1, 0x49, L_RIT_055, L_RIT_056, L_RIT_057, L_RIT_058, L_RIT_059, 0x0000, 0x0000) // "" tag(0x22, 1) key(0x0080, MODEL_KEYCARD, 0x0001, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) - rename_object(-1, 0x49, L_RIT(55), L_RIT(56), L_RIT(57), L_RIT(58), L_RIT(59), 0x0000, 0x0000) // "" + rename_object(-1, 0x49, L_RIT_055, L_RIT_056, L_RIT_057, L_RIT_058, L_RIT_059, 0x0000, 0x0000) // "" door(0x0100, MODEL_DD_DR_NONREF, 0x00f5, 0x10000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000e666, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000000, 0x0000012c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) door(0x0100, MODEL_DD_DR_NONREF, 0x00f6, 0x10000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000e666, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000000, 0x0000012c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) door(0x0100, MODEL_DD_DR_NONREF, 0x00f7, 0x10000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000e666, 0x00010000, 0x00007fff, 0x00014000, 0x00000666, 0x00040000, 0x00000000, 0x0000012c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000) @@ -432,10 +432,10 @@ u32 props[] = { singlemonitor(0x0100, MODEL_GOODSTATION, 0x0167, 0x000004e1, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff03) tag(0x00, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0x00b3, 0x00000101, 0x00000000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_SUITCASE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x4d, L_RIT(10), L_RIT(11), L_RIT(12), L_RIT(13), L_RIT(14), 0x0000, 0x0000) // "Obtain Suitcase." + rename_object(-1, 0x4d, L_RIT_010, L_RIT_011, L_RIT_012, L_RIT_013, L_RIT_014, 0x0000, 0x0000) // "Obtain Suitcase." tag(0x3a, 1) weapon(0x0180, MODEL_CHRBRIEFCASE, 0xffff, 0x00000101, 0x00000000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_SUITCASE, 0x00ffffff, 0x00000000) - rename_object(-1, 0x4d, L_RIT(10), L_RIT(11), L_RIT(12), L_RIT(13), L_RIT(14), 0x0000, 0x0000) // "Obtain Suitcase." + rename_object(-1, 0x4d, L_RIT_010, L_RIT_011, L_RIT_012, L_RIT_013, L_RIT_014, 0x0000, 0x0000) // "Obtain Suitcase." tag(0x24, 1) stdobject(0x0100, MODEL_PRESCAPSULE, 0x0171, 0x000001e1, 0x00004101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007d00, 0x00000000, 0x00000000, 0x0fff0000) glass(0x0100, MODEL_WINDOW, 0x016d, 0x04000262, 0x00304000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000) @@ -672,7 +672,7 @@ u8 func1005_check_neutrals_killed[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_BOND, L_RIT(20)) // "Too many neutral casualties inflicted." + show_hudmsg(CHR_BOND, L_RIT_020) // "Too many neutral casualties inflicted." set_stage_flag(STAGEFLAG_KILLED_NEUTRALS) label(0x06) @@ -1151,8 +1151,8 @@ u8 func100a_autopilot_switch[] = { set_object_image(OBJ_AUTOPILOT_SWITCH, 0x00, 0x13) set_stage_flag(STAGEFLAG_PLANE_STABILIZED) yield - show_hudmsg(CHR_P1P2, L_RIT(24)) // "Air Force One has been stabilized." - show_hudmsg(CHR_P1P2, L_RIT(23)) // "Autopilot has been activated." + show_hudmsg(CHR_P1P2, L_RIT_024) // "Air Force One has been stabilized." + show_hudmsg(CHR_P1P2, L_RIT_023) // "Autopilot has been activated." restart_timer beginloop(0x0e) @@ -1165,7 +1165,7 @@ u8 func100a_autopilot_switch[] = { // Switch destroyed label(0x08) - show_hudmsg(CHR_P1P2, L_RIT(25)) // "Autopilot systems have been destroyed." + show_hudmsg(CHR_P1P2, L_RIT_025) // "Autopilot systems have been destroyed." set_stage_flag(STAGEFLAG_AUTOPILOT_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1224,7 +1224,7 @@ u8 func0405_president_in_room[] = { label(0x06) do_preset_animation(0) - speak(CHR_TARGET, L_RIT(35), 0x12c5, CHANNEL_6, COLOR_08_RED) // "Who are you, young lady?" + speak(CHR_TARGET, L_RIT_035, 0x12c5, CHANNEL_6, COLOR_08_RED) // "Who are you, young lady?" restart_timer beginloop(0x60) @@ -1243,7 +1243,7 @@ u8 func0405_president_in_room[] = { endloop(0x60) label(0x06) - speak(CHR_TARGET, L_RIT(37), 0x72bc, CHANNEL_7, COLOR_09_BLUE) // "Mr. President, you're in danger. Trent is trying t..." + speak(CHR_TARGET, L_RIT_037, 0x72bc, CHANNEL_7, COLOR_09_BLUE) // "Mr. President, you're in danger. Trent is trying t..." restart_timer stop_chr try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x78) @@ -1267,7 +1267,7 @@ u8 func0405_president_in_room[] = { label(0x06) do_preset_animation(1) - speak(CHR_TARGET, L_RIT(40), 0x12c6, CHANNEL_6, COLOR_08_RED) // "You can't make accusations like that without evide..." + speak(CHR_TARGET, L_RIT_040, 0x12c6, CHANNEL_6, COLOR_08_RED) // "You can't make accusations like that without evide..." restart_timer beginloop(0x79) @@ -1294,7 +1294,7 @@ u8 func0405_president_in_room[] = { label(0x85) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_DISGUISE_UNCOVERED) set_chr_hiddenflag(CHR_COOP, CHRHFLAG_DISGUISE_UNCOVERED) - speak(CHR_TARGET, L_RIT(36), 0x12c4, CHANNEL_6, COLOR_08_RED) // "Security, SECURITY!!" + speak(CHR_TARGET, L_RIT_036, 0x12c4, CHANNEL_6, COLOR_08_RED) // "Security, SECURITY!!" restart_timer chr_do_animation(0x0231, 0, 193, 0x18, 0x10, CHR_SELF, 2) @@ -1337,7 +1337,7 @@ u8 func0405_president_in_room[] = { // Has equipment label(0x10) stop_chr - speak(CHR_TARGET, L_RIT(41), 0x72bd, CHANNEL_6, COLOR_09_BLUE) // "This is a recording of a meeting between Trent and..." + speak(CHR_TARGET, L_RIT_041, 0x72bd, CHANNEL_6, COLOR_09_BLUE) // "This is a recording of a meeting between Trent and..." restart_timer try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x0b) @@ -1358,7 +1358,7 @@ u8 func0405_president_in_room[] = { label(0x06) do_preset_animation(2) - speak(CHR_TARGET, L_RIT(42), 0x12c7, CHANNEL_6, COLOR_08_RED) // "Seems overwhelming... I'm in your hands. What do w..." + speak(CHR_TARGET, L_RIT_042, 0x12c7, CHANNEL_6, COLOR_08_RED) // "Seems overwhelming... I'm in your hands. What do w..." restart_timer beginloop(0x7a) @@ -1401,7 +1401,7 @@ u8 func0405_president_in_room[] = { label(0x06) do_preset_animation(-1) - speak(CHR_TARGET, L_RIT(38), 0x816e, CHANNEL_6, COLOR_08_RED) // "What the hell was that!" + speak(CHR_TARGET, L_RIT_038, 0x816e, CHANNEL_6, COLOR_08_RED) // "What the hell was that!" restart_timer beginloop(0x0c) @@ -1411,7 +1411,7 @@ u8 func0405_president_in_room[] = { label(0x06) stop_chr set_stage_flag(STAGEFLAG_PRESIDENT_STARTED_RUNNING) - speak(CHR_TARGET, L_RIT(39), 0x72be, CHANNEL_6, COLOR_09_BLUE) // "We have to get you to the escape pod. Follow me." + speak(CHR_TARGET, L_RIT_039, 0x72be, CHANNEL_6, COLOR_09_BLUE) // "We have to get you to the escape pod. Follow me." restart_timer try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x0e) @@ -1468,7 +1468,7 @@ u8 func0404_president_running[] = { play_sound_from_entity(CHANNEL_6, CHR_SELF, 0x0bb8, 0x1770, 0x01) if_stage_flag_eq(STAGEFLAG_PRESIDENT_INJURED, TRUE, /*goto*/ 0x56) set_stage_flag(STAGEFLAG_PRESIDENT_INJURED) - show_hudmsg(CHR_BOND, L_RIT(72)) // "The President is under attack." + show_hudmsg(CHR_BOND, L_RIT_072) // "The President is under attack." beginloop(0x56) if_num_times_shot_lt(1, /*goto*/ 0x06) @@ -1638,7 +1638,7 @@ u8 func100b_check_president_dead[] = { label(0x06) set_stage_flag(STAGEFLAG_PRESIDENT_DEAD) - show_hudmsg(CHR_BOND, L_RIT(26)) // "The President has been incapacitated." + show_hudmsg(CHR_BOND, L_RIT_026) // "The President has been incapacitated." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1870,7 +1870,7 @@ u8 func100c_cockpit[] = { damage_chr(CHR_PILOT2, 18) yield set_stage_flag(STAGEFLAG_PILOTS_DEAD) - show_hudmsg(CHR_BOND, L_RIT(27)) // "Pilots have been killed." + show_hudmsg(CHR_BOND, L_RIT_027) // "Pilots have been killed." goto_next(0x06) // Both takers dead @@ -1904,7 +1904,7 @@ u8 func100c_cockpit[] = { label(0x0b) if_stage_flag_eq(STAGEFLAG_ALL_OBJECTIVES_COMPLETE, TRUE, /*goto*/ 0x11) - show_hudmsg(CHR_BOND, L_RIT(29)) // "Air Force One is about to crash." + show_hudmsg(CHR_BOND, L_RIT_029) // "Air Force One is about to crash." // Wait until the 50 second mark beginloop(0x0c) @@ -1932,7 +1932,7 @@ u8 func100c_cockpit[] = { label(0x2d) set_object_image(0x03, 0x00, 0x13) set_stage_flag(STAGEFLAG_PLANE_STABILIZED) - show_hudmsg(CHR_BOND, L_RIT(28)) // "Pilots have been saved." + show_hudmsg(CHR_BOND, L_RIT_028) // "Pilots have been saved." stop_ambient_track set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2055,14 +2055,14 @@ u8 func1002_intro[] = { wait_until(140, 0x94) wait_until(180, 0x60) - speak(CHR_BOND, L_RIT(73), 0x744c, CHANNEL_7, COLOR_05_GREEN) // "Have you thought any more about that proposal I ga..." + speak(CHR_BOND, L_RIT_073, 0x744c, CHANNEL_7, COLOR_05_GREEN) // "Have you thought any more about that proposal I ga..." wait_until(330, 0x95) wait_until(360, 0x96) wait_until(438, 0x77) - speak(CHR_BOND, L_RIT(74), 0x744d, CHANNEL_7, COLOR_08_RED) // "My answer remains the same... I'm sorry Trent, but..." + speak(CHR_BOND, L_RIT_074, 0x744d, CHANNEL_7, COLOR_08_RED) // "My answer remains the same... I'm sorry Trent, but..." wait_until(486, 0x97) @@ -2071,13 +2071,13 @@ u8 func1002_intro[] = { wait_until(850, 0x99) wait_until(1020, 0x78) - speak(CHR_BOND, L_RIT(75), 0x744e, CHANNEL_7, COLOR_05_GREEN) // "But this is a golden opportunity to show that Amer..." + speak(CHR_BOND, L_RIT_075, 0x744e, CHANNEL_7, COLOR_05_GREEN) // "But this is a golden opportunity to show that Amer..." wait_until(1402, 0x79) - speak(CHR_BOND, L_RIT(76), 0x81bb, CHANNEL_7, COLOR_08_RED) // "Damn it, man! I say no and I mean no! I'm not gonn..." + speak(CHR_BOND, L_RIT_076, 0x81bb, CHANNEL_7, COLOR_08_RED) // "Damn it, man! I say no and I mean no! I'm not gonn..." wait_until(2348, 0x7a) - speak(CHR_BOND, L_RIT(77), 0x7450, CHANNEL_7, COLOR_05_GREEN) // "As you wish, sir." + speak(CHR_BOND, L_RIT_077, 0x7450, CHANNEL_7, COLOR_05_GREEN) // "As you wish, sir." wait_until(2406, 0x9a) @@ -2093,7 +2093,7 @@ u8 func1002_intro[] = { wait_until(2616, 0x9e) wait_until(2654, 0x7b) - speak(CHR_BOND, L_RIT(78), 0x7451, CHANNEL_7, COLOR_05_GREEN) // "My last chance? Ha! You fool. That was yours." + speak(CHR_BOND, L_RIT_078, 0x7451, CHANNEL_7, COLOR_05_GREEN) // "My last chance? Ha! You fool. That was yours." close_door(0x15) play_sound(0x8008, CHANNEL_10) @@ -2881,7 +2881,7 @@ u8 func0421_trent_waiting[] = { label(0x06) restart_timer - speak(CHR_TARGET, L_RIT(45), 0x816f, CHANNEL_6, COLOR_05_GREEN) // "How the hell did you get on board?" + speak(CHR_TARGET, L_RIT_045, 0x816f, CHANNEL_6, COLOR_05_GREEN) // "How the hell did you get on board?" chr_do_animation(ANIM_TALKING_0231, 0, -1, 0x10, 0x10, CHR_SELF, 2) beginloop(0x08) @@ -2910,7 +2910,7 @@ u8 func0420_trent_attacking[] = { label(0x2d) set_shield(500) set_chr_hiddenflag(CHR_SELF, CHRHFLAG_10000000) - speak(CHR_P1P2, L_RIT(70), 0x12cb, CHANNEL_6, COLOR_05_GREEN) // "Ha, Ha, Ha, Ha, Ha." + speak(CHR_P1P2, L_RIT_070, 0x12cb, CHANNEL_6, COLOR_05_GREEN) // "Ha, Ha, Ha, Ha, Ha." set_ailist(CHR_SELF, AILIST_TRENT_RUNNING) // President in sight @@ -2938,7 +2938,7 @@ u8 func0420_trent_attacking[] = { label(0x09) restart_timer chr_do_animation(ANIM_TALKING_0231, 0, -1, 0x10, 0x10, CHR_SELF, 2) - speak(CHR_P1P2, L_RIT(71), 0x12ca, CHANNEL_6, COLOR_05_GREEN) // "You'll never save him now." + speak(CHR_P1P2, L_RIT_071, 0x12ca, CHANNEL_6, COLOR_05_GREEN) // "You'll never save him now." beginloop(0x0a) if_timer_gt(120, /*goto*/ 0x06) @@ -3251,7 +3251,7 @@ u8 func0407_steward[] = { set_chr_hiddenflag(CHR_BOND, CHRHFLAG_DISGUISE_UNCOVERED) do_preset_animation(-1) restart_timer - speak(CHR_P1P2, L_RIT(43), 0x1abb, CHANNEL_4, COLOR_04_ORANGE) // "Hey, that's not..." + speak(CHR_P1P2, L_RIT_043, 0x1abb, CHANNEL_4, COLOR_04_ORANGE) // "Hey, that's not..." beginloop(0x08) if_timer_gt(35, /*goto*/ 0x2d) @@ -3356,7 +3356,7 @@ u8 func1015_msg_retrievetheevidence[] = { endloop(0x08) label(0x2d) - speak(CHR_BOND, L_RIT(46), 0x73c8, CHANNEL_6, COLOR_09_BLUE) // "Now, let's retrieve the evidence." + speak(CHR_BOND, L_RIT_046, 0x73c8, CHANNEL_6, COLOR_09_BLUE) // "Now, let's retrieve the evidence." label(0x0e) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3375,7 +3375,7 @@ u8 func1016_msg_onthislevel[] = { label(0x2d) set_target_chr(CHR_PRESET) - speak(CHR_TARGET, L_RIT(47), 0x8185, CHANNEL_6, COLOR_09_BLUE) // "The President's room is on this level, Joanna." + speak(CHR_TARGET, L_RIT_047, 0x8185, CHANNEL_6, COLOR_09_BLUE) // "The President's room is on this level, Joanna." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3399,7 +3399,7 @@ u8 func1017_msg_gettothecockpit[] = { endloop(0x08) label(0x2d) - speak(CHR_BOND, L_RIT(48), 0x8186, CHANNEL_5, COLOR_09_BLUE) // "Something's wrong... You have to get to the cockpi..." + speak(CHR_BOND, L_RIT_048, 0x8186, CHANNEL_5, COLOR_09_BLUE) // "Something's wrong... You have to get to the cockpi..." label(0x0e) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -3418,7 +3418,7 @@ u8 func1018_msg_maybeamine[] = { endloop(0x04) label(0x2d) - speak(CHR_P1P2, L_RIT(49), 0x73cb, CHANNEL_6, COLOR_09_BLUE) // "Maybe a mine will detach the UFO." + speak(CHR_P1P2, L_RIT_049, 0x73cb, CHANNEL_6, COLOR_09_BLUE) // "Maybe a mine will detach the UFO." label(0x0e) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -3483,7 +3483,7 @@ u8 func0423_outro[] = { goto_first(0x60) label(0x06) - speak(CHR_BOND, L_RIT(79), 0x7452, CHANNEL_7, COLOR_09_BLUE) // "Elvis! Elvis! I can't detach that tube from the fu..." + speak(CHR_BOND, L_RIT_079, 0x7452, CHANNEL_7, COLOR_09_BLUE) // "Elvis! Elvis! I can't detach that tube from the fu..." #define outro_wait_until(time, loopid) \ beginloop(loopid) \ @@ -3495,20 +3495,20 @@ u8 func0423_outro[] = { outro_wait_until(426, 0x77) - speak(CHR_BOND, L_RIT(80), 0x7453, CHANNEL_7, COLOR_06_WHITE) // "Piece of cake, Joanna. Watch this!" + speak(CHR_BOND, L_RIT_080, 0x7453, CHANNEL_7, COLOR_06_WHITE) // "Piece of cake, Joanna. Watch this!" outro_wait_until(1045, 0x65) play_sound(0x0063, CHANNEL_10) outro_wait_until(1050, 0x78) - speak(CHR_BOND, L_RIT(81), 0x7454, CHANNEL_7, COLOR_06_WHITE) // "Uh-oh." + speak(CHR_BOND, L_RIT_081, 0x7454, CHANNEL_7, COLOR_06_WHITE) // "Uh-oh." emit_sparks(0x23) outro_wait_until(1112, 0x79) - speak(CHR_BOND, L_RIT(82), 0x7455, CHANNEL_7, COLOR_09_BLUE) // "Watch what? Will you stop playing around and shoot..." + speak(CHR_BOND, L_RIT_082, 0x7455, CHANNEL_7, COLOR_09_BLUE) // "Watch what? Will you stop playing around and shoot..." outro_wait_until(1380, 0x7a) - speak(CHR_BOND, L_RIT(83), 0x7456, CHANNEL_7, COLOR_06_WHITE) // "Out of options... Joanna, brace yourself for impac..." + speak(CHR_BOND, L_RIT_083, 0x7456, CHANNEL_7, COLOR_06_WHITE) // "Out of options... Joanna, brace yourself for impac..." outro_wait_until(1950, 0x7b) @@ -3634,7 +3634,7 @@ u8 func101a_equipment_switch[] = { if_chr_has_object(CHR_P1P2, OBJ_KEYCARD, /*goto*/ 0x2d) restart_timer - show_hudmsg(CHR_P1P2, L_RIT(63)) // "Access denied - lift key card required." + show_hudmsg(CHR_P1P2, L_RIT_063) // "Access denied - lift key card required." beginloop(0x77) if_timer_gt(120, /*goto*/ 0x06) @@ -3648,7 +3648,7 @@ u8 func101a_equipment_switch[] = { set_object_image(OBJ_EQUIPMENT_SWITCH, 0x00, 0x13) set_stage_flag(STAGEFLAG_EQUIPMENT_RAISED) open_door(0x1c) - show_hudmsg(CHR_P1P2, L_RIT(61)) // "Cargo bay has been raised." + show_hudmsg(CHR_P1P2, L_RIT_061) // "Cargo bay has been raised." assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_EQUIPMENT_SWITCH, TRUE) unset_object_flag(0x1b, OBJFLAG_DEACTIVATED) @@ -3699,7 +3699,7 @@ u8 func101b_hoverbike_switch[] = { label(0x0a) if_chr_has_object(CHR_P1P2, OBJ_KEYCARD, /*goto*/ 0x2d) restart_timer - show_hudmsg(CHR_P1P2, L_RIT(63)) // "Access denied - lift key card required." + show_hudmsg(CHR_P1P2, L_RIT_063) // "Access denied - lift key card required." beginloop(0x77) if_timer_gt(120, /*goto*/ 0x06) @@ -3711,7 +3711,7 @@ u8 func101b_hoverbike_switch[] = { // Activated with keycard label(0x2d) set_object_image(OBJ_HOVERBIKE_SWITCH, 0x00, 0x13) - show_hudmsg(CHR_P1P2, L_RIT(60)) // "Cargo bay has been lowered." + show_hudmsg(CHR_P1P2, L_RIT_060) // "Cargo bay has been lowered." set_savefile_flag(SAVEFILEFLAG_CRASHSITE_BIKE) assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_HOVERBIKE_SWITCH, TRUE) @@ -3747,7 +3747,7 @@ u8 func101c_check_equipment_switch_destroyed[] = { label(0x06) if_stage_flag_eq(STAGEFLAG_EQUIPMENT_RAISED, TRUE, /*goto*/ 0x2d) set_stage_flag(STAGEFLAG_EQUIPMENT_SWITCH_DESTROYED) - show_hudmsg(CHR_BOND, L_RIT(62)) // "Mission critical object has been destroyed." + show_hudmsg(CHR_BOND, L_RIT_062) // "Mission critical object has been destroyed." label(0x2d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3842,7 +3842,7 @@ u8 func101d_handle_early_president_death[] = { u8 func1007_check_pod_destroyed[] = { beginloop(0x04) if_object_in_good_condition(OBJ_ESCAPE_POD, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_RIT(62)) // "Mission critical object has been destroyed." + show_hudmsg(CHR_BOND, L_RIT_062) // "Mission critical object has been destroyed." set_stage_flag(STAGEFLAG_POD_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) @@ -3917,7 +3917,7 @@ u8 func1022_pilots_stabilizing[] = { endloop(0x93) label(0x06) - show_hudmsg(CHR_BOND, L_RIT(84)) // "The pilots have stabilized Air Force One." + show_hudmsg(CHR_BOND, L_RIT_084) // "The pilots have stabilized Air Force One." set_stage_flag(STAGEFLAG_PLANE_STABILIZED) label(0x0e) diff --git a/src/assets/files/setup/setupsev.c b/src/assets/files/setup/setupsev.c index 94b29024b..020835524 100644 --- a/src/assets/files/setup/setupsev.c +++ b/src/assets/files/setup/setupsev.c @@ -57,20 +57,20 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_SEV(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_SEV(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_SEV(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_SEV(3)) + briefing(BRIEFINGTYPE_LOCATION, L_SEV_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_SEV_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_SEV_002) + briefing(BRIEFINGTYPE_TEXT_A, L_SEV_003) - beginobjective(0, L_SEV(4), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Sabotage enemy medical experiment" + beginobjective(0, L_SEV_004, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Sabotage enemy medical experiment" complete_flags(STAGEFLAG_EXPERIMENT_DESTROYED) endobjective - beginobjective(1, L_SEV(5), (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy captured Maian saucer" + beginobjective(1, L_SEV_005, (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy captured Maian saucer" complete_flags(STAGEFLAG_SAUCER_DESTROYED) endobjective - beginobjective(2, L_SEV(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate distress signal" + beginobjective(2, L_SEV_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate distress signal" complete_flags(STAGEFLAG_CONSOLE_ACTIVATED) fail_flags(STAGEFLAG_CONSOLE_DESTROYED) fail_flags(STAGEFLAG_TRAPPED_AT_START) @@ -1136,7 +1136,7 @@ u8 func100d_start_lifts[] = { u8 func1003_check_experiment_destroyed[] = { beginloop(0x04) if_object_in_good_condition(OBJ_EXPERIMENT, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_SEV(7)) // "Medical experiment has been sabotaged." + show_hudmsg(CHR_BOND, L_SEV_007) // "Medical experiment has been sabotaged." set_stage_flag(STAGEFLAG_EXPERIMENT_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -1148,7 +1148,7 @@ u8 func1003_check_experiment_destroyed[] = { u8 func1004_check_saucer_destroyed[] = { beginloop(0x04) if_object_in_good_condition(0x3e, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_SEV(8)) // "Captured Maian saucer has been destroyed." + show_hudmsg(CHR_BOND, L_SEV_008) // "Captured Maian saucer has been destroyed." set_stage_flag(STAGEFLAG_SAUCER_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) @@ -1332,13 +1332,13 @@ u8 func1008_check_console[] = { label(0x2c) assign_sound(0x8111, CHANNEL_0) play_sound_from_object(CHANNEL_0, OBJ_CONSOLE, 0x012c, 0x0190) - show_hudmsg(CHR_BOND, L_SEV(9)) // "Distress signal has been sent." + show_hudmsg(CHR_BOND, L_SEV_009) // "Distress signal has been sent." set_stage_flag(STAGEFLAG_CONSOLE_ACTIVATED) set_ailist(CHR_SELF, GAILIST_IDLE) // Console destroyed label(0x08) - show_hudmsg(CHR_BOND, L_SEV(10)) // "Critical mission object has been destroyed." + show_hudmsg(CHR_BOND, L_SEV_010) // "Critical mission object has been destroyed." set_stage_flag(STAGEFLAG_CONSOLE_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1491,7 +1491,7 @@ u8 func100b_check_medlab_escapable[] = { // Player has psychosis gun but ammo depleted label(0x2c) - show_hudmsg(CHR_BOND, L_SEV(11)) // "Mission failed - cannot escape from medlab." + show_hudmsg(CHR_BOND, L_SEV_011) // "Mission failed - cannot escape from medlab." set_stage_flag(STAGEFLAG_TRAPPED_AT_START) goto_next(0x0e) @@ -1510,7 +1510,7 @@ u8 func100b_check_medlab_escapable[] = { endloop(0x0e) label(0x06) - show_hudmsg(CHR_BOND, L_SEV(12)) // "Alternative escape route found." + show_hudmsg(CHR_BOND, L_SEV_012) // "Alternative escape route found." unset_stage_flag(STAGEFLAG_TRAPPED_AT_START) goto_first(0x04) diff --git a/src/assets/files/setup/setupsho.c b/src/assets/files/setup/setupsho.c index a47df76a8..90d0e1327 100644 --- a/src/assets/files/setup/setupsho.c +++ b/src/assets/files/setup/setupsho.c @@ -118,31 +118,31 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_SHO(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_SHO(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_SHO(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_SHO(3)) + briefing(BRIEFINGTYPE_LOCATION, L_SHO_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_SHO_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_SHO_002) + briefing(BRIEFINGTYPE_TEXT_A, L_SHO_003) - beginobjective(0, L_SHO(5), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Identify temple targets" + beginobjective(0, L_SHO_005, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Identify temple targets" complete_flags(STAGEFLAG_PILLAR1_MARKED) complete_flags(STAGEFLAG_PILLAR2_MARKED) complete_flags(STAGEFLAG_PILLAR3_MARKED) fail_flags(STAGEFLAG_BUG_WASTED) endobjective - beginobjective(1, L_SHO(6), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate bridge" + beginobjective(1, L_SHO_006, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Activate bridge" complete_flags(STAGEFLAG_BRIDGE_EXTENDED) endobjective - beginobjective(2, L_SHO(7), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain access to Inner Sanctum" + beginobjective(2, L_SHO_007, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Gain access to Inner Sanctum" complete_flags(STAGEFLAG_ACCESSED_SANCTUM) endobjective - beginobjective(3, L_SHO(8), (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy secret Skedar army" + beginobjective(3, L_SHO_008, (DIFFBIT_PA | DIFFBIT_PD)) // "Destroy secret Skedar army" complete_flags(STAGEFLAG_ARMY_DEFEATED) endobjective - beginobjective(4, L_SHO(9), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Assassinate Skedar leader" + beginobjective(4, L_SHO_009, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Assassinate Skedar leader" complete_flags(STAGEFLAG_SPIKE1_DESTROYED) complete_flags(STAGEFLAG_SPIKE2_DESTROYED) complete_flags(STAGEFLAG_SPIKE3_DESTROYED) @@ -347,10 +347,10 @@ u32 props[] = { lift(0x0100, MODEL_SKEDARBRIDGE, 0x0135, 0x035204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0135, 0x0134, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000471c, 0x00a6aaaa, 0x00000000, 0x00000000, 0x00000000, 0x00000000) tag(0x08, 1) stdobject(0x0100, MODEL_TARGETAMP, 0x0001, 0x012405e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x3f, L_SHO(20), L_SHO(21), L_SHO(22), L_SHO(23), L_SHO(24), 0x0000, 0x0000) // "Obtain Target Amplifier." + rename_object(-1, 0x3f, L_SHO_020, L_SHO_021, L_SHO_022, L_SHO_023, L_SHO_024, 0x0000, 0x0000) // "Obtain Target Amplifier." tag(0x35, 1) stdobject(0x0100, MODEL_TARGETAMP, 0x0001, 0x012405e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x3f, L_SHO(20), L_SHO(21), L_SHO(22), L_SHO(23), L_SHO(24), 0x0000, 0x0000) // "Obtain Target Amplifier." + rename_object(-1, 0x3f, L_SHO_020, L_SHO_021, L_SHO_022, L_SHO_023, L_SHO_024, 0x0000, 0x0000) // "Obtain Target Amplifier." tag(0x0b, 1) multimonitor(0x0019, MODEL_COMHUB, 0x0137, 0x00420002, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03030300) tag(0x13, 1) @@ -1047,7 +1047,7 @@ u8 func100c_check_army_defeated[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_BOND, L_SHO(29)) // "Skedar secret army has been defeated." + show_hudmsg(CHR_BOND, L_SHO_029) // "Skedar secret army has been defeated." set_stage_flag(STAGEFLAG_ARMY_DEFEATED) beginloop(0x91) @@ -1260,7 +1260,7 @@ u8 func1007_bug_throws_bond[] = { dprint '1',' ','P','L','A','C','E','D','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR1_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR1_MARKED) - show_hudmsg(CHR_BOND, L_SHO(25)) // "Target Amplifier placed correctly." + show_hudmsg(CHR_BOND, L_SHO_025) // "Target Amplifier placed correctly." if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 1, /*goto*/ 0x0d) goto_first(0x03) @@ -1268,7 +1268,7 @@ u8 func1007_bug_throws_bond[] = { dprint '2',' ','P','L','A','C','E','D','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR2_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR2_MARKED) - show_hudmsg(CHR_BOND, L_SHO(25)) // "Target Amplifier placed correctly." + show_hudmsg(CHR_BOND, L_SHO_025) // "Target Amplifier placed correctly." if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 1, /*goto*/ 0x0d) goto_first(0x03) @@ -1276,7 +1276,7 @@ u8 func1007_bug_throws_bond[] = { dprint '3',' ','P','L','A','C','E','D','\n',0, if_stage_flag_eq(STAGEFLAG_PILLAR3_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR3_MARKED) - show_hudmsg(CHR_BOND, L_SHO(25)) // "Target Amplifier placed correctly." + show_hudmsg(CHR_BOND, L_SHO_025) // "Target Amplifier placed correctly." if_ammo_quantity_lt(CHR_BOND, AMMOTYPE_BUG, 1, /*goto*/ 0x0d) goto_first(0x03) @@ -1300,7 +1300,7 @@ u8 func1007_bug_throws_bond[] = { set_stage_flag(STAGEFLAG_BOND_BUGS_WASTED) if_stage_flag_eq(STAGEFLAG_COOP_BUGS_WASTED, FALSE, /*goto*/ 0x0f) set_stage_flag(STAGEFLAG_BUG_WASTED) - show_hudmsg(CHR_BOND, L_SHO(26)) // "Target Amplifier placed incorrectly." + show_hudmsg(CHR_BOND, L_SHO_026) // "Target Amplifier placed incorrectly." label(0x2d) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1378,7 +1378,7 @@ u8 func101b_bug_throws_coop[] = { unset_object_flag3(OBJ_PILLAR1, OBJFLAG3_RTRACKED_YELLOW) if_stage_flag_eq(STAGEFLAG_PILLAR1_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR1_MARKED) - show_hudmsg(CHR_COOP, L_SHO(25)) // "Target Amplifier placed correctly." + show_hudmsg(CHR_COOP, L_SHO_025) // "Target Amplifier placed correctly." if_ammo_quantity_lt(CHR_COOP, AMMOTYPE_BUG, 1, /*goto*/ 0x0d) goto_first(0x03) @@ -1387,7 +1387,7 @@ u8 func101b_bug_throws_coop[] = { unset_object_flag3(OBJ_PILLAR2, OBJFLAG3_RTRACKED_YELLOW) if_stage_flag_eq(STAGEFLAG_PILLAR2_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR2_MARKED) - show_hudmsg(CHR_COOP, L_SHO(25)) // "Target Amplifier placed correctly." + show_hudmsg(CHR_COOP, L_SHO_025) // "Target Amplifier placed correctly." if_ammo_quantity_lt(CHR_COOP, AMMOTYPE_BUG, 1, /*goto*/ 0x0d) goto_first(0x03) @@ -1396,7 +1396,7 @@ u8 func101b_bug_throws_coop[] = { unset_object_flag3(OBJ_PILLAR3, OBJFLAG3_RTRACKED_YELLOW) if_stage_flag_eq(STAGEFLAG_PILLAR3_MARKED, TRUE, /*goto*/ 0x0d) set_stage_flag(STAGEFLAG_PILLAR3_MARKED) - show_hudmsg(CHR_COOP, L_SHO(25)) // "Target Amplifier placed correctly." + show_hudmsg(CHR_COOP, L_SHO_025) // "Target Amplifier placed correctly." if_ammo_quantity_lt(CHR_COOP, AMMOTYPE_BUG, 1, /*goto*/ 0x0d) goto_first(0x03) @@ -1419,7 +1419,7 @@ u8 func101b_bug_throws_coop[] = { set_stage_flag(STAGEFLAG_COOP_BUGS_WASTED) if_self_flag_bankx_eq(CHRFLAG0_00000010, FALSE, BANK_0, /*goto*/ 0x0f) set_stage_flag(STAGEFLAG_BUG_WASTED) - show_hudmsg(CHR_COOP, L_SHO(26)) // "Target Amplifier placed incorrectly." + show_hudmsg(CHR_COOP, L_SHO_026) // "Target Amplifier placed incorrectly." label(0x2d) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1471,7 +1471,7 @@ u8 func1009_altar[] = { // At pad, or invalid weapon equipped label(0x2e) set_object_flag2(OBJ_ALTAR, OBJFLAG2_00002000) - show_hudmsg(CHR_P1P2, L_SHO(51)) // "Make your sacrifice to the God of War." + show_hudmsg(CHR_P1P2, L_SHO_051) // "Make your sacrifice to the God of War." restart_timer beginloop(0x91) @@ -1550,7 +1550,7 @@ u8 func1009_altar[] = { label(0x2d) if_difficulty_lt(DIFF_SA, /*goto*/ 0x2d) - show_hudmsg(CHR_P1P2, L_SHO(27)) // "Generator has been reactivated." + show_hudmsg(CHR_P1P2, L_SHO_027) // "Generator has been reactivated." label(0x2d) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1866,7 +1866,7 @@ u8 func100b_check_sanctum_accessed[] = { endloop(0x04) label(0x2d) - show_hudmsg(CHR_P1P2, L_SHO(28)) // "Skedar Inner Sanctum has been reached." + show_hudmsg(CHR_P1P2, L_SHO_028) // "Skedar Inner Sanctum has been reached." set_stage_flag(STAGEFLAG_ACCESSED_SANCTUM) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3040,7 +3040,7 @@ u8 func1015_msg_specialpillars[] = { goto_first(0x04) label(0x2d) - speak(CHR_P1P2, L_SHO(30), 0x73e0, CHANNEL_6, COLOR_09_BLUE) // "This seems to be one of the special pillars." + speak(CHR_P1P2, L_SHO_030, 0x73e0, CHANNEL_6, COLOR_09_BLUE) // "This seems to be one of the special pillars." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3054,7 +3054,7 @@ u8 func1016_msg_powersmoreconstant[] = { endloop(0x04) label(0x2d) - speak(CHR_P1P2, L_SHO(31), 0x73e1, CHANNEL_6, COLOR_09_BLUE) // "The power's more constant in this area. The Inner ..." + speak(CHR_P1P2, L_SHO_031, 0x73e1, CHANNEL_6, COLOR_09_BLUE) // "The power's more constant in this area. The Inner ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3066,7 +3066,7 @@ u8 func1017_msg_skedararmy[] = { endloop(0x04) label(0x2d) - speak(CHR_P1P2, L_SHO(32), 0x73e2, CHANNEL_6, COLOR_09_BLUE) // "OH, NO!!! A Skedar army in suspended animation!" + speak(CHR_P1P2, L_SHO_032, 0x73e2, CHANNEL_6, COLOR_09_BLUE) // "OH, NO!!! A Skedar army in suspended animation!" set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3085,7 +3085,7 @@ u8 func1018_msg_cutoffthehead[] = { endloop(0x08) label(0x2d) - speak(CHR_P1P2, L_SHO(33), 0x73e3, CHANNEL_6, COLOR_09_BLUE) // "Okay, this is it... Cut off the head and the body ..." + speak(CHR_P1P2, L_SHO_033, 0x73e3, CHANNEL_6, COLOR_09_BLUE) // "Okay, this is it... Cut off the head and the body ..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3230,13 +3230,13 @@ u8 func0c00_intro_sounds[] = { restart_timer wait_until_with_stageflag(100, 0x91) - speak(CHR_BOND, L_SHO(34), 0x748d, CHANNEL_10, COLOR_04_ORANGE) // "This is the Skedar fanatics' most holy place. They..." + speak(CHR_BOND, L_SHO_034, 0x748d, CHANNEL_10, COLOR_04_ORANGE) // "This is the Skedar fanatics' most holy place. They..." wait_until_with_stageflag(770, 0xa4) play_sound(0x0433, CHANNEL_10) wait_until_with_stageflag(800, 0x92) - speak(CHR_BOND, L_SHO(35), 0x748e, CHANNEL_10, COLOR_09_BLUE) // "So let me get this straight - it's holy. But there..." + speak(CHR_BOND, L_SHO_035, 0x748e, CHANNEL_10, COLOR_09_BLUE) // "So let me get this straight - it's holy. But there..." wait_until_with_stageflag(1018, 0xa5) play_sound(0x05a0, CHANNEL_10) @@ -3248,7 +3248,7 @@ u8 func0c00_intro_sounds[] = { play_sound(0x05a0, CHANNEL_10) wait_until_with_stageflag(1210, 0x93) - speak(CHR_BOND, L_SHO(36), 0x748f, CHANNEL_10, COLOR_04_ORANGE) // "Yes. In all of the time that we Maians fought the ..." + speak(CHR_BOND, L_SHO_036, 0x748f, CHANNEL_10, COLOR_04_ORANGE) // "Yes. In all of the time that we Maians fought the ..." wait_until_with_stageflag(1230, 0xa8) play_sound(0x05a1, CHANNEL_10) @@ -3317,10 +3317,10 @@ u8 func0c00_intro_sounds[] = { play_sound(0x05a0, CHANNEL_10) wait_until_with_stageflag(2650, 0x94) - speak(CHR_BOND, L_SHO(37), 0x7490, CHANNEL_10, COLOR_09_BLUE) // "Then we have to be certain that no fanatics surviv..." + speak(CHR_BOND, L_SHO_037, 0x7490, CHANNEL_10, COLOR_09_BLUE) // "Then we have to be certain that no fanatics surviv..." wait_until_with_stageflag(3250, 0x95) - speak(CHR_BOND, L_SHO(38), 0x7491, CHANNEL_10, COLOR_04_ORANGE) // "If you're caught on the ground when the fleet gets..." + speak(CHR_BOND, L_SHO_038, 0x7491, CHANNEL_10, COLOR_04_ORANGE) // "If you're caught on the ground when the fleet gets..." wait_until(3330, 0xc3) play_sound(0x0530, CHANNEL_10) @@ -3330,7 +3330,7 @@ u8 func0c00_intro_sounds[] = { wait_until_with_stageflag(3600, 0x96) mute_channel(CHANNEL_7) - speak(CHR_BOND, L_SHO(39), 0x7492, CHANNEL_10, COLOR_09_BLUE) // "That's a mistake I don't intend to make." + speak(CHR_BOND, L_SHO_039, 0x7492, CHANNEL_10, COLOR_09_BLUE) // "That's a mistake I don't intend to make." wait_until(4040, 0xc0) play_sound(0x05a0, CHANNEL_10) @@ -3432,7 +3432,7 @@ u8 func0414_outro_sounds[] = { play_sound(0x052d, CHANNEL_10) outro_wait_until_with_stageflag(230, 0x9b) - speak(CHR_BOND, L_SHO(40), 0x74de, CHANNEL_10, COLOR_09_BLUE) // "Yesss..." + speak(CHR_BOND, L_SHO_040, 0x74de, CHANNEL_10, COLOR_09_BLUE) // "Yesss..." outro_wait_until_with_stageflag(470, 0xa9) play_sound(0x8099, CHANNEL_10) @@ -3493,22 +3493,22 @@ u8 func0414_outro_sounds[] = { outro_wait_until_with_stageflag(1680, 0x91) mute_channel(CHANNEL_10) - speak(CHR_BOND, L_SHO(41), 0x7493, CHANNEL_10, COLOR_04_ORANGE) // "Joanna! Joanna!" + speak(CHR_BOND, L_SHO_041, 0x7493, CHANNEL_10, COLOR_04_ORANGE) // "Joanna! Joanna!" outro_wait_until_with_stageflag(2020, 0x9c) - speak(CHR_BOND, L_SHO(54), 0x7755, CHANNEL_10, COLOR_04_ORANGE) // "Where are you? Are you hurt?" + speak(CHR_BOND, L_SHO_054, 0x7755, CHANNEL_10, COLOR_04_ORANGE) // "Where are you? Are you hurt?" outro_wait_until_with_stageflag(2206, 0x92) - speak(CHR_BOND, L_SHO(42), 0x7494, CHANNEL_10, COLOR_09_BLUE) // "Elvis! Elvis! Over here." + speak(CHR_BOND, L_SHO_042, 0x7494, CHANNEL_10, COLOR_09_BLUE) // "Elvis! Elvis! Over here." outro_wait_until_with_stageflag(2625, 0x93) - speak(CHR_BOND, L_SHO(43), 0x7495, CHANNEL_10, COLOR_04_ORANGE) // "No problem. Grab my arms - we'll get you out in no..." + speak(CHR_BOND, L_SHO_043, 0x7495, CHANNEL_10, COLOR_04_ORANGE) // "No problem. Grab my arms - we'll get you out in no..." outro_wait_until_with_stageflag(2810, 0xd4) play_sound(0x0531, CHANNEL_10) outro_wait_until_with_stageflag(2895, 0x94) - speak(CHR_BOND, L_SHO(44), 0x7496, CHANNEL_10, COLOR_09_BLUE) // "No, quick! Give me your gun!" + speak(CHR_BOND, L_SHO_044, 0x7496, CHANNEL_10, COLOR_09_BLUE) // "No, quick! Give me your gun!" outro_wait_until_with_stageflag(3160, 0xca) set_cutscene_weapon(CHR_ELVIS, WEAPON_NONE, WEAPON_NONE) @@ -3520,7 +3520,7 @@ u8 func0414_outro_sounds[] = { set_cutscene_weapon(CHR_ELVIS, WEAPON_NONE, WEAPON_NONE) outro_wait_until_with_stageflag(3290, 0x95) - speak(CHR_BOND, L_SHO(45), 0x7497, CHANNEL_10, COLOR_09_BLUE) // "Will! You! Just! Let! Go!" + speak(CHR_BOND, L_SHO_045, 0x7497, CHANNEL_10, COLOR_09_BLUE) // "Will! You! Just! Let! Go!" outro_wait_until_with_stageflag(3420, 0xcf) set_chr_shooting_in_cutscene(CHR_TARGET, TRUE) @@ -3561,19 +3561,19 @@ u8 func0414_outro_sounds[] = { play_sound(0x0427, CHANNEL_10) outro_wait_until_with_stageflag(3990, 0x96) - speak(CHR_BOND, L_SHO(46), 0x7498, CHANNEL_10, COLOR_04_ORANGE) // "I managed to get the fleet to stop the bombardment..." + speak(CHR_BOND, L_SHO_046, 0x7498, CHANNEL_10, COLOR_04_ORANGE) // "I managed to get the fleet to stop the bombardment..." outro_wait_until_with_stageflag(4425, 0x97) - speak(CHR_BOND, L_SHO(47), 0x7499, CHANNEL_10, COLOR_09_BLUE) // "I'd have got out in time if that one hadn't grabbe..." + speak(CHR_BOND, L_SHO_047, 0x7499, CHANNEL_10, COLOR_09_BLUE) // "I'd have got out in time if that one hadn't grabbe..." outro_wait_until_with_stageflag(4650, 0x98) - speak(CHR_BOND, L_SHO(48), 0x749a, CHANNEL_10, COLOR_04_ORANGE) // "Of course, Joanna, of course." + speak(CHR_BOND, L_SHO_048, 0x749a, CHANNEL_10, COLOR_04_ORANGE) // "Of course, Joanna, of course." outro_wait_until_with_stageflag(4825, 0x99) - speak(CHR_BOND, L_SHO(49), 0x749b, CHANNEL_10, COLOR_09_BLUE) // "No, I would have." + speak(CHR_BOND, L_SHO_049, 0x749b, CHANNEL_10, COLOR_09_BLUE) // "No, I would have." outro_wait_until_with_stageflag(4960, 0x9a) - speak(CHR_BOND, L_SHO(50), 0x749c, CHANNEL_10, COLOR_04_ORANGE) // "I believe you." + speak(CHR_BOND, L_SHO_050, 0x749c, CHANNEL_10, COLOR_04_ORANGE) // "I believe you." outro_wait_until_with_stageflag(5560, 0x9d) play_sound(0x0161, CHANNEL_7) @@ -3653,7 +3653,7 @@ u8 unregistered_function1[] = { label(0x2d) chr_drop_weapon(CHR_BOND) - show_hudmsg(CHR_BOND, L_SHO(26)) // "Target Amplifier placed incorrectly." + show_hudmsg(CHR_BOND, L_SHO_026) // "Target Amplifier placed incorrectly." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3708,12 +3708,12 @@ u8 func1024_check_grenades_wasted[] = { // Blown up using other means (eg. Phoenix or all guns cheat) unset_stage_flag(STAGEFLAG_GRENADES_WASTED) - show_hudmsg(CHR_BOND, L_SHO(53)) // "Alternative entrance to Shrine created." + show_hudmsg(CHR_BOND, L_SHO_053) // "Alternative entrance to Shrine created." set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2d) if_stage_flag_eq(STAGEFLAG_GRENADES_WASTED, TRUE, /*goto*/ 0x2d) - show_hudmsg(CHR_BOND, L_SHO(52)) // "Grenade ammo used up - can't enter Shrine." + show_hudmsg(CHR_BOND, L_SHO_052) // "Grenade ammo used up - can't enter Shrine." set_stage_flag(STAGEFLAG_GRENADES_WASTED) label(0x2d) endloop(0x09) diff --git a/src/assets/files/setup/setupstat.c b/src/assets/files/setup/setupstat.c index ca0a5d744..70eeb2ecb 100644 --- a/src/assets/files/setup/setupstat.c +++ b/src/assets/files/setup/setupstat.c @@ -71,21 +71,21 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_STAT(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_STAT(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_STAT(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_STAT(3)) + briefing(BRIEFINGTYPE_LOCATION, L_STAT_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_STAT_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_STAT_002) + briefing(BRIEFINGTYPE_TEXT_A, L_STAT_003) - beginobjective(0, L_STAT(4), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Kill Skedar King." + beginobjective(0, L_STAT_004, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Kill Skedar King." complete_flags(STAGEFLAG_KING1_DEAD) fail_flags(STAGEFLAG_LEADER_DEAD) endobjective - beginobjective(1, L_STAT(5), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Kill Skedar King 2." + beginobjective(1, L_STAT_005, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Kill Skedar King 2." complete_flags(STAGEFLAG_KING2_DEAD) endobjective - beginobjective(2, L_STAT(6), (DIFFBIT_PA | DIFFBIT_PD)) // "Kill Skedar King 3." + beginobjective(2, L_STAT_006, (DIFFBIT_PA | DIFFBIT_PD)) // "Kill Skedar King 3." complete_flags(STAGEFLAG_KING3_DEAD) endobjective @@ -907,7 +907,7 @@ u8 func1005_check_leader_dead[] = { endloop(0x03) label(0x2d) - show_hudmsg(CHR_BOND, L_STAT(7)) // "Maian leader has been killed." + show_hudmsg(CHR_BOND, L_STAT_007) // "Maian leader has been killed." set_stage_flag(STAGEFLAG_LEADER_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -923,7 +923,7 @@ u8 func1009_check_king1_dead[] = { endloop(0x03) label(0x2d) - show_hudmsg(CHR_BOND, L_STAT(8)) // "Skedar King has been killed." + show_hudmsg(CHR_BOND, L_STAT_008) // "Skedar King has been killed." set_stage_flag(STAGEFLAG_KING1_DEAD) unlock_door(0x3e, 0x40) unlock_door(0x3f, 0x40) @@ -942,7 +942,7 @@ u8 func100a_check_king2_dead[] = { endloop(0x03) label(0x2d) - show_hudmsg(CHR_BOND, L_STAT(8)) // "Skedar King has been killed." + show_hudmsg(CHR_BOND, L_STAT_008) // "Skedar King has been killed." set_stage_flag(STAGEFLAG_KING2_DEAD) label(0x0e) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -960,7 +960,7 @@ u8 func100b_check_king3_dead[] = { endloop(0x03) label(0x2d) - show_hudmsg(CHR_BOND, L_STAT(8)) // "Skedar King has been killed." + show_hudmsg(CHR_BOND, L_STAT_008) // "Skedar King has been killed." set_stage_flag(STAGEFLAG_KING3_DEAD) label(0x0e) set_ailist(CHR_SELF, GAILIST_IDLE) diff --git a/src/assets/files/setup/setuptra.c b/src/assets/files/setup/setuptra.c index 23d470c57..a3998ffbe 100644 --- a/src/assets/files/setup/setuptra.c +++ b/src/assets/files/setup/setuptra.c @@ -109,31 +109,31 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_TRA(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_TRA(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_TRA(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_TRA(3)) + briefing(BRIEFINGTYPE_LOCATION, L_TRA_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_TRA_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_TRA_002) + briefing(BRIEFINGTYPE_TEXT_A, L_TRA_003) - beginobjective(0, L_TRA(9), (DIFFBIT_PA | DIFFBIT_PD)) // "Locate alien tech medpack" + beginobjective(0, L_TRA_009, (DIFFBIT_PA | DIFFBIT_PD)) // "Locate alien tech medpack" complete_flags(STAGEFLAG_COLLECTED_MEDPACK) fail_flags(STAGEFLAG_00000200) fail_flags(STAGEFLAG_MEDPACK_SWITCH_DESTROYED) endobjective - beginobjective(1, L_TRA(10), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rendezvous with CI spy" + beginobjective(1, L_TRA_010, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Rendezvous with CI spy" complete_flags(STAGEFLAG_MET_JON) fail_flags(STAGEFLAG_JON_DEAD) endobjective - beginobjective(2, L_TRA(12), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate secret hangar" + beginobjective(2, L_TRA_012, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate secret hangar" complete_flags(STAGEFLAG_ENTERED_HANGAR) endobjective - beginobjective(3, L_TRA(11), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Revive Maian Bodyguard" + beginobjective(3, L_TRA_011, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Revive Maian Bodyguard" complete_flags(STAGEFLAG_ELVIS_REVIVED) endobjective - beginobjective(4, L_TRA(13), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Escape from Area 51" + beginobjective(4, L_TRA_013, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Escape from Area 51" complete_flags(STAGEFLAG_ESCAPED) fail_flags(STAGEFLAG_HANGAR_TERMINAL_DESTROYED) fail_flags(STAGEFLAG_ELVIS_DEAD) @@ -489,10 +489,10 @@ u32 props[] = { stdobject(0x0100, MODEL_LAB_CONTAINER, 0x048d, 0x000005e1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x01, 1) weapon(0x0100, MODEL_CHRBRIEFCASE, 0x037f, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_AUTOSURGEON, 0x00ffffff, 0x00000000) - rename_object(-1, 0x3a, L_TRA(20), L_TRA(21), L_TRA(22), L_TRA(23), L_TRA(24), 0x0000, 0x0000) // "Obtain alien medpack." + rename_object(-1, 0x3a, L_TRA_020, L_TRA_021, L_TRA_022, L_TRA_023, L_TRA_024, 0x0000, 0x0000) // "Obtain alien medpack." tag(0x20, 1) weapon(0x0100, MODEL_CHRBRIEFCASE, 0xffff, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_AUTOSURGEON, 0x00ffffff, 0x00000000) - rename_object(-1, 0x3a, L_TRA(20), L_TRA(21), L_TRA(22), L_TRA(23), L_TRA(24), 0x0000, 0x0000) // "Obtain alien medpack." + rename_object(-1, 0x3a, L_TRA_020, L_TRA_021, L_TRA_022, L_TRA_023, L_TRA_024, 0x0000, 0x0000) // "Obtain alien medpack." stdobject(0x0100, MODEL_A51TABLE, 0x04d0, 0x000005e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) stdobject(0x0100, MODEL_A51TABLE, 0x04d1, 0x000005e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) stdobject(0x0100, MODEL_A51TABLE, 0x04d2, 0x000005e1, 0x00004000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) @@ -699,7 +699,7 @@ u8 func1004_jon_msgs_gravedanger[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(14), 0x814f, CHANNEL_4, COLOR_03_RED) // "Joanna - this is Jonathan. You're in grave danger." + speak(CHR_BOND, L_TRA_014, 0x814f, CHANNEL_4, COLOR_03_RED) // "Joanna - this is Jonathan. You're in grave danger." beginloop(0x08) if_timer_gt(240, /*goto*/ 0x06) @@ -707,7 +707,7 @@ u8 func1004_jon_msgs_gravedanger[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(15), 0x8150, CHANNEL_4, COLOR_03_RED) // "They've flooded the area with nerve gas." + speak(CHR_BOND, L_TRA_015, 0x8150, CHANNEL_4, COLOR_03_RED) // "They've flooded the area with nerve gas." beginloop(0x09) if_timer_gt(240, /*goto*/ 0x06) @@ -715,7 +715,7 @@ u8 func1004_jon_msgs_gravedanger[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(16), 0x8151, CHANNEL_4, COLOR_03_RED) // "Get our friend to the containment lab. There's a h..." + speak(CHR_BOND, L_TRA_016, 0x8151, CHANNEL_4, COLOR_03_RED) // "Get our friend to the containment lab. There's a h..." beginloop(0x0a) if_timer_gt(270, /*goto*/ 0x06) @@ -723,7 +723,7 @@ u8 func1004_jon_msgs_gravedanger[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(17), 0x8152, CHANNEL_4, COLOR_03_RED) // "I'll contact you when you get there - good luck!" + speak(CHR_BOND, L_TRA_017, 0x8152, CHANNEL_4, COLOR_03_RED) // "I'll contact you when you get there - good luck!" beginloop(0x0c) if_timer_gt(240, /*goto*/ 0x06) @@ -750,7 +750,7 @@ u8 func1005_jon_msgs_meetup[] = { unset_object_flag3(OBJ_HOVERBED, OBJFLAG3_GRABBABLE) unset_object_flag3(OBJ_HOVERBED, OBJFLAG3_PUSHABLE) restart_timer - speak(CHR_BOND, L_TRA(18), 0x8153, CHANNEL_4, COLOR_03_RED) // "Good work, Jo. We need to meet up. They're getting..." + speak(CHR_BOND, L_TRA_018, 0x8153, CHANNEL_4, COLOR_03_RED) // "Good work, Jo. We need to meet up. They're getting..." beginloop(0x08) if_timer_gt(300, /*goto*/ 0x06) @@ -758,7 +758,7 @@ u8 func1005_jon_msgs_meetup[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(19), 0x8154, CHANNEL_4, COLOR_03_RED) // "Use the maintenance hatch I've opened in one of th..." + speak(CHR_BOND, L_TRA_019, 0x8154, CHANNEL_4, COLOR_03_RED) // "Use the maintenance hatch I've opened in one of th..." beginloop(0x09) if_timer_gt(300, /*goto*/ 0x06) @@ -825,7 +825,7 @@ u8 func0402_jonathan_waiting_for_meetup[] = { lock_door(0x0d, 0x20) lock_door(0x33, 0x20) lock_door(0x34, 0x20) - speak(CHR_P1P2, L_TRA(25), 0x12b3, CHANNEL_4, COLOR_03_RED) // "Joanna - over here." + speak(CHR_P1P2, L_TRA_025, 0x12b3, CHANNEL_4, COLOR_03_RED) // "Joanna - over here." label(0x08) restart_timer do_preset_animation(3) @@ -850,7 +850,7 @@ u8 func0402_jonathan_waiting_for_meetup[] = { endloop(0x0a) label(0x06) - speak(CHR_P1P2, L_TRA(26), 0x12b4, CHANNEL_4, COLOR_03_RED) // "We need to get back to our friend." + speak(CHR_P1P2, L_TRA_026, 0x12b4, CHANNEL_4, COLOR_03_RED) // "We need to get back to our friend." set_stage_flag(STAGEFLAG_MET_JON) do_preset_animation(-1) restart_timer @@ -969,7 +969,7 @@ u8 func0404_jonathan_following_and_mine[] = { label(0x0a) unset_self_chrflag(CHRCFLAG_PUSHABLE) set_stage_flag(STAGEFLAG_JON_ENTERED_MINE_ROOM) - speak(CHR_P1P2, L_TRA(27), 0x12b5, CHANNEL_4, COLOR_03_RED) // "Right, we're near. Cover me, Jo..." + speak(CHR_P1P2, L_TRA_027, 0x12b5, CHANNEL_4, COLOR_03_RED) // "Right, we're near. Cover me, Jo..." set_shotlist(AILIST_JONATHAN_SHOT_WHILE_PLANTING) label(0x0b) jog_to_pad(0x038b) @@ -1024,7 +1024,7 @@ u8 func0404_jonathan_following_and_mine[] = { set_stage_flag(STAGEFLAG_JON_FINISHED_EXPLOSIVES) unset_stage_flag(STAGEFLAG_JON_SHOT_WHILE_PLANTING) set_self_chrflag(CHRCFLAG_PUSHABLE) - speak(CHR_P1P2, L_TRA(28), 0x12b6, CHANNEL_4, COLOR_03_RED) // "Okay - stand back." + speak(CHR_P1P2, L_TRA_028, 0x12b6, CHANNEL_4, COLOR_03_RED) // "Okay - stand back." run_to_pad(0x0140) beginloop(0x0f) @@ -1040,7 +1040,7 @@ u8 func0404_jonathan_following_and_mine[] = { label(0x06) unlock_door(0x0a, 0x02) - speak(CHR_P1P2, L_TRA(32), 0x12b7, CHANNEL_4, COLOR_03_RED) // "Okay, Jo - let's go." + speak(CHR_P1P2, L_TRA_032, 0x12b7, CHANNEL_4, COLOR_03_RED) // "Okay, Jo - let's go." restart_timer beginloop(0x11) @@ -1120,7 +1120,7 @@ u8 func0413_jonathan_hangar[] = { if_chr_knockedout(CHR_ELVIS, /*goto*/ 0xc3) restart_timer chr_do_animation(0x0232, -1, 200, 0x02, 0x00, CHR_ELVIS, 2) - speak(CHR_P1P2, L_TRA(59), 0x1a9a, CHANNEL_5, COLOR_06_WHITE) // "Oh, no! We have a problem. It's a single seater!" + speak(CHR_P1P2, L_TRA_059, 0x1a9a, CHANNEL_5, COLOR_06_WHITE) // "Oh, no! We have a problem. It's a single seater!" beginloop(0x7d) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1136,7 +1136,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer chr_do_animation(0x0233, -1, 200, 0x02, 0x00, CHR_ELVIS, 2) - speak(CHR_P1P2, L_TRA(60), 0x1a9b, CHANNEL_5, COLOR_06_WHITE) // "Two can get in but no more." + speak(CHR_P1P2, L_TRA_060, 0x1a9b, CHANNEL_5, COLOR_06_WHITE) // "Two can get in but no more." beginloop(0x7e) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1151,7 +1151,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(41), 0x72a7, CHANNEL_5, COLOR_09_BLUE) // "It's the only way out of here." + speak(CHR_BOND, L_TRA_041, 0x72a7, CHANNEL_5, COLOR_09_BLUE) // "It's the only way out of here." beginloop(0x15) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1167,7 +1167,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer chr_do_animation(0x0232, -1, 200, 0x02, 0x00, CHR_ELVIS, 2) - speak(CHR_P1P2, L_TRA(61), 0x1a9c, CHANNEL_5, COLOR_06_WHITE) // "Plus, it's got no style, you know what I'm saying?" + speak(CHR_P1P2, L_TRA_061, 0x1a9c, CHANNEL_5, COLOR_06_WHITE) // "Plus, it's got no style, you know what I'm saying?" beginloop(0x7f) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1182,7 +1182,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(42), 0x72a8, CHANNEL_5, COLOR_09_BLUE) // "You're the only one who can fly it, Elvis, so get ..." + speak(CHR_BOND, L_TRA_042, 0x72a8, CHANNEL_5, COLOR_09_BLUE) // "You're the only one who can fly it, Elvis, so get ..." beginloop(0x17) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1198,7 +1198,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer chr_do_animation(0x0231, -1, 200, 0x02, 0x00, CHR_JONATHAN, 2) - speak(CHR_P1P2, L_TRA(45), 0x12b9, CHANNEL_5, COLOR_03_RED) // "One of us will have to stay behind and open the ha..." + speak(CHR_P1P2, L_TRA_045, 0x12b9, CHANNEL_5, COLOR_03_RED) // "One of us will have to stay behind and open the ha..." beginloop(0x1a) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1213,7 +1213,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(43), 0x72a9, CHANNEL_5, COLOR_09_BLUE) // "But we can't leave you behind." + speak(CHR_BOND, L_TRA_043, 0x72a9, CHANNEL_5, COLOR_09_BLUE) // "But we can't leave you behind." beginloop(0x18) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1228,7 +1228,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - speak(CHR_BOND, L_TRA(44), 0x72aa, CHANNEL_5, COLOR_09_BLUE) // "There must be a way out of here." + speak(CHR_BOND, L_TRA_044, 0x72aa, CHANNEL_5, COLOR_09_BLUE) // "There must be a way out of here." beginloop(0x19) if_chr_death_animation_finished(CHR_ELVIS, /*goto*/ 0xc3) @@ -1244,7 +1244,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer chr_do_animation(0x0232, -1, 200, 0x02, 0x00, CHR_JONATHAN, 2) - speak(CHR_P1P2, L_TRA(46), 0x12ba, CHANNEL_5, COLOR_03_RED) // "I'll get out on that hoverbike. Cover me while I o..." + speak(CHR_P1P2, L_TRA_046, 0x12ba, CHANNEL_5, COLOR_03_RED) // "I'll get out on that hoverbike. Cover me while I o..." beginloop(0x1b) if_timer_gt(120, /*goto*/ 0x66) @@ -1300,7 +1300,7 @@ u8 func0413_jonathan_hangar[] = { open_door(0x2d) set_object_flag(0x2c, OBJFLAG_DOOR_KEEPOPEN) set_object_flag(0x2d, OBJFLAG_DOOR_KEEPOPEN) - show_hudmsg(CHR_P1P2, L_TRA(39)) // "Inner hangar door is opening." + show_hudmsg(CHR_P1P2, L_TRA_039) // "Inner hangar door is opening." label(0x32) set_self_flag_bankx(CHRFLAG0_00004000, BANK_0) @@ -1326,7 +1326,7 @@ u8 func0413_jonathan_hangar[] = { open_door(0x2f) set_object_flag(0x2e, OBJFLAG_DOOR_KEEPOPEN) set_object_flag(0x2f, OBJFLAG_DOOR_KEEPOPEN) - show_hudmsg(CHR_P1P2, L_TRA(37)) // "Outer hangar door is opening." + show_hudmsg(CHR_P1P2, L_TRA_037) // "Outer hangar door is opening." beginloop(0x20) set_ailist(CHR_SELF, AILIST_JONATHAN_AFTER_TERMINALS) @@ -1334,7 +1334,7 @@ u8 func0413_jonathan_hangar[] = { // Jo taking over label(0x59) - speak(CHR_BOND, L_TRA(47), 0x72ac, CHANNEL_5, COLOR_09_BLUE) // "Jonathan, go with Elvis. I'll see to the consoles." + speak(CHR_BOND, L_TRA_047, 0x72ac, CHANNEL_5, COLOR_09_BLUE) // "Jonathan, go with Elvis. I'll see to the consoles." restart_timer try_face_entity(ENTITYTYPE_TARGET, 0, /*goto*/ 0x46) @@ -1444,7 +1444,7 @@ u8 func0405_jonathan_shot_while_planting[] = { if_self_flag_bankx_eq(CHRFLAG0_SAID_INJURY_QUIP, TRUE, BANK_0, /*goto*/ 0x06) if_num_times_shot_lt(1, /*goto*/ 0x06) if_timer_lt(20, /*goto*/ 0x06) - speak(CHR_P1P2, L_TRA(51), 0x8155, CHANNEL_5, COLOR_03_RED) // "Damn it, Joanna... cover me!" + speak(CHR_P1P2, L_TRA_051, 0x8155, CHANNEL_5, COLOR_03_RED) // "Damn it, Joanna... cover me!" set_self_flag_bankx(CHRFLAG0_SAID_INJURY_QUIP, BANK_0) label(0x06) if_chr_stopped(/*goto*/ 0x63) @@ -1872,7 +1872,7 @@ u8 func100a_check_hangar_accessed[] = { label(0x06) set_stage_flag(STAGEFLAG_ENTERED_HANGAR) - show_hudmsg(CHR_P1P2, L_TRA(31)) // "The secret hangar has been located." + show_hudmsg(CHR_P1P2, L_TRA_031) // "The secret hangar has been located." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -1900,7 +1900,7 @@ u8 func100b_check_jonathan_dead[] = { label(0x06) if_stage_flag_eq(STAGEFLAG_STARTED_OUTRO, TRUE, /*goto*/ 0x32) - show_hudmsg(CHR_BOND, L_TRA(29)) // "Jonathan has been killed." + show_hudmsg(CHR_BOND, L_TRA_029) // "Jonathan has been killed." set_stage_flag(STAGEFLAG_JON_DEAD) label(0x32) @@ -1925,7 +1925,7 @@ u8 func100c_medpack_activation[] = { label(0x32) set_stage_flag(STAGEFLAG_MEDPACK_STARTED) - show_hudmsg(CHR_P1P2, L_TRA(33)) // "Alien medpack activated." + show_hudmsg(CHR_P1P2, L_TRA_033) // "Alien medpack activated." assign_sound(0x814c, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_HOVERBED, TRUE) restart_timer @@ -1948,7 +1948,7 @@ u8 func100c_medpack_activation[] = { mute_channel(CHANNEL_7) assign_sound(0x814e, CHANNEL_7) control_sound_from_object(CHANNEL_7, 0x00, TRUE) - show_hudmsg(CHR_P1P2, L_TRA(35)) // "Alien medpack has been administered." + show_hudmsg(CHR_P1P2, L_TRA_035) // "Alien medpack has been administered." yield beginloop(0x0c) @@ -2054,13 +2054,13 @@ u8 func100f_terminals[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_TERMINAL1, TRUE) if_stage_flag_eq(STAGEFLAG_HANGAR_X_MUSIC_STARTED, TRUE, /*goto*/ 0x32) - show_hudmsg(CHR_P1P2, L_TRA(80)) // "Console is not active." + show_hudmsg(CHR_P1P2, L_TRA_080) // "Console is not active." goto_next(0x0f) // Terminal 1 active label(0x32) if_stage_flag_eq(STAGEFLAG_INNER_DOOR_OPENING, TRUE, /*goto*/ 0x0f) - show_hudmsg(CHR_P1P2, L_TRA(39)) // "Inner hangar door is opening." + show_hudmsg(CHR_P1P2, L_TRA_039) // "Inner hangar door is opening." if_stage_flag_eq(STAGEFLAG_HANGAR_X_MUSIC_STARTED, FALSE, /*goto*/ 0x32) set_stage_flag(STAGEFLAG_INNER_DOOR_OPENING) label(0x32) @@ -2075,13 +2075,13 @@ u8 func100f_terminals[] = { assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_TERMINAL2, TRUE) if_stage_flag_eq(STAGEFLAG_HANGAR_X_MUSIC_STARTED, TRUE, /*goto*/ 0x32) - show_hudmsg(CHR_P1P2, L_TRA(80)) // "Console is not active." + show_hudmsg(CHR_P1P2, L_TRA_080) // "Console is not active." goto_next(0x0f) // Terminal 2 active label(0x32) if_stage_flag_eq(STAGEFLAG_OUTER_DOOR_OPENING, TRUE, /*goto*/ 0x0f) - show_hudmsg(CHR_P1P2, L_TRA(37)) // "Outer hangar door is opening." + show_hudmsg(CHR_P1P2, L_TRA_037) // "Outer hangar door is opening." if_stage_flag_eq(STAGEFLAG_HANGAR_X_MUSIC_STARTED, FALSE, /*goto*/ 0x32) set_stage_flag(STAGEFLAG_OUTER_DOOR_OPENING) label(0x32) @@ -2122,7 +2122,7 @@ u8 func100d_check_terminals_destroyed[] = { endloop(0x04) label(0x08) - show_hudmsg(CHR_BOND, L_TRA(36)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_TRA_036) // "Mission critical object destroyed." set_stage_flag(STAGEFLAG_HANGAR_TERMINAL_DESTROYED) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2138,7 +2138,7 @@ u8 func100e_check_elvis_dead[] = { label(0x06) if_stage_flag_eq(STAGEFLAG_STARTED_OUTRO, TRUE, /*goto*/ 0x32) set_stage_flag(STAGEFLAG_ELVIS_DEAD) - show_hudmsg(CHR_BOND, L_TRA(30)) // "Elvis has been killed." + show_hudmsg(CHR_BOND, L_TRA_030) // "Elvis has been killed." label(0x32) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2373,7 +2373,7 @@ u8 func1017_check_both_hangar_doors_open[] = { endloop(0x04) label(0x32) - show_hudmsg(CHR_BOND, L_TRA(53)) // "The hangar doors are now open." + show_hudmsg(CHR_BOND, L_TRA_053) // "The hangar doors are now open." set_stage_flag(STAGEFLAG_BOTH_HANGAR_DOORS_OPEN) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -2508,7 +2508,7 @@ u8 func1002_intro[] = { wait_until(2, 0xc5) - speak(CHR_BOND, L_TRA(81), 0x81ba, CHANNEL_7, COLOR_02_WHITE) // "What the hell do you think you're doing? This is s..." + speak(CHR_BOND, L_TRA_081, 0x81ba, CHANNEL_7, COLOR_02_WHITE) // "What the hell do you think you're doing? This is s..." wait_until(60, 0x6a) play_sound(0x0161, CHANNEL_6) @@ -2543,7 +2543,7 @@ u8 func1002_intro[] = { play_sound(0x0161, CHANNEL_6) wait_until(545, 0x8a) - speak(CHR_BOND, L_TRA(84), 0x7758, CHANNEL_7, COLOR_09_BLUE) // "I don't care much for procedures!" + speak(CHR_BOND, L_TRA_084, 0x7758, CHANNEL_7, COLOR_09_BLUE) // "I don't care much for procedures!" wait_until(588, 0x74) play_sound(0x0162, CHANNEL_5) @@ -2557,7 +2557,7 @@ u8 func1002_intro[] = { wait_until(706, 0x77) wait_until(770, 0xc6) - speak(CHR_BOND, L_TRA(82), 0x7436, CHANNEL_7, COLOR_02_WHITE) // "Director Easton will hear about this, young lady." + speak(CHR_BOND, L_TRA_082, 0x7436, CHANNEL_7, COLOR_02_WHITE) // "Director Easton will hear about this, young lady." wait_until(810, 0xbe) close_door(0x0e) @@ -2570,7 +2570,7 @@ u8 func1002_intro[] = { play_sound(0x0162, CHANNEL_4) wait_until(998, 0xc7) - speak(CHR_BOND, L_TRA(83), 0x7437, CHANNEL_7, COLOR_02_WHITE) // "You can't take that! It's government property! Thi..." + speak(CHR_BOND, L_TRA_083, 0x7437, CHANNEL_7, COLOR_02_WHITE) // "You can't take that! It's government property! Thi..." wait_until(1032, 0x7b) play_sound(0x0161, CHANNEL_5) @@ -2633,7 +2633,7 @@ u8 func1002_intro[] = { play_sound(0x00fa, CHANNEL_10) wait_until(1736, 0x96) - speak(CHR_BOND, L_TRA(63), 0x7438, CHANNEL_7, COLOR_02_WHITE) // "Let's see how that overconfident thief deals with ..." + speak(CHR_BOND, L_TRA_063, 0x7438, CHANNEL_7, COLOR_02_WHITE) // "Let's see how that overconfident thief deals with ..." set_stage_flag(STAGEFLAG_GAS_ON) wait_until(1773, 0x9a) @@ -2664,7 +2664,7 @@ u8 func1002_intro[] = { play_sound(0x0161, CHANNEL_6) wait_until(2218, 0xa8) - speak(CHR_BOND, L_TRA(64), 0x7439, CHANNEL_7, COLOR_09_BLUE) // "What's that noise? Can't be... Gas!" + speak(CHR_BOND, L_TRA_064, 0x7439, CHANNEL_7, COLOR_09_BLUE) // "What's that noise? Can't be... Gas!" wait_until(2271, 0xa9) play_sound(0x0162, CHANNEL_6) @@ -2685,7 +2685,7 @@ u8 func1002_intro[] = { play_sound(0x0161, CHANNEL_6) wait_until(2582, 0xaf) - speak(CHR_BOND, L_TRA(65), 0x743a, CHANNEL_7, COLOR_02_WHITE) // "Noooo, that wasn't meant to happen!" + speak(CHR_BOND, L_TRA_065, 0x743a, CHANNEL_7, COLOR_02_WHITE) // "Noooo, that wasn't meant to happen!" wait_until(2725, 0xb1) play_sound(0x0429, CHANNEL_10) @@ -2737,7 +2737,7 @@ u8 func1002_intro[] = { play_sound(0x00fa, CHANNEL_10) wait_until(3894, 0xba) - speak(CHR_BOND, L_TRA(67), 0x743b, CHANNEL_7, COLOR_09_BLUE) // "You idiot! We'd better get out of here." + speak(CHR_BOND, L_TRA_067, 0x743b, CHANNEL_7, COLOR_09_BLUE) // "You idiot! We'd better get out of here." wait_until(4146, 0xbb) play_sound(0x0162, CHANNEL_6) @@ -2854,7 +2854,7 @@ u8 func0c01_midcutscene[] = { set_cutscene_weapon(CHR_TARGET, WEAPON_NONE, WEAPON_NONE) wait_until(83, 0x6a) - speak(CHR_TARGET, L_TRA(69), 0x743c, CHANNEL_7, COLOR_06_WHITE) // "***aahh...! aahaa...! aaaaahhh! aha. ahh.***" + speak(CHR_TARGET, L_TRA_069, 0x743c, CHANNEL_7, COLOR_06_WHITE) // "***aahh...! aahaa...! aaaaahhh! aha. ahh.***" wait_until(116, 0x6b) play_sound(0x80c4, CHANNEL_6) @@ -2878,22 +2878,22 @@ u8 func0c01_midcutscene[] = { play_sound(0x80c5, CHANNEL_6) wait_until(690, 0x72) - speak(CHR_TARGET, L_TRA(70), 0x743d, CHANNEL_7, COLOR_06_WHITE) // "I'm alive. I thought I'd be chopped up like the ot..." + speak(CHR_TARGET, L_TRA_070, 0x743d, CHANNEL_7, COLOR_06_WHITE) // "I'm alive. I thought I'd be chopped up like the ot..." wait_until(1392, 0x73) - speak(CHR_TARGET, L_TRA(71), 0x743e, CHANNEL_7, COLOR_09_BLUE) // "You... You speak our language?" + speak(CHR_TARGET, L_TRA_071, 0x743e, CHANNEL_7, COLOR_09_BLUE) // "You... You speak our language?" wait_until(1400, 0x74) play_sound(0x80c4, CHANNEL_6) wait_until(1554, 0x75) - speak(CHR_TARGET, L_TRA(72), 0x743f, CHANNEL_7, COLOR_03_RED) // "Watch her... she's sharp." + speak(CHR_TARGET, L_TRA_072, 0x743f, CHANNEL_7, COLOR_03_RED) // "Watch her... she's sharp." wait_until(1688, 0x76) - speak(CHR_TARGET, L_TRA(73), 0x7440, CHANNEL_7, COLOR_06_WHITE) // "Earrggghh...eerggh..." + speak(CHR_TARGET, L_TRA_073, 0x7440, CHANNEL_7, COLOR_06_WHITE) // "Earrggghh...eerggh..." wait_until(1962, 0x77) - speak(CHR_TARGET, L_TRA(74), 0x7441, CHANNEL_7, COLOR_09_BLUE) // "What's wrong?" + speak(CHR_TARGET, L_TRA_074, 0x7441, CHANNEL_7, COLOR_09_BLUE) // "What's wrong?" wait_until(1988, 0x78) play_sound(0x80c5, CHANNEL_6) @@ -2902,10 +2902,10 @@ u8 func0c01_midcutscene[] = { play_sound(0x80c4, CHANNEL_4) wait_until(2113, 0x7a) - speak(CHR_TARGET, L_TRA(75), 0x7442, CHANNEL_7, COLOR_06_WHITE) // "I have a headache. And with a head this big, that'..." + speak(CHR_TARGET, L_TRA_075, 0x7442, CHANNEL_7, COLOR_06_WHITE) // "I have a headache. And with a head this big, that'..." wait_until(2470, 0x7b) - speak(CHR_TARGET, L_TRA(76), 0x7443, CHANNEL_7, COLOR_09_BLUE) // "Can you walk? We must leave before they get organi..." + speak(CHR_TARGET, L_TRA_076, 0x7443, CHANNEL_7, COLOR_09_BLUE) // "Can you walk? We must leave before they get organi..." wait_until(2480, 0x7c) play_sound(0x80c5, CHANNEL_6) @@ -2938,13 +2938,13 @@ u8 func0c01_midcutscene[] = { play_sound(0x80c5, CHANNEL_4) wait_until(2842, 0x86) - speak(CHR_TARGET, L_TRA(77), 0x7444, CHANNEL_7, COLOR_06_WHITE) // "I think so. What's your name?" + speak(CHR_TARGET, L_TRA_077, 0x7444, CHANNEL_7, COLOR_06_WHITE) // "I think so. What's your name?" wait_until(3024, 0x87) - speak(CHR_TARGET, L_TRA(78), 0x7445, CHANNEL_7, COLOR_09_BLUE) // "I'm Agent Dark. Or Joanna, if you prefer." + speak(CHR_TARGET, L_TRA_078, 0x7445, CHANNEL_7, COLOR_09_BLUE) // "I'm Agent Dark. Or Joanna, if you prefer." wait_until(3270, 0x88) - speak(CHR_TARGET, L_TRA(79), 0x7446, CHANNEL_7, COLOR_06_WHITE) // "Well, Joanna, I'm Protector One. But you can call ..." + speak(CHR_TARGET, L_TRA_079, 0x7446, CHANNEL_7, COLOR_06_WHITE) // "Well, Joanna, I'm Protector One. But you can call ..." wait_until(3308, 0x89) play_sound(0x80c6, CHANNEL_6) @@ -3306,7 +3306,7 @@ u8 func101a_medpack_switch[] = { if_object_in_good_condition(OBJ_MEDPACK_SWITCH, /*goto*/ 0x32) if_difficulty_lt(DIFF_PA, /*goto*/ 0x06) set_stage_flag(STAGEFLAG_MEDPACK_SWITCH_DESTROYED) - show_hudmsg(CHR_BOND, L_TRA(36)) // "Mission critical object destroyed." + show_hudmsg(CHR_BOND, L_TRA_036) // "Mission critical object destroyed." label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -3317,7 +3317,7 @@ u8 func101a_medpack_switch[] = { label(0x32) assign_sound(0x043a, CHANNEL_7) control_sound_from_object(CHANNEL_7, OBJ_MEDPACK_SWITCH, TRUE) - show_hudmsg(CHR_P1P2, L_TRA(54)) // "Medical containment doors unlocked." + show_hudmsg(CHR_P1P2, L_TRA_054) // "Medical containment doors unlocked." unlock_door(0x12, 0x40) unlock_door(0x13, 0x40) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -3379,7 +3379,7 @@ u8 func101d_msg_medpackaroundhere[] = { endloop(0x6a) label(0x32) - speak(CHR_P1P2, L_TRA(55), 0x73c0, CHANNEL_6, COLOR_09_BLUE) // "The medpack's got to be somewhere around here." + speak(CHR_P1P2, L_TRA_055, 0x73c0, CHANNEL_6, COLOR_09_BLUE) // "The medpack's got to be somewhere around here." label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -3398,7 +3398,7 @@ u8 func101e_msg_hookup[] = { endloop(0x6a) label(0x32) - speak(CHR_BOND, L_TRA(56), 0x73c1, CHANNEL_6, COLOR_09_BLUE) // "Time to hook up with Jonathan, before he gets into..." + speak(CHR_BOND, L_TRA_056, 0x73c1, CHANNEL_6, COLOR_09_BLUE) // "Time to hook up with Jonathan, before he gets into..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3423,7 +3423,7 @@ u8 func101f_msg_oil[] = { endloop(0x6a) label(0x32) - speak(CHR_P1P2, L_TRA(57), 0x73c2, CHANNEL_6, COLOR_09_BLUE) // "That smell... oil... I smelt that in the other han..." + speak(CHR_P1P2, L_TRA_057, 0x73c2, CHANNEL_6, COLOR_09_BLUE) // "That smell... oil... I smelt that in the other han..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3440,7 +3440,7 @@ u8 func1020_msg_jetbike[] = { endloop(0x6a) label(0x32) - speak(CHR_BOND, L_TRA(58), 0x73c3, CHANNEL_6, COLOR_09_BLUE) // "The jetbike should get me out before they lock the..." + speak(CHR_BOND, L_TRA_058, 0x73c3, CHANNEL_6, COLOR_09_BLUE) // "The jetbike should get me out before they lock the..." set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/assets/files/setup/setupwax.c b/src/assets/files/setup/setupwax.c index efc34a90e..8ec567367 100644 --- a/src/assets/files/setup/setupwax.c +++ b/src/assets/files/setup/setupwax.c @@ -60,22 +60,22 @@ struct stagesetup setup = { }; u32 props[] = { - briefing(BRIEFINGTYPE_LOCATION, L_WAX(1)) - briefing(BRIEFINGTYPE_TEXT_PA, L_WAX(0)) - briefing(BRIEFINGTYPE_TEXT_SA, L_WAX(2)) - briefing(BRIEFINGTYPE_TEXT_A, L_WAX(3)) + briefing(BRIEFINGTYPE_LOCATION, L_WAX_001) + briefing(BRIEFINGTYPE_TEXT_PA, L_WAX_000) + briefing(BRIEFINGTYPE_TEXT_SA, L_WAX_002) + briefing(BRIEFINGTYPE_TEXT_A, L_WAX_003) - beginobjective(0, L_WAX(5), (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Plant explosive device in lab lift" + beginobjective(0, L_WAX_005, (DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Plant explosive device in lab lift" complete_flags(STAGEFLAG_BOMB_PLANTED) fail_flags(STAGEFLAG_BOMB_EXPIRED) fail_flags(STAGEFLAG_BOMB_UNPLANTABLE) endobjective - beginobjective(1, L_WAX(6), (DIFFBIT_PA | DIFFBIT_PD)) // "Eliminate dataDyne Captain" + beginobjective(1, L_WAX_006, (DIFFBIT_PA | DIFFBIT_PD)) // "Eliminate dataDyne Captain" complete_flags(STAGEFLAG_CHIEF_DEAD) endobjective - beginobjective(2, L_WAX(4), (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate and escort Cassandra to helipad" + beginobjective(2, L_WAX_004, (DIFFBIT_A | DIFFBIT_SA | DIFFBIT_PA | DIFFBIT_PD)) // "Locate and escort Cassandra to helipad" complete_flags(STAGEFLAG_CASS_CAPTURED) fail_flags(STAGEFLAG_CASS_DEAD) endobjective @@ -521,10 +521,10 @@ u32 props[] = { tinted_glass(0x0100, MODEL_DD_WINDOW, 0x0120, 0x14000b63, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x04b007d0, 0x0000ffff, 0x00000000) tag(0x52, 1) stdobject(0x0100, MODEL_SKEDARBOMB, 0x0011, 0x013004e1, 0x00084000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x3c, L_WAX(17), L_WAX(18), L_WAX(19), L_WAX(20), L_WAX(21), 0x0000, 0x0000) // "" + rename_object(-1, 0x3c, L_WAX_017, L_WAX_018, L_WAX_019, L_WAX_020, L_WAX_021, 0x0000, 0x0000) // "" tag(0x53, 1) stdobject(0x0100, MODEL_SKEDARBOMB, 0x0011, 0x013004e1, 0x00084000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) - rename_object(-1, 0x3c, L_WAX(17), L_WAX(18), L_WAX(19), L_WAX(20), L_WAX(21), 0x0000, 0x0000) // "" + rename_object(-1, 0x3c, L_WAX_017, L_WAX_018, L_WAX_019, L_WAX_020, L_WAX_021, 0x0000, 0x0000) // "" tag(0x54, 1) stdobject(0x0100, MODEL_SKEDARBOMB, 0x0257, 0x000200e3, 0x00080001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000) tag(0x41, 1) @@ -1280,7 +1280,7 @@ u8 func0411_cass_in_office[] = { set_stage_flag(STAGEFLAG_TRIGGER_YWSM) set_shotlist(AILIST_CASS_RUNNING) restart_timer - speak(CHR_TARGET, L_WAX(8), 0x0d23, CHANNEL_6, COLOR_06_WHITE) // "Go to the helipad if you want to live." + speak(CHR_TARGET, L_WAX_008, 0x0d23, CHANNEL_6, COLOR_06_WHITE) // "Go to the helipad if you want to live." chr_do_animation(0x0226, -1, -1, 0x10, 0x10, CHR_SELF, 2) yield @@ -1329,7 +1329,7 @@ u8 func0411_cass_in_office[] = { chr_do_animation(0x0245, 0, -1, 0x10, 0x10, CHR_SELF, 2) try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x2c) label(0x2c) - speak(CHR_TARGET, L_WAX(7), 0x81a3, CHANNEL_6, COLOR_04_ORANGE) // "Get the hell out of my office..." + speak(CHR_TARGET, L_WAX_007, 0x81a3, CHANNEL_6, COLOR_04_ORANGE) // "Get the hell out of my office..." beginloop(0x58) if_sound_finished(CHANNEL_6, /*goto*/ 0x2c) @@ -1468,7 +1468,7 @@ u8 func1004_check_cass_dead[] = { endloop(0x03) label(0x2c) - show_hudmsg(CHR_BOND, L_WAX(14)) // "Cassandra has been immobilized." + show_hudmsg(CHR_BOND, L_WAX_014) // "Cassandra has been immobilized." set_stage_flag(STAGEFLAG_CASS_DEAD) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1481,7 +1481,7 @@ u8 func1005_check_cass_captured[] = { if_chr_dead(CHR_CASS, /*goto*/ 0x0d) if_chr_knockedout(CHR_CASS, /*goto*/ 0x0d) if_chr_y(CHR_CASS, 0, OPERATOR_LESS_THAN, /*goto*/ 0x2c) - show_hudmsg(CHR_BOND, L_WAX(15)) // "Cassandra has been captured successfully." + show_hudmsg(CHR_BOND, L_WAX_015) // "Cassandra has been captured successfully." set_stage_flag(STAGEFLAG_CASS_CAPTURED) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -1524,7 +1524,7 @@ u8 func1006_lift_disabling[] = { unset_object_flag(OBJ_CHIEF_LIFT, OBJFLAG_DEACTIVATED) unset_chr_chrflag(CHR_CHIEF, CHRCFLAG_HIDDEN) set_ailist(CHR_CHIEF, AILIST_CHIEF) - show_hudmsg(CHR_BOND, L_WAX(25)) // "Lift has been disabled." + show_hudmsg(CHR_BOND, L_WAX_025) // "Lift has been disabled." // Wait until chief dead beginloop(0x08) @@ -1534,7 +1534,7 @@ u8 func1006_lift_disabling[] = { endloop(0x08) label(0x2c) - show_hudmsg(CHR_BOND, L_WAX(16)) // "Security chief has been eliminated." + show_hudmsg(CHR_BOND, L_WAX_016) // "Security chief has been eliminated." set_stage_flag(STAGEFLAG_CHIEF_DEAD) restart_timer @@ -1650,7 +1650,7 @@ u8 func1007_bomb_logic[] = { // Plant bomb label(0x2c) - show_hudmsg(CHR_BOND, L_WAX(22)) // "Skedar bomb has been placed successfully." + show_hudmsg(CHR_BOND, L_WAX_022) // "Skedar bomb has been placed successfully." remove_weapon_from_inventory(WEAPON_SKEDARBOMB) set_stage_flag(STAGEFLAG_BOMB_PLANTED) hide_object(OBJ_BOND_BOMB) @@ -1682,7 +1682,7 @@ u8 func1007_bomb_logic[] = { set_countdown_timer(0) stop_countdown_timer set_stage_flag(STAGEFLAG_BOMB_EXPIRED) - show_hudmsg(CHR_BOND, L_WAX(23)) // "Skedar bomb has detonated." + show_hudmsg(CHR_BOND, L_WAX_023) // "Skedar bomb has detonated." // Wait 2 seconds restart_timer @@ -1745,7 +1745,7 @@ u8 func1008_check_bomb_unplantable[] = { // Fail mission label(0x2c) - show_hudmsg(CHR_BOND, L_WAX(24)) // "Lift doors locked - bomb cannot be placed." + show_hudmsg(CHR_BOND, L_WAX_024) // "Lift doors locked - bomb cannot be placed." set_stage_flag(STAGEFLAG_BOMB_UNPLANTABLE) // Difficulty is agent or bomb has been planted - return @@ -2065,7 +2065,7 @@ u8 func100e_cass_speech[] = { // Speak label(0x2c) restart_timer - speak(CHR_CASS, L_WAX(13), 0x6af5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me!" + speak(CHR_CASS, L_WAX_013, 0x6af5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me!" chr_do_animation(0x00a0, 0, 193, 0x18, 0x10, CHR_SELF, 2) beginloop(0x09) diff --git a/src/assets/firingrange.c b/src/assets/firingrange.c index d93578ca4..7c2be3868 100644 --- a/src/assets/firingrange.c +++ b/src/assets/firingrange.c @@ -1,30 +1,32 @@ #include #include "constants.h" #include "firingrange/frcommands.h" +#include "gvars/gvars.h" +#include "types.h" #if NTSC u16 texts[] = { - /*0*/ L_MISC(281), // "FIRING\n Press Z Button to fire gun.\n" - /*1*/ L_MISC(282), // "AUTO RELOAD\n Release Z Button when out of ammo.\n" - /*2*/ L_MISC(283), // "MANUAL RELOAD\n Press B Button to reload early if magazine not full.\n" - /*3*/ L_MISC(284), // "Aiming: Hold down R Button to enter Aim mode.\n" - /*4*/ L_MISC(285), // "Use Control Stick to move aiming sight.\n" - /*5*/ L_MISC(286), // "AUTO FIRE\n Hold Z Button to repeatedly fire automatically.\n" - /*6*/ L_MISC(287), // "ALTER AIM\n Press Up C Button or Down C Button to move sight up/down.\n" - /*7*/ L_MISC(288), // "ZOOM\n Hold R Button to enter Zoom mode.\n" - /*8*/ L_MISC(289), // "FAST FIRE\n Press Z Button quickly to fire faster.\n" + /*0*/ L_MISC_281, // "FIRING\n Press Z Button to fire gun.\n" + /*1*/ L_MISC_282, // "AUTO RELOAD\n Release Z Button when out of ammo.\n" + /*2*/ L_MISC_283, // "MANUAL RELOAD\n Press B Button to reload early if magazine not full.\n" + /*3*/ L_MISC_284, // "Aiming: Hold down R Button to enter Aim mode.\n" + /*4*/ L_MISC_285, // "Use Control Stick to move aiming sight.\n" + /*5*/ L_MISC_286, // "AUTO FIRE\n Hold Z Button to repeatedly fire automatically.\n" + /*6*/ L_MISC_287, // "ALTER AIM\n Press Up C Button or Down C Button to move sight up/down.\n" + /*7*/ L_MISC_288, // "ZOOM\n Hold R Button to enter Zoom mode.\n" + /*8*/ L_MISC_289, // "FAST FIRE\n Press Z Button quickly to fire faster.\n" }; #else u16 texts[] = { - /*0*/ L_DISH(187), - /*1*/ L_DISH(188), - /*2*/ L_DISH(189), - /*3*/ L_DISH(190), - /*4*/ L_DISH(191), - /*5*/ L_DISH(192), - /*6*/ L_DISH(193), - /*7*/ L_DISH(194), - /*8*/ L_DISH(195), + /*0*/ L_DISH_187, + /*1*/ L_DISH_188, + /*2*/ L_DISH_189, + /*3*/ L_DISH_190, + /*4*/ L_DISH_191, + /*5*/ L_DISH_192, + /*6*/ L_DISH_193, + /*7*/ L_DISH_194, + /*8*/ L_DISH_195, }; #endif diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index 7707fa67a..4aa53e847 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -530,7 +530,7 @@ struct menuitem g_AmPickTargetMenuItems[] = { struct menudialog g_AmPickTargetMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(492), // "Pick Target" + L_OPTIONS_492, // "Pick Target" g_AmPickTargetMenuItems, amPickTargetMenuDialog, 0x00000000, @@ -717,7 +717,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) switch (g_AmMenus[g_AmIndex].screenindex) { case 0: // Weapon screen if (slot == 4) { - strcpy(label, langGet(L_MISC(170))); // "Weapon" + strcpy(label, langGet(L_MISC_170)); // "Weapon" return; } @@ -737,7 +737,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) qty = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_CLOAK); secs = qty / 60; modulo = (qty - (secs * 60)) * 100 / 60; - sprintf(label, langGet(L_OPTIONS(491)), secs + (modulo > 0 ? 1 : 0)); // "cloak %d" + sprintf(label, langGet(L_OPTIONS_491), secs + (modulo > 0 ? 1 : 0)); // "cloak %d" } else { strcpy(label, invGetShortNameByIndex(g_AmMenus[g_AmIndex].invindexes[slot])); } @@ -759,7 +759,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) strcpy(label, ""); if (slot == 4) { - strcpy(label, langGet(L_MISC(171))); // "Function" + strcpy(label, langGet(L_MISC_171)); // "Function" } else if (slot == 1 || slot == 7) { prifunc = weaponGetFunction(&g_Vars.currentplayer->hands[HAND_RIGHT].base, FUNC_PRIMARY); secfunc = weaponGetFunction(&g_Vars.currentplayer->hands[HAND_RIGHT].base, FUNC_SECONDARY); @@ -794,17 +794,17 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) if (g_MissionConfig.iscoop) { if (slot == 4) { - strcpy(label, langGet(L_MISC(474))); // "Perfect Buddies" + strcpy(label, langGet(L_MISC_474)); // "Perfect Buddies" } else if (slot == 1) { - strcpy(label, langGet(L_MISC(472))); // "Aggressive" + strcpy(label, langGet(L_MISC_472)); // "Aggressive" } else if (slot == 7) { - strcpy(label, langGet(L_MISC(473))); // "Passive" + strcpy(label, langGet(L_MISC_473)); // "Passive" } else if (slot == 3) { - strcpy(label, langGet(L_MISC(475))); // "Stealth" + strcpy(label, langGet(L_MISC_475)); // "Stealth" } } else { if (slot == 4) { - strcpy(label, langGet(L_MISC(172))); // "Orders" + strcpy(label, langGet(L_MISC_172)); // "Orders" } else { strcpy(label, mpGetBotCommandName(g_AmBotCommands[slot])); } @@ -1172,7 +1172,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) } if (weaponnum < WEAPON_FALCON2 || weaponnum > WEAPON_HORIZONSCANNER) { - weaponname = langGet(L_MISC(173)); // "No Weapon" + weaponname = langGet(L_MISC_173); // "No Weapon" } else { weaponname = weaponGetShortName(weaponnum); } @@ -1214,7 +1214,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) g_Vars.currentplayer->commandingaibot = g_MpPlayerChrs[buddynum]; } else { - char *title = langGet(L_MISC(215)); // "All Simulants" + char *title = langGet(L_MISC_215); // "All Simulants" textMeasure(&textheight, &textwidth, title, g_AmFont1, g_AmFont2, 0); diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 62f81eab0..863c5e367 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -643,7 +643,7 @@ bool eyespyTryLaunch(void) propSetCollisionsEnabled(g_Vars.currentplayer->eyespy->prop, false); // "Not enough room to launch " - sprintf(text, "%s%s", langGet(L_MISC(218)), weaponGetName(WEAPON_EYESPY)); + sprintf(text, "%s%s", langGet(L_MISC_218), weaponGetName(WEAPON_EYESPY)); hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT); launched = false; } else { diff --git a/src/game/bondview.c b/src/game/bondview.c index 0579b7de1..f01166d89 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -10098,7 +10098,7 @@ glabel var7f1b5f58 // // // "S/MPS" // // 437c -// sprintf(text, "%s %s%5.2f", langGet(L_MISC(73)), "", movedist * 0.6f); +// sprintf(text, "%s %s%5.2f", langGet(L_MISC_073), "", movedist * 0.6f); // savedy = viewtop + 14; // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // x = viewleft + 25 * scale; @@ -10111,7 +10111,7 @@ glabel var7f1b5f58 // // // "H/M" // // 44b4 -// sprintf(text, "%s %s%4.2f", langGet(L_MISC(74)), "", g_Vars.currentplayer->eyespy->height * 0.01f); +// sprintf(text, "%s %s%4.2f", langGet(L_MISC_074), "", g_Vars.currentplayer->eyespy->height * 0.01f); // savedy += 9; // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // x = viewleft + 25 * scale; @@ -10124,7 +10124,7 @@ glabel var7f1b5f58 // // // "Y/D" // // 45c8 -// sprintf(text, "%s %d", langGet(L_MISC(75)), (s32)g_Vars.currentplayer->eyespy->theta); +// sprintf(text, "%s %d", langGet(L_MISC_075), (s32)g_Vars.currentplayer->eyespy->theta); // savedy += 9; // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // y = savedy; @@ -10137,7 +10137,7 @@ glabel var7f1b5f58 // // // "P/D" // // 46cc -// sprintf(text, "%s %d", langGet(L_MISC(76)), (s32)g_Vars.currentplayer->eyespy->verta); +// sprintf(text, "%s %d", langGet(L_MISC_076), (s32)g_Vars.currentplayer->eyespy->verta); // savedy += 9; // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // y = savedy; @@ -10150,7 +10150,7 @@ glabel var7f1b5f58 // // // "CI 2023" // // 47d0 -// sprintf(text, "%s", langGet(L_MISC(77))); +// sprintf(text, "%s", langGet(L_MISC_077)); // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // // x = (vsplit ? -3 : 0) + viewleft + 25 * scale + 5; @@ -10163,11 +10163,11 @@ glabel var7f1b5f58 // // // 48f8 // if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { -// sprintf(text, "%s", langGet(L_MISC(78))); // "YKK: 95935" +// sprintf(text, "%s", langGet(L_MISC_078)); // "YKK: 95935" // } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { -// sprintf(text, "%s", langGet(L_MISC(208))); // "JM: 201172" +// sprintf(text, "%s", langGet(L_MISC_208)); // "JM: 201172" // } else { -// sprintf(text, "%s", langGet(L_MISC(217))); // "BNC: 15877" +// sprintf(text, "%s", langGet(L_MISC_217)); // "BNC: 15877" // } // // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); @@ -10184,7 +10184,7 @@ glabel var7f1b5f58 // // 4a8c // if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { // // "CAMSPY" -// sprintf(text, " %s", langGet(L_MISC(79))); +// sprintf(text, " %s", langGet(L_MISC_079)); // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // // x = viewright - scale * 53 - 25; @@ -10197,7 +10197,7 @@ glabel var7f1b5f58 // } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { // // "DRUGSPY" // // 4be4 -// sprintf(text, " %s", langGet(L_MISC(468))); +// sprintf(text, " %s", langGet(L_MISC_468)); // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // // x = viewright - scale * 53 - 25; @@ -10210,7 +10210,7 @@ glabel var7f1b5f58 // } else { // // "BOMBSPY" // // 4d18 -// sprintf(text, " %s", langGet(L_MISC(469))); +// sprintf(text, " %s", langGet(L_MISC_469)); // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); // // x = viewright - scale * 59 - 25; @@ -10225,11 +10225,11 @@ glabel var7f1b5f58 // // 4e3c // // Model number // if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { -// sprintf(text, "%s", langGet(L_MISC(80))); // "MODEL 1.2" +// sprintf(text, "%s", langGet(L_MISC_080)); // "MODEL 1.2" // } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { -// sprintf(text, "%s", langGet(L_MISC(207))); // "MODEL 1.4" +// sprintf(text, "%s", langGet(L_MISC_207)); // "MODEL 1.4" // } else { -// sprintf(text, "%s", langGet(L_MISC(216))); // "MODEL 1.3" +// sprintf(text, "%s", langGet(L_MISC_216)); // "MODEL 1.3" // } // // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); @@ -10245,9 +10245,9 @@ glabel var7f1b5f58 // // Gyrostat/dartammo text // if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY // || g_Vars.currentplayer->eyespy->mode == EYESPYMODE_BOMBSPY) { -// sprintf(text, "%s", langGet(L_MISC(81))); // "GYROSTAT" +// sprintf(text, "%s", langGet(L_MISC_081)); // "GYROSTAT" // } else { -// sprintf(text, "%s", langGet(L_MISC(206))); // "DARTAMMO" +// sprintf(text, "%s", langGet(L_MISC_206)); // "DARTAMMO" // } // // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); diff --git a/src/game/cheats.c b/src/game/cheats.c index 3bb940490..67c259042 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -22,48 +22,48 @@ struct menuitem g_CheatsBuddiesMenuItems[]; struct menudialog g_CheatsBuddiesMenuDialog; struct cheat g_Cheats[NUM_CHEATS] = { - { L_MPWEAPONS(75), 123, SOLOSTAGEINDEX_EXTRACTION, DIFF_A, CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK }, // Hurricane Fists - { L_MPWEAPONS(76), 100, SOLOSTAGEINDEX_G5BUILDING, DIFF_A, CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK }, // Cloaking Device - { L_MPWEAPONS(77), 230, SOLOSTAGEINDEX_ESCAPE, DIFF_A, CHEATFLAG_TIMED }, // Invincible - { L_MPWEAPONS(78), 331, SOLOSTAGEINDEX_SKEDARRUINS, DIFF_PA, CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK }, // All Guns in Solo - { L_MPWEAPONS(79), 427, SOLOSTAGEINDEX_PELAGIC, DIFF_SA, CHEATFLAG_TIMED }, // Unlimited Ammo - { L_MPWEAPONS(80), 191, SOLOSTAGEINDEX_AIRBASE, DIFF_SA, CHEATFLAG_TIMED }, // Unlimited Ammo, No Reloads - { L_MPWEAPONS(81), 0, SOLOSTAGEINDEX_INVESTIGATION, DIFF_A, CHEATFLAG_COMPLETION }, // Slo-mo Single Player - { L_MPWEAPONS(82), 0, SOLOSTAGEINDEX_CHICAGO, DIFF_A, CHEATFLAG_COMPLETION }, // DK Mode - { L_MPWEAPONS(83), 170, SOLOSTAGEINDEX_CRASHSITE, DIFF_A, CHEATFLAG_TIMED }, // Trent's Magnum - { L_MPWEAPONS(84), 447, SOLOSTAGEINDEX_DEEPSEA, DIFF_PA, CHEATFLAG_TIMED }, // FarSight - { L_MPWEAPONS(85), 0, SOLOSTAGEINDEX_G5BUILDING, DIFF_A, CHEATFLAG_COMPLETION }, // Small Jo - { L_MPWEAPONS(86), 0, SOLOSTAGEINDEX_INFILTRATION, DIFF_A, CHEATFLAG_COMPLETION }, // Small Characters - { L_MPWEAPONS(87), 0, SOLOSTAGEINDEX_DEFENSE, DIFF_A, CHEATFLAG_COMPLETION }, // Enemy Shields - { L_MPWEAPONS(88), 0, SOLOSTAGEINDEX_DEEPSEA, DIFF_A, CHEATFLAG_COMPLETION }, // Jo Shield - { L_MPWEAPONS(89), 105, SOLOSTAGEINDEX_DEFENSE, DIFF_A, CHEATFLAG_TIMED }, // Super Shield - { L_MPWEAPONS(90), 0, SOLOSTAGEINDEX_DEFECTION, DIFF_A, CHEATFLAG_COMPLETION }, // Classic Sight - { L_MPWEAPONS(91), 0, SOLOSTAGEINDEX_AIRBASE, DIFF_A, CHEATFLAG_COMPLETION }, // Team Heads Only - { L_MPWEAPONS(92), 479, SOLOSTAGEINDEX_RESCUE, DIFF_PA, CHEATFLAG_TIMED }, // Play as Elvis - { L_MPWEAPONS(93), 0, SOLOSTAGEINDEX_PELAGIC, DIFF_A, CHEATFLAG_COMPLETION }, // Enemy Rockets - { L_MPWEAPONS(94), 235, SOLOSTAGEINDEX_AIRFORCEONE, DIFF_PA, CHEATFLAG_TIMED }, // Unlimited Ammo - Laptop Sentry Gun - { L_MPWEAPONS(95), 90, SOLOSTAGEINDEX_DEFECTION, DIFF_SA, CHEATFLAG_TIMED }, // Marquis of Queensbury Rules - { L_MPWEAPONS(96), 0, SOLOSTAGEINDEX_CRASHSITE, DIFF_A, CHEATFLAG_COMPLETION }, // Perfect Darkness - { L_MPWEAPONS(97), 390, SOLOSTAGEINDEX_INVESTIGATION, DIFF_PA, CHEATFLAG_TIMED }, // Pugilist - { L_MPWEAPONS(98), 300, SOLOSTAGEINDEX_INFILTRATION, DIFF_SA, CHEATFLAG_TIMED }, // Hotshot - { L_MPWEAPONS(99), 150, SOLOSTAGEINDEX_VILLA, DIFF_SA, CHEATFLAG_TIMED }, // Hit and Run - { L_MPWEAPONS(100), 317, SOLOSTAGEINDEX_ATTACKSHIP, DIFF_SA, CHEATFLAG_TIMED }, // Alien - { L_MPWEAPONS(101), 0, SOLOSTAGEINDEX_SKEDARRUINS, DIFF_A, CHEATFLAG_COMPLETION | CHEATFLAG_TRANSFERPAK }, // R-Tracker/Weapon Cache Locations - { L_MPWEAPONS(102), 0, SOLOSTAGEINDEX_EXTRACTION, DIFF_A, CHEATFLAG_COMPLETION }, // Rocket Launcher - { L_MPWEAPONS(103), 0, SOLOSTAGEINDEX_VILLA, DIFF_A, CHEATFLAG_COMPLETION }, // Sniper Rifle - { L_MPWEAPONS(104), 0, SOLOSTAGEINDEX_RESCUE, DIFF_A, CHEATFLAG_COMPLETION }, // X-Ray Scanner - { L_MPWEAPONS(105), 0, SOLOSTAGEINDEX_ESCAPE, DIFF_A, CHEATFLAG_COMPLETION }, // SuperDragon - { L_MPWEAPONS(106), 0, SOLOSTAGEINDEX_AIRFORCEONE, DIFF_A, CHEATFLAG_COMPLETION }, // Laptop Gun - { L_MPWEAPONS(107), 0, SOLOSTAGEINDEX_ATTACKSHIP, DIFF_A, CHEATFLAG_COMPLETION }, // Phoenix - { L_MPWEAPONS(108), 120, SOLOSTAGEINDEX_CHICAGO, DIFF_PA, CHEATFLAG_TIMED }, // Psychosis Gun - { L_MPWEAPONS(109), WEAPON_PP9I, 0, 0, CHEATFLAG_FIRINGRANGE }, // PP9i - { L_MPWEAPONS(110), WEAPON_CC13, 0, 0, CHEATFLAG_FIRINGRANGE }, // CC13 - { L_MPWEAPONS(111), WEAPON_KL01313, 0, 0, CHEATFLAG_FIRINGRANGE }, // KL01313 - { L_MPWEAPONS(112), WEAPON_KF7SPECIAL, 0, 0, CHEATFLAG_FIRINGRANGE }, // KF7 Special - { L_MPWEAPONS(113), WEAPON_ZZT, 0, 0, CHEATFLAG_FIRINGRANGE }, // ZZT (9mm) - { L_MPWEAPONS(114), WEAPON_DMC, 0, 0, CHEATFLAG_FIRINGRANGE }, // DMC - { L_MPWEAPONS(115), WEAPON_AR53, 0, 0, CHEATFLAG_FIRINGRANGE }, // AR53 - { L_MPWEAPONS(116), WEAPON_RCP45, 0, 0, CHEATFLAG_FIRINGRANGE }, // RC-P45 + { L_MPWEAPONS_075, 123, SOLOSTAGEINDEX_EXTRACTION, DIFF_A, CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK }, // Hurricane Fists + { L_MPWEAPONS_076, 100, SOLOSTAGEINDEX_G5BUILDING, DIFF_A, CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK }, // Cloaking Device + { L_MPWEAPONS_077, 230, SOLOSTAGEINDEX_ESCAPE, DIFF_A, CHEATFLAG_TIMED }, // Invincible + { L_MPWEAPONS_078, 331, SOLOSTAGEINDEX_SKEDARRUINS, DIFF_PA, CHEATFLAG_TIMED | CHEATFLAG_TRANSFERPAK }, // All Guns in Solo + { L_MPWEAPONS_079, 427, SOLOSTAGEINDEX_PELAGIC, DIFF_SA, CHEATFLAG_TIMED }, // Unlimited Ammo + { L_MPWEAPONS_080, 191, SOLOSTAGEINDEX_AIRBASE, DIFF_SA, CHEATFLAG_TIMED }, // Unlimited Ammo, No Reloads + { L_MPWEAPONS_081, 0, SOLOSTAGEINDEX_INVESTIGATION, DIFF_A, CHEATFLAG_COMPLETION }, // Slo-mo Single Player + { L_MPWEAPONS_082, 0, SOLOSTAGEINDEX_CHICAGO, DIFF_A, CHEATFLAG_COMPLETION }, // DK Mode + { L_MPWEAPONS_083, 170, SOLOSTAGEINDEX_CRASHSITE, DIFF_A, CHEATFLAG_TIMED }, // Trent's Magnum + { L_MPWEAPONS_084, 447, SOLOSTAGEINDEX_DEEPSEA, DIFF_PA, CHEATFLAG_TIMED }, // FarSight + { L_MPWEAPONS_085, 0, SOLOSTAGEINDEX_G5BUILDING, DIFF_A, CHEATFLAG_COMPLETION }, // Small Jo + { L_MPWEAPONS_086, 0, SOLOSTAGEINDEX_INFILTRATION, DIFF_A, CHEATFLAG_COMPLETION }, // Small Characters + { L_MPWEAPONS_087, 0, SOLOSTAGEINDEX_DEFENSE, DIFF_A, CHEATFLAG_COMPLETION }, // Enemy Shields + { L_MPWEAPONS_088, 0, SOLOSTAGEINDEX_DEEPSEA, DIFF_A, CHEATFLAG_COMPLETION }, // Jo Shield + { L_MPWEAPONS_089, 105, SOLOSTAGEINDEX_DEFENSE, DIFF_A, CHEATFLAG_TIMED }, // Super Shield + { L_MPWEAPONS_090, 0, SOLOSTAGEINDEX_DEFECTION, DIFF_A, CHEATFLAG_COMPLETION }, // Classic Sight + { L_MPWEAPONS_091, 0, SOLOSTAGEINDEX_AIRBASE, DIFF_A, CHEATFLAG_COMPLETION }, // Team Heads Only + { L_MPWEAPONS_092, 479, SOLOSTAGEINDEX_RESCUE, DIFF_PA, CHEATFLAG_TIMED }, // Play as Elvis + { L_MPWEAPONS_093, 0, SOLOSTAGEINDEX_PELAGIC, DIFF_A, CHEATFLAG_COMPLETION }, // Enemy Rockets + { L_MPWEAPONS_094, 235, SOLOSTAGEINDEX_AIRFORCEONE, DIFF_PA, CHEATFLAG_TIMED }, // Unlimited Ammo - Laptop Sentry Gun + { L_MPWEAPONS_095, 90, SOLOSTAGEINDEX_DEFECTION, DIFF_SA, CHEATFLAG_TIMED }, // Marquis of Queensbury Rules + { L_MPWEAPONS_096, 0, SOLOSTAGEINDEX_CRASHSITE, DIFF_A, CHEATFLAG_COMPLETION }, // Perfect Darkness + { L_MPWEAPONS_097, 390, SOLOSTAGEINDEX_INVESTIGATION, DIFF_PA, CHEATFLAG_TIMED }, // Pugilist + { L_MPWEAPONS_098, 300, SOLOSTAGEINDEX_INFILTRATION, DIFF_SA, CHEATFLAG_TIMED }, // Hotshot + { L_MPWEAPONS_099, 150, SOLOSTAGEINDEX_VILLA, DIFF_SA, CHEATFLAG_TIMED }, // Hit and Run + { L_MPWEAPONS_100, 317, SOLOSTAGEINDEX_ATTACKSHIP, DIFF_SA, CHEATFLAG_TIMED }, // Alien + { L_MPWEAPONS_101, 0, SOLOSTAGEINDEX_SKEDARRUINS, DIFF_A, CHEATFLAG_COMPLETION | CHEATFLAG_TRANSFERPAK }, // R-Tracker/Weapon Cache Locations + { L_MPWEAPONS_102, 0, SOLOSTAGEINDEX_EXTRACTION, DIFF_A, CHEATFLAG_COMPLETION }, // Rocket Launcher + { L_MPWEAPONS_103, 0, SOLOSTAGEINDEX_VILLA, DIFF_A, CHEATFLAG_COMPLETION }, // Sniper Rifle + { L_MPWEAPONS_104, 0, SOLOSTAGEINDEX_RESCUE, DIFF_A, CHEATFLAG_COMPLETION }, // X-Ray Scanner + { L_MPWEAPONS_105, 0, SOLOSTAGEINDEX_ESCAPE, DIFF_A, CHEATFLAG_COMPLETION }, // SuperDragon + { L_MPWEAPONS_106, 0, SOLOSTAGEINDEX_AIRFORCEONE, DIFF_A, CHEATFLAG_COMPLETION }, // Laptop Gun + { L_MPWEAPONS_107, 0, SOLOSTAGEINDEX_ATTACKSHIP, DIFF_A, CHEATFLAG_COMPLETION }, // Phoenix + { L_MPWEAPONS_108, 120, SOLOSTAGEINDEX_CHICAGO, DIFF_PA, CHEATFLAG_TIMED }, // Psychosis Gun + { L_MPWEAPONS_109, WEAPON_PP9I, 0, 0, CHEATFLAG_FIRINGRANGE }, // PP9i + { L_MPWEAPONS_110, WEAPON_CC13, 0, 0, CHEATFLAG_FIRINGRANGE }, // CC13 + { L_MPWEAPONS_111, WEAPON_KL01313, 0, 0, CHEATFLAG_FIRINGRANGE }, // KL01313 + { L_MPWEAPONS_112, WEAPON_KF7SPECIAL, 0, 0, CHEATFLAG_FIRINGRANGE }, // KF7 Special + { L_MPWEAPONS_113, WEAPON_ZZT, 0, 0, CHEATFLAG_FIRINGRANGE }, // ZZT (9mm) + { L_MPWEAPONS_114, WEAPON_DMC, 0, 0, CHEATFLAG_FIRINGRANGE }, // DMC + { L_MPWEAPONS_115, WEAPON_AR53, 0, 0, CHEATFLAG_FIRINGRANGE }, // AR53 + { L_MPWEAPONS_116, WEAPON_RCP45, 0, 0, CHEATFLAG_FIRINGRANGE }, // RC-P45 }; u32 cheatIsUnlocked(s32 cheat_id) @@ -459,7 +459,7 @@ char *cheatGetNameIfUnlocked(struct menuitem *item) return langGet(g_Cheats[item->param].nametextid); } - return langGet(L_MPWEAPONS(74)); // "----------" + return langGet(L_MPWEAPONS_074); // "----------" } s32 cheatMenuHandleDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) @@ -825,14 +825,14 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog && g_Menus[g_MpPlayerNum].curframe->focuseditem == &g_CheatsBuddiesMenuItems[0]) { // Velvet - sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS(143)), langGet(L_MPWEAPONS(117))); // "Buddy Available", "Velvet Dark" + sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS_143), langGet(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" return g_CheatMarqueeString; } if (cheatIsUnlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s: %s\n", - g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS(143)) : langGet(L_MPWEAPONS(136)), // "Buddy Available", "Cheat available" + g_Menus[g_MpPlayerNum].curframe->dialog == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" langGet(g_Cheats[cheat_id].nametextid) ); return g_CheatMarqueeString; @@ -850,15 +850,15 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Cheats[cheat_id].flags & CHEATFLAG_COMPLETION) { sprintf(g_CheatMarqueeString, "%s %s: %s %s %s", - langGet(L_MPWEAPONS(137)), // "Complete" + langGet(L_MPWEAPONS_137), // "Complete" langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name1), langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS(138)), // "for cheat:" + langGet(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } else { // Timed - strcpy(difficultyname, langGet(L_OPTIONS(251) + g_Cheats[cheat_id].difficulty)); + strcpy(difficultyname, langGet(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -868,21 +868,21 @@ char *cheatGetMarquee(struct menuitem *arg0) *ptr = '\0'; sprintf(g_CheatMarqueeString, "%s %s: %s %s %s %s %d:%02d %s %s", - langGet(L_MPWEAPONS(137)), // "Complete" + langGet(L_MPWEAPONS_137), // "Complete" langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name1), langGet(g_StageNames[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS(139)), // "on" + langGet(L_MPWEAPONS_139), // "on" &difficultyname, - langGet(L_MPWEAPONS(140)), // "in under" + langGet(L_MPWEAPONS_140), // "in under" g_Cheats[cheat_id].time / 60, g_Cheats[cheat_id].time % 60, - langGet(L_MPWEAPONS(138)), // "for cheat:" + langGet(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - strcat(g_CheatMarqueeString, langGet(L_MPWEAPONS(141))); // " or insert Game Boy ..." + strcat(g_CheatMarqueeString, langGet(L_MPWEAPONS_141)); // " or insert Game Boy ..." } strcat(g_CheatMarqueeString, "\n"); @@ -891,7 +891,7 @@ char *cheatGetMarquee(struct menuitem *arg0) } // No cheat selected - return langGet(L_MPWEAPONS(142)); // "Select cheat for information" + return langGet(L_MPWEAPONS_142); // "Select cheat for information" } #endif @@ -945,15 +945,15 @@ char *cheatGetName(s32 cheat_id) } struct menuitem g_CheatsWarningMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(479), 0x00000000, NULL }, // "If you activate any cheats, then you will be unable to progress further in the game while those cheats are active." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(480), 0x00000000, NULL }, // "OK" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(481), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_479, 0x00000000, NULL }, // "If you activate any cheats, then you will be unable to progress further in the game while those cheats are active." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_480, 0x00000000, NULL }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_481, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsWarningMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPMENU(478), // "Warning" + L_MPMENU_478, // "Warning" g_CheatsWarningMenuItems, NULL, 0x00000000, @@ -970,13 +970,13 @@ struct menuitem g_CheatsFunMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&cheatGetMarquee, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsFunMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(118), // "Fun" + L_MPWEAPONS_118, // "Fun" g_CheatsFunMenuItems, cheatMenuHandleDialog, 0x00000000, @@ -995,13 +995,13 @@ struct menuitem g_CheatsGameplayMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&cheatGetMarquee, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsGameplayMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(119), // "Gameplay" + L_MPWEAPONS_119, // "Gameplay" g_CheatsGameplayMenuItems, cheatMenuHandleDialog, 0x00000000, @@ -1020,13 +1020,13 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&cheatGetMarquee, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsSoloWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(122), // "Weapons for Jo in Solo" + L_MPWEAPONS_122, // "Weapons for Jo in Solo" g_CheatsSoloWeaponsMenuItems, cheatMenuHandleDialog, 0x00000000, @@ -1043,15 +1043,15 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { { MENUITEMTYPE_CHECKBOX, CHEAT_AR53, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_RCP45, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleCheatCheckbox }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000c8, 0x00000000, NULL }, - { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, L_MPWEAPONS(144), 0x00000000, NULL }, // "Win Golds on the firing range to enable classic guns." + { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, L_MPWEAPONS_144, 0x00000000, NULL }, // "Win Golds on the firing range to enable classic guns." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000c8, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsClassicWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(123), // "Classic Weapons for Jo in Solo" + L_MPWEAPONS_123, // "Classic Weapons for Jo in Solo" g_CheatsClassicWeaponsMenuItems, cheatMenuHandleDialog, 0x00000000, @@ -1070,13 +1070,13 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&cheatGetMarquee, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(120), // "Weapons" + L_MPWEAPONS_120, // "Weapons" g_CheatsWeaponsMenuItems, cheatMenuHandleDialog, 0x00000000, @@ -1084,7 +1084,7 @@ struct menudialog g_CheatsWeaponsMenuDialog = { }; struct menuitem g_CheatsBuddiesMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(117), 0x00000000, cheatMenuHandleBuddyCheckbox }, // "Velvet Dark" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_117, 0x00000000, cheatMenuHandleBuddyCheckbox }, // "Velvet Dark" { MENUITEMTYPE_CHECKBOX, CHEAT_PUGILIST, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleBuddyCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_HOTSHOT, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleBuddyCheckbox }, { MENUITEMTYPE_CHECKBOX, CHEAT_HITANDRUN, 0x00000000, (u32)&cheatGetNameIfUnlocked, 0x00000000, cheatMenuHandleBuddyCheckbox }, @@ -1092,13 +1092,13 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&cheatGetMarquee, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsBuddiesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(121), // "Buddies" + L_MPWEAPONS_121, // "Buddies" g_CheatsBuddiesMenuItems, cheatMenuHandleDialog, 0x00000000, @@ -1106,22 +1106,22 @@ struct menudialog g_CheatsBuddiesMenuDialog = { }; struct menuitem g_CheatsMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(118), 0x00000000, (void *)&g_CheatsFunMenuDialog }, // "Fun" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(119), 0x00000000, (void *)&g_CheatsGameplayMenuDialog }, // "Gameplay" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(122), 0x00000000, (void *)&g_CheatsSoloWeaponsMenuDialog }, // "Weapons for Jo in Solo" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(123), 0x00000000, (void *)&g_CheatsClassicWeaponsMenuDialog }, // "Classic Weapons for Jo in Solo" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(120), 0x00000000, (void *)&g_CheatsWeaponsMenuDialog }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(121), 0x00000000, (void *)&g_CheatsBuddiesMenuDialog }, // "Buddies" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_118, 0x00000000, (void *)&g_CheatsFunMenuDialog }, // "Fun" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_119, 0x00000000, (void *)&g_CheatsGameplayMenuDialog }, // "Gameplay" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_122, 0x00000000, (void *)&g_CheatsSoloWeaponsMenuDialog }, // "Weapons for Jo in Solo" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_123, 0x00000000, (void *)&g_CheatsClassicWeaponsMenuDialog }, // "Classic Weapons for Jo in Solo" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_120, 0x00000000, (void *)&g_CheatsWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_121, 0x00000000, (void *)&g_CheatsBuddiesMenuDialog }, // "Buddies" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(217), 0x00000000, cheatMenuHandleTurnOffAllCheats }, // "Turn off all Cheats" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_217, 0x00000000, cheatMenuHandleTurnOffAllCheats }, // "Turn off all Cheats" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000096, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(477), 0x00000000, NULL }, // "Done" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_477, 0x00000000, NULL }, // "Done" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CheatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(476), // "Cheats" + L_MPMENU_476, // "Cheats" g_CheatsMenuItems, cheatMenuHandleDialog, 0x00000000, diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 63535a70e..23bb97d1e 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -7192,16 +7192,16 @@ s16 g_SpecialQuipBank[][4] = { }; s16 g_QuipTexts[][4] = { - { 1, L_AME(83), L_AME(84), L_AME(85) }, // "How dare you disturb me!", "You will regret this intrusion, girl!", "If I were you, I'd leave...NOW!" - { 2, L_AME(86), L_AME(87), L_AME(86) }, // "Please don't kill me!", "Don't shoot!" - { 3, L_EAR(64), L_EAR(65), L_EAR(66) }, // "What are you doing in my lab?", "I haven't seen you before...", "Who the hell are you?" - { 4, L_EAR(67), L_EAR(68), L_EAR(69) }, // "Shut down the experiment.", "Pull the plug on that, NOW.", "Switch this thing off." - { 5, L_EAR(70), L_EAR(71), L_EAR(72) }, // "I'll shut it down.", "Please don't hurt me.", "Allow me to assist you." - { 6, L_EAR(73), L_EAR(74), L_EAR(75) }, // "My experiments!", "There the experiment is down.", "Leave this area NOW!" - { 7, L_EAR(76), L_EAR(77), L_EAR(78) }, // "Security!", "I'm calling security.", "Accidents will happen." - { 8, L_EAR(79), L_EAR(80), L_EAR(81) }, // "How did that happen?", "Looks like it's off already.", "Have you been tampering with this?" - { 9, L_EAR(82), L_EAR(83), L_EAR(84) }, // "Someone's broken my equipment.", "What's happened to the terminal?", "You vandal - you've broken it." - { 10, L_WAX(10), L_WAX(12), L_WAX(12) }, // "How dare you disturb me!", "If I were you, I'd leave... NOW!" + { 1, L_AME_083, L_AME_084, L_AME_085 }, // "How dare you disturb me!", "You will regret this intrusion, girl!", "If I were you, I'd leave...NOW!" + { 2, L_AME_086, L_AME_087, L_AME_086 }, // "Please don't kill me!", "Don't shoot!" + { 3, L_EAR_064, L_EAR_065, L_EAR_066 }, // "What are you doing in my lab?", "I haven't seen you before...", "Who the hell are you?" + { 4, L_EAR_067, L_EAR_068, L_EAR_069 }, // "Shut down the experiment.", "Pull the plug on that, NOW.", "Switch this thing off." + { 5, L_EAR_070, L_EAR_071, L_EAR_072 }, // "I'll shut it down.", "Please don't hurt me.", "Allow me to assist you." + { 6, L_EAR_073, L_EAR_074, L_EAR_075 }, // "My experiments!", "There the experiment is down.", "Leave this area NOW!" + { 7, L_EAR_076, L_EAR_077, L_EAR_078 }, // "Security!", "I'm calling security.", "Accidents will happen." + { 8, L_EAR_079, L_EAR_080, L_EAR_081 }, // "How did that happen?", "Looks like it's off already.", "Have you been tampering with this?" + { 9, L_EAR_082, L_EAR_083, L_EAR_084 }, // "Someone's broken my equipment.", "What's happened to the terminal?", "You vandal - you've broken it." + { 10, L_WAX_010, L_WAX_012, L_WAX_012 }, // "How dare you disturb me!", "If I were you, I'd leave... NOW!" }; s16 g_SkedarQuipBank[][4] = { diff --git a/src/game/core.c b/src/game/core.c index ca48f625b..0e0267c5f 100644 --- a/src/game/core.c +++ b/src/game/core.c @@ -5284,7 +5284,7 @@ void coreTick(void) for (i = 0; i < PLAYERCOUNT(); i++) { setCurrentPlayerNum(i); - hudmsgCreateViaPreset(langGet(L_MISC(68)), 0); // "One minute left." + hudmsgCreateViaPreset(langGet(L_MISC_068), 0); // "One minute left." } } diff --git a/src/game/credits.c b/src/game/credits.c index ab02fa1d9..1e622144f 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -377,141 +377,141 @@ u32 var8007f468 = 0x00000025; u32 var8007f46c = 0x00000000; struct credit g_Credits[] = { - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(2), L_TITLE(0) }, // "perfect dark", "" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_002, L_TITLE_000 }, // "perfect dark", "" // The order of these items are randomised - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(3), L_TITLE(4) }, // "beau ner chesluk", "guns and visual orgasms" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(5), L_TITLE(6) }, // "jonathan nasty mummery", "mover and shaker" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(7), L_TITLE(8) }, // "darkmark", "reality engineer" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(9), L_TITLE(10) }, // "chris tilston", "designs on the future" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(11), L_TITLE(12) }, // "chris darling", "weapons specialist" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(13), L_TITLE(14) }, // "duncan botwood", "grey area" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(15), L_TITLE(16) }, // "b jones", "bodybuilder" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(17), L_TITLE(18) }, // "steve malpass", "perfect locations and vox" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(19), L_TITLE(20) }, // "brian marshall", "-aqham-" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(21), L_TITLE(22) }, // "russel irwin", "well packed man" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(23), L_TITLE(24) }, // "jamie 'evo' williams", "manic welsh designer" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(25), L_TITLE(26) }, // "ross bury", "bionic backgrounds" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(27), L_TITLE(28) }, // "martin penny", "sound geezer" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(29), L_TITLE(30) }, // "grant kirkhope", "play that music maestro" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(31), L_TITLE(32) }, // "david clynick", "bangin hardcore choonz" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(33), L_TITLE(34) }, // "keith 'bunny' rabbette", "dinomic backgrounds" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_003, L_TITLE_004 }, // "beau ner chesluk", "guns and visual orgasms" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_005, L_TITLE_006 }, // "jonathan nasty mummery", "mover and shaker" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_007, L_TITLE_008 }, // "darkmark", "reality engineer" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_009, L_TITLE_010 }, // "chris tilston", "designs on the future" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_011, L_TITLE_012 }, // "chris darling", "weapons specialist" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_013, L_TITLE_014 }, // "duncan botwood", "grey area" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_015, L_TITLE_016 }, // "b jones", "bodybuilder" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_017, L_TITLE_018 }, // "steve malpass", "perfect locations and vox" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_019, L_TITLE_020 }, // "brian marshall", "-aqham-" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_021, L_TITLE_022 }, // "russel irwin", "well packed man" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_023, L_TITLE_024 }, // "jamie 'evo' williams", "manic welsh designer" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_025, L_TITLE_026 }, // "ross bury", "bionic backgrounds" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_027, L_TITLE_028 }, // "martin penny", "sound geezer" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_029, L_TITLE_030 }, // "grant kirkhope", "play that music maestro" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_031, L_TITLE_032 }, // "david clynick", "bangin hardcore choonz" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_033, L_TITLE_034 }, // "keith 'bunny' rabbette", "dinomic backgrounds" //load next credit for same slide //| no transition in //| | no transition out //| | | duration: 0=4s, 1=8s, 2=12s, 3=16s //| | | | - { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(36), L_TITLE(37) }, // "kevin bayliss", "dean smith" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(38), L_TITLE(1) }, // "graham smith", "\n" + { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE_035, L_TITLE_000 }, // "dd snipers", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_036, L_TITLE_037 }, // "kevin bayliss", "dean smith" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_038, L_TITLE_001 }, // "graham smith", "\n" - { 1, 1, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(39), L_TITLE(40) }, // "mike 'curry' currington", "tony wong" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(41), L_TITLE(1) }, // "simon farmer", "\n" + { 1, 1, 1, 0, CREDITSTYLE_C_BIG, L_TITLE_035, L_TITLE_000 }, // "dd snipers", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_039, L_TITLE_040 }, // "mike 'curry' currington", "tony wong" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_041, L_TITLE_001 }, // "simon farmer", "\n" - { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(42), L_TITLE(43) }, // "leigh loveday", "rob harrison" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(44), L_TITLE(1) }, // "steven hurst", "\n" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_035, L_TITLE_000 }, // "dd snipers", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_042, L_TITLE_043 }, // "leigh loveday", "rob harrison" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_044, L_TITLE_001 }, // "steven hurst", "\n" - { 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(45), L_TITLE(0) }, // "fearsome foursome", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(46), L_TITLE(47) }, // "phil dunne", "ricky berwick" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(48), L_TITLE(49) }, // "gareth glover", "jonathan ambrose" + { 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_045, L_TITLE_000 }, // "fearsome foursome", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_046, L_TITLE_047 }, // "phil dunne", "ricky berwick" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_048, L_TITLE_049 }, // "gareth glover", "jonathan ambrose" - { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(50), L_TITLE(0) }, // "trent's henchmen", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(51), L_TITLE(52) }, // "lee musgrave", "johnni christensen" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(53), L_TITLE(1) }, // "mark betteridge", "\n" + { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE_050, L_TITLE_000 }, // "trent's henchmen", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_051, L_TITLE_052 }, // "lee musgrave", "johnni christensen" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_053, L_TITLE_001 }, // "mark betteridge", "\n" - { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(50), L_TITLE(0) }, // "trent's henchmen", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(54), L_TITLE(55) }, // "chris marlow", "robin beanland" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(56), L_TITLE(57) }, // "neil gallagher", "feargal plant" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_050, L_TITLE_000 }, // "trent's henchmen", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_054, L_TITLE_055 }, // "chris marlow", "robin beanland" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_056, L_TITLE_057 }, // "neil gallagher", "feargal plant" - { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(58), L_TITLE(0) }, // "voices in the dark", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(59), L_TITLE(60) }, // "eveline fischer", "chris sutherland" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(61), L_TITLE(62) }, // "chris seavor", "john silke" + { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE_058, L_TITLE_000 }, // "voices in the dark", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_059, L_TITLE_060 }, // "eveline fischer", "chris sutherland" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_061, L_TITLE_062 }, // "chris seavor", "john silke" - { 1, 1, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(58), L_TITLE(0) }, // "voices in the dark", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(63), L_TITLE(64) }, // "ben cullum", "louise tilston" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(65), L_TITLE(66) }, // "alistair", "lindsay" + { 1, 1, 1, 0, CREDITSTYLE_C_BIG, L_TITLE_058, L_TITLE_000 }, // "voices in the dark", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_063, L_TITLE_064 }, // "ben cullum", "louise tilston" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_065, L_TITLE_066 }, // "alistair", "lindsay" - { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(58), L_TITLE(0) }, // "voices in the dark", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(68), L_TITLE(67) }, // "beau chesluk", "b jones" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(69), L_TITLE(1) }, // "steve malpass", "\n" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_058, L_TITLE_000 }, // "voices in the dark", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_068, L_TITLE_067 }, // "beau chesluk", "b jones" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_069, L_TITLE_001 }, // "steve malpass", "\n" - { 1, 0, 1, 0, CREDITSTYLE_L_BIG, L_TITLE(93), L_TITLE(0) }, // "rare exterminators", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(94), L_TITLE(95) }, // "huw ward", "adam munton" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(96), L_TITLE(97) }, // "david wong", "luke munton" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(98), L_TITLE(109) }, // "gary phelps", "andrew wilson" + { 1, 0, 1, 0, CREDITSTYLE_L_BIG, L_TITLE_093, L_TITLE_000 }, // "rare exterminators", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_094, L_TITLE_095 }, // "huw ward", "adam munton" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_096, L_TITLE_097 }, // "david wong", "luke munton" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_098, L_TITLE_109 }, // "gary phelps", "andrew wilson" - { 1, 1, 1, 0, CREDITSTYLE_L_BIG, L_TITLE(93), L_TITLE(0) }, // "rare exterminators", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(99), L_TITLE(100) }, // "john silke", "matthew carter" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(101), L_TITLE(102) }, // "gavin price", "gareth stevenson" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(103), L_TITLE(1) }, // "bushbaby", "\n" + { 1, 1, 1, 0, CREDITSTYLE_L_BIG, L_TITLE_093, L_TITLE_000 }, // "rare exterminators", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_099, L_TITLE_100 }, // "john silke", "matthew carter" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_101, L_TITLE_102 }, // "gavin price", "gareth stevenson" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_103, L_TITLE_001 }, // "bushbaby", "\n" - { 1, 1, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(93), L_TITLE(0) }, // "rare exterminators", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(104), L_TITLE(105) }, // "stephen stamper", "ross bullimore" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(106), L_TITLE(107) }, // "justin cook", "dale murchie" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(108), L_TITLE(1) }, // "roger smith", "\n" + { 1, 1, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_093, L_TITLE_000 }, // "rare exterminators", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_104, L_TITLE_105 }, // "stephen stamper", "ross bullimore" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_106, L_TITLE_107 }, // "justin cook", "dale murchie" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_108, L_TITLE_001 }, // "roger smith", "\n" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(70), L_TITLE(0) }, // "ci techs", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(71), L_TITLE(72) }, // "richard 'force 9' gale", "mark green" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(73), L_TITLE(74) }, // "alex zoro", "mark wilson" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_070, L_TITLE_000 }, // "ci techs", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_071, L_TITLE_072 }, // "richard 'force 9' gale", "mark green" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_073, L_TITLE_074 }, // "alex zoro", "mark wilson" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(75), L_TITLE(0) }, // "hard and wary support", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(76), L_TITLE(77) }, // "pete 'hardrom' cox", "maul 'max' mikell" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(78), L_TITLE(0) }, // "doug crouch", "" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_075, L_TITLE_000 }, // "hard and wary support", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_076, L_TITLE_077 }, // "pete 'hardrom' cox", "maul 'max' mikell" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_078, L_TITLE_000 }, // "doug crouch", "" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(83), L_TITLE(0) }, // "motion capture", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(84), L_TITLE(85) }, // "alan tippertronic", "des easen" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(86), L_TITLE(0) }, // "jim 'love' ballard", "" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_083, L_TITLE_000 }, // "motion capture", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_084, L_TITLE_085 }, // "alan tippertronic", "des easen" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_086, L_TITLE_000 }, // "jim 'love' ballard", "" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(87), L_TITLE(0) }, // "going through the motions", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(88), L_TITLE(89) }, // "duncan 'bot' botwood", "michelle tipper" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(90), L_TITLE(91) }, // "sue 'falling' fell", "doug 'crouch' crouch" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(92), L_TITLE(0) }, // "ross bury", "" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_087, L_TITLE_000 }, // "going through the motions", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_088, L_TITLE_089 }, // "duncan 'bot' botwood", "michelle tipper" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_090, L_TITLE_091 }, // "sue 'falling' fell", "doug 'crouch' crouch" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_092, L_TITLE_000 }, // "ross bury", "" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(118), L_TITLE(0) }, // "testing (rare miami)", "" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(119), L_TITLE(0) }, // "keith coll", "" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_118, L_TITLE_000 }, // "testing (rare miami)", "" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_119, L_TITLE_000 }, // "keith coll", "" - { 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(113), L_TITLE(0) }, // "rare in the sun", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(114), L_TITLE(115) }, // "joel hochberg", "" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(116), L_TITLE(117) }, // "scott hochberg", "" + { 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_113, L_TITLE_000 }, // "rare in the sun", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_114, L_TITLE_115 }, // "joel hochberg", "" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_116, L_TITLE_117 }, // "scott hochberg", "" - { 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(110), L_TITLE(0) }, // "dark commanders", "" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(111), L_TITLE(112) }, // "bis", "wombat" + { 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_110, L_TITLE_000 }, // "dark commanders", "" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_111, L_TITLE_112 }, // "bis", "wombat" - { 1, 0, 1, 0, CREDITSTYLE_L_BIG, L_TITLE(120), L_TITLE(0) }, // "testing (noa)", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(121), L_TITLE(122) }, // "michael kelbaugh", "tim bechtel" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(123), L_TITLE(124) }, // "tom hertzog", "melvin 'sherwood' forrest" + { 1, 0, 1, 0, CREDITSTYLE_L_BIG, L_TITLE_120, L_TITLE_000 }, // "testing (noa)", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_121, L_TITLE_122 }, // "michael kelbaugh", "tim bechtel" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_123, L_TITLE_124 }, // "tom hertzog", "melvin 'sherwood' forrest" - { 1, 1, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(120), L_TITLE(0) }, // "testing (noa)", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(125), L_TITLE(126) }, // "dougall campbell", "roger harrison" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(127), L_TITLE(1) }, // "jeff kalles", "\n" + { 1, 1, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_120, L_TITLE_000 }, // "testing (noa)", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_125, L_TITLE_126 }, // "dougall campbell", "roger harrison" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_127, L_TITLE_001 }, // "jeff kalles", "\n" - { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(128), L_TITLE(129) }, // "the perfect core", "-darker than you" + { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE_128, L_TITLE_129 }, // "the perfect core", "-darker than you" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(130), L_TITLE(0) }, // "treehouse", "" - { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(131), L_TITLE(132) }, // "armond williams junior", "henry sterchi" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(133), L_TITLE(0) }, // "ed ridgeway", "" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_130, L_TITLE_000 }, // "treehouse", "" + { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_131, L_TITLE_132 }, // "armond williams junior", "henry sterchi" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_133, L_TITLE_000 }, // "ed ridgeway", "" - { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(134), L_TITLE(0) }, // "perfect spelling", "" - { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(135), L_TITLE(0) }, // "teresa lillygren", "" + { 1, 0, 0, 0, CREDITSTYLE_L_BIG, L_TITLE_134, L_TITLE_000 }, // "perfect spelling", "" + { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE_135, L_TITLE_000 }, // "teresa lillygren", "" - { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(136), L_TITLE(0) }, // "nintendo", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(137), L_TITLE(138) }, // "mr arakawa", "" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(139), L_TITLE(140) }, // "don james", "" + { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE_136, L_TITLE_000 }, // "nintendo", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_137, L_TITLE_138 }, // "mr arakawa", "" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_139, L_TITLE_140 }, // "don james", "" - { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(136), L_TITLE(0) }, // "nintendo", "" - { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(141), L_TITLE(142) }, // "howard lincoln", "ken lobb" - { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(143), L_TITLE(144) }, // "jacqualee story", "gail tilden" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE_136, L_TITLE_000 }, // "nintendo", "" + { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_141, L_TITLE_142 }, // "howard lincoln", "ken lobb" + { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE_143, L_TITLE_144 }, // "jacqualee story", "gail tilden" - { 1, 0, 0, 1, CREDITSTYLE_C_BIG_C_BIG, L_TITLE(148), L_TITLE(149) }, // "rare", "designs on the future" - { 1, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE(1), L_TITLE(145) }, // "\n", "copyright rare 2000" - { 0, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE(146), L_TITLE(147) }, // "perfect dark and the pd device", "are trademarks" + { 1, 0, 0, 1, CREDITSTYLE_C_BIG_C_BIG, L_TITLE_148, L_TITLE_149 }, // "rare", "designs on the future" + { 1, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE_001, L_TITLE_145 }, // "\n", "copyright rare 2000" + { 0, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE_146, L_TITLE_147 }, // "perfect dark and the pd device", "are trademarks" - { 0, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE(150), L_TITLE(0) }, // "perfect dark is forever", "" + { 0, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE_150, L_TITLE_000 }, // "perfect dark is forever", "" - { 0, 0, 0, 0, CREDITSTYLE_TERMINATOR, L_TITLE(0), L_TITLE(0) }, // "", "" + { 0, 0, 0, 0, CREDITSTYLE_TERMINATOR, L_TITLE_000, L_TITLE_000 }, // "", "" }; /** diff --git a/src/game/data/ailists.c b/src/game/data/ailists.c index 6b1445ef8..a3cd989a3 100644 --- a/src/game/data/ailists.c +++ b/src/game/data/ailists.c @@ -3561,7 +3561,7 @@ u8 func0016_show_objective_failed_msg[] = { // Show message first time label(0x13) - show_hudmsg(CHR_BOND, L_MISC(69)) // "OBJECTIVES FAILED - abort mission." + show_hudmsg(CHR_BOND, L_MISC_069) // "OBJECTIVES FAILED - abort mission." // Wait 60 seconds restart_timer @@ -3581,7 +3581,7 @@ u8 func0016_show_objective_failed_msg[] = { // Show message second time label(0x13) - show_hudmsg(CHR_BOND, L_MISC(69)) // "OBJECTIVES FAILED - abort mission." + show_hudmsg(CHR_BOND, L_MISC_069) // "OBJECTIVES FAILED - abort mission." restart_timer // Wait 2 minutes @@ -3600,7 +3600,7 @@ u8 func0016_show_objective_failed_msg[] = { // Show message third time label(0x13) - show_hudmsg(CHR_BOND, L_MISC(69)) // "OBJECTIVES FAILED - abort mission." + show_hudmsg(CHR_BOND, L_MISC_069) // "OBJECTIVES FAILED - abort mission." restart_timer // Wait 5 minutes diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 8d74411f2..8c9e9fc71 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -98,10 +98,10 @@ char *menuDialogTitleRetryStageName(struct menudialog *dialog) char *prefix; if (g_Menus[g_MpPlayerNum].curframe->dialog != dialog) { - return langGet(L_OPTIONS(300)); // "Objectives" + return langGet(L_OPTIONS_300); // "Objectives" } - prefix = langGet(L_OPTIONS(296)); // "Retry" + prefix = langGet(L_OPTIONS_296); // "Retry" name = langGet(g_StageNames[g_MissionConfig.stageindex].name3); sprintf(g_StringPointer, "%s: %s\n", prefix, name); @@ -115,10 +115,10 @@ char *menuDialogTitleNextMissionStageName(struct menudialog *dialog) char *prefix; if (g_Menus[g_MpPlayerNum].curframe->dialog != dialog) { - return langGet(L_OPTIONS(300)); // "Objectives" + return langGet(L_OPTIONS_300); // "Objectives" } - prefix = langGet(L_OPTIONS(297)); // "Next Mission" + prefix = langGet(L_OPTIONS_297); // "Next Mission" name = langGet(g_StageNames[g_MissionConfig.stageindex].name3); sprintf(g_StringPointer, "%s: %s\n", prefix, name); @@ -138,8 +138,8 @@ s32 menuhandlerReplayPreviousMission(s32 operation, struct menuitem *item, union struct menuitem g_RetryMissionMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(298), 0x00000000, menuhandlerAcceptMission }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(299), 0x00000000, menuhandlerDeclineMission }, // "Decline" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_298, 0x00000000, menuhandlerAcceptMission }, // "Accept" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_299, 0x00000000, menuhandlerDeclineMission }, // "Decline" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -154,10 +154,10 @@ struct menudialog g_RetryMissionMenuDialog = { struct menuitem g_NextMissionMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(298), 0x00000000, menuhandlerAcceptMission }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(299), 0x00000000, menuhandlerDeclineMission }, // "Decline" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_298, 0x00000000, menuhandlerAcceptMission }, // "Accept" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_299, 0x00000000, menuhandlerDeclineMission }, // "Decline" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MISC(470), 0x00000000, menuhandlerReplayPreviousMission }, // "Replay Previous Mission" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MISC_470, 0x00000000, menuhandlerReplayPreviousMission }, // "Replay Previous Mission" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -236,86 +236,86 @@ char *soloMenuTextAccuracy(struct menuitem *item) char *soloMenuTextMissionStatus(struct menuitem *item) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { - return langGet(L_MPWEAPONS(135)); // "Cheated" + return langGet(L_MPWEAPONS_135); // "Cheated" } if (g_Vars.coopplayernum >= 0) { if (g_Vars.bond->aborted || g_Vars.coop->aborted) { - return langGet(L_OPTIONS(295)); // "Aborted" + return langGet(L_OPTIONS_295); // "Aborted" } if (g_Vars.bond->isdead && g_Vars.coop->isdead) { - return langGet(L_OPTIONS(293)); // "Failed" + return langGet(L_OPTIONS_293); // "Failed" } } else if (g_Vars.antiplayernum >= 0) { if (g_Vars.currentplayer == g_Vars.bond) { if (g_Vars.bond->aborted) { - return langGet(L_OPTIONS(295)); // "Aborted" + return langGet(L_OPTIONS_295); // "Aborted" } if (g_Vars.anti->aborted) { - return langGet(L_OPTIONS(295)); // "Aborted" + return langGet(L_OPTIONS_295); // "Aborted" } if (g_Vars.bond->isdead) { - return langGet(L_OPTIONS(293)); // "Failed" + return langGet(L_OPTIONS_293); // "Failed" } } else { if (g_Vars.anti->aborted) { - return langGet(L_OPTIONS(295)); // "Aborted" + return langGet(L_OPTIONS_295); // "Aborted" } if (!g_Vars.bond->aborted && !g_Vars.bond->isdead) { - return langGet(L_OPTIONS(293)); // "Failed" + return langGet(L_OPTIONS_293); // "Failed" } } } else { if (g_Vars.bond->aborted) { - return langGet(L_OPTIONS(295)); // "Aborted" + return langGet(L_OPTIONS_295); // "Aborted" } if (g_Vars.bond->isdead) { - return langGet(L_OPTIONS(293)); // "Failed" + return langGet(L_OPTIONS_293); // "Failed" } } if (objectiveIsAllComplete() == false) { - return langGet(L_OPTIONS(293)); // "Failed" + return langGet(L_OPTIONS_293); // "Failed" } if (g_StageIndex == STAGEINDEX_DEFENSE) { - return langGet(L_MPWEAPONS(62)); // "Unknown" + return langGet(L_MPWEAPONS_062); // "Unknown" } - return langGet(L_OPTIONS(294)); // "Completed" + return langGet(L_OPTIONS_294); // "Completed" } char *soloMenuTextAgentStatus(struct menuitem *item) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { - return langGet(L_MPWEAPONS(134)); // "Dishonored" + return langGet(L_MPWEAPONS_134); // "Dishonored" } if (g_Vars.currentplayer->aborted) { - return langGet(L_OPTIONS(292)); // "Disavowed" + return langGet(L_OPTIONS_292); // "Disavowed" } if (g_Vars.currentplayer->isdead) { - return langGet(L_OPTIONS(290)); // "Deceased" + return langGet(L_OPTIONS_290); // "Deceased" } if (g_StageIndex == STAGEINDEX_DEFENSE) { - return langGet(L_MPWEAPONS(63)); // "Missing" + return langGet(L_MPWEAPONS_063); // "Missing" } - return langGet(L_OPTIONS(291)); // "Active" + return langGet(L_OPTIONS_291); // "Active" } char *menuTitleStageCompleted(struct menuitem *item) { sprintf(g_StringPointer, "%s: %s\n", langGet(g_StageNames[g_Menus[g_MpPlayerNum].data.endscreen.stageindex].name3), - langGet(L_OPTIONS(276))); // "Completed" + langGet(L_OPTIONS_276)); // "Completed" return g_StringPointer; } @@ -332,7 +332,7 @@ char *menuTitleStageFailed(struct menuitem *item) { sprintf(g_StringPointer, "%s: %s\n", langGet(g_StageNames[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS(277))); // "Failed" + langGet(L_OPTIONS_277)); // "Failed" return g_StringPointer; } @@ -381,20 +381,20 @@ s32 menuhandlerReplayLastLevel(s32 operation, struct menuitem *item, union handl struct menuitem g_2PMissionEndscreenObjectivesVMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 2, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(301), 0x00000000, NULL }, // "Press START" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_301, 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_SoloEndscreenObjectivesMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(301), 0x00000000, NULL }, // "Press START" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_301, 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_SoloEndscreenObjectivesFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(300), // "Objectives" + L_OPTIONS_300, // "Objectives" g_SoloEndscreenObjectivesMenuItems, soloMenuDialogPauseStatus, 0x00000048, @@ -403,7 +403,7 @@ struct menudialog g_SoloEndscreenObjectivesFailedMenuDialog = { struct menudialog g_SoloEndscreenObjectivesCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_OPTIONS(300), // "Objectives" + L_OPTIONS_300, // "Objectives" g_SoloEndscreenObjectivesMenuItems, soloMenuDialogPauseStatus, 0x00000048, @@ -412,7 +412,7 @@ struct menudialog g_SoloEndscreenObjectivesCompletedMenuDialog = { struct menudialog g_2PMissionEndscreenObjectivesFailedVMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(300), // "Objectives" + L_OPTIONS_300, // "Objectives" g_2PMissionEndscreenObjectivesVMenuItems, soloMenuDialogPauseStatus, 0x00000048, @@ -421,7 +421,7 @@ struct menudialog g_2PMissionEndscreenObjectivesFailedVMenuDialog = { struct menudialog g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_OPTIONS(300), // "Objectives" + L_OPTIONS_300, // "Objectives" g_2PMissionEndscreenObjectivesVMenuItems, soloMenuDialogPauseStatus, 0x00000048, @@ -442,8 +442,8 @@ s32 menuhandlerContinueMission(s32 operation, struct menuitem *item, union handl } struct menuitem g_MissionContinueOrReplyMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(244), 0x00000000, menuhandlerContinueMission }, // "Continue" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(245), 0x00000000, menuhandlerReplayLastLevel }, // "Replay Last Level" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS_244, 0x00000000, menuhandlerContinueMission }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS_245, 0x00000000, menuhandlerReplayLastLevel }, // "Replay Last Level" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -635,55 +635,55 @@ s32 menudialogSolo2PEndscreenFailed(s32 operation, struct menudialog *dialog, un } struct menuitem g_2PMissionEndscreenVMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(278), 0x00000000, NULL }, // "Mission Status:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS_278, 0x00000000, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&soloMenuTextMissionStatus, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(279), 0x00000000, NULL }, // "Agent Status:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS_279, 0x00000000, NULL }, // "Agent Status:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&soloMenuTextAgentStatus, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(280), 0x00000000, NULL }, // "Mission Time:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS_280, 0x00000000, NULL }, // "Mission Time:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&soloMenuTextMissionTime, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS(129), 0x00000000, NULL }, // "Difficulty" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS_129, 0x00000000, NULL }, // "Difficulty" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)soloMenuTextDifficulty, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS(281), 0x00000000, NULL }, // "Weapon of Choice:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_OPTIONS_281, 0x00000000, NULL }, // "Weapon of Choice:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextWeaponOfChoiceName, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(282), (u32)&soloMenuTextNumKills, NULL }, // "Kills:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(283), (u32)&soloMenuTextAccuracy, NULL }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_282, (u32)&soloMenuTextNumKills, NULL }, // "Kills:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_283, (u32)&soloMenuTextAccuracy, NULL }, // "Accuracy:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(284), (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:" - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS(285), (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:" - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS(286), (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:" - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS(287), (u32)&soloMenuTextNumLimbShots, NULL }, // "Limb Shots:" - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS(288), (u32)&soloMenuTextNumOtherShots, NULL }, // "Others:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_284, (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS_285, (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS_286, (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS_287, (u32)&soloMenuTextNumLimbShots, NULL }, // "Limb Shots:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_OPTIONS_288, (u32)&soloMenuTextNumOtherShots, NULL }, // "Others:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(289), 0x00000000, NULL }, // "Press START" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_289, 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; u32 g_CheatColour = 0xff7f7fff; struct menuitem g_MissionEndscreenMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(278), (u32)&soloMenuTextMissionStatus, NULL }, // "Mission Status:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(279), (u32)&soloMenuTextAgentStatus, NULL }, // "Agent Status:" - { MENUITEMTYPE_LABEL, 0, 0x01000000, L_OPTIONS(280), (u32)&soloMenuTextMissionTime, menuhandlerEndscreenCheats }, // "Mission Time:" - { MENUITEMTYPE_LABEL, 1, 0x01000000, L_MPWEAPONS(242), (u32)&soloMenuTextTargetTime, menuhandlerEndscreenCheats }, // "Target Time:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPWEAPONS(129), (u32)&soloMenuTextDifficulty, NULL }, // "Difficulty:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_278, (u32)&soloMenuTextMissionStatus, NULL }, // "Mission Status:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_279, (u32)&soloMenuTextAgentStatus, NULL }, // "Agent Status:" + { MENUITEMTYPE_LABEL, 0, 0x01000000, L_OPTIONS_280, (u32)&soloMenuTextMissionTime, menuhandlerEndscreenCheats }, // "Mission Time:" + { MENUITEMTYPE_LABEL, 1, 0x01000000, L_MPWEAPONS_242, (u32)&soloMenuTextTargetTime, menuhandlerEndscreenCheats }, // "Target Time:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPWEAPONS_129, (u32)&soloMenuTextDifficulty, NULL }, // "Difficulty:" { MENUITEMTYPE_SEPARATOR, 2, 0x00000000, 0x00000000, 0x00000000, menuhandlerEndscreenCheats }, - { MENUITEMTYPE_LABEL, 2, 0x00000000, L_MPWEAPONS(243), 0x00000000, menuhandlerEndscreenCheats }, // "New Cheat Available!:" + { MENUITEMTYPE_LABEL, 2, 0x00000000, L_MPWEAPONS_243, 0x00000000, menuhandlerEndscreenCheats }, // "New Cheat Available!:" { MENUITEMTYPE_LABEL, 3, 0x01000020, (u32)&soloMenuTextTimedCheatName, 0x00000000, menuhandlerEndscreenCheats }, { MENUITEMTYPE_LABEL, 5, 0x01000020, (u32)&soloMenuTextCompletionCheatName, 0x00000000, menuhandlerEndscreenCheats }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(281), (u32)&mpMenuTextWeaponOfChoiceName, NULL }, // "Weapon of Choice" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(282), (u32)&soloMenuTextNumKills, NULL }, // "Kills:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(283), (u32)&soloMenuTextAccuracy, NULL }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_281, (u32)&mpMenuTextWeaponOfChoiceName, NULL }, // "Weapon of Choice" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_282, (u32)&soloMenuTextNumKills, NULL }, // "Kills:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_283, (u32)&soloMenuTextAccuracy, NULL }, // "Accuracy:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(284), (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(285), (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(286), (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:" - { MENUITEMTYPE_LABEL, 6, 0x00000000, L_OPTIONS(287), (u32)&soloMenuTextNumLimbShots, menuhandlerEndscreenCheats }, // "Limb Shots:" - { MENUITEMTYPE_LABEL, 4, 0x00000000, L_OPTIONS(288), (u32)&soloMenuTextNumOtherShots, menuhandlerEndscreenCheats }, // "Others:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_284, (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_285, (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_286, (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:" + { MENUITEMTYPE_LABEL, 6, 0x00000000, L_OPTIONS_287, (u32)&soloMenuTextNumLimbShots, menuhandlerEndscreenCheats }, // "Limb Shots:" + { MENUITEMTYPE_LABEL, 4, 0x00000000, L_OPTIONS_288, (u32)&soloMenuTextNumOtherShots, menuhandlerEndscreenCheats }, // "Others:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(289), 0x00000000, NULL }, // "Press START" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_289, 0x00000000, NULL }, // "Press START" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1517,7 +1517,7 @@ struct menudialog g_2PMissionEndscreenFailedHMenuDialog = { struct menudialog g_2PMissionEndscreenCompletedVMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_OPTIONS(276), // "Completed" + L_OPTIONS_276, // "Completed" g_2PMissionEndscreenVMenuItems, menudialogSolo2PEndscreenCompleted, 0x00000048, @@ -1526,7 +1526,7 @@ struct menudialog g_2PMissionEndscreenCompletedVMenuDialog = { struct menudialog g_2PMissionEndscreenFailedVMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(277), // "Failed" + L_OPTIONS_277, // "Failed" g_2PMissionEndscreenVMenuItems, menudialogSolo2PEndscreenFailed, 0x00000048, diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index c7850af6c..649fc3f06 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -2703,7 +2703,7 @@ void setupParseObjects(s32 stagenum) g_Briefing.objectivedifficulties[j] = 0; } - g_Briefing.briefingtextnum = L_MISC(42); // "No briefing for this mission" + g_Briefing.briefingtextnum = L_MISC_042; // "No briefing for this mission" if (stagenum < STAGE_TITLE) { if (g_StageSetup.padfiledata) { diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index 9b2cb542a..4f5fcf0ef 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -244,17 +244,17 @@ void func0f010bb0(void) g_Vars.currentplayer->gunzoomfovs[2] = 30; if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - g_Weapons[WEAPON_EYESPY]->name = L_GUN(61); // "DrugSpy" - g_Weapons[WEAPON_EYESPY]->shortname = L_GUN(61); // "DrugSpy" + g_Weapons[WEAPON_EYESPY]->name = L_GUN_061; // "DrugSpy" + g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_061; // "DrugSpy" g_Weapons[WEAPON_EYESPY]->flags &= ~(WEAPONFLAG_00200000 | WEAPONFLAG_00400000); } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO || (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR)) { - g_Weapons[WEAPON_EYESPY]->name = L_GUN(62); // "BombSpy" - g_Weapons[WEAPON_EYESPY]->shortname = L_GUN(62); // "BombSpy" + g_Weapons[WEAPON_EYESPY]->name = L_GUN_062; // "BombSpy" + g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_062; // "BombSpy" g_Weapons[WEAPON_EYESPY]->flags &= ~(WEAPONFLAG_00200000 | WEAPONFLAG_00400000); } else { - g_Weapons[WEAPON_EYESPY]->name = L_GUN(60); // "CamSpy" - g_Weapons[WEAPON_EYESPY]->shortname = L_GUN(60); // "CamSpy" + g_Weapons[WEAPON_EYESPY]->name = L_GUN_060; // "CamSpy" + g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_060; // "CamSpy" g_Weapons[WEAPON_EYESPY]->flags |= (WEAPONFLAG_00200000 | WEAPONFLAG_00400000); } diff --git a/src/game/game_011110.c b/src/game/game_011110.c index aafa03d82..0bee0ffc2 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -444,8 +444,8 @@ void currentPlayerInitEyespy(void) if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { g_Vars.currentplayer->eyespy->mode = EYESPYMODE_DRUGSPY; - g_Weapons[WEAPON_EYESPY]->name = L_GUN(61); // "DrugSpy" - g_Weapons[WEAPON_EYESPY]->shortname = L_GUN(61); // "DrugSpy" + g_Weapons[WEAPON_EYESPY]->name = L_GUN_061; // "DrugSpy" + g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_061; // "DrugSpy" } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { g_Vars.currentplayer->eyespy->mode = EYESPYMODE_BOMBSPY; } else { diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index ecd9cfdb0..365b90e5e 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -19645,15 +19645,15 @@ glabel func0f0fce8c ); struct menuitem g_PakRemovedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(174), 0x00000000, NULL }, // "The Controller Pak has been removed." + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_174, 0x00000000, NULL }, // "The Controller Pak has been removed." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(73), 0x00000000, menuhandler000fcc34 }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS_073, 0x00000000, menuhandler000fcc34 }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakRemovedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(173), // "Error" + L_MPWEAPONS_173, // "Error" g_PakRemovedMenuItems, NULL, 0x00000000, @@ -19669,7 +19669,7 @@ struct menuitem g_PakRepairSuccessMenuItems[] = { struct menudialog g_PakRepairSuccessMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPWEAPONS(180), // "Repair Successful" + L_MPWEAPONS_180, // "Repair Successful" g_PakRepairSuccessMenuItems, menudialog000fcd48, 0x00000000, @@ -19677,15 +19677,15 @@ struct menudialog g_PakRepairSuccessMenuDialog = { }; struct menuitem g_PakRepairFailedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(183), 0x00000000, NULL }, // "The Controller Pak cannot be repaired. You will not be able to load from or save to this Controller Pak." + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_183, 0x00000000, NULL }, // "The Controller Pak cannot be repaired. You will not be able to load from or save to this Controller Pak." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(73), 0x00000000, NULL }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS_073, 0x00000000, NULL }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakRepairFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(182), // "Repair Failed" + L_MPWEAPONS_182, // "Repair Failed" g_PakRepairFailedMenuItems, menudialog000fcd48, 0x00000000, @@ -19693,17 +19693,17 @@ struct menudialog g_PakRepairFailedMenuDialog = { }; struct menuitem g_PakAttemptRepairMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(176), 0x00000000, NULL }, // "Are you sure you want to attempt repair of this Controller Pak?" - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(177), 0x00000000, NULL }, // "Data may be lost!" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_176, 0x00000000, NULL }, // "Are you sure you want to attempt repair of this Controller Pak?" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_177, 0x00000000, NULL }, // "Data may be lost!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(178), 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(179), 0x00000000, menuhandlerRepairPak }, // "Repair" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS_178, 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS_179, 0x00000000, menuhandlerRepairPak }, // "Repair" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakAttemptRepairMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(175), // "Attempt Repair" + L_MPWEAPONS_175, // "Attempt Repair" g_PakAttemptRepairMenuItems, menudialog000fcd48, 0x00000000, @@ -19713,11 +19713,11 @@ struct menudialog g_PakAttemptRepairMenuDialog = { char *menuTextSaveDeviceName(struct menuitem *item) { u16 devices[] = { - L_OPTIONS(112), // "Controller Pak 1" - L_OPTIONS(113), // "Controller Pak 2" - L_OPTIONS(114), // "Controller Pak 3" - L_OPTIONS(115), // "Controller Pak 4" - L_OPTIONS(111), // "Game Pak" + L_OPTIONS_112, // "Controller Pak 1" + L_OPTIONS_113, // "Controller Pak 2" + L_OPTIONS_114, // "Controller Pak 3" + L_OPTIONS_115, // "Controller Pak 4" + L_OPTIONS_111, // "Game Pak" }; if ((u8)g_Menus[g_MpPlayerNum].savedevice < 5) { @@ -20014,18 +20014,18 @@ struct chrdata *currentPlayerGetCommandingAibot(void) struct menuitem g_PakDamagedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(65), 0x00000000, NULL }, // "is damaged or" - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(66), 0x00000000, NULL }, // "inserted incorrectly" + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_065, 0x00000000, NULL }, // "is damaged or" + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_066, 0x00000000, NULL }, // "inserted incorrectly" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(67), 0x00000000, menuhandlerWarnRepairPak }, // "Attempt Repair" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(68), 0x00000000, menuhandlerRetrySavePak }, // "Retry" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(69), 0x00000000, NULL }, // "Continue without using the Controller Pak" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_067, 0x00000000, menuhandlerWarnRepairPak }, // "Attempt Repair" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_068, 0x00000000, menuhandlerRetrySavePak }, // "Retry" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS_069, 0x00000000, NULL }, // "Continue without using the Controller Pak" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakDamagedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(64), // "Damaged Controller Pak" + L_MPWEAPONS_064, // "Damaged Controller Pak" g_PakDamagedMenuItems, menudialog000fcd48, 0x00000020, @@ -20034,17 +20034,17 @@ struct menudialog g_PakDamagedMenuDialog = { struct menuitem g_PakFullMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x02000210, L_MPWEAPONS(71), 0x00000000, NULL }, // "is too full to save note - 1 note and 28 pages required to save" - { MENUITEMTYPE_LABEL, 0, 0x02000220, L_OPTIONS(3), 0x00000000, NULL }, // "" - { MENUITEMTYPE_LABEL, 0, 0x02000210, L_MPWEAPONS(72), 0x00000000, NULL }, // "Enter the Controller Pak Menu to free some space (hold START while powering up.)" + { MENUITEMTYPE_LABEL, 0, 0x02000210, L_MPWEAPONS_071, 0x00000000, NULL }, // "is too full to save note - 1 note and 28 pages required to save" + { MENUITEMTYPE_LABEL, 0, 0x02000220, L_OPTIONS_003, 0x00000000, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x02000210, L_MPWEAPONS_072, 0x00000000, NULL }, // "Enter the Controller Pak Menu to free some space (hold START while powering up.)" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(73), 0x00000000, NULL }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS_073, 0x00000000, NULL }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakFullMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(70), // "Full Controller Pak" + L_MPWEAPONS_070, // "Full Controller Pak" g_PakFullMenuItems, menudialog000fcd48, 0x00000020, @@ -20052,15 +20052,15 @@ struct menudialog g_PakFullMenuDialog = { }; struct menuitem g_PakCannotReadGameBoyMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(254), 0x00000000, NULL }, // "Cannot read Game Boy Game Pak. Check connections and make sure correct Game Boy Game Pak is being used." + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_254, 0x00000000, NULL }, // "Cannot read Game Boy Game Pak. Check connections and make sure correct Game Boy Game Pak is being used." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(255), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS_255, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakCannotReadGameBoyMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(253), // "Error" + L_MPWEAPONS_253, // "Error" g_PakCannotReadGameBoyMenuItems, NULL, 0x00000020, @@ -20069,17 +20069,17 @@ struct menudialog g_PakCannotReadGameBoyMenuDialog = { struct menuitem g_PakDataLostMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&menuTextSaveDeviceName, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(257), 0x00000000, NULL }, // "The saved data has" - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(258), 0x00000000, NULL }, // "been erased due to" - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(259), 0x00000000, NULL }, // "corruption or damage." + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_257, 0x00000000, NULL }, // "The saved data has" + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_258, 0x00000000, NULL }, // "been erased due to" + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_259, 0x00000000, NULL }, // "corruption or damage." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(260), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS_260, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakDataLostMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(256), // "Error" + L_MPWEAPONS_256, // "Error" g_PakDataLostMenuItems, NULL, 0x00000020, diff --git a/src/game/game_102240.c b/src/game/game_102240.c index f28ba97c8..9c7d1884d 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -45,36 +45,36 @@ char *menuTextCurrentStageName(struct menuitem *item) char *soloMenuTextDifficulty(struct menuitem *item) { if (g_MissionConfig.pdmode) { - return langGet(L_MPWEAPONS(221)); + return langGet(L_MPWEAPONS_221); } switch (g_MissionConfig.difficulty) { case DIFF_SA: - return langGet(L_OPTIONS(252)); + return langGet(L_OPTIONS_252); case DIFF_PA: - return langGet(L_OPTIONS(253)); + return langGet(L_OPTIONS_253); case DIFF_A: default: - return langGet(L_OPTIONS(251)); + return langGet(L_OPTIONS_251); } } u16 g_ControlStyleOptions[] = { - L_OPTIONS(239), // "1.1" - L_OPTIONS(240), // "1.2" - L_OPTIONS(241), // "1.3" - L_OPTIONS(242), // "1.4" - L_OPTIONS(243), // "2.1" - L_OPTIONS(244), // "2.2" - L_OPTIONS(245), // "2.3" - L_OPTIONS(246), // "2.4" + L_OPTIONS_239, // "1.1" + L_OPTIONS_240, // "1.2" + L_OPTIONS_241, // "1.3" + L_OPTIONS_242, // "1.4" + L_OPTIONS_243, // "2.1" + L_OPTIONS_244, // "2.2" + L_OPTIONS_245, // "2.3" + L_OPTIONS_246, // "2.4" }; s32 menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) { u16 categories[] = { - L_OPTIONS(237), // "Single" - L_OPTIONS(238), // "Double" + L_OPTIONS_237, // "Single" + L_OPTIONS_238, // "Double" }; if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) { @@ -151,8 +151,8 @@ s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdat #if PAL u16 options[2][2] = { - L_OPTIONS(201), // "Hold" - L_OPTIONS(202), // "Toggle" + L_OPTIONS_201, // "Hold" + L_OPTIONS_202, // "Toggle" }; s32 index = 0; @@ -162,8 +162,8 @@ s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdat } #else u16 options[] = { - L_OPTIONS(201), // "Hold" - L_OPTIONS(202), // "Toggle" + L_OPTIONS_201, // "Hold" + L_OPTIONS_202, // "Toggle" }; #endif @@ -191,10 +191,10 @@ s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdat s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { - L_OPTIONS(232), // "Mono" - L_OPTIONS(233), // "Stereo" - L_OPTIONS(234), // "Headphone" - L_OPTIONS(235), // "Surround" + L_OPTIONS_232, // "Mono" + L_OPTIONS_233, // "Stereo" + L_OPTIONS_234, // "Headphone" + L_OPTIONS_235, // "Surround" }; switch (operation) { @@ -217,9 +217,9 @@ s32 menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { - L_OPTIONS(220), // "Full" - L_OPTIONS(221), // "Wide" - L_OPTIONS(222), // "Cinema" + L_OPTIONS_220, // "Full" + L_OPTIONS_221, // "Wide" + L_OPTIONS_222, // "Cinema" }; switch (operation) { @@ -242,8 +242,8 @@ s32 menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdat s32 menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { - L_OPTIONS(223), // "Normal" - L_OPTIONS(224), // "16:9" + L_OPTIONS_223, // "Normal" + L_OPTIONS_224, // "16:9" }; switch (operation) { @@ -335,8 +335,8 @@ glabel func0f1030e4pf s32 menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { - L_OPTIONS(225), // "Horizontal" - L_OPTIONS(226), // "Vertical" + L_OPTIONS_225, // "Horizontal" + L_OPTIONS_226, // "Vertical" }; switch (operation) { @@ -718,7 +718,7 @@ struct menuitem g_PreAndPostMissionBriefingMenuItems[] = { struct menudialog g_PreAndPostMissionBriefingMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(247), // "Briefing" + L_OPTIONS_247, // "Briefing" g_PreAndPostMissionBriefingMenuItems, menudialogBriefing, 0x00000008, @@ -781,12 +781,12 @@ s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handler char *soloMenuTitleStageOverview(struct menudialog *dialog) { if (dialog != g_Menus[g_MpPlayerNum].curframe->dialog) { - return langGet(L_OPTIONS(273)); // "Overview" + return langGet(L_OPTIONS_273); // "Overview" } sprintf(g_StringPointer, "%s: %s\n", langGet(g_StageNames[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS(273))); + langGet(L_OPTIONS_273)); return g_StringPointer; } @@ -811,8 +811,8 @@ s32 menudialog00103608(s32 operation, struct menudialog *dialog, union handlerda struct menuitem g_AcceptMissionMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 1, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(274), 0x00000000, menuhandlerAcceptMission }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(275), 0x00000000, NULL }, // "Decline" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_274, 0x00000000, menuhandlerAcceptMission }, // "Accept" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_275, 0x00000000, NULL }, // "Decline" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -884,19 +884,19 @@ s32 menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union } struct menuitem g_PdModeSettingsMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS(222), 0x00000000, NULL }, // "Choose Settings:" - { MENUITEMTYPE_SLIDER, 1, 0x00100000, L_MPWEAPONS(224), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Health" - { MENUITEMTYPE_SLIDER, 2, 0x00100000, L_MPWEAPONS(225), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Damage" - { MENUITEMTYPE_SLIDER, 3, 0x00100000, L_MPWEAPONS(226), 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Accuracy" + { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS_222, 0x00000000, NULL }, // "Choose Settings:" + { MENUITEMTYPE_SLIDER, 1, 0x00100000, L_MPWEAPONS_224, 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Health" + { MENUITEMTYPE_SLIDER, 2, 0x00100000, L_MPWEAPONS_225, 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Damage" + { MENUITEMTYPE_SLIDER, 3, 0x00100000, L_MPWEAPONS_226, 0x000000ff, menuhandlerPdModeSetting }, // "Enemy Accuracy" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000b4, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(227), 0x00000000, menuhandlerAcceptPdModeSettings }, // "OK" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(228), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_227, 0x00000000, menuhandlerAcceptPdModeSettings }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS_228, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PdModeSettingsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(221), // "Perfect Dark" + L_MPWEAPONS_221, // "Perfect Dark" g_PdModeSettingsMenuItems, NULL, 0x00000004, @@ -1272,19 +1272,19 @@ char *soloMenuTextBestTime(struct menuitem *item) } struct menuitem g_SoloMissionDifficultyMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(249), L_OPTIONS(250), NULL }, // "Difficulty" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Agent" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Special Agent" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Perfect Agent" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(221), 0x00000000, menuhandlerPdMode }, // "Perfect Dark" + { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS_249, L_OPTIONS_250, NULL }, // "Difficulty" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_251, (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Agent" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS_252, (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Special Agent" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS_253, (u32)&soloMenuTextBestTime, menuhandlerSoloDifficulty }, // "Perfect Agent" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_221, 0x00000000, menuhandlerPdMode }, // "Perfect Dark" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(254), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_254, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_SoloMissionDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(248), // "Select Difficulty" + L_OPTIONS_248, // "Select Difficulty" g_SoloMissionDifficultyMenuItems, NULL, 0x00000004, @@ -1500,18 +1500,18 @@ glabel menuhandlerCoopBuddy ); struct menuitem g_CoopOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(256), 0x00000000, menuhandlerCoopRadar }, // "Radar On" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(257), 0x00000000, menuhandlerCoopFriendlyFire }, // "Friendly Fire" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(258), 0x00000000, menuhandlerCoopBuddy }, // "Perfect Buddy" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_256, 0x00000000, menuhandlerCoopRadar }, // "Radar On" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_257, 0x00000000, menuhandlerCoopFriendlyFire }, // "Friendly Fire" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_258, 0x00000000, menuhandlerCoopBuddy }, // "Perfect Buddy" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, // "" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(259), 0x00000000, menuhandlerBuddyOptionsContinue }, // "Continue" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(260), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_259, 0x00000000, menuhandlerBuddyOptionsContinue }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_260, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, // "" }; struct menudialog g_CoopOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(255), // "Co-Operative Options" + L_OPTIONS_255, // "Co-Operative Options" g_CoopOptionsMenuItems, menudialogCoopAntiOptions, 0x00000004, @@ -1533,7 +1533,7 @@ s32 menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata s32 menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data) { - const u16 labels[] = {L_OPTIONS(271), L_OPTIONS(272)}; + const u16 labels[] = {L_OPTIONS_271, L_OPTIONS_272}; switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -1554,17 +1554,17 @@ s32 menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdat } struct menuitem g_AntiOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(267), 0x00000000, menuhandlerAntiRadar }, // "Radar On" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(268), 0x00000000, menuhandlerAntiPlayer }, // "Counter-Operative" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_267, 0x00000000, menuhandlerAntiRadar }, // "Radar On" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_268, 0x00000000, menuhandlerAntiPlayer }, // "Counter-Operative" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(269), 0x00000000, menuhandlerBuddyOptionsContinue }, // "Continue" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(270), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_269, 0x00000000, menuhandlerBuddyOptionsContinue }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_270, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_AntiOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(266), // "Counter-Operative Options" + L_OPTIONS_266, // "Counter-Operative Options" g_AntiOptionsMenuItems, menudialogCoopAntiOptions, 0x00000004, @@ -1593,17 +1593,17 @@ s32 menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handle } struct menuitem g_CoopMissionDifficultyMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), 0x00000000, menuhandlerCoopDifficulty }, // "Agent" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), 0x00000000, menuhandlerCoopDifficulty }, // "Special Agent" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), 0x00000000, menuhandlerCoopDifficulty }, // "Perfect Agent" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_251, 0x00000000, menuhandlerCoopDifficulty }, // "Agent" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS_252, 0x00000000, menuhandlerCoopDifficulty }, // "Special Agent" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS_253, 0x00000000, menuhandlerCoopDifficulty }, // "Perfect Agent" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(254), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_254, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CoopMissionDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(248), // "Select Difficulty" + L_OPTIONS_248, // "Select Difficulty" g_CoopMissionDifficultyMenuItems, NULL, 0x00000004, @@ -1625,17 +1625,17 @@ s32 menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handle } struct menuitem g_AntiMissionDifficultyMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(251), 0x00000000, menuhandlerAntiDifficulty }, // "Agent" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(252), 0x00000000, menuhandlerAntiDifficulty }, // "Special Agent" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(253), 0x00000000, menuhandlerAntiDifficulty }, // "Perfect Agent" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_251, 0x00000000, menuhandlerAntiDifficulty }, // "Agent" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS_252, 0x00000000, menuhandlerAntiDifficulty }, // "Special Agent" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS_253, 0x00000000, menuhandlerAntiDifficulty }, // "Perfect Agent" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(254), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_254, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_AntiMissionDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(248), // "Select Difficulty" + L_OPTIONS_248, // "Select Difficulty" g_AntiMissionDifficultyMenuItems, NULL, 0x00000004, @@ -1644,27 +1644,27 @@ struct menudialog g_AntiMissionDifficultyMenuDialog = { struct stageoverviewentry g_StageNames[NUM_SOLOSTAGES] = { // stage, unk04, - { STAGE_DEFECTION, 0x0c, L_OPTIONS(133), L_OPTIONS(134), L_MPWEAPONS(124) }, - { STAGE_INVESTIGATION, 0x0d, L_OPTIONS(135), L_OPTIONS(136), L_MPWEAPONS(172) }, - { STAGE_EXTRACTION, 0x0e, L_OPTIONS(137), L_OPTIONS(138), L_MPWEAPONS(125) }, - { STAGE_VILLA, 0x0f, L_OPTIONS(139), L_OPTIONS(140), L_OPTIONS(139) }, - { STAGE_CHICAGO, 0x10, L_OPTIONS(141), L_OPTIONS(142), L_OPTIONS(141) }, - { STAGE_G5BUILDING, 0x11, L_OPTIONS(143), L_OPTIONS(144), L_OPTIONS(143) }, - { STAGE_INFILTRATION, 0x12, L_OPTIONS(145), L_OPTIONS(146), L_MPWEAPONS(126) }, - { STAGE_RESCUE, 0x13, L_OPTIONS(147), L_OPTIONS(148), L_MPWEAPONS(127) }, - { STAGE_ESCAPE, 0x14, L_OPTIONS(149), L_OPTIONS(150), L_MPWEAPONS(128) }, - { STAGE_AIRBASE, 0x15, L_OPTIONS(151), L_OPTIONS(152), L_OPTIONS(151) }, - { STAGE_AIRFORCEONE, 0x16, L_OPTIONS(153), L_OPTIONS(154), L_OPTIONS(153) }, - { STAGE_CRASHSITE, 0x17, L_OPTIONS(155), L_OPTIONS(156), L_OPTIONS(155) }, - { STAGE_PELAGIC, 0x18, L_OPTIONS(157), L_OPTIONS(158), L_OPTIONS(157) }, - { STAGE_DEEPSEA, 0x19, L_OPTIONS(159), L_OPTIONS(160), L_OPTIONS(159) }, - { STAGE_DEFENSE, 0x1a, L_OPTIONS(161), L_OPTIONS(162), L_OPTIONS(161) }, - { STAGE_ATTACKSHIP, 0x1b, L_OPTIONS(163), L_OPTIONS(164), L_OPTIONS(163) }, - { STAGE_SKEDARRUINS, 0x1c, L_OPTIONS(165), L_OPTIONS(166), L_OPTIONS(165) }, - { STAGE_MBR, 0x1c, L_OPTIONS(167), L_OPTIONS(3), L_OPTIONS(167) }, - { STAGE_MAIANSOS, 0x1c, L_OPTIONS(168), L_OPTIONS(3), L_OPTIONS(168) }, - { STAGE_WAR, 0x1c, L_OPTIONS(170), L_OPTIONS(3), L_OPTIONS(170) }, - { STAGE_DUEL, 0x1c, L_OPTIONS(171), L_OPTIONS(3), L_OPTIONS(171) }, + { STAGE_DEFECTION, 0x0c, L_OPTIONS_133, L_OPTIONS_134, L_MPWEAPONS_124 }, + { STAGE_INVESTIGATION, 0x0d, L_OPTIONS_135, L_OPTIONS_136, L_MPWEAPONS_172 }, + { STAGE_EXTRACTION, 0x0e, L_OPTIONS_137, L_OPTIONS_138, L_MPWEAPONS_125 }, + { STAGE_VILLA, 0x0f, L_OPTIONS_139, L_OPTIONS_140, L_OPTIONS_139 }, + { STAGE_CHICAGO, 0x10, L_OPTIONS_141, L_OPTIONS_142, L_OPTIONS_141 }, + { STAGE_G5BUILDING, 0x11, L_OPTIONS_143, L_OPTIONS_144, L_OPTIONS_143 }, + { STAGE_INFILTRATION, 0x12, L_OPTIONS_145, L_OPTIONS_146, L_MPWEAPONS_126 }, + { STAGE_RESCUE, 0x13, L_OPTIONS_147, L_OPTIONS_148, L_MPWEAPONS_127 }, + { STAGE_ESCAPE, 0x14, L_OPTIONS_149, L_OPTIONS_150, L_MPWEAPONS_128 }, + { STAGE_AIRBASE, 0x15, L_OPTIONS_151, L_OPTIONS_152, L_OPTIONS_151 }, + { STAGE_AIRFORCEONE, 0x16, L_OPTIONS_153, L_OPTIONS_154, L_OPTIONS_153 }, + { STAGE_CRASHSITE, 0x17, L_OPTIONS_155, L_OPTIONS_156, L_OPTIONS_155 }, + { STAGE_PELAGIC, 0x18, L_OPTIONS_157, L_OPTIONS_158, L_OPTIONS_157 }, + { STAGE_DEEPSEA, 0x19, L_OPTIONS_159, L_OPTIONS_160, L_OPTIONS_159 }, + { STAGE_DEFENSE, 0x1a, L_OPTIONS_161, L_OPTIONS_162, L_OPTIONS_161 }, + { STAGE_ATTACKSHIP, 0x1b, L_OPTIONS_163, L_OPTIONS_164, L_OPTIONS_163 }, + { STAGE_SKEDARRUINS, 0x1c, L_OPTIONS_165, L_OPTIONS_166, L_OPTIONS_165 }, + { STAGE_MBR, 0x1c, L_OPTIONS_167, L_OPTIONS_003, L_OPTIONS_167 }, + { STAGE_MAIANSOS, 0x1c, L_OPTIONS_168, L_OPTIONS_003, L_OPTIONS_168 }, + { STAGE_WAR, 0x1c, L_OPTIONS_170, L_OPTIONS_003, L_OPTIONS_170 }, + { STAGE_DUEL, 0x1c, L_OPTIONS_171, L_OPTIONS_003, L_OPTIONS_171 }, }; s32 getNumUnlockedSpecialStages(void) @@ -1712,16 +1712,16 @@ s32 func0f104720(s32 value) struct mission missions[] = { // first stage index, name - { 0, L_OPTIONS(123) }, // "Mission 1" - { 3, L_OPTIONS(124) }, // "Mission 2" - { 4, L_OPTIONS(125) }, // "Mission 3" - { 6, L_OPTIONS(126) }, // "Mission 4" - { 9, L_OPTIONS(127) }, // "Mission 5" - { 12, L_OPTIONS(128) }, // "Mission 6" - { 14, L_OPTIONS(129) }, // "Mission 7" - { 15, L_OPTIONS(130) }, // "Mission 8" - { 16, L_OPTIONS(131) }, // "Mission 9" - { 99, L_OPTIONS(132) }, // "Special Assignments" + { 0, L_OPTIONS_123 }, // "Mission 1" + { 3, L_OPTIONS_124 }, // "Mission 2" + { 4, L_OPTIONS_125 }, // "Mission 3" + { 6, L_OPTIONS_126 }, // "Mission 4" + { 9, L_OPTIONS_127 }, // "Mission 5" + { 12, L_OPTIONS_128 }, // "Mission 6" + { 14, L_OPTIONS_129 }, // "Mission 7" + { 15, L_OPTIONS_130 }, // "Mission 8" + { 16, L_OPTIONS_131 }, // "Mission 9" + { 99, L_OPTIONS_132 }, // "Special Assignments" }; GLOBAL_ASM( @@ -2763,7 +2763,7 @@ struct menuitem g_2PMissionBreifingVMenuItems[] = { struct menudialog g_SoloMissionBriefingMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(247), // "Briefing" + L_OPTIONS_247, // "Briefing" g_MissionBriefingMenuItems, NULL, 0x00000008, @@ -2772,7 +2772,7 @@ struct menudialog g_SoloMissionBriefingMenuDialog = { struct menudialog g_2PMissionBriefingHMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(247), // "Briefing" + L_OPTIONS_247, // "Briefing" g_MissionBriefingMenuItems, NULL, 0x00000008, @@ -2781,7 +2781,7 @@ struct menudialog g_2PMissionBriefingHMenuDialog = { struct menudialog g_2PMissionBriefingVMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(247), // "Briefing" + L_OPTIONS_247, // "Briefing" g_2PMissionBreifingVMenuItems, NULL, 0x00000008, @@ -2857,7 +2857,7 @@ struct menuitem g_2PMissionControlStyleMenuItems[] = { struct menudialog g_2PMissionControlStyleMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(236), // "Control" + L_OPTIONS_236, // "Control" g_2PMissionControlStyleMenuItems, NULL, 0x00000400, @@ -2872,7 +2872,7 @@ struct menuitem g_SoloMissionControlStyleMenuItems[] = { struct menudialog g_SoloMissionControlStyleMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(236), // "Control" + L_OPTIONS_236, // "Control" g_SoloMissionControlStyleMenuItems, NULL, 0x00000400, @@ -2887,7 +2887,7 @@ struct menuitem g_CiControlStyleMenuItems[] = { struct menudialog g_CiControlStyleMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(236), // "Control" + L_OPTIONS_236, // "Control" g_CiControlStyleMenuItems, NULL, 0x00000400, @@ -2902,7 +2902,7 @@ struct menuitem g_CiControlStylePlayer2MenuItems[] = { struct menudialog g_CiControlStylePlayer2MenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(236), // "Control" + L_OPTIONS_236, // "Control" g_CiControlStylePlayer2MenuItems, NULL, 0x00000400, @@ -2910,18 +2910,18 @@ struct menudialog g_CiControlStylePlayer2MenuDialog = { }; struct menuitem g_AudioOptionsMenuItems[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(228), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" - { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(229), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(230), 0x00000000, menuhandlerSoundMode }, // "Sound Mode" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(218), 0x00000000, menuhandlerLangFilter }, // "Language Filter" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS_228, L_MPMENU_000, menuhandlerSfxVolume }, // "Sound" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS_229, L_MPMENU_000, menuhandlerMusicVolume }, // "Music" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_230, 0x00000000, menuhandlerSoundMode }, // "Sound Mode" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_218, 0x00000000, menuhandlerLangFilter }, // "Language Filter" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(231), 0x00000000, NULL }, // "" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_231, 0x00000000, NULL }, // "" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_AudioOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(227), // "Audio Options" + L_OPTIONS_227, // "Audio Options" g_AudioOptionsMenuItems, NULL, 0x00000000, @@ -2929,18 +2929,18 @@ struct menudialog g_AudioOptionsMenuDialog = { }; struct menuitem g_2PMissionAudioOptionsVMenuItems[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS(228), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" - { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS(229), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(153), 0x00000000, menuhandlerSoundMode }, // "Mode" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(218), 0x00000000, menuhandlerLangFilter }, // "Language Filter" + { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS_228, L_MPMENU_000, menuhandlerSfxVolume }, // "Sound" + { MENUITEMTYPE_SLIDER, 0, 0x00102800, L_OPTIONS_229, L_MPMENU_000, menuhandlerMusicVolume }, // "Music" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS_153, 0x00000000, menuhandlerSoundMode }, // "Mode" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_218, 0x00000000, menuhandlerLangFilter }, // "Language Filter" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(231), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_231, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_2PMissionAudioOptionsVMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(227), // "Audio Options" + L_OPTIONS_227, // "Audio Options" g_2PMissionAudioOptionsVMenuItems, NULL, 0x00000000, @@ -2948,28 +2948,28 @@ struct menudialog g_2PMissionAudioOptionsVMenuDialog = { }; struct menuitem g_VideoOptionsMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(215), 0x00000000, menuhandlerScreenSize }, // "Screen Size" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(217), 0x00000000, menuhandlerHiRes }, // "Hi-Res" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(218), 0x00000000, menuhandlerScreenSplit }, // "2-Player Screen Split" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(170), 0x00000000, menuhandlerAlternativeTitle }, // "Alternative Title Screen" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_215, 0x00000000, menuhandlerScreenSize }, // "Screen Size" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_216, 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_217, 0x00000000, menuhandlerHiRes }, // "Hi-Res" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_218, 0x00000000, menuhandlerScreenSplit }, // "2-Player Screen Split" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_170, 0x00000000, menuhandlerAlternativeTitle }, // "Alternative Title Screen" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x000000c8, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(219), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_219, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_2PMissionVideoOptionsMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(217), 0x00000000, menuhandlerHiRes }, // "Hi-Res" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(154), 0x00000000, menuhandlerScreenSplit }, // "Split" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_216, 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_217, 0x00000000, menuhandlerHiRes }, // "Hi-Res" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS_154, 0x00000000, menuhandlerScreenSplit }, // "Split" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(219), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_219, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_VideoOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(214), // "Video Options" + L_OPTIONS_214, // "Video Options" g_VideoOptionsMenuItems, NULL, 0x00000000, @@ -2978,7 +2978,7 @@ struct menudialog g_VideoOptionsMenuDialog = { struct menudialog g_2PMissionVideoOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(214), // "Video Options" + L_OPTIONS_214, // "Video Options" g_2PMissionVideoOptionsMenuItems, NULL, 0x00000000, @@ -2986,23 +2986,23 @@ struct menudialog g_2PMissionVideoOptionsMenuDialog = { }; struct menuitem g_MissionDisplayOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(205), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(206), 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(207), 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(208), 0x00000004, menuhandlerAmmoOnScreen }, // "Ammo on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(209), 0x00000004, menuhandlerShowGunFunction }, // "Show Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(210), 0x00000004, menuhandlerPaintball }, // "Paintball" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(169), 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(168), 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(212), 0x00000004, menuhandlerShowMissionTime }, // "Show Mission Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_205, 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_206, 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_207, 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_208, 0x00000004, menuhandlerAmmoOnScreen }, // "Ammo on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_209, 0x00000004, menuhandlerShowGunFunction }, // "Show Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_210, 0x00000004, menuhandlerPaintball }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_169, 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_168, 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_212, 0x00000004, menuhandlerShowMissionTime }, // "Show Mission Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(213), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_213, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MissionDisplayOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(203), // "Display Options" + L_OPTIONS_203, // "Display Options" g_MissionDisplayOptionsMenuItems, NULL, 0x00000000, @@ -3010,23 +3010,23 @@ struct menudialog g_MissionDisplayOptionsMenuDialog = { }; struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(145), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(146), 0x00000004, menuhandlerAlwaysShowTarget }, // "Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(147), 0x00000004, menuhandlerShowZoomRange }, // "Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(148), 0x00000004, menuhandlerAmmoOnScreen }, // "Show Ammo" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(149), 0x00000004, menuhandlerShowGunFunction }, // "Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(150), 0x00000004, menuhandlerPaintball }, // "Paintball" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(169), 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(168), 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(152), 0x00000004, menuhandlerShowMissionTime }, // "Mission Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_145, 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_146, 0x00000004, menuhandlerAlwaysShowTarget }, // "Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_147, 0x00000004, menuhandlerShowZoomRange }, // "Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_148, 0x00000004, menuhandlerAmmoOnScreen }, // "Show Ammo" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_149, 0x00000004, menuhandlerShowGunFunction }, // "Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_150, 0x00000004, menuhandlerPaintball }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_169, 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_168, 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_152, 0x00000004, menuhandlerShowMissionTime }, // "Mission Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(213), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_213, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_2PMissionDisplayOptionsVMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(203), // "Display Options" + L_OPTIONS_203, // "Display Options" g_2PMissionDisplayOptionsVMenuItems, NULL, 0x00000000, @@ -3034,17 +3034,17 @@ struct menudialog g_2PMissionDisplayOptionsVMenuDialog = { }; struct menuitem g_CiDisplayMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(205), 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(206), 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(207), 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(208), 0x00000004, menuhandlerAmmoOnScreen }, // "Ammo on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(209), 0x00000004, menuhandlerShowGunFunction }, // "Show Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(210), 0x00000004, menuhandlerPaintball }, // "Paintball" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(169), 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS(168), 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(212), 0x00000004, menuhandlerShowMissionTime }, // "Show Mission Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_205, 0x00000004, menuhandlerSightOnScreen }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_206, 0x00000004, menuhandlerAlwaysShowTarget }, // "Always Show Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_207, 0x00000004, menuhandlerShowZoomRange }, // "Show Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_208, 0x00000004, menuhandlerAmmoOnScreen }, // "Ammo on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_209, 0x00000004, menuhandlerShowGunFunction }, // "Show Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_210, 0x00000004, menuhandlerPaintball }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_169, 0x00000004, menuhandlerInGameSubtitles }, // "In-Game Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPWEAPONS_168, 0x00000004, menuhandlerCutsceneSubtitles }, // "Cutscene Subtitles" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_212, 0x00000004, menuhandlerShowMissionTime }, // "Show Mission Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(213), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_213, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3052,7 +3052,7 @@ struct menudialog g_CiDisplayPlayer2MenuDialog; struct menudialog g_CiDisplayMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(203), // "Display Options" + L_OPTIONS_203, // "Display Options" g_CiDisplayMenuItems, NULL, 0x00000000, @@ -3076,7 +3076,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { struct menudialog g_CiDisplayPlayer2MenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(204), // "Display Player 2" + L_OPTIONS_204, // "Display Player 2" g_CiDisplayPlayer2MenuItems, NULL, 0x00000000, @@ -3084,20 +3084,20 @@ struct menudialog g_CiDisplayPlayer2MenuDialog = { }; struct menuitem g_MissionControlOptionsMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(194), (u32)&func0f105664, menuhandlerControlStyle }, // "Control Style" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(195), 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(196), 0x00000004, menuhandlerLookAhead }, // "Look Ahead" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(197), 0x00000004, menuhandlerHeadRoll }, // "Head Roll" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(198), 0x00000004, menuhandlerAutoAim }, // "Auto-Aim" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(199), 0x00000004, menuhandlerAimControl }, // "Aim Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_194, (u32)&func0f105664, menuhandlerControlStyle }, // "Control Style" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_195, 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_196, 0x00000004, menuhandlerLookAhead }, // "Look Ahead" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_197, 0x00000004, menuhandlerHeadRoll }, // "Head Roll" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_198, 0x00000004, menuhandlerAutoAim }, // "Auto-Aim" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_199, 0x00000004, menuhandlerAimControl }, // "Aim Control" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(200), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_200, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MissionControlOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(192), // "Control Options" + L_OPTIONS_192, // "Control Options" g_MissionControlOptionsMenuItems, NULL, 0x00000000, @@ -3105,20 +3105,20 @@ struct menudialog g_MissionControlOptionsMenuDialog = { }; struct menuitem g_CiControlOptionsMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(194), (u32)&func0f105664, (void *)&g_CiControlStyleMenuDialog }, // "Control Style" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(195), 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(196), 0x00000004, menuhandlerLookAhead }, // "Look Ahead" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(197), 0x00000004, menuhandlerHeadRoll }, // "Head Roll" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS(198), 0x00000004, menuhandlerAutoAim }, // "Auto-Aim" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(199), 0x00000004, menuhandlerAimControl }, // "Aim Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_194, (u32)&func0f105664, (void *)&g_CiControlStyleMenuDialog }, // "Control Style" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_195, 0x00000004, menuhandlerReversePitch }, // "Reverse Pitch" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_196, 0x00000004, menuhandlerLookAhead }, // "Look Ahead" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_197, 0x00000004, menuhandlerHeadRoll }, // "Head Roll" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_OPTIONS_198, 0x00000004, menuhandlerAutoAim }, // "Auto-Aim" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_199, 0x00000004, menuhandlerAimControl }, // "Aim Control" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(200), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_200, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CiControlOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(192), // "Control Options" + L_OPTIONS_192, // "Control Options" g_CiControlOptionsMenuItems, NULL, 0x00000000, @@ -3139,7 +3139,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { struct menudialog g_CiControlPlayer2MenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(193), // "Control Player 2" + L_OPTIONS_193, // "Control Player 2" g_CiControlPlayer2MenuItems, NULL, 0x00000000, @@ -3147,15 +3147,15 @@ struct menudialog g_CiControlPlayer2MenuDialog = { }; struct menuitem g_ChangeAgentMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(189), 0x00000000, NULL }, // "Do you want to load another agent?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(190), 0x00000000, menuhandlerChangeAgent }, // "Yes" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(191), 0x00000000, NULL }, // "No" + { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS_189, 0x00000000, NULL }, // "Do you want to load another agent?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_190, 0x00000000, menuhandlerChangeAgent }, // "Yes" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_191, 0x00000000, NULL }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_ChangeAgentMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(188), // "Warning" + L_OPTIONS_188, // "Warning" g_ChangeAgentMenuItems, NULL, 0x00000000, @@ -3163,28 +3163,28 @@ struct menudialog g_ChangeAgentMenuDialog = { }; struct menuitem g_SoloMissionOptionsMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(181), 0x00000000, (void *)&g_AudioOptionsMenuDialog }, // "Audio" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(182), 0x00000000, (void *)&g_VideoOptionsMenuDialog }, // "Video" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(183), 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(184), 0x00000000, (void *)&g_MissionDisplayOptionsMenuDialog }, // "Display" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_181, 0x00000000, (void *)&g_AudioOptionsMenuDialog }, // "Audio" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_182, 0x00000000, (void *)&g_VideoOptionsMenuDialog }, // "Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_183, 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_184, 0x00000000, (void *)&g_MissionDisplayOptionsMenuDialog }, // "Display" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_2PMissionOptionsHMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, (void *)&g_AudioOptionsMenuDialog }, // "Audio" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(184), 0x00000000, (void *)&g_MissionDisplayOptionsMenuDialog }, // "Display" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_181, 0x00000000, (void *)&g_AudioOptionsMenuDialog }, // "Audio" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_182, 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_183, 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_184, 0x00000000, (void *)&g_MissionDisplayOptionsMenuDialog }, // "Display" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000064, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_2PMissionOptionsVMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(181), 0x00000000, (void *)&g_2PMissionAudioOptionsVMenuDialog }, // "Audio" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(182), 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(183), 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(184), 0x00000000, (void *)&g_2PMissionDisplayOptionsVMenuDialog }, // "Display" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_181, 0x00000000, (void *)&g_2PMissionAudioOptionsVMenuDialog }, // "Audio" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_182, 0x00000000, (void *)&g_2PMissionVideoOptionsMenuDialog }, // "Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_183, 0x00000000, (void *)&g_MissionControlOptionsMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_184, 0x00000000, (void *)&g_2PMissionDisplayOptionsVMenuDialog }, // "Display" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000064, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3202,7 +3202,7 @@ struct menuitem g_CiOptionsMenuItems[] = { struct menudialog g_SoloMissionOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(180), // "Options" + L_OPTIONS_180, // "Options" g_SoloMissionOptionsMenuItems, menudialog0010559c, 0x00000000, @@ -3211,7 +3211,7 @@ struct menudialog g_SoloMissionOptionsMenuDialog = { struct menudialog g_CiOptionsViaPcMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(180), // "Options" + L_OPTIONS_180, // "Options" g_CiOptionsMenuItems, menudialog0010559c, 0x00000000, @@ -3220,7 +3220,7 @@ struct menudialog g_CiOptionsViaPcMenuDialog = { struct menudialog g_CiOptionsViaPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(180), // "Options" + L_OPTIONS_180, // "Options" g_CiOptionsMenuItems, menudialog0010559c, 0x00000000, @@ -3229,7 +3229,7 @@ struct menudialog g_CiOptionsViaPauseMenuDialog = { struct menudialog g_2PMissionOptionsHMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(180), // "Options" + L_OPTIONS_180, // "Options" g_2PMissionOptionsHMenuItems, menudialog0010559c, 0x00000000, @@ -3238,7 +3238,7 @@ struct menudialog g_2PMissionOptionsHMenuDialog = { struct menudialog g_2PMissionOptionsVMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(180), // "Options" + L_OPTIONS_180, // "Options" g_2PMissionOptionsVMenuItems, menudialog0010559c, 0x00000000, @@ -3260,7 +3260,7 @@ char *invMenuTextPrimaryFunction(struct menuitem *item) return langGet(primaryfunc->name); } - return langGet(L_OPTIONS(3)); // "\n" + return langGet(L_OPTIONS_003); // "\n" } char *invMenuTextSecondaryFunction(struct menuitem *item) @@ -3276,7 +3276,7 @@ char *invMenuTextSecondaryFunction(struct menuitem *item) return langGet(primaryfunc->name); } - return langGet(L_OPTIONS(3)); // "\n" + return langGet(L_OPTIONS_003); // "\n" } void func0f105948(s32 weaponnum) @@ -3464,14 +3464,14 @@ char *invMenuTextWeaponName(struct menuitem *item) struct weapon *weapon = weaponFindById(g_InventoryWeapon); if (weapon) { - if (weapon->manufacturer == L_GUN(0)) { // "\n" - return langGet(L_OPTIONS(3)); // "\n" + if (weapon->manufacturer == L_GUN_000) { // "\n" + return langGet(L_OPTIONS_003); // "\n" } return langGet(weapon->name); } - return langGet(L_OPTIONS(3)); // "\n" + return langGet(L_OPTIONS_003); // "\n" } /** @@ -3480,13 +3480,13 @@ char *invMenuTextWeaponName(struct menuitem *item) char *invMenuTextWeaponManufacturer(struct menuitem *item) { struct weapon *weapon = weaponFindById(g_InventoryWeapon); - u32 textid = L_GUN(0); // "\n" + u32 textid = L_GUN_000; // "\n" if (weapon) { textid = weapon->manufacturer; } - if (textid != L_GUN(0)) { + if (textid != L_GUN_000) { return langGet(textid); } @@ -3496,7 +3496,7 @@ char *invMenuTextWeaponManufacturer(struct menuitem *item) return langGet(weapon->name); } - return langGet(L_OPTIONS(3)); // "\n" + return langGet(L_OPTIONS_003); // "\n" } char *invMenuTextWeaponDescription(struct menuitem *item) @@ -3506,11 +3506,11 @@ char *invMenuTextWeaponDescription(struct menuitem *item) if (weapon) { if (g_InventoryWeapon == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) { if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - return langGet(L_GUN(237)); // Drugspy description + return langGet(L_GUN_237); // Drugspy description } if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_BOMBSPY) { - return langGet(L_GUN(236)); // Bombspy description + return langGet(L_GUN_236); // Bombspy description } } @@ -3558,14 +3558,14 @@ char *invMenuTextWeaponDescription(struct menuitem *item) } // "Cassandra De Vries' replacement necklace. Username: %s Password: %s" - sprintf(g_StringPointer, langGet(L_GUN(239)), &username, &password); + sprintf(g_StringPointer, langGet(L_GUN_239), &username, &password); return g_StringPointer; } return langGet(weapon->description); } - return langGet(L_OPTIONS(3)); // "\n" + return langGet(L_OPTIONS_003); // "\n" } GLOBAL_ASM( @@ -3875,29 +3875,29 @@ glabel var7f1b2e84 struct menuitem g_SoloMissionInventoryMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x0000006e, 0x00000063, menuhandler00106178 }, - { MENUITEMTYPE_LABEL, 0, 0x00000203, L_OPTIONS(3), (u32)&invMenuTextWeaponManufacturer, NULL }, // "" - { MENUITEMTYPE_LABEL, 0, 0x00000302, L_OPTIONS(3), (u32)&invMenuTextWeaponName, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x00000203, L_OPTIONS_003, (u32)&invMenuTextWeaponManufacturer, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x00000302, L_OPTIONS_003, (u32)&invMenuTextWeaponName, NULL }, // "" { MENUITEMTYPE_MODEL, 0, 0x00000000, 0x0000008c, 0x00000037, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000202, L_OPTIONS(3), (u32)&invMenuTextPrimaryFunction, NULL }, // "" - { MENUITEMTYPE_LABEL, 0, 0x00000202, L_OPTIONS(3), (u32)&invMenuTextSecondaryFunction, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x00000202, L_OPTIONS_003, (u32)&invMenuTextPrimaryFunction, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x00000202, L_OPTIONS_003, (u32)&invMenuTextSecondaryFunction, NULL }, // "" { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&invMenuTextWeaponDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_FrWeaponsAvailableMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x0000006e, 0x00000063, menuhandler00106028 }, - { MENUITEMTYPE_LABEL, 0, 0x0213, L_OPTIONS(3), (u32)&invMenuTextWeaponManufacturer, NULL }, // "" - { MENUITEMTYPE_LABEL, 0, 0x0312, L_OPTIONS(3), (u32)&invMenuTextWeaponName, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x0213, L_OPTIONS_003, (u32)&invMenuTextWeaponManufacturer, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x0312, L_OPTIONS_003, (u32)&invMenuTextWeaponName, NULL }, // "" { MENUITEMTYPE_MODEL, 0, 0x00000000, 0x0000008c, 0x00000037, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x0212, L_OPTIONS(3), (u32)&invMenuTextPrimaryFunction, NULL }, // "" - { MENUITEMTYPE_LABEL, 0, 0x0212, L_OPTIONS(3), (u32)&invMenuTextSecondaryFunction, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x0212, L_OPTIONS_003, (u32)&invMenuTextPrimaryFunction, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x0212, L_OPTIONS_003, (u32)&invMenuTextSecondaryFunction, NULL }, // "" { MENUITEMTYPE_MARQUEE, 0, 0x00000a00, (u32)&invMenuTextWeaponDescription, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_SoloMissionInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(178), // "Inventory" + L_OPTIONS_178, // "Inventory" g_SoloMissionInventoryMenuItems, inventoryMenuDialog, 0x00000602, @@ -3906,7 +3906,7 @@ struct menudialog g_SoloMissionInventoryMenuDialog = { struct menudialog g_FrWeaponsAvailableMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(179), // "Weapons Available" + L_OPTIONS_179, // "Weapons Available" g_FrWeaponsAvailableMenuItems, inventoryMenuDialog, 0x00000602, @@ -3939,15 +3939,15 @@ s32 menudialogAbortMission(s32 operation, struct menudialog *dialog, union handl } struct menuitem g_MissionAbortMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(175), 0x00000000, NULL }, // "Do you want to abort the mission?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(176), 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(177), 0x00000000, menuhandlerAbortMission }, // "Abort" + { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS_175, 0x00000000, NULL }, // "Do you want to abort the mission?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_176, 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_177, 0x00000000, menuhandlerAbortMission }, // "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MissionAbortMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(174), // "Warning" + L_OPTIONS_174, // "Warning" g_MissionAbortMenuItems, menudialogAbortMission, 0x00000000, @@ -3955,15 +3955,15 @@ struct menudialog g_MissionAbortMenuDialog = { }; struct menuitem g_2PMissionAbortVMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS(155), 0x00000000, NULL }, // "Do you want to abort the mission" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(176), 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(177), 0x00000000, menuhandlerAbortMission }, // "Abort" + { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPWEAPONS_155, 0x00000000, NULL }, // "Do you want to abort the mission" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_176, 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_177, 0x00000000, menuhandlerAbortMission }, // "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_2PMissionAbortVMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(174), // "Warning" + L_OPTIONS_174, // "Warning" g_2PMissionAbortVMenuItems, menudialogAbortMission, 0x00000000, @@ -3990,7 +3990,7 @@ s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union ha wanttype = BRIEFINGTYPE_TEXT_SA; } - g_Briefing.briefingtextnum = L_MISC(42); // "No briefing for this mission" + g_Briefing.briefingtextnum = L_MISC_042; // "No briefing for this mission" while (briefing) { if (briefing->type == BRIEFINGTYPE_TEXT_PA) { @@ -4019,25 +4019,25 @@ s32 soloMenuDialogPauseStatus(s32 operation, struct menudialog *dialog, union ha char *soloMenuTitlePauseStatus(struct menudialog *dialog) { if (dialog != g_Menus[g_MpPlayerNum].curframe->dialog) { - return langGet(L_OPTIONS(172)); // "Status" + return langGet(L_OPTIONS_172); // "Status" } sprintf(g_StringPointer, "%s: %s\n", langGet(g_StageNames[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS(172))); + langGet(L_OPTIONS_172)); return g_StringPointer; } struct menuitem g_2PMissionPauseVMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 2, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, (void *)&g_2PMissionAbortVMenuDialog }, // "Abort!" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_173, 0x00000000, (void *)&g_2PMissionAbortVMenuDialog }, // "Abort!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_MissionPauseMenuItems[] = { { MENUITEMTYPE_OBJECTIVES, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(173), 0x00000000, (void *)&g_MissionAbortMenuDialog }, // "Abort!" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_173, 0x00000000, (void *)&g_MissionAbortMenuDialog }, // "Abort!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -4061,7 +4061,7 @@ struct menudialog g_2PMissionPauseHMenuDialog = { struct menudialog g_2PMissionPauseVMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(172), // "Status" + L_OPTIONS_172, // "Status" g_2PMissionPauseVMenuItems, soloMenuDialogPauseStatus, 0x00000048, @@ -4074,44 +4074,44 @@ struct menudialog g_2PMissionPauseVMenuDialog = { struct cutscene g_Cutscenes[] = { // stage ID, mission, scene, name - { /* 0*/ STAGE_DEFECTION, 0, 0, L_OPTIONS(450) }, - { /* 1*/ STAGE_DEFECTION, 0, 1, L_OPTIONS(451) }, - { /* 2*/ STAGE_INVESTIGATION, 1, 0, L_OPTIONS(452) }, - { /* 3*/ STAGE_INVESTIGATION, 1, 1, L_OPTIONS(453) }, - { /* 4*/ STAGE_EXTRACTION, 2, 0, L_OPTIONS(454) }, - { /* 5*/ STAGE_EXTRACTION, 2, 1, L_OPTIONS(455) }, - { /* 6*/ STAGE_VILLA, 3, 0, L_OPTIONS(456) }, - { /* 7*/ STAGE_VILLA, 3, 2, L_OPTIONS(458) }, - { /* 8*/ STAGE_CHICAGO, 4, 0, L_OPTIONS(459) }, - { /* 9*/ STAGE_CHICAGO, 4, 1, L_OPTIONS(460) }, - { /*10*/ STAGE_G5BUILDING, 5, 0, L_OPTIONS(461) }, - { /*11*/ STAGE_G5BUILDING, 5, 1, L_OPTIONS(462) }, - { /*12*/ STAGE_G5BUILDING, 5, 2, L_OPTIONS(463) }, - { /*13*/ STAGE_INFILTRATION, 6, 0, L_OPTIONS(464) }, - { /*14*/ STAGE_INFILTRATION, 6, 1, L_OPTIONS(465) }, - { /*15*/ STAGE_RESCUE, 7, 0, L_OPTIONS(466) }, - { /*16*/ STAGE_RESCUE, 7, 1, L_OPTIONS(467) }, - { /*17*/ STAGE_ESCAPE, 8, 0, L_OPTIONS(468) }, - { /*18*/ STAGE_ESCAPE, 8, 1, L_OPTIONS(469) }, - { /*19*/ STAGE_ESCAPE, 8, 2, L_OPTIONS(470) }, - { /*20*/ STAGE_AIRBASE, 9, 0, L_OPTIONS(471) }, - { /*21*/ STAGE_AIRBASE, 9, 1, L_OPTIONS(472) }, - { /*22*/ STAGE_AIRFORCEONE, 10, 0, L_OPTIONS(473) }, - { /*23*/ STAGE_AIRFORCEONE, 10, 1, L_OPTIONS(474) }, - { /*24*/ STAGE_AIRFORCEONE, 10, 2, L_OPTIONS(475) }, - { /*25*/ STAGE_CRASHSITE, 11, 0, L_OPTIONS(476) }, - { /*26*/ STAGE_CRASHSITE, 11, 1, L_OPTIONS(477) }, - { /*27*/ STAGE_PELAGIC, 12, 0, L_OPTIONS(478) }, - { /*28*/ STAGE_PELAGIC, 12, 1, L_OPTIONS(479) }, - { /*29*/ STAGE_DEEPSEA, 13, 0, L_OPTIONS(480) }, - { /*30*/ STAGE_DEEPSEA, 13, 1, L_OPTIONS(481) }, - { /*31*/ STAGE_DEEPSEA, 13, 2, L_OPTIONS(482) }, - { /*32*/ STAGE_DEFENSE, 14, 0, L_OPTIONS(483) }, - { /*33*/ STAGE_DEFENSE, 14, 1, L_OPTIONS(484) }, - { /*34*/ STAGE_ATTACKSHIP, 15, 0, L_OPTIONS(485) }, - { /*35*/ STAGE_ATTACKSHIP, 15, 1, L_OPTIONS(486) }, - { /*36*/ STAGE_SKEDARRUINS, 16, 0, L_OPTIONS(487) }, - { /*37*/ STAGE_SKEDARRUINS, 16, 1, L_OPTIONS(488) }, + { /* 0*/ STAGE_DEFECTION, 0, 0, L_OPTIONS_450 }, + { /* 1*/ STAGE_DEFECTION, 0, 1, L_OPTIONS_451 }, + { /* 2*/ STAGE_INVESTIGATION, 1, 0, L_OPTIONS_452 }, + { /* 3*/ STAGE_INVESTIGATION, 1, 1, L_OPTIONS_453 }, + { /* 4*/ STAGE_EXTRACTION, 2, 0, L_OPTIONS_454 }, + { /* 5*/ STAGE_EXTRACTION, 2, 1, L_OPTIONS_455 }, + { /* 6*/ STAGE_VILLA, 3, 0, L_OPTIONS_456 }, + { /* 7*/ STAGE_VILLA, 3, 2, L_OPTIONS_458 }, + { /* 8*/ STAGE_CHICAGO, 4, 0, L_OPTIONS_459 }, + { /* 9*/ STAGE_CHICAGO, 4, 1, L_OPTIONS_460 }, + { /*10*/ STAGE_G5BUILDING, 5, 0, L_OPTIONS_461 }, + { /*11*/ STAGE_G5BUILDING, 5, 1, L_OPTIONS_462 }, + { /*12*/ STAGE_G5BUILDING, 5, 2, L_OPTIONS_463 }, + { /*13*/ STAGE_INFILTRATION, 6, 0, L_OPTIONS_464 }, + { /*14*/ STAGE_INFILTRATION, 6, 1, L_OPTIONS_465 }, + { /*15*/ STAGE_RESCUE, 7, 0, L_OPTIONS_466 }, + { /*16*/ STAGE_RESCUE, 7, 1, L_OPTIONS_467 }, + { /*17*/ STAGE_ESCAPE, 8, 0, L_OPTIONS_468 }, + { /*18*/ STAGE_ESCAPE, 8, 1, L_OPTIONS_469 }, + { /*19*/ STAGE_ESCAPE, 8, 2, L_OPTIONS_470 }, + { /*20*/ STAGE_AIRBASE, 9, 0, L_OPTIONS_471 }, + { /*21*/ STAGE_AIRBASE, 9, 1, L_OPTIONS_472 }, + { /*22*/ STAGE_AIRFORCEONE, 10, 0, L_OPTIONS_473 }, + { /*23*/ STAGE_AIRFORCEONE, 10, 1, L_OPTIONS_474 }, + { /*24*/ STAGE_AIRFORCEONE, 10, 2, L_OPTIONS_475 }, + { /*25*/ STAGE_CRASHSITE, 11, 0, L_OPTIONS_476 }, + { /*26*/ STAGE_CRASHSITE, 11, 1, L_OPTIONS_477 }, + { /*27*/ STAGE_PELAGIC, 12, 0, L_OPTIONS_478 }, + { /*28*/ STAGE_PELAGIC, 12, 1, L_OPTIONS_479 }, + { /*29*/ STAGE_DEEPSEA, 13, 0, L_OPTIONS_480 }, + { /*30*/ STAGE_DEEPSEA, 13, 1, L_OPTIONS_481 }, + { /*31*/ STAGE_DEEPSEA, 13, 2, L_OPTIONS_482 }, + { /*32*/ STAGE_DEFENSE, 14, 0, L_OPTIONS_483 }, + { /*33*/ STAGE_DEFENSE, 14, 1, L_OPTIONS_484 }, + { /*34*/ STAGE_ATTACKSHIP, 15, 0, L_OPTIONS_485 }, + { /*35*/ STAGE_ATTACKSHIP, 15, 1, L_OPTIONS_486 }, + { /*36*/ STAGE_SKEDARRUINS, 16, 0, L_OPTIONS_487 }, + { /*37*/ STAGE_SKEDARRUINS, 16, 1, L_OPTIONS_488 }, }; u32 g_CutsceneIndexes[] = { @@ -4168,17 +4168,17 @@ struct cutscenegroup { s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data) { struct cutscenegroup groups[] = { - { /* 0*/ 0, L_OPTIONS(436) }, // "Special" - { /* 1*/ 1, L_OPTIONS(438) }, // "Mission 1 - dataDyne Central" - { /* 2*/ 7, L_OPTIONS(439) }, - { /* 3*/ 9, L_OPTIONS(440) }, - { /* 4*/ 14, L_OPTIONS(441) }, - { /* 5*/ 21, L_OPTIONS(442) }, - { /* 6*/ 28, L_OPTIONS(443) }, - { /* 7*/ 33, L_OPTIONS(444) }, - { /* 8*/ 35, L_OPTIONS(445) }, - { /* 9*/ 37, L_OPTIONS(446) }, // "Mission 9 - Skedar Ruins" - { /*10*/ 39, L_OPTIONS(447) }, // "Finale" + { /* 0*/ 0, L_OPTIONS_436 }, // "Special" + { /* 1*/ 1, L_OPTIONS_438 }, // "Mission 1 - dataDyne Central" + { /* 2*/ 7, L_OPTIONS_439 }, + { /* 3*/ 9, L_OPTIONS_440 }, + { /* 4*/ 14, L_OPTIONS_441 }, + { /* 5*/ 21, L_OPTIONS_442 }, + { /* 6*/ 28, L_OPTIONS_443 }, + { /* 7*/ 33, L_OPTIONS_444 }, + { /* 8*/ 35, L_OPTIONS_445 }, + { /* 9*/ 37, L_OPTIONS_446 }, // "Mission 9 - Skedar Ruins" + { /*10*/ 39, L_OPTIONS_447 }, // "Finale" }; switch (operation) { @@ -4187,7 +4187,7 @@ s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *d break; case MENUOP_GETOPTIONTEXT: if (data->list.value == 0) { - sprintf(g_StringPointer, langGet(L_OPTIONS(448))); // "Play All" + sprintf(g_StringPointer, langGet(L_OPTIONS_448)); // "Play All" return (s32) g_StringPointer; } return (s32) langGet(g_Cutscenes[data->list.value - 1].name); @@ -4228,7 +4228,7 @@ struct menuitem g_CinemaMenuItems[] = { struct menudialog g_CinemaMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(490), // "Cinema" + L_OPTIONS_490, // "Cinema" g_CinemaMenuItems, NULL, 0x00000004, @@ -4246,7 +4246,7 @@ struct menuitem g_SelectMissionMenuItems[] = { struct menudialog g_SelectMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(122), // "Mission Select" + L_OPTIONS_122, // "Mission Select" g_SelectMissionMenuItems, NULL, 0x00000004, @@ -4338,17 +4338,17 @@ s32 menudialogMainMenu(s32 operation, struct menudialog *dialog, union handlerda char *mainMenuTextLabel(struct menuitem *item) { u16 nocheats[] = { - L_OPTIONS(117), // "Solo Missions" - L_OPTIONS(118), // "Combat Simulator" - L_OPTIONS(119), // "Co-Operative" - L_OPTIONS(120), // "Counter-Operative" + L_OPTIONS_117, // "Solo Missions" + L_OPTIONS_118, // "Combat Simulator" + L_OPTIONS_119, // "Co-Operative" + L_OPTIONS_120, // "Counter-Operative" }; u16 withcheats[] = { - L_MPWEAPONS(130), // "Cheat Solo Missions" - L_MPWEAPONS(131), // "Cheat Combat Simulator" - L_MPWEAPONS(132), // "Cheat Co-Operative" - L_MPWEAPONS(133), // "Cheat Counter-Operative" + L_MPWEAPONS_130, // "Cheat Solo Missions" + L_MPWEAPONS_131, // "Cheat Combat Simulator" + L_MPWEAPONS_132, // "Cheat Co-Operative" + L_MPWEAPONS_133, // "Cheat Counter-Operative" }; if (g_CheatsEnabledBank0 || g_CheatsEnabledBank1) { @@ -4359,18 +4359,18 @@ char *mainMenuTextLabel(struct menuitem *item) } struct menuitem g_MainMenuMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400008, L_MISC(446), 0x00000001, NULL }, // "Carrington Institute" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400008, L_MISC_446, 0x00000001, NULL }, // "Carrington Institute" { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, (u32)&mainMenuTextLabel, 0x00000002, menuhandlerMainMenuSoloMissions }, { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, (u32)&mainMenuTextLabel, 0x00000003, menuhandlerMainMenuCombatSimulator }, { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, (u32)&mainMenuTextLabel, 0x00000004, menuhandlerMainMenuCooperative }, { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, (u32)&mainMenuTextLabel, 0x00000005, menuhandlerMainMenuCounterOperative }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(187), 0x00000006, (void *)&g_ChangeAgentMenuDialog }, // "Change Agent..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_187, 0x00000006, (void *)&g_ChangeAgentMenuDialog }, // "Change Agent..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CiMenuViaPcMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(116), // "Perfect Menu" + L_OPTIONS_116, // "Perfect Menu" g_MainMenuMenuItems, menudialogMainMenu, 0x00000004, @@ -4379,7 +4379,7 @@ struct menudialog g_CiMenuViaPcMenuDialog = { struct menudialog g_CiMenuViaPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(116), // "Perfect Menu" + L_OPTIONS_116, // "Perfect Menu" g_MainMenuMenuItems, menudialogMainMenu, 0x00000004, diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index ff363abcb..38e88ba0d 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -73,12 +73,12 @@ glabel func0f1088d0pf char *filemgrGetDeviceName(s32 index) { u16 names[] = { - L_OPTIONS(112), // "Controller Pak 1" - L_OPTIONS(113), // "Controller Pak 2" - L_OPTIONS(114), // "Controller Pak 3" - L_OPTIONS(115), // "Controller Pak 4" - L_OPTIONS(111), // "Game Pak" - L_MPWEAPONS(229), // "Controller Pak Not Found" + L_OPTIONS_112, // "Controller Pak 1" + L_OPTIONS_113, // "Controller Pak 2" + L_OPTIONS_114, // "Controller Pak 3" + L_OPTIONS_115, // "Controller Pak 4" + L_OPTIONS_111, // "Game Pak" + L_MPWEAPONS_229, // "Controller Pak Not Found" }; if (index < ARRAYCOUNT(names)) { @@ -200,15 +200,15 @@ void func0f1083d0(struct savelocation000 *arg0, s32 filetype) } u16 g_PakFailReasons[] = { - L_OPTIONS(322), // "The Controller Pak was not found in any controller." - L_OPTIONS(323), // "File was not saved." - L_OPTIONS(324), // "File would not load." - L_OPTIONS(325), // "Could not delete the file." - L_OPTIONS(326), // "Out of memory." - L_OPTIONS(327), // "This player is already loaded for this game." - L_OPTIONS(328), // "has been removed." - L_OPTIONS(329), // "Controller Pak is damaged or incorrectly inserted." - L_OPTIONS(330), // "Game note delete failed." + L_OPTIONS_322, // "The Controller Pak was not found in any controller." + L_OPTIONS_323, // "File was not saved." + L_OPTIONS_324, // "File would not load." + L_OPTIONS_325, // "Could not delete the file." + L_OPTIONS_326, // "Out of memory." + L_OPTIONS_327, // "This player is already loaded for this game." + L_OPTIONS_328, // "has been removed." + L_OPTIONS_329, // "Controller Pak is damaged or incorrectly inserted." + L_OPTIONS_330, // "Game note delete failed." }; char *filemgrMenuTextFailReason(struct menuitem *item) @@ -289,13 +289,13 @@ void filemgrPushErrorDialog(u16 errno) struct menuitem g_FilemgrErrorMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextDeviceNameForError, 0x00000000, filemgrDeviceNameForErrorMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextFailReason, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(321), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_321, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrErrorMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(320), // "Error" + L_OPTIONS_320, // "Error" g_FilemgrErrorMenuItems, NULL, 0x00000080, @@ -305,11 +305,11 @@ struct menudialog g_FilemgrErrorMenuDialog = { s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex) { u16 names[] = { - L_OPTIONS(111), // "Game Pak" - L_OPTIONS(112), // "Controller Pak 1" - L_OPTIONS(113), // "Controller Pak 2" - L_OPTIONS(114), // "Controller Pak 3" - L_OPTIONS(115), // "Controller Pak 4" + L_OPTIONS_111, // "Game Pak" + L_OPTIONS_112, // "Controller Pak 1" + L_OPTIONS_113, // "Controller Pak 2" + L_OPTIONS_114, // "Controller Pak 3" + L_OPTIONS_115, // "Controller Pak 4" }; s32 i; @@ -335,15 +335,15 @@ s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex char *filemgrMenuTextErrorTitle(struct menuitem *item) { u16 messages[] = { - L_OPTIONS(331), // "Error Loading Game" - L_OPTIONS(332), // "Error Saving Game" - L_OPTIONS(333), // "Error Loading Player" - L_OPTIONS(334), // "Error Saving Player" - L_OPTIONS(335), // "Error Loading PerfectHead" - L_OPTIONS(336), // "Error Saving PerfectHead" - L_OPTIONS(337), // "Error Reading File" - L_OPTIONS(338), // "Error Writing File" - L_OPTIONS(339), // "Error" + L_OPTIONS_331, // "Error Loading Game" + L_OPTIONS_332, // "Error Saving Game" + L_OPTIONS_333, // "Error Loading Player" + L_OPTIONS_334, // "Error Saving Player" + L_OPTIONS_335, // "Error Loading PerfectHead" + L_OPTIONS_336, // "Error Saving PerfectHead" + L_OPTIONS_337, // "Error Reading File" + L_OPTIONS_338, // "Error Writing File" + L_OPTIONS_339, // "Error" }; switch (g_Menus[g_MpPlayerNum].unke42) { @@ -375,10 +375,10 @@ char *filemgrMenuTextErrorTitle(struct menuitem *item) char *filemgrMenuTextFileType(struct menuitem *item) { u16 names[] = { - L_OPTIONS(103), // "Single Player Agent File" - L_OPTIONS(104), // "Combat Simulator Settings File" - L_OPTIONS(105), // "Combat Simulator Player File" - L_OPTIONS(106), // "PerfectHead Files" + L_OPTIONS_103, // "Single Player Agent File" + L_OPTIONS_104, // "Combat Simulator Settings File" + L_OPTIONS_105, // "Combat Simulator Player File" + L_OPTIONS_106, // "PerfectHead Files" }; switch (g_Menus[g_MpPlayerNum].unke42) { @@ -621,7 +621,7 @@ char *filemgrMenuTextInsertOriginalPak(struct menuitem *item) } // "Please insert the Controller Pak containing your %s into any controller." - sprintf(fullbuffer, langGet(L_OPTIONS(363)), namebuffer); + sprintf(fullbuffer, langGet(L_OPTIONS_363), namebuffer); textWrap(120, fullbuffer, g_StringPointer, g_FontHandelGothicSm1, g_FontHandelGothicSm2); @@ -842,14 +842,14 @@ void filemgrDeleteCurrentFile(void) } struct menuitem g_FilemgrFileSavedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(346), 0x00000000, NULL }, // "File Saved." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(347), 0x00000000, NULL }, // "OK" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_346, 0x00000000, NULL }, // "File Saved." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_347, 0x00000000, NULL }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrFileSavedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_OPTIONS(345), // "Cool!" + L_OPTIONS_345, // "Cool!" g_FilemgrFileSavedMenuItems, NULL, 0x00000080, @@ -858,10 +858,10 @@ struct menudialog g_FilemgrFileSavedMenuDialog = { struct menuitem g_FilemgrSaveErrorMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextDeviceName, 0x00000000, filemgrDeviceNameMenuHandler }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(348), 0x00000000, NULL }, // "An error occurred while trying to save" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(349), 0x00000000, filemgrRetrySaveMenuHandler }, // "Try Again" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(350), 0x00000000, filemgrSaveElsewhereYesMenuHandler }, // "Save Elsewhere" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(351), 0x00000000, filemgrCancelSave2MenuHandler }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_348, 0x00000000, NULL }, // "An error occurred while trying to save" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_349, 0x00000000, filemgrRetrySaveMenuHandler }, // "Try Again" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_350, 0x00000000, filemgrSaveElsewhereYesMenuHandler }, // "Save Elsewhere" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_351, 0x00000000, filemgrCancelSave2MenuHandler }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -876,8 +876,8 @@ struct menudialog g_FilemgrSaveErrorMenuDialog = { struct menuitem g_FilemgrFileLoadMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextDeviceName, 0x00000000, filemgrDeviceNameMenuHandler }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(251), 0x00000000, NULL }, // "The saved file has been erased due to corruption or damage." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(354), 0x00000000, filemgrAcknowledgeFileLostMenuHandler }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_251, 0x00000000, NULL }, // "The saved file has been erased due to corruption or damage." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_354, 0x00000000, filemgrAcknowledgeFileLostMenuHandler }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -891,15 +891,15 @@ struct menudialog g_FilemgrFileLostMenuDialog = { }; struct menuitem g_FilemgrSaveElsewhereMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(360), 0x00000000, NULL }, // "Would you like to save your file elsewhere?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(361), 0x00000000, filemgrSaveElsewhereYesMenuHandler }, // "Yes" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(362), 0x00000000, filemgrCancelSave2MenuHandler }, // "No" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_360, 0x00000000, NULL }, // "Would you like to save your file elsewhere?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_361, 0x00000000, filemgrSaveElsewhereYesMenuHandler }, // "Yes" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_362, 0x00000000, filemgrCancelSave2MenuHandler }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrSaveElsewhereMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(359), // "Save" + L_OPTIONS_359, // "Save" g_FilemgrSaveElsewhereMenuItems, NULL, 0x000000a0, @@ -908,8 +908,8 @@ struct menudialog g_FilemgrSaveElsewhereMenuDialog = { struct menuitem g_PakNotOriginalMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextInsertOriginalPak, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(365), 0x00000000, filemgrReinsertedOkMenuHandler }, // "OK" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(366), 0x00000000, filemgrReinsertedCancelMenuHandler }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_365, 0x00000000, filemgrReinsertedOkMenuHandler }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_366, 0x00000000, filemgrReinsertedCancelMenuHandler }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -1318,14 +1318,14 @@ char *filemgrMenuTextDuplicateFileName(struct menuitem *item) } struct menuitem g_FilemgrRenameMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(239), 0x00000000, NULL }, // "Enter new file name:" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_239, 0x00000000, NULL }, // "Enter new file name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, filemgrConfirmRenameMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrRenameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(238), // "Change File Name" + L_MPWEAPONS_238, // "Change File Name" g_FilemgrRenameMenuItems, NULL, 0x00000080, @@ -1334,18 +1334,18 @@ struct menudialog g_FilemgrRenameMenuDialog = { struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&filemgrMenuTextDeviceNameContainingDuplicateFile, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(233), 0x00000000, NULL }, // "already contains" - { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS(234), 0x00000000, NULL }, // "a file named" + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_233, 0x00000000, NULL }, // "already contains" + { MENUITEMTYPE_LABEL, 0, 0x02000030, L_MPWEAPONS_234, 0x00000000, NULL }, // "a file named" { MENUITEMTYPE_LABEL, 0, 0x02000030, (u32)&filemgrMenuTextDuplicateFileName, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(235), 0x00000000, filemgrDuplicateRenameMenuHandler }, // "Rename File" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS(236), 0x00000000, NULL }, // "Change Location" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(237), 0x00000000, filemgrDuplicateCancelMenuHandler }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_235, 0x00000000, filemgrDuplicateRenameMenuHandler }, // "Rename File" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPWEAPONS_236, 0x00000000, NULL }, // "Change Location" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_237, 0x00000000, filemgrDuplicateCancelMenuHandler }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrDuplicateNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(232), // "Duplicate File Name" + L_MPWEAPONS_232, // "Duplicate File Name" g_FilemgrDuplicateMenuMenuItems, NULL, 0x00000080, @@ -1355,12 +1355,12 @@ struct menudialog g_FilemgrDuplicateNameMenuDialog = { char *filemgrMenuTextLocationName2(struct menuitem *item) { u16 names[] = { - L_OPTIONS(112), // "Controller Pak 1" - L_OPTIONS(113), // "Controller Pak 2" - L_OPTIONS(114), // "Controller Pak 3" - L_OPTIONS(115), // "Controller Pak 4" - L_OPTIONS(111), // "Game Pak" - L_OPTIONS(4), // "" + L_OPTIONS_112, // "Controller Pak 1" + L_OPTIONS_113, // "Controller Pak 2" + L_OPTIONS_114, // "Controller Pak 3" + L_OPTIONS_115, // "Controller Pak 4" + L_OPTIONS_111, // "Game Pak" + L_OPTIONS_004, // "" }; if (g_FileLists[g_Menus[g_MpPlayerNum].listnum] == NULL) { @@ -1389,7 +1389,7 @@ char *filemgrMenuTextSaveLocationSpaces(struct menuitem *item) } if (spacesfree == 0) { - return langGet(L_OPTIONS(372)); // "Full" + return langGet(L_OPTIONS_372); // "Full" } sprintf(g_StringPointer, "%d", spacesfree); @@ -1471,10 +1471,10 @@ s32 filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union char *filemgrMenuTextFileInUseDescription(struct menuitem *item) { if (menuIsDialogOpen(&g_FilemgrCopyMenuDialog)) { - return langGet(L_MPWEAPONS(240)); // "The file you are copying cannot be deleted." + return langGet(L_MPWEAPONS_240); // "The file you are copying cannot be deleted." } - return langGet(L_MPWEAPONS(160)); // "Cannot delete file as it is being used." + return langGet(L_MPWEAPONS_160); // "Cannot delete file as it is being used." } Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, u32 arg2, u32 arg3) @@ -1787,8 +1787,8 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl sprintf(extbuffer, "%s\n", tmpext); sprintf(pagesbuffer, "%d\n", note->file_size / 256); } else { - sprintf(generalbuffer, langGet(L_OPTIONS(392))); // "Empty" - sprintf(pagesbuffer, langGet(L_OPTIONS(393))); // "--" + sprintf(generalbuffer, langGet(L_OPTIONS_392)); // "Empty" + sprintf(pagesbuffer, langGet(L_OPTIONS_393)); // "--" sprintf(extbuffer, "", tmpname, tmpext); } @@ -1857,9 +1857,9 @@ s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handl char *pakMenuTextPagesFree(struct menuitem *item) { if (g_EditingPak == NULL) { - sprintf(g_StringPointer, langGet(L_OPTIONS(394))); // "Pages Free: " + sprintf(g_StringPointer, langGet(L_OPTIONS_394)); // "Pages Free: " } else { - sprintf(g_StringPointer, langGet(L_OPTIONS(395)), g_EditingPak->pagesfree); // "Pages Free: %d" + sprintf(g_StringPointer, langGet(L_OPTIONS_395), g_EditingPak->pagesfree); // "Pages Free: %d" } return g_StringPointer; @@ -1868,9 +1868,9 @@ char *pakMenuTextPagesFree(struct menuitem *item) char *pakMenuTextPagesUsed(struct menuitem *item) { if (g_EditingPak == NULL) { - sprintf(g_StringPointer2, langGet(L_OPTIONS(396))); // "Pages Used: " + sprintf(g_StringPointer2, langGet(L_OPTIONS_396)); // "Pages Used: " } else { - sprintf(g_StringPointer2, langGet(L_OPTIONS(397)), g_EditingPak->pagesused); // "Pages Used: %d" + sprintf(g_StringPointer2, langGet(L_OPTIONS_397), g_EditingPak->pagesused); // "Pages Used: %d" } return g_StringPointer2; @@ -1883,7 +1883,7 @@ char *pakMenuTextStatusMessage(struct menuitem *item) s32 i; if (g_EditingPak == NULL) { - return langGet(L_OPTIONS(398)); // "Perfect Dark note already exists on this Controller Pak." + return langGet(L_OPTIONS_398); // "Perfect Dark note already exists on this Controller Pak." } for (i = 0; i < ARRAYCOUNT(g_EditingPak->notes); i++) { @@ -1898,14 +1898,14 @@ char *pakMenuTextStatusMessage(struct menuitem *item) } if (haspdnote) { - return langGet(L_OPTIONS(398)); // "Perfect Dark note already exists on this Controller Pak." + return langGet(L_OPTIONS_398); // "Perfect Dark note already exists on this Controller Pak." } if (g_EditingPak->pagesfree < 28 || !hasemptynote) { - return langGet(L_OPTIONS(400)); // "Controller Pak is too full to save note- 1 note and 28 pages required to save to Controller Pak." + return langGet(L_OPTIONS_400); // "Controller Pak is too full to save note- 1 note and 28 pages required to save to Controller Pak." } - return langGet(L_OPTIONS(399)); // "There is enough space for Perfect Dark note." + return langGet(L_OPTIONS_399); // "There is enough space for Perfect Dark note." } char *pakMenuTextEditingPakName(struct menuitem *item) @@ -2142,7 +2142,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio if (data->list.unk04 == g_FileLists[0]->numfiles) { // "New Agent..." - gdl = textRenderProjected(gdl, &x, &y, langGet(L_OPTIONS(403)), + gdl = textRenderProjected(gdl, &x, &y, langGet(L_OPTIONS_403), g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); } else { if (location000) { @@ -2160,7 +2160,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio langGet(g_StageNames[stage - 1].name2)); } else { // "New Recruit" - strcpy(buffer, langGet(L_OPTIONS(404))); + strcpy(buffer, langGet(L_OPTIONS_404)); } strcat(buffer, "\n"); @@ -2173,10 +2173,10 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio if (days > 0) { // "Mission Time:" - sprintf(buffer, "%s %d:%02d:%02d", langGet(L_OPTIONS(405)), days, hours, minutes); + sprintf(buffer, "%s %d:%02d:%02d", langGet(L_OPTIONS_405), days, hours, minutes); } else { // "Mission Time:" - sprintf(buffer, "%s %02d:%02d", langGet(L_OPTIONS(405)), hours, minutes); + sprintf(buffer, "%s %02d:%02d", langGet(L_OPTIONS_405), hours, minutes); } // Useless - textwidth and textheight are not used @@ -2217,7 +2217,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio break; case MENUOP_GETOPTGROUPTEXT: if (data->list.value >= g_FileLists[0]->unk30a) { - return (u32) langGet(L_OPTIONS(402)); // "New..." + return (u32) langGet(L_OPTIONS_402); // "New..." } return filemgrGetDeviceNameOrStartIndex(0, operation, data->list.value); case MENUOP_GETGROUPSTARTINDEX: @@ -2246,7 +2246,7 @@ s32 filemgrMainMenuDialog(s32 operation, struct menudialog *dialog, union handle // Set MP player names to "Player 1" through 4 if blank for (i = 0; i < 4; i++) { if (g_MpPlayers[i].base.name[0] == '\0') { - sprintf(g_MpPlayers[i].base.name, "%s %d\n", langGet(L_MISC(437)), i + 1); + sprintf(g_MpPlayers[i].base.name, "%s %d\n", langGet(L_MISC_437), i + 1); } } break; @@ -2323,7 +2323,7 @@ void pakPushPakMenuDialog(void) } struct menuitem g_FilemgrSelectLocationMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(368), L_OPTIONS(369), NULL }, // "Where", "Spaces" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_368, L_OPTIONS_369, NULL }, // "Where", "Spaces" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_GAMEPAK, 0x00000000, (u32)&filemgrMenuTextLocationName2, (u32)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK1, 0x00000000, (u32)&filemgrMenuTextLocationName2, (u32)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler }, @@ -2331,14 +2331,14 @@ struct menuitem g_FilemgrSelectLocationMenuItems[] = { { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK3, 0x00000000, (u32)&filemgrMenuTextLocationName2, (u32)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK4, 0x00000000, (u32)&filemgrMenuTextLocationName2, (u32)&filemgrMenuTextSaveLocationSpaces, filemgrSelectLocationMenuHandler }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(370), 0x00000000, filemgrDeleteFilesForSaveMenuHandler }, // "Delete Files..." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(371), 0x00000000, filemgrCancelSaveMenuHandler }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_370, 0x00000000, filemgrDeleteFilesForSaveMenuHandler }, // "Delete Files..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_371, 0x00000000, filemgrCancelSaveMenuHandler }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrSelectLocationMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(367), // "Select Location" + L_OPTIONS_367, // "Select Location" g_FilemgrSelectLocationMenuItems, NULL, 0x00000080, @@ -2348,15 +2348,15 @@ struct menudialog g_FilemgrSelectLocationMenuDialog = { struct menuitem g_FilemgrConfirmDeleteMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&filemgrMenuTextDeleteFileName, 0x00000000, filemgrFileNameMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemgrMenuTextDeviceName, 0x00000000, filemgrDeviceNameMenuHandler }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(380), 0x00000000, NULL }, // "Are you sure you want to delete this file?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(381), 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(382), 0x00000000, filemgrConfirmDeleteMenuHandler }, // "OK" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_380, 0x00000000, NULL }, // "Are you sure you want to delete this file?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_381, 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_382, 0x00000000, filemgrConfirmDeleteMenuHandler }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrConfirmDeleteMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(379), // "Warning" + L_OPTIONS_379, // "Warning" g_FilemgrConfirmDeleteMenuItems, NULL, 0x00000080, @@ -2367,13 +2367,13 @@ struct menuitem g_FilemgrFileInUseMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000030, (u32)&filemgrMenuTextDeleteFileName, 0x00000000, filemgrFileNameMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemgrMenuTextDeviceName, 0x00000000, filemgrDeviceNameMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&filemgrMenuTextFileInUseDescription, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(161), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS_161, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrFileInUseMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(159), // "Error" + L_MPWEAPONS_159, // "Error" g_FilemgrFileInUseMenuItems, NULL, 0x00000080, @@ -2381,15 +2381,15 @@ struct menudialog g_FilemgrFileInUseMenuDialog = { }; struct menuitem g_FilemgrDeleteMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(377), 0x00000000, NULL }, // "Select a file to delete:" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_377, 0x00000000, NULL }, // "Select a file to delete:" { MENUITEMTYPE_LIST, 1, 0x00200000, 0x00000000, 0x00000000, filemgrFileToDeleteListMenuHandler }, - { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS(378), 0x00000000, NULL }, // "Press B Button to exit." + { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS_378, 0x00000000, NULL }, // "Press B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrDeleteMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(376), // "Delete File" + L_OPTIONS_376, // "Delete File" g_FilemgrDeleteMenuItems, filemgrCopyOrDeleteListMenuDialog, 0x00000000, @@ -2397,15 +2397,15 @@ struct menudialog g_FilemgrDeleteMenuDialog = { }; struct menuitem g_FilemgrCopyMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(374), 0x00000000, NULL }, // "Select a file to copy:" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_374, 0x00000000, NULL }, // "Select a file to copy:" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000000, 0x00000000, filemgrFileToCopyListMenuHandler }, - { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS(375), 0x00000000, NULL }, // "Press B Button to exit." + { MENUITEMTYPE_LABEL, 0, 0x00004030, L_OPTIONS_375, 0x00000000, NULL }, // "Press B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrCopyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(373), // "Copy File" + L_OPTIONS_373, // "Copy File" g_FilemgrCopyMenuItems, filemgrCopyOrDeleteListMenuDialog, 0x00000000, @@ -2415,15 +2415,15 @@ struct menudialog g_FilemgrCopyMenuDialog = { struct pakdata *g_EditingPak = NULL; struct menuitem g_PakDeleteNoteMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(384), 0x00000000, NULL }, // "Are you sure you want to delete this game note?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(385), 0x00000000, NULL }, // "No" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS(386), 0x00000000, pakDeleteGameNoteMenuHandler }, // "Yes" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_384, 0x00000000, NULL }, // "Are you sure you want to delete this game note?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_385, 0x00000000, NULL }, // "No" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_OPTIONS_386, 0x00000000, pakDeleteGameNoteMenuHandler }, // "Yes" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakDeleteNoteMenuDialog = { MENUDIALOGTYPE_DANGER, - L_OPTIONS(383), // "Delete Game Note" + L_OPTIONS_383, // "Delete Game Note" g_PakDeleteNoteMenuItems, NULL, 0x00000000, @@ -2431,19 +2431,19 @@ struct menudialog g_PakDeleteNoteMenuDialog = { }; struct menuitem g_PakGameNotesMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(388), (u32)&pakMenuTextEditingPakName, NULL }, // "Delete Game Notes:" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_388, (u32)&pakMenuTextEditingPakName, NULL }, // "Delete Game Notes:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x0000010e, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(389), L_OPTIONS(390), NULL }, // "Note", "Pages" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_389, L_OPTIONS_390, NULL }, // "Note", "Pages" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000c8, 0x0000006e, pakGameNoteListMenuHandler }, { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&pakMenuTextPagesFree, (u32)&pakMenuTextPagesUsed, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&pakMenuTextStatusMessage, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000030, L_OPTIONS(391), 0x00000000, NULL }, // "Press the B Button to exit." + { MENUITEMTYPE_LABEL, 0, 0x00000030, L_OPTIONS_391, 0x00000000, NULL }, // "Press the B Button to exit." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakGameNotesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(387), // "Game Notes" + L_OPTIONS_387, // "Game Notes" g_PakGameNotesMenuItems, pakGameNotesMenuDialog, 0x00000000, @@ -2451,21 +2451,21 @@ struct menudialog g_PakGameNotesMenuDialog = { }; struct menuitem g_PakChoosePakMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(108), 0x00000000, NULL }, // "Use this menu to delete game notes from your Controller Pak" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_108, 0x00000000, NULL }, // "Use this menu to delete game notes from your Controller Pak" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS(109), 0x00000000, NULL }, // "Choose Controller Pak to Edit:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(112), 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 1" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(113), 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 2" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(114), 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 3" - { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, L_OPTIONS(115), 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 4" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_OPTIONS_109, 0x00000000, NULL }, // "Choose Controller Pak to Edit:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_112, 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 1" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS_113, 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 2" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS_114, 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 3" + { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, L_OPTIONS_115, 0x00000000, pakSelectionMenuHandler }, // "Controller Pak 4" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(110), 0x00000000, NULL }, // "Exit" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_110, 0x00000000, NULL }, // "Exit" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_PakChoosePakMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(107), // "Controller Pak Menu" + L_OPTIONS_107, // "Controller Pak Menu" g_PakChoosePakMenuItems, pakChoosePakMenuDialog, 0x00000000, @@ -2473,23 +2473,23 @@ struct menudialog g_PakChoosePakMenuDialog = { }; struct menuitem g_FilemgrOperationsMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:" - { MENUITEMTYPE_SELECTABLE, FILETYPE_SOLO, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, FILETYPE_MPSETUP , 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, FILETYPE_MPPLAYER, 0x00000000, L_OPTIONS(105), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Player File" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_100, 0x00000000, NULL }, // "Copy:" + { MENUITEMTYPE_SELECTABLE, FILETYPE_SOLO, 0x00000000, L_OPTIONS_103, 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, FILETYPE_MPSETUP , 0x00000000, L_OPTIONS_104, 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, FILETYPE_MPPLAYER, 0x00000000, L_OPTIONS_105, 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(101), 0x00000000, NULL }, // "Delete:" - { MENUITEMTYPE_SELECTABLE, FILETYPE_SOLO, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, FILETYPE_MPSETUP, 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, FILETYPE_MPPLAYER, 0x00000000, L_OPTIONS(105), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Player File" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_101, 0x00000000, NULL }, // "Delete:" + { MENUITEMTYPE_SELECTABLE, FILETYPE_SOLO, 0x00000000, L_OPTIONS_103, 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, FILETYPE_MPSETUP, 0x00000000, L_OPTIONS_104, 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, FILETYPE_MPPLAYER, 0x00000000, L_OPTIONS_105, 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(102), 0x00000000, (void *)&g_PakChoosePakMenuDialog }, // "Delete Game Notes..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_102, 0x00000000, (void *)&g_PakChoosePakMenuDialog }, // "Delete Game Notes..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrOperationsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(99), // "Game Files" + L_OPTIONS_099, // "Game Files" g_FilemgrOperationsMenuItems, NULL, 0x00000020, @@ -2503,7 +2503,7 @@ struct menuitem g_FilemgrEnterNameMenuItems[] = { struct menudialog g_FilemgrEnterNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(401), // "Enter Agent Name" + L_OPTIONS_401, // "Enter Agent Name" g_FilemgrEnterNameMenuItems, NULL, 0x00000000, @@ -2511,14 +2511,14 @@ struct menudialog g_FilemgrEnterNameMenuDialog = { }; struct menuitem g_FilemgrFileSelectMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_096, 0x00000000, NULL }, // "Choose Your Reality" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, filemgrChooseAgentListMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrFileSelectMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(95), // "Perfect Dark" + L_OPTIONS_095, // "Perfect Dark" g_FilemgrFileSelectMenuItems, filemgrMainMenuDialog, 0x00000020, diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 3b15aa43c..3f1695924 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -183,23 +183,23 @@ s32 menudialog4MbMainMenu(s32 operation, struct menudialog *dialog, union handle } struct menuitem g_GameFiles4MbMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Player File" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_100, 0x00000000, NULL }, // "Copy:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_103, 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS_104, 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS_105, 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(101), 0x00000000, NULL }, // "Delete:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Single Player Agent File" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Settings File" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Player File" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_101, 0x00000000, NULL }, // "Delete:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS_103, 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Single Player Agent File" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS_104, 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Settings File" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS_105, 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Player File" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(102), 0x00000000, (void *)&g_PakChoosePakMenuDialog }, // "Delete Game Notes..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS_102, 0x00000000, (void *)&g_PakChoosePakMenuDialog }, // "Delete Game Notes..." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_GameFiles4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(99), // "Game Files" + L_OPTIONS_099, // "Game Files" g_GameFiles4MbMenuItems, NULL, 0x00000020, @@ -207,14 +207,14 @@ struct menudialog g_GameFiles4MbMenuDialog = { }; struct menuitem g_FilemgrFileSelect4MbMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality" + { MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS_096, 0x00000000, NULL }, // "Choose Your Reality" { MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, filemgrChooseAgentListMenuHandler }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FilemgrFileSelect4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(95), // "Perfect Dark" + L_OPTIONS_095, // "Perfect Dark" g_FilemgrFileSelect4MbMenuItems, filemgrMainMenuDialog, 0x00000020, @@ -222,19 +222,19 @@ struct menudialog g_FilemgrFileSelect4MbMenuDialog = { }; struct menuitem g_AudioVideo4MbMenuItems[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(308), L_MPMENU(0), menuhandlerSfxVolume }, // "Sound" - { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS(309), L_MPMENU(0), menuhandlerMusicVolume }, // "Music" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(310), 0x00000000, menuhandlerSoundMode }, // "Sound Mode" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS_308, L_MPMENU_000, menuhandlerSfxVolume }, // "Sound" + { MENUITEMTYPE_SLIDER, 0, 0x00002800, L_OPTIONS_309, L_MPMENU_000, menuhandlerMusicVolume }, // "Music" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_310, 0x00000000, menuhandlerSoundMode }, // "Sound Mode" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(311), 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_311, 0x00000000, menuhandlerScreenRatio }, // "Ratio" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS(312), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_OPTIONS_312, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_AudioVideo4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(307), // "Audio/Visual" + L_OPTIONS_307, // "Audio/Visual" g_AudioVideo4MbMenuItems, menudialog0010559c, 0x00000000, @@ -242,19 +242,19 @@ struct menudialog g_AudioVideo4MbMenuDialog = { }; struct menuitem g_MpPlayerSetup4MbMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog }, // "Name" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, (void *)&g_MpControlMenuDialog }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, (void *)&g_MpPlayerOptionsMenuDialog }, // "Player Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(35), 0x00000000, (void *)&g_MpPlayerStatsMenuDialog }, // "Statistics" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_030, (u32)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog }, // "Name" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_033, 0x00000000, (void *)&g_MpControlMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_034, 0x00000000, (void *)&g_MpPlayerOptionsMenuDialog }, // "Player Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_035, 0x00000000, (void *)&g_MpPlayerStatsMenuDialog }, // "Statistics" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_029, 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&mpMenuTextSavePlayerOrCopy, 0x00000000, menuhandlerMpSavePlayer }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpPlayerSetup4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(28), // "Player Setup" + L_MPMENU_028, // "Player Setup" g_MpPlayerSetup4MbMenuItems, NULL, 0x00000800, @@ -264,16 +264,16 @@ struct menudialog g_MpPlayerSetup4MbMenuDialog = { struct menudialog g_MpDropOut4MbMenuDialog; struct menuitem g_MpQuickGo4MbMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(456), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, (void *)&g_MpPlayerSetup4MbMenuDialog }, // "Player Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(457), 0x00000000, (void *)&g_MpDropOut4MbMenuDialog }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_456, 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_029, 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_458, 0x00000000, (void *)&g_MpPlayerSetup4MbMenuDialog }, // "Player Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_457, 0x00000000, (void *)&g_MpDropOut4MbMenuDialog }, // "Drop Out" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpQuickGo4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MISC(460), // "Quick Go" + L_MISC_460, // "Quick Go" g_MpQuickGo4MbMenuItems, menudialogMpQuickGo, 0x00000000, @@ -283,8 +283,8 @@ struct menudialog g_MpQuickGo4MbMenuDialog = { struct menuitem g_MpConfirmChallenge4MbMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(57), 0x00000000, menuhandler0010cabc }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(58), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_057, 0x00000000, menuhandler0010cabc }, // "Accept" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_058, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -304,7 +304,7 @@ struct menuitem g_MpChallenges4MbMenuItems[] = { struct menudialog g_MpChallenges4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(50), // "Combat Challenges" + L_MPMENU_050, // "Combat Challenges" g_MpChallenges4MbMenuItems, mpCombatChallengesMenuDialog, 0x00000000, @@ -312,19 +312,19 @@ struct menudialog g_MpChallenges4MbMenuDialog = { }; struct menuitem g_MainMenu4MbMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, (void *)&g_MpChallenges4MbMenuDialog }, // "Challenges" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, (void *)&g_MpLoadPresetMenuDialog }, // "Load/Preset Games" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, (void *)&g_MpQuickTeamMenuDialog }, // "Quick Start" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(444), 0x00000003, menuhandler4MbAdvancedSetup }, // "Advanced Setup" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(305), 0x00000000, (void *)&g_AudioVideo4MbMenuDialog }, // "Audio/Video" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC_441, 0x00000000, (void *)&g_MpChallenges4MbMenuDialog }, // "Challenges" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC_442, 0x00000001, (void *)&g_MpLoadPresetMenuDialog }, // "Load/Preset Games" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC_443, 0x00000002, (void *)&g_MpQuickTeamMenuDialog }, // "Quick Start" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC_444, 0x00000003, menuhandler4MbAdvancedSetup }, // "Advanced Setup" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_305, 0x00000000, (void *)&g_AudioVideo4MbMenuDialog }, // "Audio/Video" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS(306), 0x00000000, (void *)&g_ChangeAgentMenuDialog }, // "Change Agent" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_OPTIONS_306, 0x00000000, (void *)&g_ChangeAgentMenuDialog }, // "Change Agent" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MainMenu4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_OPTIONS(302), // "Small but Perfect Menu" + L_OPTIONS_302, // "Small but Perfect Menu" g_MainMenu4MbMenuItems, menudialog4MbMainMenu, 0x00000030, @@ -332,15 +332,15 @@ struct menudialog g_MainMenu4MbMenuDialog = { }; struct menuitem g_MpDropOut4MbMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(196), 0x00000000, NULL }, // "Are you sure you want to drop out?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(197), 0x00000000, menuhandler4MbDropOut }, // "Drop Out" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(198), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_196, 0x00000000, NULL }, // "Are you sure you want to drop out?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_197, 0x00000000, menuhandler4MbDropOut }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_198, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpDropOut4MbMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(195), // "Drop Out" + L_MPMENU_195, // "Drop Out" g_MpDropOut4MbMenuItems, NULL, 0x00000000, @@ -348,15 +348,15 @@ struct menudialog g_MpDropOut4MbMenuDialog = { }; struct menuitem g_UnusedAbortMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(53), 0x00000000, NULL }, // "Are you sure you want to abort the game?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(54), 0x00000000, menuhandler0010ca1c }, // "Abort" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(55), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_053, 0x00000000, NULL }, // "Are you sure you want to abort the game?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_054, 0x00000000, menuhandler0010ca1c }, // "Abort" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_055, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_UnusedAbortMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(52), // "Abort" + L_MPMENU_052, // "Abort" g_UnusedAbortMenuItems, NULL, 0x00000000, @@ -364,11 +364,11 @@ struct menudialog g_UnusedAbortMenuDialog = { }; struct menuitem g_MpEditSimulant4MbMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(95), 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(96), 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_095, 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_096, 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(98), 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(99), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_098, 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_099, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -382,26 +382,26 @@ struct menudialog g_MpEditSimulant4MbMenuDialog = { }; struct menuitem g_AdvancedSetup4MbMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog }, // "Scenario" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(44), 0x00000000, menuhandlerMpLock }, // "Lock" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU_019, (u32)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog }, // "Scenario" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_021, 0x00000000, menuhandlerMpOpenOptions }, // "Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_020, (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_044, 0x00000000, menuhandlerMpLock }, // "Lock" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), 0x00000000, (void *)&g_MpWeaponsMenuDialog }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(184), 0x00000000, (void *)&g_MpHandicapsMenuDialog }, // "Player Handicaps" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(25), 0x00000000, (void *)&g_MpSimulantsMenuDialog }, // "Simulants" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(22), 0x00000000, (void *)&g_MpTeamsMenuDialog }, // "Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_023, 0x00000000, (void *)&g_MpWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_024, 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_184, 0x00000000, (void *)&g_MpHandicapsMenuDialog }, // "Player Handicaps" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_025, 0x00000000, (void *)&g_MpSimulantsMenuDialog }, // "Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_022, 0x00000000, (void *)&g_MpTeamsMenuDialog }, // "Teams" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(36), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU(18), 0x00000000, (void *)&g_MpLoadSettingsMenuDialog }, // "Load Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(26), 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_036, 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU_018, 0x00000000, (void *)&g_MpLoadSettingsMenuDialog }, // "Load Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU_026, 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_AdvancedSetup4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(17), // "Game Setup" + L_MPMENU_017, // "Game Setup" g_AdvancedSetup4MbMenuItems, menudialogMpGameSetup, 0x00000810, diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 725425447..e606ef057 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -47,20 +47,20 @@ struct simdifficulty g_SimDifficulties[] = { }; u32 g_MpBotCommands[NUM_MPBOTCOMMANDS] = { - L_MISC(175), // "Follow" - L_MISC(176), // "Attack" - L_MISC(177), // "Defend" - L_MISC(178), // "Hold" - L_MISC(179), // "Normal" - L_MISC(180), // "Download" - L_MISC(181), // "Get Case" - L_MISC(182), // "Tag Box" - L_MISC(209), // "Save Case" - L_MISC(210), // "Def Hill" - L_MISC(211), // "Hold Hill" - L_MISC(212), // "Get Case" - L_MISC(213), // "Pop Cap" - L_MISC(214), // "Protect" + L_MISC_175, // "Follow" + L_MISC_176, // "Attack" + L_MISC_177, // "Defend" + L_MISC_178, // "Hold" + L_MISC_179, // "Normal" + L_MISC_180, // "Download" + L_MISC_181, // "Get Case" + L_MISC_182, // "Tag Box" + L_MISC_209, // "Save Case" + L_MISC_210, // "Def Hill" + L_MISC_211, // "Hold Hill" + L_MISC_212, // "Get Case" + L_MISC_213, // "Pop Cap" + L_MISC_214, // "Protect" }; bool func0f190260(struct chrdata *chr) @@ -3036,7 +3036,7 @@ void func0f1921f8(struct chrdata *chr, f32 *move, s32 numupdates, f32 arg3) char *mpGetBotCommandName(s32 command) { if (command < 0 || command >= NUM_MPBOTCOMMANDS) { - return langGet(L_MISC(179)); // "Normal" + return langGet(L_MISC_179); // "Normal" } return langGet(g_MpBotCommands[command]); diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index 7a2d11f34..c673a5a1d 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -26,36 +26,36 @@ struct mpconfigfull *g_MpCurrentChallengeConfig = NULL; // 2e4d8 struct challenge g_MpChallenges[NUM_CHALLENGES] = { - { L_OPTIONS(406), MPCONFIG_CHALLENGE01 }, // "Challenge 1" - { L_OPTIONS(407), MPCONFIG_CHALLENGE02 }, // "Challenge 2" - { L_OPTIONS(408), MPCONFIG_CHALLENGE03 }, // "Challenge 3" - { L_OPTIONS(409), MPCONFIG_CHALLENGE04 }, // "Challenge 4" - { L_OPTIONS(410), MPCONFIG_CHALLENGE05 }, // "Challenge 5" - { L_OPTIONS(411), MPCONFIG_CHALLENGE06 }, // "Challenge 6" - { L_OPTIONS(412), MPCONFIG_CHALLENGE07 }, // "Challenge 7" - { L_OPTIONS(413), MPCONFIG_CHALLENGE08 }, // "Challenge 8" - { L_OPTIONS(414), MPCONFIG_CHALLENGE09 }, // "Challenge 9" - { L_OPTIONS(415), MPCONFIG_CHALLENGE10 }, // "Challenge 10" - { L_OPTIONS(416), MPCONFIG_CHALLENGE11 }, // "Challenge 11" - { L_OPTIONS(417), MPCONFIG_CHALLENGE12 }, // "Challenge 12" - { L_OPTIONS(418), MPCONFIG_CHALLENGE13 }, // "Challenge 13" - { L_OPTIONS(419), MPCONFIG_CHALLENGE14 }, // "Challenge 14" - { L_OPTIONS(420), MPCONFIG_CHALLENGE15 }, // "Challenge 15" - { L_OPTIONS(421), MPCONFIG_CHALLENGE16 }, // "Challenge 16" - { L_OPTIONS(422), MPCONFIG_CHALLENGE17 }, // "Challenge 17" - { L_OPTIONS(423), MPCONFIG_CHALLENGE18 }, // "Challenge 18" - { L_OPTIONS(424), MPCONFIG_CHALLENGE19 }, // "Challenge 19" - { L_OPTIONS(425), MPCONFIG_CHALLENGE20 }, // "Challenge 20" - { L_OPTIONS(426), MPCONFIG_CHALLENGE21 }, // "Challenge 21" - { L_OPTIONS(427), MPCONFIG_CHALLENGE22 }, // "Challenge 22" - { L_OPTIONS(428), MPCONFIG_CHALLENGE23 }, // "Challenge 23" - { L_OPTIONS(429), MPCONFIG_CHALLENGE24 }, // "Challenge 24" - { L_OPTIONS(430), MPCONFIG_CHALLENGE25 }, // "Challenge 25" - { L_OPTIONS(431), MPCONFIG_CHALLENGE26 }, // "Challenge 26" - { L_OPTIONS(432), MPCONFIG_CHALLENGE27 }, // "Challenge 27" - { L_OPTIONS(433), MPCONFIG_CHALLENGE28 }, // "Challenge 28" - { L_OPTIONS(434), MPCONFIG_CHALLENGE29 }, // "Challenge 29" - { L_OPTIONS(435), MPCONFIG_CHALLENGE30 }, // "Challenge 30" + { L_OPTIONS_406, MPCONFIG_CHALLENGE01 }, // "Challenge 1" + { L_OPTIONS_407, MPCONFIG_CHALLENGE02 }, // "Challenge 2" + { L_OPTIONS_408, MPCONFIG_CHALLENGE03 }, // "Challenge 3" + { L_OPTIONS_409, MPCONFIG_CHALLENGE04 }, // "Challenge 4" + { L_OPTIONS_410, MPCONFIG_CHALLENGE05 }, // "Challenge 5" + { L_OPTIONS_411, MPCONFIG_CHALLENGE06 }, // "Challenge 6" + { L_OPTIONS_412, MPCONFIG_CHALLENGE07 }, // "Challenge 7" + { L_OPTIONS_413, MPCONFIG_CHALLENGE08 }, // "Challenge 8" + { L_OPTIONS_414, MPCONFIG_CHALLENGE09 }, // "Challenge 9" + { L_OPTIONS_415, MPCONFIG_CHALLENGE10 }, // "Challenge 10" + { L_OPTIONS_416, MPCONFIG_CHALLENGE11 }, // "Challenge 11" + { L_OPTIONS_417, MPCONFIG_CHALLENGE12 }, // "Challenge 12" + { L_OPTIONS_418, MPCONFIG_CHALLENGE13 }, // "Challenge 13" + { L_OPTIONS_419, MPCONFIG_CHALLENGE14 }, // "Challenge 14" + { L_OPTIONS_420, MPCONFIG_CHALLENGE15 }, // "Challenge 15" + { L_OPTIONS_421, MPCONFIG_CHALLENGE16 }, // "Challenge 16" + { L_OPTIONS_422, MPCONFIG_CHALLENGE17 }, // "Challenge 17" + { L_OPTIONS_423, MPCONFIG_CHALLENGE18 }, // "Challenge 18" + { L_OPTIONS_424, MPCONFIG_CHALLENGE19 }, // "Challenge 19" + { L_OPTIONS_425, MPCONFIG_CHALLENGE20 }, // "Challenge 20" + { L_OPTIONS_426, MPCONFIG_CHALLENGE21 }, // "Challenge 21" + { L_OPTIONS_427, MPCONFIG_CHALLENGE22 }, // "Challenge 22" + { L_OPTIONS_428, MPCONFIG_CHALLENGE23 }, // "Challenge 23" + { L_OPTIONS_429, MPCONFIG_CHALLENGE24 }, // "Challenge 24" + { L_OPTIONS_430, MPCONFIG_CHALLENGE25 }, // "Challenge 25" + { L_OPTIONS_431, MPCONFIG_CHALLENGE26 }, // "Challenge 26" + { L_OPTIONS_432, MPCONFIG_CHALLENGE27 }, // "Challenge 27" + { L_OPTIONS_433, MPCONFIG_CHALLENGE28 }, // "Challenge 28" + { L_OPTIONS_434, MPCONFIG_CHALLENGE29 }, // "Challenge 29" + { L_OPTIONS_435, MPCONFIG_CHALLENGE30 }, // "Challenge 30" }; /** diff --git a/src/game/inventory/items.c b/src/game/inventory/items.c index b7c32845c..e50970abd 100644 --- a/src/game/inventory/items.c +++ b/src/game/inventory/items.c @@ -112,7 +112,7 @@ struct inventory_typee inve_00011140 = { struct weaponfunc_shootsingle invfunc_00011160 = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -159,10 +159,10 @@ struct weapon invitem_hammer = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(0), // short name - L_GUN(0), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_000, // short name + L_GUN_000, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00001258, // flags }; @@ -185,10 +185,10 @@ struct weapon invitem_nothing = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(0), // short name - L_GUN(0), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_000, // short name + L_GUN_000, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00001000, // flags }; @@ -227,7 +227,7 @@ struct guncmd invanim_punch[] = { struct weaponfunc_close invfunc_unarmed_punch = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(100), // name + L_GUN_100, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -251,7 +251,7 @@ struct weaponfunc_close invfunc_unarmed_punch = { struct weaponfunc_close invfunc_unarmed_disarm = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(101), // name + L_GUN_101, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -291,10 +291,10 @@ struct weapon invitem_unarmed = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(6), // short name - L_GUN(6), // name - L_GUN(0), // manufacturer - L_GUN(155), // description + L_GUN_006, // short name + L_GUN_006, // name + L_GUN_000, // manufacturer + L_GUN_155, // description 0x08042258, // flags }; @@ -435,7 +435,7 @@ struct guncmd invanim_falcon2_shoot[] = { struct weaponfunc_shootsingle invfunc_falcon2_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -457,7 +457,7 @@ struct weaponfunc_shootsingle invfunc_falcon2_singleshot = { struct weaponfunc_shootsingle invfunc_falcon2silenced_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fe4, // menupos @@ -479,7 +479,7 @@ struct weaponfunc_shootsingle invfunc_falcon2silenced_singleshot = { struct weaponfunc_close invfunc_falcon2_pistolwhip = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(94), // name + L_GUN_094, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -535,10 +535,10 @@ struct weapon invitem_falcon2 = { 1, // unk38 invf_000113f4, // fptr invpartvisibility_falcon2, // part visibility - L_GUN(7), // short name - L_GUN(7), // name - L_GUN(150), // manufacturer - L_GUN(156), // description + L_GUN_007, // short name + L_GUN_007, // name + L_GUN_150, // manufacturer + L_GUN_156, // description 0x000ab67c, // flags }; @@ -560,10 +560,10 @@ struct weapon invitem_falcon2scope = { 1, // unk38 invf_00011444, // fptr invpartvisibility_falcon2scope, // part visibility - L_GUN(77), // short name - L_GUN(9), // name - L_GUN(150), // manufacturer - L_GUN(158), // description + L_GUN_077, // short name + L_GUN_009, // name + L_GUN_150, // manufacturer + L_GUN_158, // description 0x0002b67c, // flags }; @@ -585,10 +585,10 @@ struct weapon invitem_falcon2silencer = { 1, // unk38 invf_0001148c, // fptr invpartvisibility_falcon2silencer, // part visibility - L_GUN(78), // short name - L_GUN(8), // name - L_GUN(150), // manufacturer - L_GUN(157), // description + L_GUN_078, // short name + L_GUN_008, // name + L_GUN_150, // manufacturer + L_GUN_157, // description 0x000ab67c, // flags }; @@ -664,7 +664,7 @@ struct inventory_typee inve_00011970 = { struct weaponfunc_shootsingle invfunc_magsec_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -686,7 +686,7 @@ struct weaponfunc_shootsingle invfunc_magsec_singleshot = { struct weaponfunc_shootsingle invfunc_magsec_burst = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(128), // name + L_GUN_128, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -732,10 +732,10 @@ struct weapon invitem_magsec = { 1, // unk38 invf_00011840, // fptr invpartvisibility_magsec, // part visibility - L_GUN(10), // short name - L_GUN(10), // name - L_GUN(151), // manufacturer - L_GUN(159), // description + L_GUN_010, // short name + L_GUN_010, // name + L_GUN_151, // manufacturer + L_GUN_159, // description 0x000a767c, // flags }; @@ -831,7 +831,7 @@ struct guncmd invanim_dy357_pistolwhip[] = { struct weaponfunc_shootsingle invfunc_dy357_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -853,7 +853,7 @@ struct weaponfunc_shootsingle invfunc_dy357_singleshot = { struct weaponfunc_shootsingle invfunc_dy357lx_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -875,7 +875,7 @@ struct weaponfunc_shootsingle invfunc_dy357lx_singleshot = { struct weaponfunc_close invfunc_dy357_pistolwhip = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(94), // name + L_GUN_094, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -923,10 +923,10 @@ struct weapon invitem_dy357 = { 1, // unk38 invf_00011a84, // fptr invpartvisibility_dy357, // part visibility - L_GUN(84), // short name - L_GUN(12), // name - L_GUN(149), // manufacturer - L_GUN(161), // description + L_GUN_084, // short name + L_GUN_012, // name + L_GUN_149, // manufacturer + L_GUN_161, // description 0x0002f67c, // flags }; @@ -948,10 +948,10 @@ struct weapon invitem_dy357lx = { 1, // unk38 invf_00011a84, // fptr invpartvisibility_dy357, // part visibility - L_GUN(13), // short name - L_GUN(13), // name - L_GUN(149), // manufacturer - L_GUN(162), // description + L_GUN_013, // short name + L_GUN_013, // name + L_GUN_149, // manufacturer + L_GUN_162, // description 0x0002f67c, // flags }; @@ -1000,7 +1000,7 @@ struct guncmd invanim_phoenix_shoot[] = { struct weaponfunc_shootsingle invfunc_phoenix_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -1022,7 +1022,7 @@ struct weaponfunc_shootsingle invfunc_phoenix_singleshot = { struct weaponfunc_shootsingle invfunc_phoenix_explosiveshells = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(95), // name + L_GUN_095, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -1068,10 +1068,10 @@ struct weapon invitem_phoenix = { 1, // unk38 invf_00011e00, // fptr invpartvisibility_phoenix, // part visibility - L_GUN(14), // short name - L_GUN(14), // name - L_GUN(153), // manufacturer - L_GUN(163), // description + L_GUN_014, // short name + L_GUN_014, // name + L_GUN_153, // manufacturer + L_GUN_163, // description 0x000af67c, // flags }; @@ -1140,7 +1140,7 @@ struct guncmd invanim_unused_8007c0bc[] = { struct weaponfunc_shootsingle invfunc_mauler_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -1162,7 +1162,7 @@ struct weaponfunc_shootsingle invfunc_mauler_singleshot = { struct weaponfunc_shootsingle invfunc_mauler_chargeshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(129), // name + L_GUN_129, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -1208,10 +1208,10 @@ struct weapon invitem_mauler = { 1, // unk38 invf_00011fac, // fptr invpartvisibility_mauler, // part visibility - L_GUN(11), // short name - L_GUN(11), // name - L_GUN(152), // manufacturer - L_GUN(160), // description + L_GUN_011, // short name + L_GUN_011, // name + L_GUN_152, // manufacturer + L_GUN_160, // description 0x00027678, // flags }; @@ -1286,7 +1286,7 @@ struct inventory_typee inve_00012308 = { struct weaponfunc_shootauto invfunc_cmp150_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -1312,7 +1312,7 @@ struct weaponfunc_shootauto invfunc_cmp150_rapidfire = { struct weaponfunc_shootauto invfunc_cmp150_followlockon = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(102), // name + L_GUN_102, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -1362,10 +1362,10 @@ struct weapon invitem_cmp150 = { 1, // unk38 invf_000121d8, // fptr invpartvisibility_cmp150, // part visibility - L_GUN(15), // short name - L_GUN(15), // name - L_GUN(149), // manufacturer - L_GUN(164), // description + L_GUN_015, // short name + L_GUN_015, // name + L_GUN_149, // manufacturer + L_GUN_164, // description 0x4402f678, // flags }; @@ -1410,7 +1410,7 @@ struct guncmd invanim_cyclone_shoot[] = { struct weaponfunc_shootauto invfunc_cyclone_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -1436,7 +1436,7 @@ struct weaponfunc_shootauto invfunc_cyclone_rapidfire = { struct weaponfunc_shootauto invfunc_cyclone_magazinedischarge = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(97), // name + L_GUN_097, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -1486,10 +1486,10 @@ struct weapon invitem_cyclone = { 1, // unk38 invf_0001243c, // fptr invpartvisibility_cyclone, // part visibility - L_GUN(20), // short name - L_GUN(20), // name - L_GUN(151), // manufacturer - L_GUN(169), // description + L_GUN_020, // short name + L_GUN_020, // name + L_GUN_151, // manufacturer + L_GUN_169, // description 0x00027678, // flags }; @@ -1526,7 +1526,7 @@ struct inventory_typef invf_00012658[] = { struct weaponfunc_shootauto invfunc_rcp120_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -1552,7 +1552,7 @@ struct weaponfunc_shootauto invfunc_rcp120_rapidfire = { struct weaponfunc_special invfunc_rcp120_cloak = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(116), // name + L_GUN_116, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -1589,10 +1589,10 @@ struct weapon invitem_rcp120 = { 1, // unk38 invf_00012658, // fptr invpartvisibility_rcp120, // part visibility - L_GUN(22), // short name - L_GUN(22), // name - L_GUN(151), // manufacturer - L_GUN(170), // description + L_GUN_022, // short name + L_GUN_022, // name + L_GUN_151, // manufacturer + L_GUN_170, // description 0x0062e670, // flags }; @@ -1624,7 +1624,7 @@ struct inventory_typef invf_00012798[] = { struct weaponfunc_shootauto invfunc_callisto_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -1650,7 +1650,7 @@ struct weaponfunc_shootauto invfunc_callisto_rapidfire = { struct weaponfunc_shootauto invfunc_callisto_highimpactshells = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(115), // name + L_GUN_115, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -1700,10 +1700,10 @@ struct weapon invitem_callisto = { 1, // unk38 invf_00012798, // fptr invpartvisibility_callisto, // part visibility - L_GUN(23), // short name - L_GUN(23), // name - L_GUN(153), // manufacturer - L_GUN(171), // description + L_GUN_023, // short name + L_GUN_023, // name + L_GUN_153, // manufacturer + L_GUN_171, // description 0x0002e670, // flags }; @@ -1737,7 +1737,7 @@ struct guncmd invanim_dragon_reload[] = { struct weaponfunc_shootauto invfunc_dragon_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -1763,7 +1763,7 @@ struct weaponfunc_shootauto invfunc_dragon_rapidfire = { struct weaponfunc_throw invfunc_dragon_selfdestruct = { INVENTORYFUNCTYPE_THROW, - L_GUN(118), // name + L_GUN_118, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -1801,10 +1801,10 @@ struct weapon invitem_dragon = { 1, // unk38 invf_000128b8, // fptr invpartvisibility_dragon, // part visibility - L_GUN(17), // short name - L_GUN(17), // name - L_GUN(149), // manufacturer - L_GUN(166), // description + L_GUN_017, // short name + L_GUN_017, // name + L_GUN_149, // manufacturer + L_GUN_166, // description 0x04026650, // flags }; @@ -1869,7 +1869,7 @@ struct guncmd invanim_superdragon_sectopri[] = { struct weaponfunc_shootauto invfunc_superdragon_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -1895,7 +1895,7 @@ struct weaponfunc_shootauto invfunc_superdragon_rapidfire = { struct weaponfunc_shootprojectile invfunc_superdragon_grenadelauncher = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(98), // name + L_GUN_098, // name 0x00, // unk06 1, // unk07 &invmenupos_00011048, // menupos @@ -1957,10 +1957,10 @@ struct weapon invitem_superdragon = { 1, // unk38 invf_00012a08, // fptr invpartvisibility_superdragon, // part visibility - L_GUN(18), // short name - L_GUN(18), // name - L_GUN(149), // manufacturer - L_GUN(167), // description + L_GUN_018, // short name + L_GUN_018, // name + L_GUN_149, // manufacturer + L_GUN_167, // description 0x00026650, // flags }; @@ -2004,7 +2004,7 @@ struct inventory_typee inve_00012cc4 = { struct weaponfunc_shootauto invfunc_ar34_burstfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(87), // name + L_GUN_087, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -2030,7 +2030,7 @@ struct weaponfunc_shootauto invfunc_ar34_burstfire = { struct weaponfunc_shootauto invfunc_ar34_usescope = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(103), // name + L_GUN_103, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -2080,10 +2080,10 @@ struct weapon invitem_ar34 = { 1, // unk38 invf_00012c40, // fptr invpartvisibility_ar34, // part visibility - L_GUN(16), // short name - L_GUN(16), // name - L_GUN(0), // manufacturer - L_GUN(165), // description + L_GUN_016, // short name + L_GUN_016, // name + L_GUN_000, // manufacturer + L_GUN_165, // description 0x04626650, // flags }; @@ -2141,7 +2141,7 @@ struct inventory_typee inve_00012e9c = { struct weaponfunc_shootauto invfunc_k7avenger_burstfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(87), // name + L_GUN_087, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -2167,7 +2167,7 @@ struct weaponfunc_shootauto invfunc_k7avenger_burstfire = { struct weaponfunc_shootauto invfunc_k7avenger_threatdetector = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(119), // name + L_GUN_119, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -2217,10 +2217,10 @@ struct weapon invitem_k7avenger = { 1, // unk38 invf_00012df0, // fptr invpartvisibility_k7avenger, // part visibility - L_GUN(19), // short name - L_GUN(19), // name - L_GUN(149), // manufacturer - L_GUN(168), // description + L_GUN_019, // short name + L_GUN_019, // name + L_GUN_149, // manufacturer + L_GUN_168, // description 0x00022650, // flags }; @@ -2285,7 +2285,7 @@ struct guncmd invanim_laptopgun_unequip[] = { struct weaponfunc_shootauto invfunc_laptopgun_burstfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(87), // name + L_GUN_087, // name 0x00, // unk06 0, // unk07 &invmenupos_00011020, // menupos @@ -2311,7 +2311,7 @@ struct weaponfunc_shootauto invfunc_laptopgun_burstfire = { struct weaponfunc_throw invfunc_laptopgun_deploy = { INVENTORYFUNCTYPE_THROW, - L_GUN(117), // name + L_GUN_117, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -2349,10 +2349,10 @@ struct weapon invitem_laptopgun = { 1, // unk38 invf_00012fc8, // fptr invpartvisibility_laptopgun, // part visibility - L_GUN(24), // short name - L_GUN(24), // name - L_GUN(150), // manufacturer - L_GUN(172), // description + L_GUN_024, // short name + L_GUN_024, // name + L_GUN_150, // manufacturer + L_GUN_172, // description 0x0402a650, // flags }; @@ -2394,7 +2394,7 @@ struct guncmd invanim_shotgun_doubleshot[] = { struct weaponfunc_shootsingle invfunc_shotgun_single = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(89), // name + L_GUN_089, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2416,7 +2416,7 @@ struct weaponfunc_shootsingle invfunc_shotgun_single = { struct weaponfunc_shootsingle invfunc_shotgun_double = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(105), // name + L_GUN_105, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2462,10 +2462,10 @@ struct weapon invitem_shotgun = { 1, // unk38 invf_000131dc, // fptr invpartvisibility_shotgun, // part visibility - L_GUN(25), // short name - L_GUN(25), // name - L_GUN(149), // manufacturer - L_GUN(173), // description + L_GUN_025, // short name + L_GUN_025, // name + L_GUN_149, // manufacturer + L_GUN_173, // description 0x00026650, // flags }; @@ -2515,7 +2515,7 @@ struct guncmd invanim_reaper_unequip[] = { struct weaponfunc_shootauto invfunc_reaper_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(88), // name + L_GUN_088, // name 0x00, // unk06 0, // unk07 &invmenupos_0001105c, // menupos @@ -2541,7 +2541,7 @@ struct weaponfunc_shootauto invfunc_reaper_shoot = { struct weaponfunc_close invfunc_reaper_grind = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(106), // name + L_GUN_106, // name 0x00, // unk06 -1, // unk07 &invmenupos_0001100c, // menupos @@ -2589,10 +2589,10 @@ struct weapon invitem_reaper = { 1, // unk38 invf_000133c8, // fptr invpartvisibility_reaper, // part visibility - L_GUN(26), // short name - L_GUN(26), // name - L_GUN(152), // manufacturer - L_GUN(174), // description + L_GUN_026, // short name + L_GUN_026, // name + L_GUN_152, // manufacturer + L_GUN_174, // description 0x00022650, // flags }; @@ -2640,7 +2640,7 @@ struct inventory_typee inve_000135f0 = { struct weaponfunc_shootprojectile invfunc_rockerlauncher_shoot = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(91), // name + L_GUN_091, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2670,7 +2670,7 @@ struct weaponfunc_shootprojectile invfunc_rockerlauncher_shoot = { struct weaponfunc_shootprojectile invfunc_rocketlauncher_homing = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(92), // name + L_GUN_092, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2724,10 +2724,10 @@ struct weapon invitem_rocketlauncher = { 1, // unk38 invf_00013564, // fptr invpartvisibility_rocketlauncher, // part visibility - L_GUN(80), // short name - L_GUN(27), // name - L_GUN(149), // manufacturer - L_GUN(175), // description + L_GUN_080, // short name + L_GUN_027, // name + L_GUN_149, // manufacturer + L_GUN_175, // description 0x40026270, // flags }; @@ -2748,7 +2748,7 @@ struct guncmd invanim_slayer_reload[] = { struct weaponfunc_shootprojectile invfunc_slayer_shoot = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(91), // name + L_GUN_091, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2778,7 +2778,7 @@ struct weaponfunc_shootprojectile invfunc_slayer_shoot = { struct weaponfunc_shootprojectile invfunc_slayer_flybywire = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(93), // name + L_GUN_093, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2832,10 +2832,10 @@ struct weapon invitem_slayer = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(29), // short name - L_GUN(29), // name - L_GUN(152), // manufacturer - L_GUN(177), // description + L_GUN_029, // short name + L_GUN_029, // name + L_GUN_152, // manufacturer + L_GUN_177, // description 0x02026270, // flags }; @@ -2866,7 +2866,7 @@ struct guncmd invanim_devastator_reload[] = { struct weaponfunc_shootprojectile invfunc_devastator_shoot = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(98), // name + L_GUN_098, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2896,7 +2896,7 @@ struct weaponfunc_shootprojectile invfunc_devastator_shoot = { struct weaponfunc_shootprojectile invfunc_devastator_wallhugger = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(99), // name + L_GUN_099, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -2955,16 +2955,16 @@ struct weapon invitem_devastator = { 1, // unk38 NULL, // fptr invpartvisibility_devastator, // part visibility - L_GUN(28), // short name - L_GUN(28), // name - L_GUN(149), // manufacturer - L_GUN(176), // description + L_GUN_028, // short name + L_GUN_028, // name + L_GUN_149, // manufacturer + L_GUN_176, // description 0x00026270, // flags }; struct weaponfunc invfunc_mine_threatdetector = { INVENTORYFUNCTYPE_NONE, - L_GUN(119), // name + L_GUN_119, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -2991,7 +2991,7 @@ struct guncmd invanim_mine_throw[] = { struct weaponfunc_throw invfunc_timedmine_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(120), // name + L_GUN_120, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3029,10 +3029,10 @@ struct weapon invitem_timedmine = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(38), // short name - L_GUN(38), // name - L_GUN(0), // manufacturer - L_GUN(185), // description + L_GUN_038, // short name + L_GUN_038, // name + L_GUN_000, // manufacturer + L_GUN_185, // description 0x00022259, // flags }; @@ -3063,7 +3063,7 @@ struct guncmd invanim_remotemine_throw[] = { struct weaponfunc_throw invfunc_remotemine_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(122), // name + L_GUN_122, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3077,7 +3077,7 @@ struct weaponfunc_throw invfunc_remotemine_throw = { struct weaponfunc_special invfunc_remotemine_detonate = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(123), // name + L_GUN_123, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -3119,16 +3119,16 @@ struct weapon invitem_remotemine = { 1, // unk38 invf_00013b40, // fptr invpartvisibility_remotemine, // part visibility - L_GUN(40), // short name - L_GUN(40), // name - L_GUN(0), // manufacturer - L_GUN(187), // description + L_GUN_040, // short name + L_GUN_040, // name + L_GUN_000, // manufacturer + L_GUN_187, // description 0x00022259, // flags }; struct weaponfunc_throw invfunc_proxymine_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(121), // name + L_GUN_121, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3166,10 +3166,10 @@ struct weapon invitem_proximitymine = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(81), // short name - L_GUN(39), // name - L_GUN(0), // manufacturer - L_GUN(186), // description + L_GUN_081, // short name + L_GUN_039, // name + L_GUN_000, // manufacturer + L_GUN_186, // description 0x00022259, // flags }; @@ -3191,7 +3191,7 @@ struct guncmd invanim_ecmmine_throw[] = { struct weaponfunc_throw invfunc_ecmmine_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(140), // name + L_GUN_140, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3229,10 +3229,10 @@ struct weapon invitem_ecmmine = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(41), // short name - L_GUN(41), // name - L_GUN(0), // manufacturer - L_GUN(188), // description + L_GUN_041, // short name + L_GUN_041, // name + L_GUN_000, // manufacturer + L_GUN_188, // description 0x08622059, // flags }; @@ -3256,10 +3256,10 @@ struct weapon invitem_unused_8007dd88 = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(38), // short name - L_GUN(38), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_038, // short name + L_GUN_038, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x08000048, // flags }; @@ -3284,7 +3284,7 @@ struct guncmd invanim_grenade_equiporreload[] = { struct weaponfunc_throw invfunc_grenade_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(124), // name + L_GUN_124, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3298,7 +3298,7 @@ struct weaponfunc_throw invfunc_grenade_throw = { struct weaponfunc_throw invfunc_grenade_pinball = { INVENTORYFUNCTYPE_THROW, - L_GUN(125), // name + L_GUN_125, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3336,16 +3336,16 @@ struct weapon invitem_grenade = { 1, // unk38 invf_00013df8, // fptr NULL, // part visibility - L_GUN(36), // short name - L_GUN(36), // name - L_GUN(0), // manufacturer - L_GUN(183), // description + L_GUN_036, // short name + L_GUN_036, // name + L_GUN_000, // manufacturer + L_GUN_183, // description 0x0002a67d, // flags }; struct weaponfunc_throw invfunc_nbomb_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(134), // name + L_GUN_134, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3359,7 +3359,7 @@ struct weaponfunc_throw invfunc_nbomb_throw = { struct weaponfunc_throw invfunc_nbomb_proxy = { INVENTORYFUNCTYPE_THROW, - L_GUN(127), // name + L_GUN_127, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -3397,10 +3397,10 @@ struct weapon invitem_nbomb = { 1, // unk38 invf_00013df8, // fptr NULL, // part visibility - L_GUN(37), // short name - L_GUN(37), // name - L_GUN(0), // manufacturer - L_GUN(184), // description + L_GUN_037, // short name + L_GUN_037, // name + L_GUN_000, // manufacturer + L_GUN_184, // description 0x0062a67d, // flags }; @@ -3436,7 +3436,7 @@ struct inventory_typee inve_00013ff8 = { struct weaponfunc_shootsingle invfunc_farsight_shoot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(90), // name + L_GUN_090, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -3458,7 +3458,7 @@ struct weaponfunc_shootsingle invfunc_farsight_shoot = { struct weaponfunc_shootsingle invfunc_farsight_targetlocator = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(111), // name + L_GUN_111, // name 0x00, // unk06 0, // unk07 &invmenupos_00011034, // menupos @@ -3509,10 +3509,10 @@ struct weapon invitem_farsight = { 1, // unk38 invf_00013fa4, // fptr invpartvisibility_farsight, // part visibility - L_GUN(79), // short name - L_GUN(31), // name - L_GUN(0), // manufacturer - L_GUN(178), // description + L_GUN_079, // short name + L_GUN_031, // name + L_GUN_000, // manufacturer + L_GUN_178, // description 0x00026650, // flags }; @@ -3560,7 +3560,7 @@ struct guncmd invanim_crosbow_equip[] = { struct weaponfunc_shootprojectile invfunc_crossbow_lethal = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(112), // name + L_GUN_112, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fe4, // menupos @@ -3590,7 +3590,7 @@ struct weaponfunc_shootprojectile invfunc_crossbow_lethal = { struct weaponfunc_shootprojectile invfunc_crossbow_shoot = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(107), // name + L_GUN_107, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fe4, // menupos @@ -3651,10 +3651,10 @@ struct weapon invitem_crossbow = { 1, // unk38 invf_00014100, // fptr invpartvisibility_crossbow, // part visibility - L_GUN(33), // short name - L_GUN(33), // name - L_GUN(0), // manufacturer - L_GUN(180), // description + L_GUN_033, // short name + L_GUN_033, // name + L_GUN_000, // manufacturer + L_GUN_180, // description 0x00022658, // flags }; @@ -3699,7 +3699,7 @@ struct guncmd invanim_tranquilizer_reload[] = { struct weaponfunc_shootsingle invfunc_tranquilizer_shoot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(107), // name + L_GUN_107, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fe4, // menupos @@ -3721,7 +3721,7 @@ struct weaponfunc_shootsingle invfunc_tranquilizer_shoot = { struct weaponfunc_close invfunc_tranquilizer_lethal = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(108), // name + L_GUN_108, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fe4, // menupos @@ -3776,10 +3776,10 @@ struct weapon invitem_tranquilizer = { 1, // unk38 invf_00014314, // fptr invpartvisibility_tranquilizer, // part visibility - L_GUN(34), // short name - L_GUN(34), // name - L_GUN(0), // manufacturer - L_GUN(181), // description + L_GUN_034, // short name + L_GUN_034, // name + L_GUN_000, // manufacturer + L_GUN_181, // description 0x0002e65c, // flags }; @@ -3793,7 +3793,7 @@ struct inventory_ammo invammo_psychosisgun = { struct weaponfunc_shootsingle invfunc_psychosisgun_shoot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(131), // name + L_GUN_131, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fe4, // menupos @@ -3831,10 +3831,10 @@ struct weapon invitem_psychosisgun = { 1, // unk38 invf_00014314, // fptr invpartvisibility_tranquilizer, // part visibility - L_GUN(82), // short name - L_GUN(49), // name - L_GUN(0), // manufacturer - L_GUN(210), // description + L_GUN_082, // short name + L_GUN_049, // name + L_GUN_000, // manufacturer + L_GUN_210, // description 0x0002e65c, // flags }; @@ -3875,7 +3875,7 @@ struct inventory_typee inve_0001460c = { struct weaponfunc_shootsingle invfunc_sniperrifle_singleshot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_00010ff8, // menupos @@ -3897,7 +3897,7 @@ struct weaponfunc_shootsingle invfunc_sniperrifle_singleshot = { struct weaponfunc_special invfunc_sniperrifle_crouch = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(130), // name + L_GUN_130, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -3939,10 +3939,10 @@ struct weapon invitem_sniperrifle = { 1, // unk38 invf_00014590, // fptr invpartvisibility_sniperrifle, // part visibility - L_GUN(32), // short name - L_GUN(32), // name - L_GUN(0), // manufacturer - L_GUN(179), // description + L_GUN_032, // short name + L_GUN_032, // name + L_GUN_000, // manufacturer + L_GUN_179, // description 0x00026650, // flags }; @@ -3958,7 +3958,7 @@ struct guncmd invanim_laser_unequip[] = { struct weaponfunc_shootsingle invfunc_laser_pulse = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(132), // name + L_GUN_132, // name 0x00, // unk06 -1, // unk07 &invmenupos_0001100c, // menupos @@ -3980,7 +3980,7 @@ struct weaponfunc_shootsingle invfunc_laser_pulse = { struct weaponfunc_shootauto invfunc_laser_stream = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(133), // name + L_GUN_133, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -4022,10 +4022,10 @@ struct weapon invitem_laser = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(47), // short name - L_GUN(47), // name - L_GUN(150), // manufacturer - L_GUN(189), // description + L_GUN_047, // short name + L_GUN_047, // name + L_GUN_150, // manufacturer + L_GUN_189, // description 0x0412a678, // flags }; @@ -4047,7 +4047,7 @@ struct guncmd invanim_pp9i_equiporshoot[] = { struct weaponfunc_shootsingle invfunc_pp9i_shoot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4093,10 +4093,10 @@ struct weapon invitem_pp9i = { 1, // unk38 invf_000147fc, // fptr invpartvisibility_classic, // part visibility - L_GUN(50), // short name - L_GUN(50), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_050, // short name + L_GUN_050, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x000af67c, // flags }; @@ -4108,7 +4108,7 @@ struct guncmd invanim_cc13_equiporshoot[] = { struct weaponfunc_shootsingle invfunc_cc13_shoot = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(85), // name + L_GUN_085, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4154,16 +4154,16 @@ struct weapon invitem_cc13 = { 1, // unk38 invf_000147fc, // fptr invpartvisibility_classic, // part visibility - L_GUN(51), // short name - L_GUN(51), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_051, // short name + L_GUN_051, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x000af67c, // flags }; struct weaponfunc_shootauto invfunc_kl01313_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4213,16 +4213,16 @@ struct weapon invitem_kl01313 = { 1, // unk38 NULL, // fptr invpartvisibility_classic, // part visibility - L_GUN(52), // short name - L_GUN(52), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_052, // short name + L_GUN_052, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0000967c, // flags }; struct weaponfunc_shootauto invfunc_kf7special_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(87), // name + L_GUN_087, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4272,16 +4272,16 @@ struct weapon invitem_kf7special = { 1, // unk38 NULL, // fptr invpartvisibility_classic, // part visibility - L_GUN(53), // short name - L_GUN(53), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_053, // short name + L_GUN_053, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0000967c, // flags }; struct weaponfunc_shootauto invfunc_zzt9mm_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4331,16 +4331,16 @@ struct weapon invitem_zzt9mm = { 1, // unk38 NULL, // fptr invpartvisibility_classic, // part visibility - L_GUN(54), // short name - L_GUN(54), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_054, // short name + L_GUN_054, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0000967c, // flags }; struct weaponfunc_shootauto invfunc_dmc_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4390,16 +4390,16 @@ struct weapon invitem_dmc = { 1, // unk38 NULL, // fptr invpartvisibility_classic, // part visibility - L_GUN(55), // short name - L_GUN(55), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_055, // short name + L_GUN_055, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0000967c, // flags }; struct weaponfunc_shootauto invfunc_ar53_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(87), // name + L_GUN_087, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4449,16 +4449,16 @@ struct weapon invitem_ar53 = { 1, // unk38 NULL, // fptr invpartvisibility_classic, // part visibility - L_GUN(56), // short name - L_GUN(56), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_056, // short name + L_GUN_056, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0060967c, // flags }; struct weaponfunc_shootauto invfunc_rcp45_shoot = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4508,16 +4508,16 @@ struct weapon invitem_rcp45 = { 1, // unk38 NULL, // fptr invpartvisibility_classic, // part visibility - L_GUN(57), // short name - L_GUN(57), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_057, // short name + L_GUN_057, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0060967c, // flags }; struct weaponfunc invfunc_briefcase_use = { INVENTORYFUNCTYPE_NONE, - L_GUN(0), // name + L_GUN_000, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -4548,16 +4548,16 @@ struct weapon invitem_briefcase2 = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(71), // short name - L_GUN(71), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_071, // short name + L_GUN_071, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x01940808, // flags }; struct weaponfunc_shootauto invfunc_59_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4607,16 +4607,16 @@ struct weapon invitem_59 = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(0), // short name - L_GUN(0), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_000, // short name + L_GUN_000, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00001250, // flags }; struct weaponfunc_shootauto invfunc_5a_rapidfire = { INVENTORYFUNCTYPE_SHOOT_AUTOMATIC, - L_GUN(86), // name + L_GUN_086, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -4666,10 +4666,10 @@ struct weapon invitem_5a = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(0), // short name - L_GUN(0), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_000, // short name + L_GUN_000, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00001250, // flags }; @@ -4731,7 +4731,7 @@ struct guncmd invanim_combatknife_reload[] = { struct weaponfunc_close invfunc_combatknife_slash = { INVENTORYFUNCTYPE_CLOSE, - L_GUN(109), // name + L_GUN_109, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -4755,7 +4755,7 @@ struct weaponfunc_close invfunc_combatknife_slash = { struct weaponfunc_throw invfunc_combatknife_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(110), // name + L_GUN_110, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -4793,16 +4793,16 @@ struct weapon invitem_combatknife = { 1, // unk38 invf_00014fc0, // fptr NULL, // part visibility - L_GUN(83), // short name - L_GUN(35), // name - L_GUN(0), // manufacturer - L_GUN(182), // description + L_GUN_083, // short name + L_GUN_035, // name + L_GUN_000, // manufacturer + L_GUN_182, // description 0x0402f679, // flags }; struct weaponfunc_throw invfunc_bug_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(0), // name + L_GUN_000, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -4816,7 +4816,7 @@ struct weaponfunc_throw invfunc_bug_throw = { struct weaponfunc_throw invfunc_targetamplifier_throw = { INVENTORYFUNCTYPE_THROW, - L_GUN(0), // name + L_GUN_000, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -4854,10 +4854,10 @@ struct weapon invitem_commsrider = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(222), // short name - L_GUN(222), // name - L_GUN(0), // manufacturer - L_GUN(204), // description + L_GUN_222, // short name + L_GUN_222, // name + L_GUN_000, // manufacturer + L_GUN_204, // description 0x08000018, // flags }; @@ -4879,10 +4879,10 @@ struct weapon invitem_tracerbug = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(223), // short name - L_GUN(223), // name - L_GUN(0), // manufacturer - L_GUN(205), // description + L_GUN_223, // short name + L_GUN_223, // name + L_GUN_000, // manufacturer + L_GUN_205, // description 0x08000018, // flags }; @@ -4904,16 +4904,16 @@ struct weapon invitem_targetamplifier = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(235), // short name - L_GUN(224), // name - L_GUN(0), // manufacturer - L_GUN(206), // description + L_GUN_235, // short name + L_GUN_224, // name + L_GUN_000, // manufacturer + L_GUN_206, // description 0x08000018, // flags }; struct weaponfunc_device invfunc_nightvision_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(135), // name + L_GUN_135, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -4940,16 +4940,16 @@ struct weapon invitem_nightvision = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(59), // short name - L_GUN(59), // name - L_GUN(0), // manufacturer - L_GUN(191), // description + L_GUN_059, // short name + L_GUN_059, // name + L_GUN_000, // manufacturer + L_GUN_191, // description 0x08001098, // flags }; struct weaponfunc invfunc_horizonscanner_primary = { INVENTORYFUNCTYPE_NONE, - L_GUN(139), // name + L_GUN_139, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -4986,16 +4986,16 @@ struct weapon invitem_horizonscanner = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(234), // short name - L_GUN(76), // name - L_GUN(0), // manufacturer - L_GUN(196), // description + L_GUN_234, // short name + L_GUN_076, // name + L_GUN_000, // manufacturer + L_GUN_196, // description 0x08600058, // flags }; struct weaponfunc_device invfunc_cloak_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(116), // name + L_GUN_116, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5030,16 +5030,16 @@ struct weapon invitem_cloakingdevice = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(73), // short name - L_GUN(73), // name - L_GUN(0), // manufacturer - L_GUN(195), // description + L_GUN_073, // short name + L_GUN_073, // name + L_GUN_000, // manufacturer + L_GUN_195, // description 0x04000018, // flags }; struct weaponfunc_special invfunc_combatboost_boost = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(113), // name + L_GUN_113, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5052,7 +5052,7 @@ struct weaponfunc_special invfunc_combatboost_boost = { struct weaponfunc_special invfunc_combatboost_revert = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(114), // name + L_GUN_114, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5089,16 +5089,16 @@ struct weapon invitem_combatboost = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(232), // short name - L_GUN(74), // name - L_GUN(0), // manufacturer - L_GUN(190), // description + L_GUN_232, // short name + L_GUN_074, // name + L_GUN_000, // manufacturer + L_GUN_190, // description 0x34000018, // flags }; struct weaponfunc_device invfunc_suicidepill_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(0), // name + L_GUN_000, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5125,16 +5125,16 @@ struct weapon invitem_suicidepill = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(72), // short name - L_GUN(72), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_072, // short name + L_GUN_072, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x08000010, // flags }; struct weaponfunc_device invfunc_irscanner_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(138), // name + L_GUN_138, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5161,16 +5161,16 @@ struct weapon invitem_irscanner = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(69), // short name - L_GUN(69), // name - L_GUN(0), // manufacturer - L_GUN(194), // description + L_GUN_069, // short name + L_GUN_069, // name + L_GUN_000, // manufacturer + L_GUN_194, // description 0x08001058, // flags }; struct weaponfunc invfunc_disguise_primary = { INVENTORYFUNCTYPE_NONE, - L_GUN(143), // name + L_GUN_143, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -5196,10 +5196,10 @@ struct weapon invitem_disguise40 = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(43), // short name - L_GUN(43), // name - L_GUN(0), // manufacturer - L_GUN(211), // description + L_GUN_043, // short name + L_GUN_043, // name + L_GUN_000, // manufacturer + L_GUN_211, // description 0x88000018, // flags }; @@ -5221,16 +5221,16 @@ struct weapon invitem_disguise41 = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(43), // short name - L_GUN(43), // name - L_GUN(0), // manufacturer - L_GUN(211), // description + L_GUN_043, // short name + L_GUN_043, // name + L_GUN_000, // manufacturer + L_GUN_211, // description 0x88000018, // flags }; struct weaponfunc_device invfunc_camspy_deploy = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(136), // name + L_GUN_136, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5257,16 +5257,16 @@ struct weapon invitem_camspy = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(60), // short name - L_GUN(60), // name - L_GUN(0), // manufacturer - L_GUN(192), // description + L_GUN_060, // short name + L_GUN_060, // name + L_GUN_000, // manufacturer + L_GUN_192, // description 0x08001018, // flags }; struct weaponfunc_device invfunc_rtracker_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(142), // name + L_GUN_142, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5293,16 +5293,16 @@ struct weapon invitem_rtracker = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(70), // short name - L_GUN(70), // name - L_GUN(0), // manufacturer - L_GUN(198), // description + L_GUN_070, // short name + L_GUN_070, // name + L_GUN_000, // manufacturer + L_GUN_198, // description 0x08001018, // flags }; struct weaponfunc_device invfunc_xray_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(137), // name + L_GUN_137, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5329,10 +5329,10 @@ struct weapon invitem_xrayscanner = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(233), // short name - L_GUN(65), // name - L_GUN(0), // manufacturer - L_GUN(193), // description + L_GUN_233, // short name + L_GUN_065, // name + L_GUN_000, // manufacturer + L_GUN_193, // description 0x08600058, // flags }; @@ -5353,7 +5353,7 @@ struct guncmd invanim_unused_8007f794[] = { struct weaponfunc_special invfunc_datauplink_primary = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(141), // name + L_GUN_141, // name 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -5382,10 +5382,10 @@ struct weapon invitem_datauplink = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(75), // short name - L_GUN(75), // name - L_GUN(0), // manufacturer - L_GUN(197), // description + L_GUN_075, // short name + L_GUN_075, // name + L_GUN_000, // manufacturer + L_GUN_197, // description 0x88022048, // flags }; @@ -5408,10 +5408,10 @@ struct weapon invitem_doordecoder = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(63), // short name - L_GUN(63), // name - L_GUN(0), // manufacturer - L_GUN(200), // description + L_GUN_063, // short name + L_GUN_063, // name + L_GUN_000, // manufacturer + L_GUN_200, // description 0x88000008, // flags }; @@ -5434,10 +5434,10 @@ struct weapon invitem_rocket = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(44), // short name - L_GUN(44), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_044, // short name + L_GUN_044, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00000000, // flags }; @@ -5460,10 +5460,10 @@ struct weapon invitem_homingrocket = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(45), // short name - L_GUN(45), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_045, // short name + L_GUN_045, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00000000, // flags }; @@ -5485,10 +5485,10 @@ struct weapon invitem_grenaderound = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(46), // short name - L_GUN(46), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_046, // short name + L_GUN_046, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00000000, // flags }; @@ -5510,16 +5510,16 @@ struct weapon invitem_bolt = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(48), // short name - L_GUN(48), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_048, // short name + L_GUN_048, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x00000000, // flags }; struct weaponfunc_special invfunc_unused_8006f9a4 = { INVENTORYFUNCTYPE_SPECIAL, - L_GUN(144), // "Place Explosives" + L_GUN_144, // "Place Explosives" 0x00, // unk06 -1, // unk07 &invmenupos_00010fd0, // menupos @@ -5549,10 +5549,10 @@ struct weapon invitem_skedarbomb = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(221), // short name - L_GUN(221), // name - L_GUN(0), // manufacturer - L_GUN(203), // description + L_GUN_221, // short name + L_GUN_221, // name + L_GUN_000, // manufacturer + L_GUN_203, // description 0x80000000, // flags }; @@ -5575,16 +5575,16 @@ struct weapon invitem_explosives = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(64), // short name - L_GUN(64), // name - L_GUN(0), // manufacturer - L_GUN(202), // description + L_GUN_064, // short name + L_GUN_064, // name + L_GUN_000, // manufacturer + L_GUN_202, // description 0x80000000, // flags }; struct weaponfunc_device invfunc_presidentscanner_primary = { INVENTORYFUNCTYPE_DEVICE, - L_GUN(142), // name + L_GUN_142, // name 0x00, // unk06 0, // unk07 &invmenupos_00010fd0, // menupos @@ -5611,10 +5611,10 @@ struct weapon invitem_presidentscanner = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(231), // short name - L_GUN(219), // name - L_GUN(0), // manufacturer - L_GUN(199), // description + L_GUN_231, // short name + L_GUN_219, // name + L_GUN_000, // manufacturer + L_GUN_199, // description 0x08001018, // flags }; @@ -5637,10 +5637,10 @@ struct weapon invitem_autosurgeon = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(220), // short name - L_GUN(220), // name - L_GUN(0), // manufacturer - L_GUN(201), // description + L_GUN_220, // short name + L_GUN_220, // name + L_GUN_000, // manufacturer + L_GUN_201, // description 0x88000000, // flags }; @@ -5663,10 +5663,10 @@ struct weapon invitem_flightplans = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(225), // short name - L_GUN(225), // name - L_GUN(0), // manufacturer - L_GUN(207), // description + L_GUN_225, // short name + L_GUN_225, // name + L_GUN_000, // manufacturer + L_GUN_207, // description 0x08000000, // flags }; @@ -5689,10 +5689,10 @@ struct weapon invitem_researchtape = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(226), // short name - L_GUN(226), // name - L_GUN(0), // manufacturer - L_GUN(208), // description + L_GUN_226, // short name + L_GUN_226, // name + L_GUN_000, // manufacturer + L_GUN_208, // description 0x08000000, // flags }; @@ -5715,10 +5715,10 @@ struct weapon invitem_backupdisk = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(227), // short name - L_GUN(227), // name - L_GUN(0), // manufacturer - L_GUN(209), // description + L_GUN_227, // short name + L_GUN_227, // name + L_GUN_000, // manufacturer + L_GUN_209, // description 0x08000000, // flags }; @@ -5741,10 +5741,10 @@ struct weapon invitem_briefcase = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(229), // short name - L_GUN(229), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_229, // short name + L_GUN_229, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x08040000, // flags }; @@ -5767,10 +5767,10 @@ struct weapon invitem_suitcase = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(67), // short name - L_GUN(67), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_067, // short name + L_GUN_067, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x88000000, // flags }; @@ -5793,10 +5793,10 @@ struct weapon invitem_necklace = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(230), // short name - L_GUN(230), // name - L_GUN(0), // manufacturer - L_GUN(238), // description + L_GUN_230, // short name + L_GUN_230, // name + L_GUN_000, // manufacturer + L_GUN_238, // description 0x08000000, // flags }; @@ -5819,10 +5819,10 @@ struct weapon invitem_shield = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(240), // short name - L_GUN(240), // name - L_GUN(0), // manufacturer - L_GUN(241), // description + L_GUN_240, // short name + L_GUN_240, // name + L_GUN_000, // manufacturer + L_GUN_241, // description 0x08000000, // flags }; @@ -5845,16 +5845,16 @@ struct weapon invitem_keycard = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(228), // short name - L_GUN(228), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_228, // short name + L_GUN_228, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x08000000, // flags }; struct weaponfunc_shootprojectile invfunc_rocketlauncher34_primary = { INVENTORYFUNCTYPE_SHOOT_PROJECTILE, - L_GUN(0), // name + L_GUN_000, // name 0x00, // unk06 0, // unk07 &invmenupos_00011048, // menupos @@ -5908,10 +5908,10 @@ struct weapon invitem_rocketlauncher_34 = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(80), // short name - L_GUN(27), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_080, // short name + L_GUN_027, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x40026070, // flags }; @@ -5922,7 +5922,7 @@ struct guncmd invanim_tester_shoot[] = { struct weaponfunc_shootsingle invfunc_tester_primary = { INVENTORYFUNCTYPE_SHOOT_SINGLE, - L_GUN(0), // name + L_GUN_000, // name 0x00, // unk06 0, // unk07 &invmenupos_0001100c, // menupos @@ -5968,10 +5968,10 @@ struct weapon invitem_tester = { 1, // unk38 NULL, // fptr NULL, // part visibility - L_GUN(58), // short name - L_GUN(58), // name - L_GUN(0), // manufacturer - L_GUN(0), // description + L_GUN_058, // short name + L_GUN_058, // name + L_GUN_000, // manufacturer + L_GUN_000, // description 0x0000a47c, // flags }; diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 41f7dccad..924ecc98b 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -2855,10 +2855,10 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context) if (row == 4) { u16 labels[] = { - L_OPTIONS(314), // "DEL" - L_OPTIONS(315), // "CAPS" - L_OPTIONS(316), // "CANCEL" - L_OPTIONS(317), // "OK" + L_OPTIONS_314, // "DEL" + L_OPTIONS_315, // "CAPS" + L_OPTIONS_316, // "CANCEL" + L_OPTIONS_317, // "OK" }; s32 index = -1; @@ -7074,18 +7074,18 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context) if (!team) { // "Deaths" - textMeasure(&textheight, &textwidth, langGet(L_MPMENU(277)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); + textMeasure(&textheight, &textwidth, langGet(L_MPMENU_277), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); x = (context->x - textwidth) + 91; y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU(277)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, + gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_277), g_FontHandelGothicXs1, g_FontHandelGothicXs2, textcolour, context->width, context->height, 0, 0); } // "Score" - textMeasure(&textheight, &textwidth, langGet(L_MPMENU(278)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); + textMeasure(&textheight, &textwidth, langGet(L_MPMENU_278), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); x = (context->x - textwidth) + 120; y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU(278)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, + gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_278), g_FontHandelGothicXs1, g_FontHandelGothicXs2, textcolour, context->width, context->height, 0, 0); gdl = func0f153780(gdl); @@ -7317,11 +7317,11 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context) maincolour = colourBlend(maincolour, 0x00000000, 127) & 0xffffff00 | maincolour & 0xff; } - textMeasure(&textheight, &textwidth, langGet(L_MPMENU(281)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); + textMeasure(&textheight, &textwidth, langGet(L_MPMENU_281), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); x = context->x - textwidth + 121; y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU(281)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, + gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_281), g_FontHandelGothicXs1, g_FontHandelGothicXs2, maincolour, context->width, context->height, 0, 0); // Num suicides @@ -7351,17 +7351,17 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context) } // "Deaths" heading - textMeasure(&textheight, &textwidth, langGet(L_MPMENU(282)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); + textMeasure(&textheight, &textwidth, langGet(L_MPMENU_282), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); x = context->x - textwidth + 120; y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU(282)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, + gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_282), g_FontHandelGothicXs1, g_FontHandelGothicXs2, maincolour, context->width, context->height, 0, 0); // "Kills" heading - textMeasure(&textheight, &textwidth, langGet(L_MPMENU(283)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); + textMeasure(&textheight, &textwidth, langGet(L_MPMENU_283), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0); x = context->x - textwidth + 25; y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU(283)), g_FontHandelGothicXs1, g_FontHandelGothicXs2, + gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_283), g_FontHandelGothicXs1, g_FontHandelGothicXs2, maincolour, context->width, context->height, 0, 0); // Move ypos past heading row @@ -7851,37 +7851,37 @@ glabel menuRenderControllerLines // These are the action names, like "AIM", and "LOOK UP" u16 var80071354[][9] = { - /*0*/ { L_MPWEAPONS(194), L_MPWEAPONS(196), L_MPWEAPONS(202), L_MPWEAPONS(197), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(205), L_MPWEAPONS(210) }, - /*1*/ { L_MPWEAPONS(194), L_MPWEAPONS(200), L_MPWEAPONS(202), L_MPWEAPONS(201), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(205), L_MPWEAPONS(210) }, - /*2*/ { L_MPWEAPONS(203), L_MPWEAPONS(196), L_MPWEAPONS(202), L_MPWEAPONS(197), L_MPWEAPONS(205), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(194), L_MPWEAPONS(210) }, - /*3*/ { L_MPWEAPONS(203), L_MPWEAPONS(200), L_MPWEAPONS(202), L_MPWEAPONS(201), L_MPWEAPONS(205), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(194), L_MPWEAPONS(210) }, - /*4*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(205), L_OPTIONS(3) }, - /*5*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(205), L_OPTIONS(3) }, - /*6*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(206), L_MPWEAPONS(194), L_OPTIONS(3) }, - /*7*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(211), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(207), L_MPWEAPONS(194), L_OPTIONS(3) }, - /*8*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(209), L_MPWEAPONS(194), L_OPTIONS(3) }, - /*9*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(208), L_MPWEAPONS(194), L_OPTIONS(3) }, - /*10*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(209), L_MPWEAPONS(205), L_OPTIONS(3) }, - /*11*/ { L_OPTIONS(3), L_OPTIONS(3), L_MPWEAPONS(212), L_OPTIONS(3), L_MPWEAPONS(203), L_MPWEAPONS(204), L_MPWEAPONS(208), L_MPWEAPONS(205), L_OPTIONS(3) }, + /*0*/ { L_MPWEAPONS_194, L_MPWEAPONS_196, L_MPWEAPONS_202, L_MPWEAPONS_197, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_206, L_MPWEAPONS_205, L_MPWEAPONS_210 }, + /*1*/ { L_MPWEAPONS_194, L_MPWEAPONS_200, L_MPWEAPONS_202, L_MPWEAPONS_201, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_207, L_MPWEAPONS_205, L_MPWEAPONS_210 }, + /*2*/ { L_MPWEAPONS_203, L_MPWEAPONS_196, L_MPWEAPONS_202, L_MPWEAPONS_197, L_MPWEAPONS_205, L_MPWEAPONS_204, L_MPWEAPONS_206, L_MPWEAPONS_194, L_MPWEAPONS_210 }, + /*3*/ { L_MPWEAPONS_203, L_MPWEAPONS_200, L_MPWEAPONS_202, L_MPWEAPONS_201, L_MPWEAPONS_205, L_MPWEAPONS_204, L_MPWEAPONS_207, L_MPWEAPONS_194, L_MPWEAPONS_210 }, + /*4*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_211, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_206, L_MPWEAPONS_205, L_OPTIONS_003 }, + /*5*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_211, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_207, L_MPWEAPONS_205, L_OPTIONS_003 }, + /*6*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_211, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_206, L_MPWEAPONS_194, L_OPTIONS_003 }, + /*7*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_211, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_207, L_MPWEAPONS_194, L_OPTIONS_003 }, + /*8*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_212, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_209, L_MPWEAPONS_194, L_OPTIONS_003 }, + /*9*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_212, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_208, L_MPWEAPONS_194, L_OPTIONS_003 }, + /*10*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_212, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_209, L_MPWEAPONS_205, L_OPTIONS_003 }, + /*11*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_212, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_208, L_MPWEAPONS_205, L_OPTIONS_003 }, }; u16 menuControllerGetButtonAction(s32 mode, s32 buttonnum) { u32 textid = var80071354[mode][buttonnum]; - if (textid == L_MPWEAPONS(194) // "AIM" + if (textid == L_MPWEAPONS_194 // "AIM" && optionsGetAimControl(g_Menus[g_MpPlayerNum].data.main.mpindex) == AIMCONTROL_TOGGLE) { - textid = L_MPWEAPONS(195); // "AIM TOGGLE" + textid = L_MPWEAPONS_195; // "AIM TOGGLE" } - if (textid == L_MPWEAPONS(196) // "LOOK UP" + if (textid == L_MPWEAPONS_196 // "LOOK UP" && optionsGetForwardPitch(g_Menus[g_MpPlayerNum].data.main.mpindex) == false) { - textid = L_MPWEAPONS(198); // "LOOK DOWN" + textid = L_MPWEAPONS_198; // "LOOK DOWN" } - if (textid == L_MPWEAPONS(197) // "LOOK DOWN" + if (textid == L_MPWEAPONS_197 // "LOOK DOWN" && optionsGetForwardPitch(g_Menus[g_MpPlayerNum].data.main.mpindex) == false) { - textid = L_MPWEAPONS(199); // "LOOK UP" + textid = L_MPWEAPONS_199; // "LOOK UP" } return textid; @@ -7904,15 +7904,15 @@ Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *c u32 colour; u16 labels[] = { - /*0*/ L_MPWEAPONS(185), // "L/R BUTTONS:" - /*1*/ L_MPWEAPONS(186), // "UP C BUTTON:" - /*2*/ L_MPWEAPONS(187), // "LEFT/RIGHT C BUTTONS:" - /*3*/ L_MPWEAPONS(188), // "DOWN C BUTTON:" - /*4*/ L_MPWEAPONS(189), // "A BUTTON:" - /*5*/ L_MPWEAPONS(190), // "B BUTTON:" - /*6*/ L_MPWEAPONS(191), // "CONTROL STICK:" - /*7*/ L_MPWEAPONS(192), // "Z BUTTON:" - /*8*/ L_MPWEAPONS(193), // "+ CONTROL PAD:" + /*0*/ L_MPWEAPONS_185, // "L/R BUTTONS:" + /*1*/ L_MPWEAPONS_186, // "UP C BUTTON:" + /*2*/ L_MPWEAPONS_187, // "LEFT/RIGHT C BUTTONS:" + /*3*/ L_MPWEAPONS_188, // "DOWN C BUTTON:" + /*4*/ L_MPWEAPONS_189, // "A BUTTON:" + /*5*/ L_MPWEAPONS_190, // "B BUTTON:" + /*6*/ L_MPWEAPONS_191, // "CONTROL STICK:" + /*7*/ L_MPWEAPONS_192, // "Z BUTTON:" + /*8*/ L_MPWEAPONS_193, // "+ CONTROL PAD:" }; s32 i; @@ -8072,13 +8072,13 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context) g_MenuColourPalettes2[frame->type].unfocused); if (g_Menus[g_MpPlayerNum].data.main.controlmode >= CONTROLMODE_21) { - sprintf(text, langGet(L_MPWEAPONS(213)), // "Control Style %s %s" + sprintf(text, langGet(L_MPWEAPONS_213), // "Control Style %s %s" langGet(g_ControlStyleOptions[g_Menus[g_MpPlayerNum].data.main.controlmode]), - langGet(L_MPWEAPONS(215))); // "(Two-Handed)" + langGet(L_MPWEAPONS_215)); // "(Two-Handed)" } else { - sprintf(text, langGet(L_MPWEAPONS(213)), // "Control Style %s %s" + sprintf(text, langGet(L_MPWEAPONS_213), // "Control Style %s %s" langGet(g_ControlStyleOptions[g_Menus[g_MpPlayerNum].data.main.controlmode]), - langGet(L_MPWEAPONS(214))); // "(One-Handed)" + langGet(L_MPWEAPONS_214)); // "(One-Handed)" } x = context->x + 2; @@ -8105,7 +8105,7 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context) x = context->x; y = context->y + 92; gdl = func0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPWEAPONS(216)), // "Hold weapon button for ..." + gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPWEAPONS_216), // "Hold weapon button for ..." g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetWidth(), viGetHeight(), 0, 0); gdl = func0f153780(gdl); } diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index ca89f4457..5d259ed89 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -129,13 +129,13 @@ char *mpMenuTextInGameLimit(struct menuitem *item) switch (item->param) { case 0: - sprintf(g_StringPointer, langGet(L_MPMENU(114)), g_MpSetup.timelimit + 1); + sprintf(g_StringPointer, langGet(L_MPMENU_114), g_MpSetup.timelimit + 1); break; case 1: - sprintf(g_StringPointer, langGet(L_MPMENU(113)), g_MpSetup.scorelimit + 1); + sprintf(g_StringPointer, langGet(L_MPMENU_113), g_MpSetup.scorelimit + 1); break; case 2: - sprintf(g_StringPointer, langGet(L_MPMENU(113)), mpCalculateTeamScoreLimit() + 1); + sprintf(g_StringPointer, langGet(L_MPMENU_113), mpCalculateTeamScoreLimit() + 1); break; } @@ -183,10 +183,10 @@ s32 menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata * char *menutextPauseOrUnpause(s32 arg0) { if (mpIsPaused()) { - return langGet(L_MPMENU(289)); // "Unpause" + return langGet(L_MPMENU_289); // "Unpause" } - return langGet(L_MPMENU(288)); // "Pause" + return langGet(L_MPMENU_288); // "Pause" } char *menutextMatchTime(s32 arg0) @@ -222,7 +222,7 @@ char *mpMenuTitleStatsFor(struct menudialog *dialog) } // "Stats for %s" - sprintf(g_StringPointer, langGet(L_MPMENU(280)), name); + sprintf(g_StringPointer, langGet(L_MPMENU_280), name); return g_StringPointer; } @@ -249,16 +249,16 @@ char *mpMenuTextAward2(struct menuitem *item) } struct menuitem g_MpEndGameMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x02000020, L_MPMENU(291), 0x00000000, NULL }, // "Are you sure?" + { MENUITEMTYPE_LABEL, 0, 0x02000020, L_MPMENU_291, 0x00000000, NULL }, // "Are you sure?" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(292), 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPMENU(293), 0x00000000, menuhandlerMpEndGame }, // "End Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_292, 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPMENU_293, 0x00000000, menuhandlerMpEndGame }, // "End Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpEndGameMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(290), // "End Game" + L_MPMENU_290, // "End Game" g_MpEndGameMenuItems, NULL, 0x00000000, @@ -268,19 +268,19 @@ struct menudialog g_MpEndGameMenuDialog = { struct menuitem g_MpPauseControlMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextChallengeName, 0x00000000, menuhandler00178018 }, { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextScenarioName, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS(162), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Time Limit:" - { MENUITEMTYPE_LABEL, 1, 0x00000200, L_MPWEAPONS(163), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Score Limit:" - { MENUITEMTYPE_LABEL, 2, 0x00000200, L_MPWEAPONS(164), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Team Score Limit:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS_162, (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Time Limit:" + { MENUITEMTYPE_LABEL, 1, 0x00000200, L_MPWEAPONS_163, (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Score Limit:" + { MENUITEMTYPE_LABEL, 2, 0x00000200, L_MPWEAPONS_164, (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Team Score Limit:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(286), (u32)&menutextMatchTime, NULL }, // "Game Time:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_286, (u32)&menutextMatchTime, NULL }, // "Game Time:" { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, (u32)&menutextPauseOrUnpause, 0x00000000, menuhandlerMpPause }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000024, L_MPMENU(287), 0x00000000, (void *)&g_MpEndGameMenuDialog }, // "End Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000024, L_MPMENU_287, 0x00000000, (void *)&g_MpEndGameMenuDialog }, // "End Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpPauseControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(285), // "Control" + L_MPMENU_285, // "Control" g_MpPauseControlMenuItems, NULL, 0x00000000, @@ -295,7 +295,7 @@ struct menuitem g_Mp2PMissionInventoryMenuItems[] = { struct menudialog g_MpPauseInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(284), // "Inventory" + L_MPMENU_284, // "Inventory" g_Mp2PMissionInventoryMenuItems, NULL, 0x00000000, @@ -304,7 +304,7 @@ struct menudialog g_MpPauseInventoryMenuDialog = { struct menudialog g_2PMissionInventoryHMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(284), // "Inventory" + L_MPMENU_284, // "Inventory" g_Mp2PMissionInventoryMenuItems, NULL, 0x00000000, @@ -313,7 +313,7 @@ struct menudialog g_2PMissionInventoryHMenuDialog = { struct menudialog g_2PMissionInventoryVMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(284), // "Inventory" + L_MPMENU_284, // "Inventory" g_Mp2PMissionInventoryMenuItems, NULL, 0x00000000, @@ -350,7 +350,7 @@ struct menuitem g_MpPlayerRankingMenuItems[] = { struct menudialog g_MpPausePlayerRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(276), // "Player Ranking" + L_MPMENU_276, // "Player Ranking" g_MpPlayerRankingMenuItems, NULL, 0x00000000, @@ -359,7 +359,7 @@ struct menudialog g_MpPausePlayerRankingMenuDialog = { struct menudialog g_MpEndscreenPlayerRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(276), // "Player Ranking" + L_MPMENU_276, // "Player Ranking" g_MpPlayerRankingMenuItems, NULL, 0x00000000, @@ -373,7 +373,7 @@ struct menuitem g_MpTeamRankingsMenuItems[] = { struct menudialog g_MpPauseTeamRankingsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(279), // "Team Ranking" + L_MPMENU_279, // "Team Ranking" g_MpTeamRankingsMenuItems, NULL, 0x00000000, @@ -382,7 +382,7 @@ struct menudialog g_MpPauseTeamRankingsMenuDialog = { struct menudialog g_MpEndscreenTeamRankingMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(279), // "Team Ranking" + L_MPMENU_279, // "Team Ranking" g_MpTeamRankingsMenuItems, NULL, 0x00000000, @@ -392,18 +392,18 @@ struct menudialog g_MpEndscreenTeamRankingMenuDialog = { char *mpMenuTextPlacementWithSuffix(struct menuitem *item) { u16 suffixes[] = { - L_MPMENU(264), // "1st" - L_MPMENU(265), // "2nd" - L_MPMENU(266), // "3rd" - L_MPMENU(267), // "4th" - L_MPMENU(268), // "5th" - L_MPMENU(269), // "6th" - L_MPMENU(270), // "7th" - L_MPMENU(271), // "8th" - L_MPMENU(272), // "9th" - L_MPMENU(273), // "10th" - L_MPMENU(274), // "11th" - L_MPMENU(275), // "12th" + L_MPMENU_264, // "1st" + L_MPMENU_265, // "2nd" + L_MPMENU_266, // "3rd" + L_MPMENU_267, // "4th" + L_MPMENU_268, // "5th" + L_MPMENU_269, // "6th" + L_MPMENU_270, // "7th" + L_MPMENU_271, // "8th" + L_MPMENU_272, // "9th" + L_MPMENU_273, // "10th" + L_MPMENU_274, // "11th" + L_MPMENU_275, // "12th" }; return langGet(suffixes[g_MpPlayers[g_MpPlayerNum].base.placement]); @@ -494,7 +494,7 @@ s32 mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handler char *mpMenuTextPlayerTitle(s32 arg0) { - return langGet(L_MISC(185) + g_MpPlayers[g_MpPlayerNum].title); + return langGet(L_MISC_185 + g_MpPlayers[g_MpPlayerNum].title); } GLOBAL_ASM( @@ -691,12 +691,12 @@ void mpPushEndscreenDialog(u32 arg0, u32 playernum) struct menuitem g_MpGameOverMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x01000010, (u32)&mpGetCurrentPlayerName, (u32)&mpMenuTextPlacementWithSuffix, mpPlacementMenuHandler }, - { MENUITEMTYPE_LABEL, 0, 0x01000000, L_MPMENU(261), (u32)&mpMenuTextPlayerTitle, mpPlayerTitleMenuHandler }, // "Title:" + { MENUITEMTYPE_LABEL, 0, 0x01000000, L_MPMENU_261, (u32)&mpMenuTextPlayerTitle, mpPlayerTitleMenuHandler }, // "Title:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPMENU(262), 0x00000000, NULL }, // "Weapon of Choice:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPMENU_262, 0x00000000, NULL }, // "Weapon of Choice:" { MENUITEMTYPE_LABEL, 0, 0x00000120, (u32)&mpMenuTextWeaponOfChoiceName, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00200210, L_MPMENU(263), 0x00000000, mpAwardsMenuHandler }, // "Awards:" + { MENUITEMTYPE_LABEL, 0, 0x00200210, L_MPMENU_263, 0x00000000, mpAwardsMenuHandler }, // "Awards:" { MENUITEMTYPE_LABEL, 0, 0x00000120, (u32)&mpMenuTextAward1, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000120, (u32)&mpMenuTextAward2, 0x00000000, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -704,7 +704,7 @@ struct menuitem g_MpGameOverMenuItems[] = { struct menudialog g_MpEndscreenIndGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(260), // "Game Over" + L_MPMENU_260, // "Game Over" g_MpGameOverMenuItems, NULL, 0x00000000, @@ -713,7 +713,7 @@ struct menudialog g_MpEndscreenIndGameOverMenuDialog = { struct menudialog g_MpEndscreenTeamGameOverMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(260), // "Game Over" + L_MPMENU_260, // "Game Over" g_MpGameOverMenuItems, NULL, 0x00000000, @@ -722,7 +722,7 @@ struct menudialog g_MpEndscreenTeamGameOverMenuDialog = { struct menudialog g_MpEndscreenChallengeCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPWEAPONS(165), // "Challenge Completed!" + L_MPWEAPONS_165, // "Challenge Completed!" g_MpTeamRankingsMenuItems, NULL, 0x00000000, @@ -731,7 +731,7 @@ struct menudialog g_MpEndscreenChallengeCompletedMenuDialog = { struct menudialog g_MpEndscreenChallengeCheatedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(167), // "Challenge Cheated!" + L_MPWEAPONS_167, // "Challenge Cheated!" g_MpTeamRankingsMenuItems, NULL, 0x00000000, @@ -740,7 +740,7 @@ struct menudialog g_MpEndscreenChallengeCheatedMenuDialog = { struct menudialog g_MpEndscreenChallengeFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPWEAPONS(166), // "Challenge Failed!" + L_MPWEAPONS_166, // "Challenge Failed!" g_MpTeamRankingsMenuItems, NULL, 0x00000000, @@ -748,14 +748,14 @@ struct menudialog g_MpEndscreenChallengeFailedMenuDialog = { }; struct menuitem g_MpEndscreenConfirmNameMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(250), 0x00000000, NULL }, // "Confirm player name:" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_250, 0x00000000, NULL }, // "Confirm player name:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler00178bf4 }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpEndscreenConfirmNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(142), // "Player Name" + L_MPMENU_142, // "Player Name" g_MpEndscreenConfirmNameMenuItems, NULL, 0x00000000, @@ -763,15 +763,15 @@ struct menudialog g_MpEndscreenConfirmNameMenuDialog = { }; struct menuitem g_MpEndscreenSavePlayerMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS(247), 0x00000000, NULL }, // "Save new player and statistics?" - { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS(248), 0x00000000, (void *)&g_MpEndscreenConfirmNameMenuDialog }, // "Save Now" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS(249), 0x00000000, NULL }, // "No Thanks!" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPWEAPONS_247, 0x00000000, NULL }, // "Save new player and statistics?" + { MENUITEMTYPE_SELECTABLE, 0, 0x0000002c, L_MPWEAPONS_248, 0x00000000, (void *)&g_MpEndscreenConfirmNameMenuDialog }, // "Save Now" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPWEAPONS_249, 0x00000000, NULL }, // "No Thanks!" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpEndscreenSavePlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(246), // "Save Player" + L_MPWEAPONS_246, // "Save Player" g_MpEndscreenSavePlayerMenuItems, NULL, 0x00000004, diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index f1a0cfc86..4d024f87a 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -409,7 +409,7 @@ void mpPlayerSetDefaults(s32 playernum, bool autonames) if (autonames) { // "Player 1" etc - sprintf(g_MpPlayers[playernum].base.name, "%s %d\n", langGet(L_MISC(437)), playernum + 1); + sprintf(g_MpPlayers[playernum].base.name, "%s %d\n", langGet(L_MISC_437), playernum + 1); } else { g_MpPlayers[playernum].base.name[0] = '\0'; } @@ -612,20 +612,20 @@ void mpSetDefaultNamesIfEmpty(void) // Setup file name if (g_MpSetup.name[0] == '\0') { - strcpy(g_MpSetup.name, langGet(L_MISC(438))); // empty string + strcpy(g_MpSetup.name, langGet(L_MISC_438)); // empty string } // Team names for (i = 0; i < 8; i++) { if (g_MpSetupSaveFile.teamnames[i][0] == '\0') { - strcpy(g_MpSetupSaveFile.teamnames[i], langGet(L_OPTIONS(8) + i)); // "Red", "Yellow" etc + strcpy(g_MpSetupSaveFile.teamnames[i], langGet(L_OPTIONS_008 + i)); // "Red", "Yellow" etc } } // Player names for (i = 0; i < 4; i++) { if (g_MpPlayers[i].base.name[0] == '\0') { - sprintf(g_MpPlayers[i].base.name, "%s %d\n", langGet(L_MISC(437)), i + 1); // "Player 1" etc + sprintf(g_MpPlayers[i].base.name, "%s %d\n", langGet(L_MISC_437), i + 1); // "Player 1" etc } } } @@ -1133,15 +1133,15 @@ char *mpGetWeaponLabel(s32 weaponnum) if (mpIsFeatureUnlocked(g_MpWeapons[i].unlockfeature)) { if (weaponnum == 0) { if (g_MpWeapons[i].weaponnum == WEAPON_NONE) { - return langGet(L_MPWEAPONS(58)); // "Nothing" + return langGet(L_MPWEAPONS_058); // "Nothing" } if (g_MpWeapons[i].weaponnum == WEAPON_MPSHIELD) { - return langGet(L_MPWEAPONS(59)); // "Shield" + return langGet(L_MPWEAPONS_059); // "Shield" } if (g_MpWeapons[i].weaponnum == WEAPON_DISABLED) { - return langGet(L_MPWEAPONS(60)); // "Disabled" + return langGet(L_MPWEAPONS_060); // "Disabled" } return weaponGetName(g_MpWeapons[i].weaponnum); @@ -1300,15 +1300,15 @@ char *mpGetWeaponSetName(s32 index) index = func0f188f9c(index); if (index < 0 || index >= 14) { - return langGet(L_MPWEAPONS(41)); // "Custom" + return langGet(L_MPWEAPONS_041); // "Custom" } if (index == 13) { - return langGet(L_MPWEAPONS(42)); // "Random" + return langGet(L_MPWEAPONS_042); // "Random" } if (index == 12) { - return langGet(L_MPWEAPONS(43)); // "Random Five" + return langGet(L_MPWEAPONS_043); // "Random Five" } return langGet(g_MpWeaponSets[index].name); @@ -2420,18 +2420,18 @@ glabel func0f18a030 ); struct mpweaponset g_MpWeaponSets[12] = { - { /*0x00*/ L_MPWEAPONS(55), { WEAPON_FALCON2, WEAPON_MAGSEC4, WEAPON_PHOENIX, WEAPON_MAULER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_PHOENIX, MPFEATURE_WEAPON_MAULER, 0, 0 }, 0x02, 0x05, 0x02, 0x08, 0x5b, 0x5c }, // Pistols - { /*0x01*/ L_MPWEAPONS(54), { WEAPON_FALCON2, WEAPON_CMP150, WEAPON_LAPTOPGUN, WEAPON_AR34, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_LAPTOPGUN, 0, 0, 0 }, 0x02, 0x0a, 0x0f, 0x11, 0x5b, 0x5c }, // Automatics - { /*0x02*/ L_MPWEAPONS(53), { WEAPON_MAGSEC4, WEAPON_DY357MAGNUM, WEAPON_SHOTGUN, WEAPON_RCP120, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SHOTGUN, MPFEATURE_WEAPON_RCP120, 0, 0 }, 0x05, 0x08, 0x0f, 0x11, 0x5b, 0x5c }, // Power - { /*0x03*/ L_MPWEAPONS(52), { WEAPON_PHOENIX, WEAPON_CYCLONE, WEAPON_CALLISTONTG, WEAPON_FARSIGHTXR20, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_FARSIGHT, MPFEATURE_WEAPON_CALLISTO, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // FarSight - { /*0x04*/ L_MPWEAPONS(51), { WEAPON_FALCON2, WEAPON_CMP150, WEAPON_DRAGON, WEAPON_TRANQUILIZER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_TRANQUILIZER, 0, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Tranquilizer - { /*0x05*/ L_MPWEAPONS(50), { WEAPON_MAULER, WEAPON_K7AVENGER, WEAPON_REAPER, WEAPON_SUPERDRAGON, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SUPERDRAGON, MPFEATURE_WEAPON_MAULER, MPFEATURE_WEAPON_K7AVENGER, MPFEATURE_WEAPON_REAPER }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Heavy - { /*0x06*/ L_MPWEAPONS(49), { WEAPON_FALCON2_SILENCER, WEAPON_GRENADE, WEAPON_CMP150, WEAPON_DY357LX, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_FALCON2SILENCED, MPFEATURE_WEAPON_DY357LX, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Golden Magnum - { /*0x07*/ L_MPWEAPONS(48), { WEAPON_DEVASTATOR, WEAPON_DEVASTATOR, WEAPON_SUPERDRAGON, WEAPON_SUPERDRAGON, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SUPERDRAGON, MPFEATURE_WEAPON_DEVASTATOR, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Explosive - { /*0x08*/ L_MPWEAPONS(47), { WEAPON_MAGSEC4, WEAPON_CMP150, WEAPON_AR34, WEAPON_DEVASTATOR, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_DEVASTATOR, 0, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Grenade Launcher - { /*0x09*/ L_MPWEAPONS(46), { WEAPON_MAULER, WEAPON_CYCLONE, WEAPON_DRAGON, WEAPON_ROCKETLAUNCHER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_MAULER, 0, 0, 0 }, 0x02, 0x0b, 0x0f, 0x18, 0x5b, 0x5c }, // Rocket Launcher - { /*0x0a*/ L_MPWEAPONS(45), { WEAPON_MAGSEC4, WEAPON_LAPTOPGUN, WEAPON_K7AVENGER, WEAPON_PROXIMITYMINE, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_LAPTOPGUN, MPFEATURE_WEAPON_K7AVENGER, MPFEATURE_WEAPON_PROXIMITYMINE, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Proximity Mine - { /*0x0b*/ L_MPWEAPONS(44), { WEAPON_COMBATKNIFE, WEAPON_COMBATKNIFE, WEAPON_TIMEDMINE, WEAPON_CROSSBOW, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_CROSSBOW, 0, 0, 0 }, 0x1a, 0x1a, 0x20, 0x20, 0x5b, 0x5c }, // Close Combat + { /*0x00*/ L_MPWEAPONS_055, { WEAPON_FALCON2, WEAPON_MAGSEC4, WEAPON_PHOENIX, WEAPON_MAULER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_PHOENIX, MPFEATURE_WEAPON_MAULER, 0, 0 }, 0x02, 0x05, 0x02, 0x08, 0x5b, 0x5c }, // Pistols + { /*0x01*/ L_MPWEAPONS_054, { WEAPON_FALCON2, WEAPON_CMP150, WEAPON_LAPTOPGUN, WEAPON_AR34, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_LAPTOPGUN, 0, 0, 0 }, 0x02, 0x0a, 0x0f, 0x11, 0x5b, 0x5c }, // Automatics + { /*0x02*/ L_MPWEAPONS_053, { WEAPON_MAGSEC4, WEAPON_DY357MAGNUM, WEAPON_SHOTGUN, WEAPON_RCP120, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SHOTGUN, MPFEATURE_WEAPON_RCP120, 0, 0 }, 0x05, 0x08, 0x0f, 0x11, 0x5b, 0x5c }, // Power + { /*0x03*/ L_MPWEAPONS_052, { WEAPON_PHOENIX, WEAPON_CYCLONE, WEAPON_CALLISTONTG, WEAPON_FARSIGHTXR20, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_FARSIGHT, MPFEATURE_WEAPON_CALLISTO, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // FarSight + { /*0x04*/ L_MPWEAPONS_051, { WEAPON_FALCON2, WEAPON_CMP150, WEAPON_DRAGON, WEAPON_TRANQUILIZER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_TRANQUILIZER, 0, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Tranquilizer + { /*0x05*/ L_MPWEAPONS_050, { WEAPON_MAULER, WEAPON_K7AVENGER, WEAPON_REAPER, WEAPON_SUPERDRAGON, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SUPERDRAGON, MPFEATURE_WEAPON_MAULER, MPFEATURE_WEAPON_K7AVENGER, MPFEATURE_WEAPON_REAPER }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Heavy + { /*0x06*/ L_MPWEAPONS_049, { WEAPON_FALCON2_SILENCER, WEAPON_GRENADE, WEAPON_CMP150, WEAPON_DY357LX, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_FALCON2SILENCED, MPFEATURE_WEAPON_DY357LX, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Golden Magnum + { /*0x07*/ L_MPWEAPONS_048, { WEAPON_DEVASTATOR, WEAPON_DEVASTATOR, WEAPON_SUPERDRAGON, WEAPON_SUPERDRAGON, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_SUPERDRAGON, MPFEATURE_WEAPON_DEVASTATOR, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Explosive + { /*0x08*/ L_MPWEAPONS_047, { WEAPON_MAGSEC4, WEAPON_CMP150, WEAPON_AR34, WEAPON_DEVASTATOR, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_DEVASTATOR, 0, 0, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Grenade Launcher + { /*0x09*/ L_MPWEAPONS_046, { WEAPON_MAULER, WEAPON_CYCLONE, WEAPON_DRAGON, WEAPON_ROCKETLAUNCHER, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_MAULER, 0, 0, 0 }, 0x02, 0x0b, 0x0f, 0x18, 0x5b, 0x5c }, // Rocket Launcher + { /*0x0a*/ L_MPWEAPONS_045, { WEAPON_MAGSEC4, WEAPON_LAPTOPGUN, WEAPON_K7AVENGER, WEAPON_PROXIMITYMINE, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_LAPTOPGUN, MPFEATURE_WEAPON_K7AVENGER, MPFEATURE_WEAPON_PROXIMITYMINE, 0 }, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c }, // Proximity Mine + { /*0x0b*/ L_MPWEAPONS_044, { WEAPON_COMBATKNIFE, WEAPON_COMBATKNIFE, WEAPON_TIMEDMINE, WEAPON_CROSSBOW, WEAPON_MPSHIELD, WEAPON_DISABLED }, { MPFEATURE_WEAPON_CROSSBOW, 0, 0, 0 }, 0x1a, 0x1a, 0x20, 0x20, 0x5b, 0x5c }, // Close Combat }; u32 var800874c8 = 0x00000000; @@ -2667,90 +2667,90 @@ u32 table_0x2d678[] = { // 2d74c struct mpsimulanttype g_MpSimulantTypes[] = { // type, difficulty, name, body, require feature - { SIMTYPE_GENERAL, SIMDIFF_MEAT, L_MISC(88), MPBODY_DD_GUARD, 0 }, - { SIMTYPE_GENERAL, SIMDIFF_EASY, L_MISC(89), MPBODY_DD_SECGUARD, 0 }, - { SIMTYPE_GENERAL, SIMDIFF_NORMAL, L_MISC(90), MPBODY_DD_SHOCK_INF, 0 }, - { SIMTYPE_GENERAL, SIMDIFF_HARD, L_MISC(91), MPBODY_DDSHOCK, MPFEATURE_SIMDIFF_HARD }, - { SIMTYPE_GENERAL, SIMDIFF_PERFECT, L_MISC(92), MPBODY_STRIPES, MPFEATURE_SIMDIFF_PERFECT }, - { SIMTYPE_GENERAL, SIMDIFF_DARK, L_MISC(93), MPBODY_MOORE, MPFEATURE_SIMDIFF_DARK }, - { SIMTYPE_PEACE, SIMDIFF_NORMAL, L_MISC(94), MPBODY_DD_LABTECH, 0 }, - { SIMTYPE_SHIELD, SIMDIFF_NORMAL, L_MISC(95), MPBODY_G5_SWAT_GUARD, 0 }, - { SIMTYPE_ROCKET, SIMDIFF_NORMAL, L_MISC(96), MPBODY_G5_GUARD, 0 }, - { SIMTYPE_KAZE, SIMDIFF_NORMAL, L_MISC(97), MPBODY_PRES_SECURITY, 0 }, - { SIMTYPE_FIST, SIMDIFF_NORMAL, L_MISC(98), MPBODY_PELAGIC_GUARD, 0 }, - { SIMTYPE_PREY, SIMDIFF_NORMAL, L_MISC(99), MPBODY_DDSHOCK, 0 }, - { SIMTYPE_COWARD, SIMDIFF_NORMAL, L_MISC(100), MPBODY_PRESIDENT, 0 }, - { SIMTYPE_JUDGE, SIMDIFF_NORMAL, L_MISC(101), MPBODY_STEWARD, 0 }, - { SIMTYPE_FEUD, SIMDIFF_NORMAL, L_MISC(102), MPBODY_NSA_LACKEY, 0 }, - { SIMTYPE_SPEED, SIMDIFF_NORMAL, L_MISC(103), MPBODY_MRBLONDE, 0 }, - { SIMTYPE_TURTLE, SIMDIFF_NORMAL, L_MISC(104), MPBODY_CARRINGTON, 0 }, - { SIMTYPE_VENGE, SIMDIFF_NORMAL, L_MISC(105), MPBODY_ALASKAN_GUARD, 0 }, + { SIMTYPE_GENERAL, SIMDIFF_MEAT, L_MISC_088, MPBODY_DD_GUARD, 0 }, + { SIMTYPE_GENERAL, SIMDIFF_EASY, L_MISC_089, MPBODY_DD_SECGUARD, 0 }, + { SIMTYPE_GENERAL, SIMDIFF_NORMAL, L_MISC_090, MPBODY_DD_SHOCK_INF, 0 }, + { SIMTYPE_GENERAL, SIMDIFF_HARD, L_MISC_091, MPBODY_DDSHOCK, MPFEATURE_SIMDIFF_HARD }, + { SIMTYPE_GENERAL, SIMDIFF_PERFECT, L_MISC_092, MPBODY_STRIPES, MPFEATURE_SIMDIFF_PERFECT }, + { SIMTYPE_GENERAL, SIMDIFF_DARK, L_MISC_093, MPBODY_MOORE, MPFEATURE_SIMDIFF_DARK }, + { SIMTYPE_PEACE, SIMDIFF_NORMAL, L_MISC_094, MPBODY_DD_LABTECH, 0 }, + { SIMTYPE_SHIELD, SIMDIFF_NORMAL, L_MISC_095, MPBODY_G5_SWAT_GUARD, 0 }, + { SIMTYPE_ROCKET, SIMDIFF_NORMAL, L_MISC_096, MPBODY_G5_GUARD, 0 }, + { SIMTYPE_KAZE, SIMDIFF_NORMAL, L_MISC_097, MPBODY_PRES_SECURITY, 0 }, + { SIMTYPE_FIST, SIMDIFF_NORMAL, L_MISC_098, MPBODY_PELAGIC_GUARD, 0 }, + { SIMTYPE_PREY, SIMDIFF_NORMAL, L_MISC_099, MPBODY_DDSHOCK, 0 }, + { SIMTYPE_COWARD, SIMDIFF_NORMAL, L_MISC_100, MPBODY_PRESIDENT, 0 }, + { SIMTYPE_JUDGE, SIMDIFF_NORMAL, L_MISC_101, MPBODY_STEWARD, 0 }, + { SIMTYPE_FEUD, SIMDIFF_NORMAL, L_MISC_102, MPBODY_NSA_LACKEY, 0 }, + { SIMTYPE_SPEED, SIMDIFF_NORMAL, L_MISC_103, MPBODY_MRBLONDE, 0 }, + { SIMTYPE_TURTLE, SIMDIFF_NORMAL, L_MISC_104, MPBODY_CARRINGTON, 0 }, + { SIMTYPE_VENGE, SIMDIFF_NORMAL, L_MISC_105, MPBODY_ALASKAN_GUARD, 0 }, }; // 2d7dc struct mpbody g_MpBodies[NUM_MPBODIES] = { // global body ID, name, head, require feature - /*0x00*/ { BODY_DARK_COMBAT, L_OPTIONS(16), HEAD_DARK_COMBAT, 0 }, - /*0x01*/ { BODY_DARK_TRENCH, L_OPTIONS(17), HEAD_DARK_COMBAT, MPFEATURE_46 }, - /*0x02*/ { BODY_DARK_FROCK, L_OPTIONS(18), HEAD_DARK_FROCK, MPFEATURE_41 }, - /*0x03*/ { BODY_DARK_RIPPED, L_OPTIONS(19), HEAD_DARK_FROCK, MPFEATURE_41 }, - /*0x04*/ { BODY_DARK_AF1, L_OPTIONS(20), HEAD_DARK_COMBAT, MPFEATURE_3F }, - /*0x05*/ { BODY_DARK_LEATHER, L_MPWEAPONS(156), HEAD_DARK_COMBAT, MPFEATURE_37 }, - /*0x06*/ { BODY_DARK_NEGOTIATOR, L_MPWEAPONS(157), HEAD_DARK_COMBAT, MPFEATURE_34 }, - /*0x07*/ { BODY_DARKWET, L_OPTIONS(21), HEAD_DARKAQUA, MPFEATURE_45 }, - /*0x08*/ { BODY_DARKAQUALUNG, L_OPTIONS(22), HEAD_DARKAQUA, MPFEATURE_45 }, - /*0x09*/ { BODY_DARKSNOW, L_OPTIONS(23), HEAD_DARK_SNOW, MPFEATURE_4A }, - /*0x0a*/ { BODY_DARKLAB, L_OPTIONS(24), HEAD_DARK_COMBAT, MPFEATURE_3A }, - /*0x0b*/ { BODY_THEKING, L_OPTIONS(25), HEAD_ELVIS, MPFEATURE_3D }, - /*0x0c*/ { BODY_ELVIS1, L_OPTIONS(26), HEAD_ELVIS, MPFEATURE_3D }, - /*0x0d*/ { BODY_ELVISWAISTCOAT, L_MPWEAPONS(158), HEAD_ELVIS, MPFEATURE_3D }, - /*0x0e*/ { BODY_CARRINGTON, L_OPTIONS(27), HEAD_CARRINGTON, 0 }, - /*0x0f*/ { BODY_CARREVENINGSUIT, L_OPTIONS(28), HEAD_CARRINGTON, MPFEATURE_41 }, - /*0x10*/ { BODY_MRBLONDE, L_OPTIONS(29), HEAD_MRBLONDE, MPFEATURE_38 }, - /*0x11*/ { BODY_CASSANDRA, L_OPTIONS(30), HEAD_CASSANDRA, 0 }, - /*0x12*/ { BODY_TRENT, L_OPTIONS(31), HEAD_TRENT, MPFEATURE_35 }, - /*0x13*/ { BODY_JONATHAN, L_OPTIONS(32), HEAD_JONATHAN, MPFEATURE_4C }, - /*0x14*/ { BODY_CILABTECH, L_OPTIONS(33), 1000, 0 }, - /*0x15*/ { BODY_CIFEMTECH, L_OPTIONS(34), 1000, 0 }, - /*0x16*/ { BODY_CISOLDIER, L_OPTIONS(35), 1000, 0 }, - /*0x17*/ { BODY_DDSHOCK, L_OPTIONS(36), HEAD_DDSHOCK, 0 }, - /*0x18*/ { BODY_FEM_GUARD, L_OPTIONS(37), 1000, MPFEATURE_32 }, - /*0x19*/ { BODY_DD_SECGUARD, L_OPTIONS(38), 1000, 0 }, - /*0x1a*/ { BODY_DD_GUARD, L_OPTIONS(39), 1000, 0 }, - /*0x1b*/ { BODY_DD_SHOCK_INF, L_OPTIONS(40), 1000, 0 }, - /*0x1c*/ { BODY_SECRETARY, L_OPTIONS(41), 1000, 0 }, - /*0x1d*/ { BODY_OFFICEWORKER, L_OPTIONS(42), 1000, MPFEATURE_33 }, - /*0x1e*/ { BODY_OFFICEWORKER2, L_OPTIONS(43), 1000, MPFEATURE_33 }, - /*0x1f*/ { BODY_NEGOTIATOR, L_OPTIONS(44), 1000, MPFEATURE_34 }, - /*0x20*/ { BODY_DDSNIPER, L_OPTIONS(45), HEAD_DDSNIPER, MPFEATURE_34 }, - /*0x21*/ { BODY_G5_GUARD, L_OPTIONS(46), 1000, MPFEATURE_37 }, - /*0x22*/ { BODY_G5_SWAT_GUARD, L_OPTIONS(47), 1000, MPFEATURE_37 }, - /*0x23*/ { BODY_CIAGUY, L_OPTIONS(48), 1000, MPFEATURE_39 }, - /*0x24*/ { BODY_FBIGUY, L_OPTIONS(49), 1000, MPFEATURE_39 }, - /*0x25*/ { BODY_AREA51GUARD, L_OPTIONS(50), 1000, MPFEATURE_3A }, - /*0x26*/ { BODY_A51TROOPER, L_OPTIONS(51), 1000, MPFEATURE_3A }, - /*0x27*/ { BODY_A51AIRMAN, L_OPTIONS(52), 1000, MPFEATURE_3A }, - /*0x28*/ { BODY_OVERALL, L_OPTIONS(53), 1000, MPFEATURE_3A }, - /*0x29*/ { BODY_STRIPES, L_OPTIONS(54), 1000, MPFEATURE_44 }, - /*0x2a*/ { BODY_LABTECH, L_OPTIONS(55), 1000, MPFEATURE_3B }, - /*0x2b*/ { BODY_FEMLABTECH, L_OPTIONS(56), 1000, MPFEATURE_3B }, - /*0x2c*/ { BODY_DD_LABTECH, L_OPTIONS(57), 1000, MPFEATURE_3B }, - /*0x2d*/ { BODY_BIOTECH, L_OPTIONS(58), HEAD_BIOTECH, MPFEATURE_3C }, - /*0x2e*/ { BODY_ALASKAN_GUARD, L_OPTIONS(59), 1000, MPFEATURE_3E }, - /*0x2f*/ { BODY_PILOTAF1, L_OPTIONS(60), 1000, MPFEATURE_3F }, - /*0x30*/ { BODY_STEWARD, L_OPTIONS(61), 1000, MPFEATURE_3F }, - /*0x31*/ { BODY_STEWARDESS, L_OPTIONS(62), 1000, MPFEATURE_3F }, - /*0x32*/ { BODY_STEWARDESS_COAT, L_OPTIONS(63), 1000, MPFEATURE_3F }, - /*0x33*/ { BODY_PRESIDENT, L_OPTIONS(64), HEAD_PRESIDENT, MPFEATURE_41 }, - /*0x34*/ { BODY_NSA_LACKEY, L_OPTIONS(65), 1000, MPFEATURE_36 }, - /*0x35*/ { BODY_PRES_SECURITY, L_OPTIONS(66), 1000, MPFEATURE_43 }, - /*0x36*/ { BODY_PRESIDENT_CLONE2, L_OPTIONS(67), HEAD_PRESIDENT, MPFEATURE_42 }, - /*0x37*/ { BODY_PELAGIC_GUARD, L_OPTIONS(68), 1000, MPFEATURE_45 }, - /*0x38*/ { BODY_MAIAN_SOLDIER, L_OPTIONS(69), HEAD_MAIAN_S, MPFEATURE_3D }, - /*0x39*/ { BODY_CONNERY, L_OPTIONS(70), 1000, MPFEATURE_8BOTS }, - /*0x3a*/ { BODY_MOORE, L_OPTIONS(70), 1000, MPFEATURE_8BOTS }, - /*0x3b*/ { BODY_DALTON, L_OPTIONS(70), 1000, MPFEATURE_8BOTS }, - /*0x3c*/ { BODY_DJBOND, L_OPTIONS(70), 1000, MPFEATURE_8BOTS }, + /*0x00*/ { BODY_DARK_COMBAT, L_OPTIONS_016, HEAD_DARK_COMBAT, 0 }, + /*0x01*/ { BODY_DARK_TRENCH, L_OPTIONS_017, HEAD_DARK_COMBAT, MPFEATURE_46 }, + /*0x02*/ { BODY_DARK_FROCK, L_OPTIONS_018, HEAD_DARK_FROCK, MPFEATURE_41 }, + /*0x03*/ { BODY_DARK_RIPPED, L_OPTIONS_019, HEAD_DARK_FROCK, MPFEATURE_41 }, + /*0x04*/ { BODY_DARK_AF1, L_OPTIONS_020, HEAD_DARK_COMBAT, MPFEATURE_3F }, + /*0x05*/ { BODY_DARK_LEATHER, L_MPWEAPONS_156, HEAD_DARK_COMBAT, MPFEATURE_37 }, + /*0x06*/ { BODY_DARK_NEGOTIATOR, L_MPWEAPONS_157, HEAD_DARK_COMBAT, MPFEATURE_34 }, + /*0x07*/ { BODY_DARKWET, L_OPTIONS_021, HEAD_DARKAQUA, MPFEATURE_45 }, + /*0x08*/ { BODY_DARKAQUALUNG, L_OPTIONS_022, HEAD_DARKAQUA, MPFEATURE_45 }, + /*0x09*/ { BODY_DARKSNOW, L_OPTIONS_023, HEAD_DARK_SNOW, MPFEATURE_4A }, + /*0x0a*/ { BODY_DARKLAB, L_OPTIONS_024, HEAD_DARK_COMBAT, MPFEATURE_3A }, + /*0x0b*/ { BODY_THEKING, L_OPTIONS_025, HEAD_ELVIS, MPFEATURE_3D }, + /*0x0c*/ { BODY_ELVIS1, L_OPTIONS_026, HEAD_ELVIS, MPFEATURE_3D }, + /*0x0d*/ { BODY_ELVISWAISTCOAT, L_MPWEAPONS_158, HEAD_ELVIS, MPFEATURE_3D }, + /*0x0e*/ { BODY_CARRINGTON, L_OPTIONS_027, HEAD_CARRINGTON, 0 }, + /*0x0f*/ { BODY_CARREVENINGSUIT, L_OPTIONS_028, HEAD_CARRINGTON, MPFEATURE_41 }, + /*0x10*/ { BODY_MRBLONDE, L_OPTIONS_029, HEAD_MRBLONDE, MPFEATURE_38 }, + /*0x11*/ { BODY_CASSANDRA, L_OPTIONS_030, HEAD_CASSANDRA, 0 }, + /*0x12*/ { BODY_TRENT, L_OPTIONS_031, HEAD_TRENT, MPFEATURE_35 }, + /*0x13*/ { BODY_JONATHAN, L_OPTIONS_032, HEAD_JONATHAN, MPFEATURE_4C }, + /*0x14*/ { BODY_CILABTECH, L_OPTIONS_033, 1000, 0 }, + /*0x15*/ { BODY_CIFEMTECH, L_OPTIONS_034, 1000, 0 }, + /*0x16*/ { BODY_CISOLDIER, L_OPTIONS_035, 1000, 0 }, + /*0x17*/ { BODY_DDSHOCK, L_OPTIONS_036, HEAD_DDSHOCK, 0 }, + /*0x18*/ { BODY_FEM_GUARD, L_OPTIONS_037, 1000, MPFEATURE_32 }, + /*0x19*/ { BODY_DD_SECGUARD, L_OPTIONS_038, 1000, 0 }, + /*0x1a*/ { BODY_DD_GUARD, L_OPTIONS_039, 1000, 0 }, + /*0x1b*/ { BODY_DD_SHOCK_INF, L_OPTIONS_040, 1000, 0 }, + /*0x1c*/ { BODY_SECRETARY, L_OPTIONS_041, 1000, 0 }, + /*0x1d*/ { BODY_OFFICEWORKER, L_OPTIONS_042, 1000, MPFEATURE_33 }, + /*0x1e*/ { BODY_OFFICEWORKER2, L_OPTIONS_043, 1000, MPFEATURE_33 }, + /*0x1f*/ { BODY_NEGOTIATOR, L_OPTIONS_044, 1000, MPFEATURE_34 }, + /*0x20*/ { BODY_DDSNIPER, L_OPTIONS_045, HEAD_DDSNIPER, MPFEATURE_34 }, + /*0x21*/ { BODY_G5_GUARD, L_OPTIONS_046, 1000, MPFEATURE_37 }, + /*0x22*/ { BODY_G5_SWAT_GUARD, L_OPTIONS_047, 1000, MPFEATURE_37 }, + /*0x23*/ { BODY_CIAGUY, L_OPTIONS_048, 1000, MPFEATURE_39 }, + /*0x24*/ { BODY_FBIGUY, L_OPTIONS_049, 1000, MPFEATURE_39 }, + /*0x25*/ { BODY_AREA51GUARD, L_OPTIONS_050, 1000, MPFEATURE_3A }, + /*0x26*/ { BODY_A51TROOPER, L_OPTIONS_051, 1000, MPFEATURE_3A }, + /*0x27*/ { BODY_A51AIRMAN, L_OPTIONS_052, 1000, MPFEATURE_3A }, + /*0x28*/ { BODY_OVERALL, L_OPTIONS_053, 1000, MPFEATURE_3A }, + /*0x29*/ { BODY_STRIPES, L_OPTIONS_054, 1000, MPFEATURE_44 }, + /*0x2a*/ { BODY_LABTECH, L_OPTIONS_055, 1000, MPFEATURE_3B }, + /*0x2b*/ { BODY_FEMLABTECH, L_OPTIONS_056, 1000, MPFEATURE_3B }, + /*0x2c*/ { BODY_DD_LABTECH, L_OPTIONS_057, 1000, MPFEATURE_3B }, + /*0x2d*/ { BODY_BIOTECH, L_OPTIONS_058, HEAD_BIOTECH, MPFEATURE_3C }, + /*0x2e*/ { BODY_ALASKAN_GUARD, L_OPTIONS_059, 1000, MPFEATURE_3E }, + /*0x2f*/ { BODY_PILOTAF1, L_OPTIONS_060, 1000, MPFEATURE_3F }, + /*0x30*/ { BODY_STEWARD, L_OPTIONS_061, 1000, MPFEATURE_3F }, + /*0x31*/ { BODY_STEWARDESS, L_OPTIONS_062, 1000, MPFEATURE_3F }, + /*0x32*/ { BODY_STEWARDESS_COAT, L_OPTIONS_063, 1000, MPFEATURE_3F }, + /*0x33*/ { BODY_PRESIDENT, L_OPTIONS_064, HEAD_PRESIDENT, MPFEATURE_41 }, + /*0x34*/ { BODY_NSA_LACKEY, L_OPTIONS_065, 1000, MPFEATURE_36 }, + /*0x35*/ { BODY_PRES_SECURITY, L_OPTIONS_066, 1000, MPFEATURE_43 }, + /*0x36*/ { BODY_PRESIDENT_CLONE2, L_OPTIONS_067, HEAD_PRESIDENT, MPFEATURE_42 }, + /*0x37*/ { BODY_PELAGIC_GUARD, L_OPTIONS_068, 1000, MPFEATURE_45 }, + /*0x38*/ { BODY_MAIAN_SOLDIER, L_OPTIONS_069, HEAD_MAIAN_S, MPFEATURE_3D }, + /*0x39*/ { BODY_CONNERY, L_OPTIONS_070, 1000, MPFEATURE_8BOTS }, + /*0x3a*/ { BODY_MOORE, L_OPTIONS_070, 1000, MPFEATURE_8BOTS }, + /*0x3b*/ { BODY_DALTON, L_OPTIONS_070, 1000, MPFEATURE_8BOTS }, + /*0x3c*/ { BODY_DJBOND, L_OPTIONS_070, 1000, MPFEATURE_8BOTS }, }; u32 g_MpMaleHeads[] = { @@ -4614,48 +4614,48 @@ void mpCalculateLockIfLastWinnerOrLoser(void) struct mptrack g_MpTracks[NUM_MPTRACKS] = { // Audio ID, duration, name, unlock after stage - /*0x00*/ { MUSIC_DARK_COMBAT, 160, L_MISC(124), -1 }, // "Dark Combat" - /*0x01*/ { MUSIC_SKEDAR_MYSTERY, 170, L_MISC(125), -1 }, // "Skedar Mystery" - /*0x02*/ { MUSIC_CI_OPERATIVE, 170, L_MISC(126), -1 }, // "CI Operative" - /*0x03*/ { MUSIC_DATADYNE_ACTION, 180, L_MISC(127), -1 }, // "dataDyne Action" - /*0x04*/ { MUSIC_MAIAN_TEARS, 200, L_MISC(128), -1 }, // "Maian Tears" - /*0x05*/ { MUSIC_ALIEN_CONFLICT, 197, L_MISC(129), -1 }, // "Alien Conflict" - /*0x06*/ { MUSIC_CI, 120, L_MISC(130), -1 }, // "Carrington Institute" - /*0x07*/ { MUSIC_DEFECTION, 120, L_MISC(131), SOLOSTAGEINDEX_DEFECTION }, // "dD Central" - /*0x08*/ { MUSIC_DEFECTION_X, 120, L_MISC(132), SOLOSTAGEINDEX_DEFECTION }, // "dD Central X" - /*0x09*/ { MUSIC_INVESTIGATION, 120, L_MISC(133), SOLOSTAGEINDEX_INVESTIGATION }, // "dD Research" - /*0x0a*/ { MUSIC_INVESTIGATION_X, 120, L_MISC(134), SOLOSTAGEINDEX_INVESTIGATION }, // "dD Research X" - /*0x0b*/ { MUSIC_EXTRACTION, 120, L_MISC(135), SOLOSTAGEINDEX_EXTRACTION }, // "dD Extraction" - /*0x0c*/ { MUSIC_EXTRACTION_X, 120, L_MISC(136), SOLOSTAGEINDEX_EXTRACTION }, // "dD Extraction X" - /*0x0d*/ { MUSIC_VILLA, 120, L_MISC(137), SOLOSTAGEINDEX_VILLA }, // "Carrington Villa" - /*0x0e*/ { MUSIC_VILLA_X, 120, L_MISC(138), SOLOSTAGEINDEX_VILLA }, // "Carrington Villa X" - /*0x0f*/ { MUSIC_CHICAGO, 120, L_MISC(139), SOLOSTAGEINDEX_CHICAGO }, // "Chicago" - /*0x10*/ { MUSIC_CHICAGO_X, 120, L_MISC(140), SOLOSTAGEINDEX_CHICAGO }, // "Chicago X" - /*0x11*/ { MUSIC_G5, 120, L_MISC(141), SOLOSTAGEINDEX_G5BUILDING }, // "G5 Building" - /*0x12*/ { MUSIC_G5_X, 120, L_MISC(142), SOLOSTAGEINDEX_G5BUILDING }, // "G5 Building X" - /*0x13*/ { MUSIC_INFILTRATION, 120, L_MISC(143), SOLOSTAGEINDEX_INFILTRATION }, // "A51 Infiltration" - /*0x14*/ { MUSIC_INFILTRATION_X, 120, L_MISC(144), SOLOSTAGEINDEX_INFILTRATION }, // "A51 Infiltration X" - /*0x15*/ { MUSIC_RESCUE, 120, L_MISC(145), SOLOSTAGEINDEX_RESCUE }, // "A51 Rescue" - /*0x16*/ { MUSIC_RESCUE_X, 120, L_MISC(146), SOLOSTAGEINDEX_RESCUE }, // "A51 Rescue X" - /*0x17*/ { MUSIC_ESCAPE, 120, L_MISC(147), SOLOSTAGEINDEX_ESCAPE }, // "A51 Escape" - /*0x18*/ { MUSIC_ESCAPE_X, 120, L_MISC(148), SOLOSTAGEINDEX_ESCAPE }, // "A51 Escape X" - /*0x19*/ { MUSIC_AIRBASE, 120, L_MISC(149), SOLOSTAGEINDEX_AIRBASE }, // "Air Base" - /*0x1a*/ { MUSIC_AIRBASE_X, 120, L_MISC(150), SOLOSTAGEINDEX_AIRBASE }, // "Air Base X" - /*0x1b*/ { MUSIC_AIRFORCEONE, 120, L_MISC(151), SOLOSTAGEINDEX_AIRFORCEONE }, // "Air Force One" - /*0x1c*/ { MUSIC_AIRFORCEONE_X, 120, L_MISC(152), SOLOSTAGEINDEX_AIRFORCEONE }, // "Air Force One X" - /*0x1d*/ { MUSIC_CRASHSITE, 120, L_MISC(153), SOLOSTAGEINDEX_CRASHSITE }, // "Crash Site" - /*0x1e*/ { MUSIC_CRASHSITE_X, 120, L_MISC(154), SOLOSTAGEINDEX_CRASHSITE }, // "Crash Site X" - /*0x1f*/ { MUSIC_PELAGIC, 120, L_MISC(155), SOLOSTAGEINDEX_PELAGIC }, // "Pelagic II" - /*0x20*/ { MUSIC_PELAGIC_X, 120, L_MISC(156), SOLOSTAGEINDEX_PELAGIC }, // "Pelagic II X" - /*0x21*/ { MUSIC_DEEPSEA, 120, L_MISC(157), SOLOSTAGEINDEX_DEEPSEA }, // "Deep Sea" - /*0x22*/ { MUSIC_DEEPSEA_X, 120, L_MISC(158), SOLOSTAGEINDEX_DEEPSEA }, // "Deep Sea X" - /*0x23*/ { MUSIC_DEFENSE, 120, L_MISC(159), SOLOSTAGEINDEX_DEFENSE }, // "Institute Defense" - /*0x24*/ { MUSIC_DEFENSE_X, 120, L_MISC(160), SOLOSTAGEINDEX_DEFENSE }, // "Institute Defense X" - /*0x25*/ { MUSIC_ATTACKSHIP, 120, L_MISC(161), SOLOSTAGEINDEX_ATTACKSHIP }, // "Attack Ship" - /*0x26*/ { MUSIC_ATTACKSHIP_X, 120, L_MISC(162), SOLOSTAGEINDEX_ATTACKSHIP }, // "Attack Ship X" - /*0x27*/ { MUSIC_SKEDARRUINS, 120, L_MISC(163), SOLOSTAGEINDEX_SKEDARRUINS }, // "Skedar Ruins" - /*0x28*/ { MUSIC_SKEDARRUINS_X, 120, L_MISC(164), SOLOSTAGEINDEX_SKEDARRUINS }, // "Skedar Ruins X" - /*0x29*/ { MUSIC_CREDITS, 120, L_MISC(165), SOLOSTAGEINDEX_SKEDARRUINS }, // "End Credits" + /*0x00*/ { MUSIC_DARK_COMBAT, 160, L_MISC_124, -1 }, // "Dark Combat" + /*0x01*/ { MUSIC_SKEDAR_MYSTERY, 170, L_MISC_125, -1 }, // "Skedar Mystery" + /*0x02*/ { MUSIC_CI_OPERATIVE, 170, L_MISC_126, -1 }, // "CI Operative" + /*0x03*/ { MUSIC_DATADYNE_ACTION, 180, L_MISC_127, -1 }, // "dataDyne Action" + /*0x04*/ { MUSIC_MAIAN_TEARS, 200, L_MISC_128, -1 }, // "Maian Tears" + /*0x05*/ { MUSIC_ALIEN_CONFLICT, 197, L_MISC_129, -1 }, // "Alien Conflict" + /*0x06*/ { MUSIC_CI, 120, L_MISC_130, -1 }, // "Carrington Institute" + /*0x07*/ { MUSIC_DEFECTION, 120, L_MISC_131, SOLOSTAGEINDEX_DEFECTION }, // "dD Central" + /*0x08*/ { MUSIC_DEFECTION_X, 120, L_MISC_132, SOLOSTAGEINDEX_DEFECTION }, // "dD Central X" + /*0x09*/ { MUSIC_INVESTIGATION, 120, L_MISC_133, SOLOSTAGEINDEX_INVESTIGATION }, // "dD Research" + /*0x0a*/ { MUSIC_INVESTIGATION_X, 120, L_MISC_134, SOLOSTAGEINDEX_INVESTIGATION }, // "dD Research X" + /*0x0b*/ { MUSIC_EXTRACTION, 120, L_MISC_135, SOLOSTAGEINDEX_EXTRACTION }, // "dD Extraction" + /*0x0c*/ { MUSIC_EXTRACTION_X, 120, L_MISC_136, SOLOSTAGEINDEX_EXTRACTION }, // "dD Extraction X" + /*0x0d*/ { MUSIC_VILLA, 120, L_MISC_137, SOLOSTAGEINDEX_VILLA }, // "Carrington Villa" + /*0x0e*/ { MUSIC_VILLA_X, 120, L_MISC_138, SOLOSTAGEINDEX_VILLA }, // "Carrington Villa X" + /*0x0f*/ { MUSIC_CHICAGO, 120, L_MISC_139, SOLOSTAGEINDEX_CHICAGO }, // "Chicago" + /*0x10*/ { MUSIC_CHICAGO_X, 120, L_MISC_140, SOLOSTAGEINDEX_CHICAGO }, // "Chicago X" + /*0x11*/ { MUSIC_G5, 120, L_MISC_141, SOLOSTAGEINDEX_G5BUILDING }, // "G5 Building" + /*0x12*/ { MUSIC_G5_X, 120, L_MISC_142, SOLOSTAGEINDEX_G5BUILDING }, // "G5 Building X" + /*0x13*/ { MUSIC_INFILTRATION, 120, L_MISC_143, SOLOSTAGEINDEX_INFILTRATION }, // "A51 Infiltration" + /*0x14*/ { MUSIC_INFILTRATION_X, 120, L_MISC_144, SOLOSTAGEINDEX_INFILTRATION }, // "A51 Infiltration X" + /*0x15*/ { MUSIC_RESCUE, 120, L_MISC_145, SOLOSTAGEINDEX_RESCUE }, // "A51 Rescue" + /*0x16*/ { MUSIC_RESCUE_X, 120, L_MISC_146, SOLOSTAGEINDEX_RESCUE }, // "A51 Rescue X" + /*0x17*/ { MUSIC_ESCAPE, 120, L_MISC_147, SOLOSTAGEINDEX_ESCAPE }, // "A51 Escape" + /*0x18*/ { MUSIC_ESCAPE_X, 120, L_MISC_148, SOLOSTAGEINDEX_ESCAPE }, // "A51 Escape X" + /*0x19*/ { MUSIC_AIRBASE, 120, L_MISC_149, SOLOSTAGEINDEX_AIRBASE }, // "Air Base" + /*0x1a*/ { MUSIC_AIRBASE_X, 120, L_MISC_150, SOLOSTAGEINDEX_AIRBASE }, // "Air Base X" + /*0x1b*/ { MUSIC_AIRFORCEONE, 120, L_MISC_151, SOLOSTAGEINDEX_AIRFORCEONE }, // "Air Force One" + /*0x1c*/ { MUSIC_AIRFORCEONE_X, 120, L_MISC_152, SOLOSTAGEINDEX_AIRFORCEONE }, // "Air Force One X" + /*0x1d*/ { MUSIC_CRASHSITE, 120, L_MISC_153, SOLOSTAGEINDEX_CRASHSITE }, // "Crash Site" + /*0x1e*/ { MUSIC_CRASHSITE_X, 120, L_MISC_154, SOLOSTAGEINDEX_CRASHSITE }, // "Crash Site X" + /*0x1f*/ { MUSIC_PELAGIC, 120, L_MISC_155, SOLOSTAGEINDEX_PELAGIC }, // "Pelagic II" + /*0x20*/ { MUSIC_PELAGIC_X, 120, L_MISC_156, SOLOSTAGEINDEX_PELAGIC }, // "Pelagic II X" + /*0x21*/ { MUSIC_DEEPSEA, 120, L_MISC_157, SOLOSTAGEINDEX_DEEPSEA }, // "Deep Sea" + /*0x22*/ { MUSIC_DEEPSEA_X, 120, L_MISC_158, SOLOSTAGEINDEX_DEEPSEA }, // "Deep Sea X" + /*0x23*/ { MUSIC_DEFENSE, 120, L_MISC_159, SOLOSTAGEINDEX_DEFENSE }, // "Institute Defense" + /*0x24*/ { MUSIC_DEFENSE_X, 120, L_MISC_160, SOLOSTAGEINDEX_DEFENSE }, // "Institute Defense X" + /*0x25*/ { MUSIC_ATTACKSHIP, 120, L_MISC_161, SOLOSTAGEINDEX_ATTACKSHIP }, // "Attack Ship" + /*0x26*/ { MUSIC_ATTACKSHIP_X, 120, L_MISC_162, SOLOSTAGEINDEX_ATTACKSHIP }, // "Attack Ship X" + /*0x27*/ { MUSIC_SKEDARRUINS, 120, L_MISC_163, SOLOSTAGEINDEX_SKEDARRUINS }, // "Skedar Ruins" + /*0x28*/ { MUSIC_SKEDARRUINS_X, 120, L_MISC_164, SOLOSTAGEINDEX_SKEDARRUINS }, // "Skedar Ruins X" + /*0x29*/ { MUSIC_CREDITS, 120, L_MISC_165, SOLOSTAGEINDEX_SKEDARRUINS }, // "End Credits" }; bool mpIsTrackUnlocked(s32 tracknum) @@ -6600,20 +6600,20 @@ glabel func0f18dac0 ); struct mppreset g_MpPresets[NUM_MPPRESETS] = { - { L_MPWEAPONS(25), MPCONFIG_NOSHIELD }, // "No Shield" - { L_MPWEAPONS(26), MPCONFIG_AUTOMATICS }, // "Automatics" - { L_MPWEAPONS(27), MPCONFIG_ROCKETS }, // "Rocket Launcher" - { L_MPWEAPONS(28), MPCONFIG_SIMULANTS }, // "Simulants" - { L_MPWEAPONS(29), MPCONFIG_SKEDARKING }, // "King of the Hill" - { L_MPWEAPONS(30), MPCONFIG_FARSIGHT }, // "Complex FarSight" - { L_MPWEAPONS(31), MPCONFIG_BRIEFCASE }, // "Hold the Briefcase" - { L_MPWEAPONS(32), MPCONFIG_PISTOLS }, // "Pistol One-Hit Kills" - { L_MPWEAPONS(33), MPCONFIG_FLAGS }, // "Capture the Case" - { L_MPWEAPONS(34), MPCONFIG_CLOAKING }, // "Cloaking" - { L_MPWEAPONS(35), MPCONFIG_TEMPLE }, // "Temple Explosives" - { L_MPWEAPONS(36), MPCONFIG_SLAYER }, // "Slayer" - { L_MPWEAPONS(37), MPCONFIG_DRUGGUN }, // "Tranquilizr" - { L_MPWEAPONS(38), MPCONFIG_SLOWMO }, // "Slow Motion" + { L_MPWEAPONS_025, MPCONFIG_NOSHIELD }, // "No Shield" + { L_MPWEAPONS_026, MPCONFIG_AUTOMATICS }, // "Automatics" + { L_MPWEAPONS_027, MPCONFIG_ROCKETS }, // "Rocket Launcher" + { L_MPWEAPONS_028, MPCONFIG_SIMULANTS }, // "Simulants" + { L_MPWEAPONS_029, MPCONFIG_SKEDARKING }, // "King of the Hill" + { L_MPWEAPONS_030, MPCONFIG_FARSIGHT }, // "Complex FarSight" + { L_MPWEAPONS_031, MPCONFIG_BRIEFCASE }, // "Hold the Briefcase" + { L_MPWEAPONS_032, MPCONFIG_PISTOLS }, // "Pistol One-Hit Kills" + { L_MPWEAPONS_033, MPCONFIG_FLAGS }, // "Capture the Case" + { L_MPWEAPONS_034, MPCONFIG_CLOAKING }, // "Cloaking" + { L_MPWEAPONS_035, MPCONFIG_TEMPLE }, // "Temple Explosives" + { L_MPWEAPONS_036, MPCONFIG_SLAYER }, // "Slayer" + { L_MPWEAPONS_037, MPCONFIG_DRUGGUN }, // "Tranquilizr" + { L_MPWEAPONS_038, MPCONFIG_SLOWMO }, // "Slow Motion" }; s32 mpGetNumPresets(void) diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index ee2bd121b..a0e2df008 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -277,9 +277,9 @@ s32 menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handler } u16 mpslowmotionoptions[] = { - L_MPMENU(240), // "Off" - L_MPMENU(241), // "On" - L_MPMENU(242), // "Smart" + L_MPMENU_240, // "Off" + L_MPMENU_241, // "On" + L_MPMENU_242, // "Smart" }; GLOBAL_ASM( @@ -496,23 +496,23 @@ void func0f180078(void) } struct menuitem g_MpCombatOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(225), MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(226), MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(227), MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_222, MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_223, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_224, MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_225, MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_226, MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_227, MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(228), MPOPTION_NOPLAYERHIGHLIGHT, menuhandlerMpCheckboxOption }, // "No Player Highlight" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(229), MPOPTION_NOPICKUPHIGHLIGHT, menuhandlerMpCheckboxOption }, // "No Pickup Highlight" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_228, MPOPTION_NOPLAYERHIGHLIGHT, menuhandlerMpCheckboxOption }, // "No Player Highlight" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_229, MPOPTION_NOPICKUPHIGHLIGHT, menuhandlerMpCheckboxOption }, // "No Pickup Highlight" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(239), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_239, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpCombatOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(215), // "Combat Options" + L_MPMENU_215, // "Combat Options" g_MpCombatOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, @@ -520,24 +520,24 @@ struct menudialog g_MpCombatOptionsMenuDialog = { }; struct menuitem g_MpBriefcaseOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(225), MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(226), MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(227), MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS(493), MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_222, MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_223, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_224, MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_225, MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_226, MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_227, MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS_493, MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(237), MPOPTION_HTB_HIGHLIGHTBRIEFCASE, menuhandlerMpCheckboxOption }, // "Highlight Briefcase" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(238), MPOPTION_HTB_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_237, MPOPTION_HTB_HIGHLIGHTBRIEFCASE, menuhandlerMpCheckboxOption }, // "Highlight Briefcase" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_238, MPOPTION_HTB_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(239), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_239, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpBriefcaseOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(216), // "Briefcase Options" + L_MPMENU_216, // "Briefcase Options" g_MpBriefcaseOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, @@ -818,7 +818,7 @@ void scenarioHtbCallback14(struct chrdata *chr) if (g_Vars.currentplayerstats->tokenheldtime >= SECSTOTIME240(30)) { audioStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); var800ac500[g_Vars.currentplayernum]->unk3e++; - func0f0ddfa4(langGet(L_MPWEAPONS(24)), 9, 1); // "1 Point!" + func0f0ddfa4(langGet(L_MPWEAPONS_024), 9, 1); // "1 Point!" g_Vars.currentplayerstats->tokenheldtime = 0; } } else { @@ -1197,23 +1197,23 @@ void scenarioCtcCallback14(struct chrdata *chr) } struct menuitem g_MpCaptureOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(225), MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(226), MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(227), MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS(493), MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_222, MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_223, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_224, MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_225, MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_226, MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_227, MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS_493, MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(236), MPOPTION_CTC_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_236, MPOPTION_CTC_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(239), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_239, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpCaptureOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(220), // "Capture Options" + L_MPMENU_220, // "Capture Options" g_MpCaptureOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, @@ -1908,7 +1908,7 @@ s32 menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdat g_Vars.mphilltime = (u8)data->slider.value; break; case MENUOP_GETSLIDERLABEL: - sprintf(data->slider.label, langGet(L_MPWEAPONS(23)), data->slider.value + 10); // "%ds/Point" + sprintf(data->slider.label, langGet(L_MPWEAPONS_023), data->slider.value + 10); // "%ds/Point" break; } @@ -3875,25 +3875,25 @@ void func0f182bf4(void) } struct menuitem g_MpHillOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(225), MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(226), MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(227), MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS(493), MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_222, MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_223, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_224, MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_225, MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_226, MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_227, MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS_493, MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(233), MPOPTION_KOH_HILLONRADAR, menuhandlerMpCheckboxOption }, // "Hill on Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(234), MPOPTION_KOH_MOBILEHILL, menuhandlerMpCheckboxOption }, // "Mobile Hill" - { MENUITEMTYPE_SLIDER, 0, 0x00020000, L_MPMENU(235), 0x0000006e, menuhandlerMpHillTime }, // "Time" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_233, MPOPTION_KOH_HILLONRADAR, menuhandlerMpCheckboxOption }, // "Hill on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_234, MPOPTION_KOH_MOBILEHILL, menuhandlerMpCheckboxOption }, // "Mobile Hill" + { MENUITEMTYPE_SLIDER, 0, 0x00020000, L_MPMENU_235, 0x0000006e, menuhandlerMpHillTime }, // "Time" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(239), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_239, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpHillOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(219), // "Hill Options" + L_MPMENU_219, // "Hill Options" g_MpHillOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, @@ -3901,24 +3901,24 @@ struct menudialog g_MpHillOptionsMenuDialog = { }; struct menuitem g_MpHackerOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(225), MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(226), MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(227), MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS(493), MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_222, MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_223, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_224, MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_225, MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_226, MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_227, MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS_493, MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(231), MPOPTION_HTM_HIGHLIGHTTERMINAL, menuhandlerMpCheckboxOption }, // "Highlight Terminal" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(238), MPOPTION_HTM_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_231, MPOPTION_HTM_HIGHLIGHTTERMINAL, menuhandlerMpCheckboxOption }, // "Highlight Terminal" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_238, MPOPTION_HTM_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(239), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_239, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpHackerOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(217), // "Hacker Options" + L_MPMENU_217, // "Hacker Options" g_MpHackerOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, @@ -5847,7 +5847,7 @@ glabel scenarioPacTick // if (g_ScenarioData.pac.age240 > SECSTOTIME240(60)) { // g_ScenarioData.pac.age240 = 0; // g_ScenarioData.pac.wincounts[g_ScenarioData.pac.victims[g_ScenarioData.pac.victimindex]]++; -// mpCreateScenarioHudmsg(g_ScenarioData.pac.victims[g_ScenarioData.pac.victimindex], langGet(L_MPWEAPONS(7))); // "Have a point for living!" +// mpCreateScenarioHudmsg(g_ScenarioData.pac.victims[g_ScenarioData.pac.victimindex], langGet(L_MPWEAPONS_007)); // "Have a point for living!" // } // } // } @@ -6188,24 +6188,24 @@ char *mpMenuTextScenarioName(struct menuitem *item) } struct menuitem g_MpPopacapOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(222), MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(223), 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(224), MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(225), MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(226), MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(227), MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS(493), MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_222, MPOPTION_ONEHITKILLS, menuhandlerMpOneHitKills }, // "One-Hit Kills" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_223, 0x00000000, menuhandlerMpSlowMotion }, // "Slow Motion" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_224, MPOPTION_FASTMOVEMENT, menuhandlerMpCheckboxOption }, // "Fast Movement" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_225, MPOPTION_DISPLAYTEAM, menuhandlerMpDisplayTeam }, // "Display Team" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_226, MPOPTION_NORADAR, menuhandlerMpCheckboxOption }, // "No Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_227, MPOPTION_NOAUTOAIM, menuhandlerMpCheckboxOption }, // "No Auto-Aim" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_OPTIONS_493, MPOPTION_KILLSSCORE, menuhandlerMpCheckboxOption }, // "Kills Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(230), MPOPTION_PAC_HIGHLIGHTTARGET, menuhandlerMpCheckboxOption }, // "Highlight Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(238), MPOPTION_PAC_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_230, MPOPTION_PAC_HIGHLIGHTTARGET, menuhandlerMpCheckboxOption }, // "Highlight Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_238, MPOPTION_PAC_SHOWONRADAR, menuhandlerMpCheckboxOption }, // "Show on Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(239), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_239, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpPopacapOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(218), // "Pop a Cap Options" + L_MPMENU_218, // "Pop a Cap Options" g_MpPopacapOptionsMenuItems, mpOptionsMenuDialog, 0x00000010, @@ -6291,12 +6291,12 @@ struct mpscenario g_MpScenarios[6] = { struct mpscenariooverview g_MpScenarioOverviews[] = { // Full name, short name, unlock flags? - { L_MPMENU(246), L_MPMENU(253), 0x00, false }, // "Combat", "Combat" - { L_MPMENU(247), L_MPMENU(254), 0x20, false }, // "Hold the Briefcase", "Briefcase" - { L_MPMENU(248), L_MPMENU(255), 0x4e, false }, // "Hacker Central", "Hacker" - { L_MPMENU(249), L_MPMENU(256), 0x4d, false }, // "Pop a Cap", "Pop" - { L_MPMENU(250), L_MPMENU(257), 0x1f, true }, // "King of the Hill", "Hill" - { L_MPMENU(251), L_MPMENU(258), 0x21, true }, // "Capture the Case", "Capture" + { L_MPMENU_246, L_MPMENU_253, 0x00, false }, // "Combat", "Combat" + { L_MPMENU_247, L_MPMENU_254, 0x20, false }, // "Hold the Briefcase", "Briefcase" + { L_MPMENU_248, L_MPMENU_255, 0x4e, false }, // "Hacker Central", "Hacker" + { L_MPMENU_249, L_MPMENU_256, 0x4d, false }, // "Pop a Cap", "Pop" + { L_MPMENU_250, L_MPMENU_257, 0x1f, true }, // "King of the Hill", "Hill" + { L_MPMENU_251, L_MPMENU_258, 0x21, true }, // "Capture the Case", "Capture" }; u32 var8008716c = 0x00000000; @@ -7471,7 +7471,7 @@ struct menuitem g_MpScenarioMenuItems[] = { struct menudialog g_MpScenarioMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(243), // "Scenario" + L_MPMENU_243, // "Scenario" g_MpScenarioMenuItems, NULL, 0x00000011, @@ -7485,7 +7485,7 @@ struct menuitem g_MpQuickTeamScenarioMenuItems[] = { struct menudialog g_MpQuickTeamScenarioMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(243), // "Scenario" + L_MPMENU_243, // "Scenario" g_MpQuickTeamScenarioMenuItems, NULL, 0x00000011, @@ -9204,10 +9204,10 @@ bool chrGiveUplink(struct chrdata *chr, struct prop *prop) #if PAL // "%shas the\nData Uplink%s" - sprintf(message, langGet(L_MPWEAPONS(0)), mpchr->name); + sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name); #else // "%shas the\n%s" - sprintf(message, langGet(L_MPWEAPONS(0)), mpchr->name, weaponGetShortName(WEAPON_DATAUPLINK)); + sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name, weaponGetShortName(WEAPON_DATAUPLINK)); #endif playernum = g_Vars.currentplayernum; diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index ef32336bd..de1152538 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -55,15 +55,15 @@ s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerd } struct menuitem g_MpDropOutMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(196), 0x00000000, NULL }, // "Are you sure you want to drop out?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(197), 0x00000000, menuhandlerMpDropOut }, // "Drop Out" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(198), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_196, 0x00000000, NULL }, // "Are you sure you want to drop out?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_197, 0x00000000, menuhandlerMpDropOut }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_198, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpDropOutMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(195), // "Drop Out" + L_MPMENU_195, // "Drop Out" g_MpDropOutMenuItems, NULL, 0x00000000, @@ -72,23 +72,23 @@ struct menudialog g_MpDropOutMenuDialog = { struct mparena g_MpArenas[] = { // Stage, unlock, name - { STAGE_MP_SKEDAR, 0, L_MPMENU(119) }, - { STAGE_MP_PIPES, 0, L_MPMENU(120) }, - { STAGE_MP_RAVINE, MPFEATURE_STAGE_RAVINE, L_MPMENU(121) }, - { STAGE_MP_G5BUILDING, MPFEATURE_STAGE_G5BUILDING, L_MPMENU(122) }, - { STAGE_MP_SEWERS, MPFEATURE_STAGE_SEWERS, L_MPMENU(123) }, - { STAGE_MP_WAREHOUSE, MPFEATURE_STAGE_WAREHOUSE, L_MPMENU(124) }, - { STAGE_MP_GRID, MPFEATURE_STAGE_GRID, L_MPMENU(125) }, - { STAGE_MP_RUINS, MPFEATURE_STAGE_RUINS, L_MPMENU(126) }, - { STAGE_MP_AREA52, 0, L_MPMENU(127) }, - { STAGE_MP_BASE, MPFEATURE_STAGE_BASE, L_MPMENU(128) }, - { STAGE_MP_FORTRESS, MPFEATURE_STAGE_FORTRESS, L_MPMENU(130) }, - { STAGE_MP_VILLA, MPFEATURE_STAGE_VILLA, L_MPMENU(131) }, - { STAGE_MP_CARPARK, MPFEATURE_STAGE_CARPARK, L_MPMENU(132) }, - { STAGE_MP_TEMPLE, MPFEATURE_STAGE_TEMPLE, L_MPMENU(133) }, - { STAGE_MP_COMPLEX, MPFEATURE_STAGE_COMPLEX, L_MPMENU(134) }, - { STAGE_MP_FELICITY, MPFEATURE_STAGE_FELICITY, L_MPMENU(135) }, - { 1, 0, L_MPMENU(136) }, // "Random" + { STAGE_MP_SKEDAR, 0, L_MPMENU_119 }, + { STAGE_MP_PIPES, 0, L_MPMENU_120 }, + { STAGE_MP_RAVINE, MPFEATURE_STAGE_RAVINE, L_MPMENU_121 }, + { STAGE_MP_G5BUILDING, MPFEATURE_STAGE_G5BUILDING, L_MPMENU_122 }, + { STAGE_MP_SEWERS, MPFEATURE_STAGE_SEWERS, L_MPMENU_123 }, + { STAGE_MP_WAREHOUSE, MPFEATURE_STAGE_WAREHOUSE, L_MPMENU_124 }, + { STAGE_MP_GRID, MPFEATURE_STAGE_GRID, L_MPMENU_125 }, + { STAGE_MP_RUINS, MPFEATURE_STAGE_RUINS, L_MPMENU_126 }, + { STAGE_MP_AREA52, 0, L_MPMENU_127 }, + { STAGE_MP_BASE, MPFEATURE_STAGE_BASE, L_MPMENU_128 }, + { STAGE_MP_FORTRESS, MPFEATURE_STAGE_FORTRESS, L_MPMENU_130 }, + { STAGE_MP_VILLA, MPFEATURE_STAGE_VILLA, L_MPMENU_131 }, + { STAGE_MP_CARPARK, MPFEATURE_STAGE_CARPARK, L_MPMENU_132 }, + { STAGE_MP_TEMPLE, MPFEATURE_STAGE_TEMPLE, L_MPMENU_133 }, + { STAGE_MP_COMPLEX, MPFEATURE_STAGE_COMPLEX, L_MPMENU_134 }, + { STAGE_MP_FELICITY, MPFEATURE_STAGE_FELICITY, L_MPMENU_135 }, + { 1, 0, L_MPMENU_136 }, // "Random" }; s32 mpGetNumStages(void) @@ -358,10 +358,10 @@ glabel var7f1b8074 s32 menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { - L_OPTIONS(239), // "1.1" - L_OPTIONS(240), // "1.2" - L_OPTIONS(241), // "1.3" - L_OPTIONS(242), // "1.4" + L_OPTIONS_239, // "1.1" + L_OPTIONS_240, // "1.2" + L_OPTIONS_241, // "1.3" + L_OPTIONS_242, // "1.4" }; switch (operation) { @@ -463,8 +463,8 @@ s32 menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union han s32 menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { - L_MPMENU(213), // "Hold" - L_MPMENU(214), // "Toggle" + L_MPMENU_213, // "Hold" + L_MPMENU_214, // "Toggle" }; switch (operation) { @@ -1489,7 +1489,7 @@ glabel menuhandlerMpMedal char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog) { // "Stats for %s" - sprintf(g_StringPointer, langGet(L_MPMENU(145)), g_MpPlayers[g_MpPlayerNum].base.name); + sprintf(g_StringPointer, langGet(L_MPMENU_145), g_MpPlayers[g_MpPlayerNum].base.name); return g_StringPointer; } @@ -1505,16 +1505,16 @@ s32 menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union ha } struct menuitem g_MpSavePlayerMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(191), 0x00000000, NULL }, // "Your player file is always saved automatically." - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(192), 0x00000000, NULL }, // "Save a copy now?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(193), 0x00000000, NULL }, // "No" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(194), 0x00000000, menuhandlerMpConfirmSaveChr }, // "Yes" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_191, 0x00000000, NULL }, // "Your player file is always saved automatically." + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_192, 0x00000000, NULL }, // "Save a copy now?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_193, 0x00000000, NULL }, // "No" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_194, 0x00000000, menuhandlerMpConfirmSaveChr }, // "Yes" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpSavePlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(190), // "Confirm" + L_MPMENU_190, // "Confirm" g_MpSavePlayerMenuItems, NULL, 0x00000000, @@ -1522,14 +1522,14 @@ struct menudialog g_MpSavePlayerMenuDialog = { }; struct menuitem g_MpSaveSetupNameMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(189), 0x00000000, NULL }, // "Enter a name for your game setup file:" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_189, 0x00000000, NULL }, // "Enter a name for your game setup file:" { MENUITEMTYPE_KEYBOARD, 0, 0x00000000, 0x00000000, 0x00000000, menuhandlerMpPlayerName }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpSaveSetupNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(188), // "Game File Name" + L_MPMENU_188, // "Game File Name" g_MpSaveSetupNameMenuItems, NULL, 0x00000000, @@ -1537,18 +1537,18 @@ struct menudialog g_MpSaveSetupNameMenuDialog = { }; struct menuitem g_MpSaveSetupExistsMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS(230), (u32)&mpMenuTextSetupName, NULL }, // "Name:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS_230, (u32)&mpMenuTextSetupName, NULL }, // "Name:" { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemgrMenuTextDeviceName, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(184), 0x00000000, NULL }, // "Do you want to save over your original game file?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(185), 0x00000000, menuhandlerMpSaveSetupOverwrite }, // "Save Over Original" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(186), 0x00000000, menuhandlerMpSaveSetupCopy }, // "Save Copy" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(187), 0x00000000, NULL }, // "Do Not Save" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_184, 0x00000000, NULL }, // "Do you want to save over your original game file?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_185, 0x00000000, menuhandlerMpSaveSetupOverwrite }, // "Save Over Original" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_186, 0x00000000, menuhandlerMpSaveSetupCopy }, // "Save Copy" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_187, 0x00000000, NULL }, // "Do Not Save" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpSaveSetupExistsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(183), // "Save Game Setup" + L_MPMENU_183, // "Save Game Setup" g_MpSaveSetupExistsMenuItems, NULL, 0x00000000, @@ -1556,23 +1556,23 @@ struct menudialog g_MpSaveSetupExistsMenuDialog = { }; struct menuitem g_MpWeaponsMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 1, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" + { MENUITEMTYPE_DROPDOWN, 1, 0x00020090, L_MPMENU_174, 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000212, L_MPMENU(175), 0x00000000, NULL }, // "Current Weapon Setup:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU(176), 0x00000000, menuhandlerMpWeaponSlot }, // "1:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU(177), 0x00000001, menuhandlerMpWeaponSlot }, // "2:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU(178), 0x00000002, menuhandlerMpWeaponSlot }, // "3:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU(179), 0x00000003, menuhandlerMpWeaponSlot }, // "4:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU(180), 0x00000004, menuhandlerMpWeaponSlot }, // "5:" - { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU(181), 0x00000005, menuhandlerMpWeaponSlot }, // "6:" + { MENUITEMTYPE_LABEL, 0, 0x00000212, L_MPMENU_175, 0x00000000, NULL }, // "Current Weapon Setup:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU_176, 0x00000000, menuhandlerMpWeaponSlot }, // "1:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU_177, 0x00000001, menuhandlerMpWeaponSlot }, // "2:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU_178, 0x00000002, menuhandlerMpWeaponSlot }, // "3:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU_179, 0x00000003, menuhandlerMpWeaponSlot }, // "4:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU_180, 0x00000004, menuhandlerMpWeaponSlot }, // "5:" + { MENUITEMTYPE_DROPDOWN, 0, 0x000a0080, L_MPMENU_181, 0x00000005, menuhandlerMpWeaponSlot }, // "6:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(182), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_182, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(173), // "Weapons" + L_MPMENU_173, // "Weapons" g_MpWeaponsMenuItems, NULL, 0x00000010, @@ -1580,21 +1580,21 @@ struct menudialog g_MpWeaponsMenuDialog = { }; struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00020090, L_MPMENU(174), 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020090, L_MPMENU_174, 0x00000000, menuhandlerMpWeaponSetDropdown }, // "Set:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(176), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "1:" - { MENUITEMTYPE_LABEL, 1, 0x00000002, L_MPMENU(177), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "2:" - { MENUITEMTYPE_LABEL, 2, 0x00000002, L_MPMENU(178), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "3:" - { MENUITEMTYPE_LABEL, 3, 0x00000002, L_MPMENU(179), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "4:" - { MENUITEMTYPE_LABEL, 4, 0x00000002, L_MPMENU(180), (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "5:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_176, (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "1:" + { MENUITEMTYPE_LABEL, 1, 0x00000002, L_MPMENU_177, (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "2:" + { MENUITEMTYPE_LABEL, 2, 0x00000002, L_MPMENU_178, (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "3:" + { MENUITEMTYPE_LABEL, 3, 0x00000002, L_MPMENU_179, (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "4:" + { MENUITEMTYPE_LABEL, 4, 0x00000002, L_MPMENU_180, (u32)&mpMenuTextWeaponNameForSlot, NULL }, // "5:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(182), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_182, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpQuickTeamWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(173), // "Weapons" + L_MPMENU_173, // "Weapons" g_MpQuickTeamWeaponsMenuItems, NULL, 0x00000010, @@ -1602,18 +1602,18 @@ struct menudialog g_MpQuickTeamWeaponsMenuDialog = { }; struct menuitem g_MpPlayerOptionsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(168), MPDISPLAYOPTION_HIGHLIGHTPICKUPS, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Pickups" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(169), MPDISPLAYOPTION_HIGHLIGHTPLAYERS, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Players" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(170), MPDISPLAYOPTION_HIGHLIGHTTEAMS, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Teams" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(171), MPDISPLAYOPTION_RADAR, menuhandlerMpDisplayOptionCheckbox }, // "Radar" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_168, MPDISPLAYOPTION_HIGHLIGHTPICKUPS, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Pickups" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_169, MPDISPLAYOPTION_HIGHLIGHTPLAYERS, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Players" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_170, MPDISPLAYOPTION_HIGHLIGHTTEAMS, menuhandlerMpDisplayOptionCheckbox }, // "Highlight Teams" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_171, MPDISPLAYOPTION_RADAR, menuhandlerMpDisplayOptionCheckbox }, // "Radar" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(172), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_172, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpPlayerOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(167), // "Options" + L_MPMENU_167, // "Options" g_MpPlayerOptionsMenuItems, NULL, 0x00000000, @@ -1621,27 +1621,27 @@ struct menudialog g_MpPlayerOptionsMenuDialog = { }; struct menuitem g_MpControlMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPMENU(200), 0x00000000, menuhandlerMpControlStyle }, // "Control Style" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(201), OPTION_FORWARDPITCH, menuhandlerMpControlCheckbox }, // "Reverse Pitch" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(202), OPTION_LOOKAHEAD, menuhandlerMpControlCheckbox }, // "Look Ahead" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(203), OPTION_HEADROLL, menuhandlerMpControlCheckbox }, // "Head Roll" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(204), OPTION_AUTOAIM, menuhandlerMpControlCheckbox }, // "Auto-Aim" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPMENU(205), 0x00000000, menuhandlerMpAimControl }, // "Aim Control" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPMENU_200, 0x00000000, menuhandlerMpControlStyle }, // "Control Style" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_201, OPTION_FORWARDPITCH, menuhandlerMpControlCheckbox }, // "Reverse Pitch" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_202, OPTION_LOOKAHEAD, menuhandlerMpControlCheckbox }, // "Look Ahead" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_203, OPTION_HEADROLL, menuhandlerMpControlCheckbox }, // "Head Roll" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_204, OPTION_AUTOAIM, menuhandlerMpControlCheckbox }, // "Auto-Aim" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPMENU_205, 0x00000000, menuhandlerMpAimControl }, // "Aim Control" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(206), OPTION_SIGHTONSCREEN, menuhandlerMpControlCheckbox }, // "Sight on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(207), OPTION_ALWAYSSHOWTARGET, menuhandlerMpControlCheckbox }, // "Show Target" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(208), OPTION_SHOWZOOMRANGE, menuhandlerMpControlCheckbox }, // "Show Zoom Range" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(209), OPTION_AMMOONSCREEN, menuhandlerMpControlCheckbox }, // "Ammo on Screen" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(210), OPTION_SHOWGUNFUNCTION, menuhandlerMpControlCheckbox }, // "Gun Function" - { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU(211), OPTION_PAINTBALL, menuhandlerMpControlCheckbox }, // "Paintball" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_206, OPTION_SIGHTONSCREEN, menuhandlerMpControlCheckbox }, // "Sight on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_207, OPTION_ALWAYSSHOWTARGET, menuhandlerMpControlCheckbox }, // "Show Target" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_208, OPTION_SHOWZOOMRANGE, menuhandlerMpControlCheckbox }, // "Show Zoom Range" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_209, OPTION_AMMOONSCREEN, menuhandlerMpControlCheckbox }, // "Ammo on Screen" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_210, OPTION_SHOWGUNFUNCTION, menuhandlerMpControlCheckbox }, // "Gun Function" + { MENUITEMTYPE_CHECKBOX, 0, 0x00000000, L_MPMENU_211, OPTION_PAINTBALL, menuhandlerMpControlCheckbox }, // "Paintball" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(212), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_212, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(199), // "Control" + L_MPMENU_199, // "Control" g_MpControlMenuItems, NULL, 0x00000000, @@ -1655,7 +1655,7 @@ struct menuitem g_MpCompletedChallengesMenuItems[] = { struct menudialog g_MpCompletedChallengesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(165), // "Completed Challenges" + L_MPMENU_165, // "Completed Challenges" g_MpCompletedChallengesMenuItems, NULL, 0x00000048, @@ -1716,35 +1716,35 @@ char *mpMenuTextUsernamePassword(struct menuitem *item) } struct menuitem g_MpPlayerStatsMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(146), (u32)&mpMenuTextKills, NULL }, // "Kills:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(147), (u32)&mpMenuTextDeaths, NULL }, // "Deaths:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(148), (u32)&mpMenuTextAccuracy, NULL }, // "Accuracy:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(149), (u32)&mpMenuTextHeadShots, NULL }, // "Head Shots:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_146, (u32)&mpMenuTextKills, NULL }, // "Kills:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_147, (u32)&mpMenuTextDeaths, NULL }, // "Deaths:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_148, (u32)&mpMenuTextAccuracy, NULL }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_149, (u32)&mpMenuTextHeadShots, NULL }, // "Head Shots:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(150), (u32)&mpMenuTextAmmoUsed, NULL }, // "Ammo Used:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(151), (u32)&mpMenuTextDamageDealt, NULL }, // "Damage Dealt:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(152), (u32)&mpMenuTextPainReceived, NULL }, // "Pain Received:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_150, (u32)&mpMenuTextAmmoUsed, NULL }, // "Ammo Used:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_151, (u32)&mpMenuTextDamageDealt, NULL }, // "Damage Dealt:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_152, (u32)&mpMenuTextPainReceived, NULL }, // "Pain Received:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(153), (u32)&mpMenuTextGamesPlayed, NULL }, // "Games Played:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(154), (u32)&mpMenuTextGamesWon, NULL }, // "Games Won:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(155), (u32)&mpMenuTextGamesLost, NULL }, // "Games Lost:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(156), (u32)&mpMenuTextTime, NULL }, // "Time:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(157), (u32)&mpMenuTextDistance, NULL }, // "Distance:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_153, (u32)&mpMenuTextGamesPlayed, NULL }, // "Games Played:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_154, (u32)&mpMenuTextGamesWon, NULL }, // "Games Won:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_155, (u32)&mpMenuTextGamesLost, NULL }, // "Games Lost:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_156, (u32)&mpMenuTextTime, NULL }, // "Time:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_157, (u32)&mpMenuTextDistance, NULL }, // "Distance:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPMENU(158), 0x00000000, NULL }, // "Medals Won:" - { MENUITEMTYPE_LABEL, 2, 0x00200000, L_MPMENU(159), (u32)&mpMenuTextMedalAccuracy, menuhandlerMpMedal }, // "Accuracy:" - { MENUITEMTYPE_LABEL, 1, 0x00200000, L_MPMENU(160), (u32)&mpMenuTextMedalHeadShot, menuhandlerMpMedal }, // "Head Shot:" - { MENUITEMTYPE_LABEL, 0, 0x00200000, L_MPMENU(161), (u32)&mpMenuTextMedalKillMaster, menuhandlerMpMedal }, // "KillMaster:" - { MENUITEMTYPE_LABEL, 3, 0x00200000, L_MPMENU(162), (u32)&mpMenuTextMedalSurvivor, menuhandlerMpMedal }, // "Survivor:" + { MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPMENU_158, 0x00000000, NULL }, // "Medals Won:" + { MENUITEMTYPE_LABEL, 2, 0x00200000, L_MPMENU_159, (u32)&mpMenuTextMedalAccuracy, menuhandlerMpMedal }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 1, 0x00200000, L_MPMENU_160, (u32)&mpMenuTextMedalHeadShot, menuhandlerMpMedal }, // "Head Shot:" + { MENUITEMTYPE_LABEL, 0, 0x00200000, L_MPMENU_161, (u32)&mpMenuTextMedalKillMaster, menuhandlerMpMedal }, // "KillMaster:" + { MENUITEMTYPE_LABEL, 3, 0x00200000, L_MPMENU_162, (u32)&mpMenuTextMedalSurvivor, menuhandlerMpMedal }, // "Survivor:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(163), 0x00000000, NULL }, // "Your Title:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_163, 0x00000000, NULL }, // "Your Title:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextPlayerTitle, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS(219), 0x00000000, menuhandlerMpUsernamePassword }, // "USERNAME:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS_219, 0x00000000, menuhandlerMpUsernamePassword }, // "USERNAME:" { MENUITEMTYPE_LABEL, 0, 0x00000220, (u32)&mpMenuTextUsernamePassword, 0x00000000, menuhandlerMpUsernamePassword }, - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS(220), 0x00000000, menuhandlerMpUsernamePassword }, // "PASSWORD:" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPWEAPONS_220, 0x00000000, menuhandlerMpUsernamePassword }, // "PASSWORD:" { MENUITEMTYPE_LABEL, 1, 0x00000220, (u32)&mpMenuTextUsernamePassword, 0x00000000, menuhandlerMpUsernamePassword }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(164), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_164, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -2455,7 +2455,7 @@ char *mpMenuTextMpconfigMarquee(struct menuitem *item) if (scenarionum <= 5 && arenanum != -1 && numsims >= 0 && filename[0] != '\0' && numsims <= 8) { // "%s: Scenario: %s Arena: %s Simulants: %d" - sprintf(g_StringPointer, langGet(L_MPMENU(140)), + sprintf(g_StringPointer, langGet(L_MPMENU_140), filename, langGet(g_MpScenarioOverviews[scenarionum].name), langGet(g_MpArenas[arenanum].name), @@ -2630,9 +2630,9 @@ s32 menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union han break; case MENUOP_GETSLIDERLABEL: if (data->slider.value == 60) { - sprintf(data->slider.label, langGet(L_MPMENU(112))); // "No Limit" + sprintf(data->slider.label, langGet(L_MPMENU_112)); // "No Limit" } else { - sprintf(data->slider.label, langGet(L_MPMENU(114)), data->slider.value + 1); // "%d Min" + sprintf(data->slider.label, langGet(L_MPMENU_114), data->slider.value + 1); // "%d Min" } } return 0; @@ -2649,9 +2649,9 @@ s32 menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union ha break; case MENUOP_GETSLIDERLABEL: if (data->slider.value == 100) { - sprintf(data->slider.label, langGet(L_MPMENU(112))); // "No Limit" + sprintf(data->slider.label, langGet(L_MPMENU_112)); // "No Limit" } else { - sprintf(data->slider.label, langGet(L_MPMENU(113)), data->slider.value + 1); // "%d" + sprintf(data->slider.label, langGet(L_MPMENU_113), data->slider.value + 1); // "%d" } } @@ -2669,9 +2669,9 @@ s32 menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, unio break; case MENUOP_GETSLIDERLABEL: if (data->slider.value == 400) { - sprintf(data->slider.label, langGet(L_MPMENU(112))); // "No Limit" + sprintf(data->slider.label, langGet(L_MPMENU_112)); // "No Limit" } else { - sprintf(data->slider.label, langGet(L_MPMENU(113)), data->slider.value + 1); // "%d" + sprintf(data->slider.label, langGet(L_MPMENU_113), data->slider.value + 1); // "%d" } } @@ -2764,7 +2764,7 @@ struct menuitem g_MpCharacterMenuItems[] = { struct menudialog g_MpCharacterMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(143), // "Character" + L_MPMENU_143, // "Character" g_MpCharacterMenuItems, menudialog0017a174, 0x00000002, @@ -2778,7 +2778,7 @@ struct menuitem g_MpPlayerNameMenuItems[] = { struct menudialog g_MpPlayerNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(142), // "Player Name" + L_MPMENU_142, // "Player Name" g_MpPlayerNameMenuItems, NULL, 0x00000000, @@ -2793,7 +2793,7 @@ struct menuitem g_MpLoadSettingsMenuItems[] = { struct menudialog g_MpLoadSettingsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(139), // "Load Game Settings" + L_MPMENU_139, // "Load Game Settings" g_MpLoadSettingsMenuItems, NULL, 0x00000001, @@ -2808,7 +2808,7 @@ struct menuitem g_MpLoadPresetMenuItems[] = { struct menudialog g_MpLoadPresetMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(139), // "Load Game Settings" + L_MPMENU_139, // "Load Game Settings" g_MpLoadPresetMenuItems, NULL, 0x00000000, @@ -2817,13 +2817,13 @@ struct menudialog g_MpLoadPresetMenuDialog = { struct menuitem g_MpLoadPlayerMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00000000, 0x0000007e, 0x00000042, menuhandler0017bfc0 }, - { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPMENU(138), 0x00000000, NULL }, // "B Button to cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000200, L_MPMENU_138, 0x00000000, NULL }, // "B Button to cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpLoadPlayerMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(137), // "Load Player" + L_MPMENU_137, // "Load Player" g_MpLoadPlayerMenuItems, NULL, 0x00000000, @@ -2837,7 +2837,7 @@ struct menuitem g_MpArenaMenuItems[] = { struct menudialog g_MpArenaMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(115), // "Arena" + L_MPMENU_115, // "Arena" g_MpArenaMenuItems, NULL, 0x00000011, @@ -2845,18 +2845,18 @@ struct menudialog g_MpArenaMenuDialog = { }; struct menuitem g_MpLimitsMenuItems[] = { - { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU(108), 0x0000003c, menuhandlerMpTimeLimitSlider }, // "Time" - { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU(109), 0x00000064, menuhandlerMpScoreLimitSlider }, // "Score" - { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MISC(447), 0x00000190, menuhandlerMpTeamScoreLimitSlider }, // "Team Score" + { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU_108, 0x0000003c, menuhandlerMpTimeLimitSlider }, // "Time" + { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MPMENU_109, 0x00000064, menuhandlerMpScoreLimitSlider }, // "Score" + { MENUITEMTYPE_SLIDER, 0, 0x00020010, L_MISC_447, 0x00000190, menuhandlerMpTeamScoreLimitSlider }, // "Team Score" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(110), 0x00000000, menuhandlerMpRestoreScoreDefaults }, // "Restore Defaults" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(111), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU_110, 0x00000000, menuhandlerMpRestoreScoreDefaults }, // "Restore Defaults" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_111, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpLimitsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(107), // "Limits" + L_MPMENU_107, // "Limits" g_MpLimitsMenuItems, NULL, 0x00000010, @@ -2869,14 +2869,14 @@ struct menuitem g_MpHandicapsMenuItems[] = { { MENUITEMTYPE_SLIDER, 2, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SLIDER, 3, 0x00020010, (u32)&mpMenuTextHandicapPlayerName, 0x000000ff, menuhandlerMpHandicapPlayer }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(110), 0x00000000, menuhandlerMpRestoreHandicapDefaults }, // "Restore Defaults" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(111), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU_110, 0x00000000, menuhandlerMpRestoreHandicapDefaults }, // "Restore Defaults" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_111, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpHandicapsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPWEAPONS(184), // "Player Handicaps" + L_MPWEAPONS_184, // "Player Handicaps" g_MpHandicapsMenuItems, NULL, 0x00000010, @@ -2884,13 +2884,13 @@ struct menudialog g_MpHandicapsMenuDialog = { }; struct menuitem g_MpReadyMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(106), 0x00000000, NULL }, // "...and waiting" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_106, 0x00000000, NULL }, // "...and waiting" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpReadyMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPMENU(105), // "Ready!" + L_MPMENU_105, // "Ready!" g_MpReadyMenuItems, menudialogMpReady, 0x00000001, @@ -3193,7 +3193,7 @@ glabel var7f1b81e8 char *mpMenuTextSimulantDescription(struct menuitem *item) { - return langGet(L_MISC(106) + g_Menus[g_MpPlayerNum].data.mpsetup.unke24); + return langGet(L_MISC_106 + g_Menus[g_MpPlayerNum].data.mpsetup.unke24); } s32 menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data) @@ -3514,7 +3514,7 @@ struct menuitem g_MpAddChangeSimulantMenuItems[] = { struct menudialog g_MpAddSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(101), // "Add Simulant" + L_MPMENU_101, // "Add Simulant" g_MpAddChangeSimulantMenuItems, NULL, 0x00000011, @@ -3523,7 +3523,7 @@ struct menudialog g_MpAddSimulantMenuDialog = { struct menudialog g_MpChangeSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(102), // "Change Simulant" + L_MPMENU_102, // "Change Simulant" g_MpAddChangeSimulantMenuItems, menudialogMpSimulant, 0x00000011, @@ -3538,7 +3538,7 @@ struct menuitem g_MpSimulantCharacterMenuItems[] = { struct menudialog g_MpSimulantCharacterMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(100), // "Simulant Character" + L_MPMENU_100, // "Simulant Character" g_MpSimulantCharacterMenuItems, menudialog0017ccfc, 0x00000012, @@ -3546,12 +3546,12 @@ struct menudialog g_MpSimulantCharacterMenuDialog = { }; struct menuitem g_MpEditSimulantMenuItems[] = { - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(95), 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(96), 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(97), 0x00000000, (void *)&g_MpSimulantCharacterMenuDialog }, // "Character..." + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_095, 0x00000000, menuhandlerMpSimulantDifficulty }, // "Difficulty:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_096, 0x00000000, menuhandlerMpChangeSimulantType }, // "Change Type..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_097, 0x00000000, (void *)&g_MpSimulantCharacterMenuDialog }, // "Character..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(98), 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(99), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_098, 0x00000000, menuhandlerMpDeleteSimulant }, // "Delete Simulant" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_099, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3565,25 +3565,25 @@ struct menudialog g_MpEditSimulantMenuDialog = { }; struct menuitem g_MpSimulantsMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(84), 0x00000000, menuhandlerMpAddSimulant }, // "Add Simulant..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_084, 0x00000000, menuhandlerMpAddSimulant }, // "Add Simulant..." { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(85), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "1:" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_MPMENU(86), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "2:" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_MPMENU(87), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "3:" - { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, L_MPMENU(88), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "4:" - { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, L_MPMENU(89), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "5:" - { MENUITEMTYPE_SELECTABLE, 5, 0x00000000, L_MPMENU(90), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "6:" - { MENUITEMTYPE_SELECTABLE, 6, 0x00000000, L_MPMENU(91), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "7:" - { MENUITEMTYPE_SELECTABLE, 7, 0x00000000, L_MPMENU(92), (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "8:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_085, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "1:" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_MPMENU_086, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "2:" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_MPMENU_087, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "3:" + { MENUITEMTYPE_SELECTABLE, 3, 0x00000000, L_MPMENU_088, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "4:" + { MENUITEMTYPE_SELECTABLE, 4, 0x00000000, L_MPMENU_089, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "5:" + { MENUITEMTYPE_SELECTABLE, 5, 0x00000000, L_MPMENU_090, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "6:" + { MENUITEMTYPE_SELECTABLE, 6, 0x00000000, L_MPMENU_091, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "7:" + { MENUITEMTYPE_SELECTABLE, 7, 0x00000000, L_MPMENU_092, (u32)&mpMenuTextSimulantName, menuhandlerMpSimulantSlot }, // "8:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(93), 0x00000000, menuhandlerMpClearAllSimulants }, // "Clear All" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(94), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_093, 0x00000000, menuhandlerMpClearAllSimulants }, // "Clear All" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_094, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpSimulantsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(83), // "Simulants" + L_MPMENU_083, // "Simulants" g_MpSimulantsMenuItems, menudialogMpSimulants, 0x00000010, @@ -3831,27 +3831,27 @@ s32 menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdat char *mpMenuTextSelectTuneOrTunes(struct menuitem *item) { if (mpGetUsingMultipleTunes()) { - return langGet(L_MPMENU(69)); // "Select Tune" + return langGet(L_MPMENU_069); // "Select Tune" } - return langGet(L_MPMENU(68)); // "Select Tunes" + return langGet(L_MPMENU_068); // "Select Tunes" } struct menuitem g_MpAutoTeamMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(76), 0x00000000, menuhandlerMpTwoTeams }, // "Two Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(77), 0x00000000, menuhandlerMpThreeTeams }, // "Three Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(78), 0x00000000, menuhandlerMpFourTeams }, // "Four Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(79), 0x00000000, menuhandlerMpMaximumTeams }, // "Maximum Teams" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(80), 0x00000000, menuhandlerMpHumansVsSimulants }, // "Humans vs. Simulants" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU(81), 0x00000000, menuhandlerMpHumanSimulantPairs }, // "Human-Simulant Pairs" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_076, 0x00000000, menuhandlerMpTwoTeams }, // "Two Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_077, 0x00000000, menuhandlerMpThreeTeams }, // "Three Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_078, 0x00000000, menuhandlerMpFourTeams }, // "Four Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_079, 0x00000000, menuhandlerMpMaximumTeams }, // "Maximum Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_080, 0x00000000, menuhandlerMpHumansVsSimulants }, // "Humans vs. Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_MPMENU_081, 0x00000000, menuhandlerMpHumanSimulantPairs }, // "Human-Simulant Pairs" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(82), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_082, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpAutoTeamMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(75), // "Auto Team" + L_MPMENU_075, // "Auto Team" g_MpAutoTeamMenuItems, NULL, 0x00000010, @@ -3859,9 +3859,9 @@ struct menudialog g_MpAutoTeamMenuDialog = { }; struct menuitem g_MpTeamsMenuItems[] = { - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(71), 0x00000002, menuhandlerMpTeamsEnabled }, // "Teams Enabled" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_071, 0x00000002, menuhandlerMpTeamsEnabled }, // "Teams Enabled" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(72), 0x00000000, menuhandlerMpTeamsLabel }, // "Teams:" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_072, 0x00000000, menuhandlerMpTeamsLabel }, // "Teams:" { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_DROPDOWN, 1, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_DROPDOWN, 2, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, @@ -3875,14 +3875,14 @@ struct menuitem g_MpTeamsMenuItems[] = { { MENUITEMTYPE_DROPDOWN, 10, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_DROPDOWN, 11, 0x00020000, (u32)&mpMenuTextChrNameForTeamSetup, 0x00000000, menuhandlerMpTeamSlot }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(73), 0x00000000, (void *)&g_MpAutoTeamMenuDialog }, // "Auto Team..." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(74), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_073, 0x00000000, (void *)&g_MpAutoTeamMenuDialog }, // "Auto Team..." + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_074, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpTeamsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(70), // "Team Control" + L_MPMENU_070, // "Team Control" g_MpTeamsMenuItems, NULL, 0x00000010, @@ -3890,10 +3890,10 @@ struct menudialog g_MpTeamsMenuDialog = { }; u32 var80085ce8[] = { - L_MISC(166), // "Random" - L_MISC(167), // "Select All" - L_MISC(168), // "Select None" - L_MISC(169), // "Randomize" + L_MISC_166, // "Random" + L_MISC_167, // "Select All" + L_MISC_168, // "Select None" + L_MISC_169, // "Randomize" }; /** @@ -4013,7 +4013,7 @@ char *mpMenuTextCurrentTrack(struct menuitem *item) s32 slotnum; if (mpGetUsingMultipleTunes()) { - return langGet(L_MPMENU(66)); // "Multiple Tunes" + return langGet(L_MPMENU_066); // "Multiple Tunes" } slotnum = mpGetCurrentTrackSlotNum(); @@ -4022,7 +4022,7 @@ char *mpMenuTextCurrentTrack(struct menuitem *item) return mpGetTrackName(slotnum); } - return langGet(L_MPMENU(67)); // "Random" + return langGet(L_MPMENU_067); // "Random" } s32 menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data) @@ -4196,7 +4196,7 @@ glabel menuhandler0017e06c char *mpMenuTextTeamName(struct menuitem *item) { s32 index = item->param2; - index -= L_OPTIONS(8); + index -= L_OPTIONS_008; return g_MpSetupSaveFile.teamnames[index]; } @@ -4213,7 +4213,7 @@ s32 menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handle char *func0f17e318(struct menudialog *dialog) { - sprintf(g_StringPointer, langGet(L_MPMENU(56)), mpGetChallengeNameBySlot(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex)); + sprintf(g_StringPointer, langGet(L_MPMENU_056), mpGetChallengeNameBySlot(g_Menus[g_MpPlayerNum].data.mpsetup.slotindex)); return g_StringPointer; } @@ -4688,7 +4688,7 @@ s32 menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union hand char *mpMenuTextChallengeName(struct menuitem *item) { if (g_MpSetupSaveFile.locktype != MPLOCKTYPE_CHALLENGE) { - return langGet(L_MPMENU(50)); // "Combat Challenges" + return langGet(L_MPMENU_050); // "Combat Challenges" } sprintf(g_StringPointer, "%s:\n", mpChallengeGetName(mpGetCurrentChallengeIndex())); @@ -4744,19 +4744,19 @@ struct menudialog g_MpSelectTunesMenuDialog = { }; struct menuitem g_MpSoundtrackMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU(63), 0x00000000, NULL }, // "Current:" - { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(3), (u32)&mpMenuTextCurrentTrack, NULL }, // "" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPMENU_063, 0x00000000, NULL }, // "Current:" + { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS_003, (u32)&mpMenuTextCurrentTrack, NULL }, // "" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, (u32)&mpMenuTextSelectTuneOrTunes, 0x00000000, (void *)&g_MpSelectTunesMenuDialog }, - { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU(64), 0x00000000, menuhandlerMpMultipleTunes }, // "Multiple Tunes" + { MENUITEMTYPE_CHECKBOX, 0, 0x00020000, L_MPMENU_064, 0x00000000, menuhandlerMpMultipleTunes }, // "Multiple Tunes" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(65), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_065, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpSoundtrackMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(62), // "Soundtrack" + L_MPMENU_062, // "Soundtrack" g_MpSoundtrackMenuItems, NULL, 0x00000010, @@ -4770,7 +4770,7 @@ struct menuitem g_MpChangeTeamNameMenuItems[] = { struct menudialog g_MpChangeTeamNameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(61), // "Change Team Name" + L_MPMENU_061, // "Change Team Name" g_MpChangeTeamNameMenuItems, NULL, 0x00000000, @@ -4778,22 +4778,22 @@ struct menudialog g_MpChangeTeamNameMenuDialog = { }; struct menuitem g_MpTeamNamesMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(8), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Red" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(9), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Yellow" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(10), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Blue" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(11), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Magenta" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(12), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Cyan" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(13), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Orange" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(14), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Pink" - { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS(15), (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Brown" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_008, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Red" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_009, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Yellow" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_010, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Blue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_011, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Magenta" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_012, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Cyan" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_013, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Orange" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_014, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Pink" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020000, L_OPTIONS_015, (u32)&mpMenuTextTeamName, menuhandlerMpTeamNameSlot }, // "Brown" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(60), 0x00000000, NULL }, // "Back" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_060, 0x00000000, NULL }, // "Back" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpTeamNamesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(59), // "Team Names" + L_MPMENU_059, // "Team Names" g_MpTeamNamesMenuItems, NULL, 0x00000010, @@ -4803,8 +4803,8 @@ struct menudialog g_MpTeamNamesMenuDialog = { struct menuitem g_MpConfirmChallengeViaListOrDetailsMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(57), 0x00000000, menuhandler0017e38c }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(58), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU_057, 0x00000000, menuhandler0017e38c }, // "Accept" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_058, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -4821,8 +4821,8 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { { MENUITEMTYPE_LIST, 0, 0x00200000, 0x00000078, 0x0000004d, menuhandler0017e4d4 }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCHALLENGE, 0x00000000, 0x0000007c, 0x00000037, menuhandler0017e9d8 }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, menuhandler0017e9d8 }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS(171), 0x00000000, menuhandlerMpStartChallenge }, // "Start Challenge" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(51), 0x00000000, menuhandlerMpAbortChallenge }, // "Abort Challenge" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPWEAPONS_171, 0x00000000, menuhandlerMpStartChallenge }, // "Start Challenge" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_051, 0x00000000, menuhandlerMpAbortChallenge }, // "Abort Challenge" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -4849,8 +4849,8 @@ struct menudialog g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = { struct menuitem g_MpConfirmChallengeMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MPCONFIG, 0x00000000, 0x0000007c, 0x00000037, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(57), 0x00000000, menuhandler0017ec64 }, // "Accept" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(58), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_057, 0x00000000, menuhandler0017ec64 }, // "Accept" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_058, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -4870,7 +4870,7 @@ struct menuitem g_MpChallengesMenuItems[] = { struct menudialog g_MpChallengesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(50), // "Combat Challenges" + L_MPMENU_050, // "Combat Challenges" g_MpChallengesMenuItems, mpCombatChallengesMenuDialog, 0x00000000, @@ -4880,10 +4880,10 @@ struct menudialog g_MpChallengesMenuDialog = { s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { - L_MPMENU(45), // "None" - L_MPMENU(46), // "Last Winner" - L_MPMENU(47), // "Last Loser" - L_MPMENU(48), // "Random" + L_MPMENU_045, // "None" + L_MPMENU_046, // "Last Winner" + L_MPMENU_047, // "Last Loser" + L_MPMENU_048, // "Random" }; switch (operation) { @@ -4892,7 +4892,7 @@ s32 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *d break; case MENUOP_GETOPTIONTEXT: if (mpGetLockType() == MPLOCKTYPE_CHALLENGE) { - return (s32) langGet(L_MPMENU(49)); // "Challenge" + return (s32) langGet(L_MPMENU_049); // "Challenge" } if (data->dropdown.value <= 3) { return (s32) langGet(labels[data->dropdown.value]); @@ -4931,10 +4931,10 @@ s32 menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerd char *mpMenuTextSavePlayerOrCopy(struct menuitem *item) { if (g_MpPlayers[g_MpPlayerNum].unk4c.unk00 == false) { - return langGet(L_MPMENU(38)); // "Save Player" + return langGet(L_MPMENU_038); // "Save Player" } - return langGet(L_MPMENU(39)); // "Save Copy of Player" + return langGet(L_MPMENU_039); // "Save Copy of Player" } s32 menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data) @@ -5238,7 +5238,7 @@ s32 mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, u for (i = 0; i < 6; i++) { if (mpIsFeatureUnlocked(g_MpSimulantTypes[i].requirefeature)) { if (count == data->dropdown.value) { - return (s32) langGet(i + L_MISC(82)); + return (s32) langGet(i + L_MISC_082); } count++; @@ -5502,22 +5502,22 @@ glabel func0f17fa28 struct menudialog g_MpAbortMenuDialog; struct menuitem g_MpStuffMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(41), 0x00000000, (void *)&g_MpSoundtrackMenuDialog }, // "Soundtrack" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(42), 0x00000000, (void *)&g_MpTeamNamesMenuDialog }, // "Team Names" - { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU(44), 0x00000000, menuhandlerMpLock }, // "Lock" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_041, 0x00000000, (void *)&g_MpSoundtrackMenuDialog }, // "Soundtrack" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_042, 0x00000000, (void *)&g_MpTeamNamesMenuDialog }, // "Team Names" + { MENUITEMTYPE_DROPDOWN, 0, 0x00020000, L_MPMENU_044, 0x00000000, menuhandlerMpLock }, // "Lock" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS(216), 0x00000000, menuhandlerScreenRatio }, // "Ratio" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS(154), 0x00000000, menuhandlerScreenSplit }, // "Split" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_OPTIONS_216, 0x00000000, menuhandlerScreenRatio }, // "Ratio" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MPWEAPONS_154, 0x00000000, menuhandlerScreenSplit }, // "Split" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(36), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(37), 0x00000000, (void *)&g_MpDropOutMenuDialog }, // "Drop Out" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(27), 0x00000000, (void *)&g_MpAbortMenuDialog }, // "Abort Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_036, 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_037, 0x00000000, (void *)&g_MpDropOutMenuDialog }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_027, 0x00000000, (void *)&g_MpAbortMenuDialog }, // "Abort Game" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpStuffMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(40), // "Stuff" + L_MPMENU_040, // "Stuff" g_MpStuffMenuItems, NULL, 0x00000810, @@ -5526,7 +5526,7 @@ struct menudialog g_MpStuffMenuDialog = { struct menudialog g_MpStuffViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(40), // "Stuff" + L_MPMENU_040, // "Stuff" g_MpStuffMenuItems, NULL, 0x00000810, @@ -5534,20 +5534,20 @@ struct menudialog g_MpStuffViaAdvChallengeMenuDialog = { }; struct menuitem g_MpPlayerSetup234MenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(30), (u32)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog }, // "Name" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(31), 0x00000000, (void *)&g_MpCharacterMenuDialog }, // "Character" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(33), 0x00000000, (void *)&g_MpControlMenuDialog }, // "Control" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(34), 0x00000000, (void *)&g_MpPlayerOptionsMenuDialog }, // "Player Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(35), 0x00000000, (void *)&g_MpPlayerStatsMenuDialog }, // "Statistics" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_030, (u32)&mpGetCurrentPlayerName, (void *)&g_MpPlayerNameMenuDialog }, // "Name" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_031, 0x00000000, (void *)&g_MpCharacterMenuDialog }, // "Character" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_033, 0x00000000, (void *)&g_MpControlMenuDialog }, // "Control" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_034, 0x00000000, (void *)&g_MpPlayerOptionsMenuDialog }, // "Player Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_035, 0x00000000, (void *)&g_MpPlayerStatsMenuDialog }, // "Statistics" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_029, 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, (u32)&mpMenuTextSavePlayerOrCopy, 0x00000000, menuhandlerMpSavePlayer }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpPlayerSetupViaAdvMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(28), // "Player Setup" + L_MPMENU_028, // "Player Setup" g_MpPlayerSetup234MenuItems, NULL, 0x00000800, @@ -5556,7 +5556,7 @@ struct menudialog g_MpPlayerSetupViaAdvMenuDialog = { struct menudialog g_MpPlayerSetupViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(28), // "Player Setup" + L_MPMENU_028, // "Player Setup" g_MpPlayerSetup234MenuItems, NULL, 0x00000800, @@ -5565,7 +5565,7 @@ struct menudialog g_MpPlayerSetupViaAdvChallengeMenuDialog = { struct menudialog g_MpPlayerSetupViaQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(28), // "Player Setup" + L_MPMENU_028, // "Player Setup" g_MpPlayerSetup234MenuItems, NULL, 0x00000000, @@ -5573,15 +5573,15 @@ struct menudialog g_MpPlayerSetupViaQuickGoMenuDialog = { }; struct menuitem g_MpAbortMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(53), 0x00000000, NULL }, // "Are you sure you want to abort the game?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(54), 0x00000000, menuhandler0017ef30 }, // "Abort" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(55), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU_053, 0x00000000, NULL }, // "Are you sure you want to abort the game?" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_054, 0x00000000, menuhandler0017ef30 }, // "Abort" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_055, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpAbortMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(52), // "Abort" + L_MPMENU_052, // "Abort" g_MpAbortMenuItems, NULL, 0x00000000, @@ -5589,23 +5589,23 @@ struct menudialog g_MpAbortMenuDialog = { }; struct menuitem g_MpAdvancedSetupMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog }, // "Scenario" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), 0x00000000, (void *)&g_MpWeaponsMenuDialog }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS(184), 0x00000000, (void *)&g_MpHandicapsMenuDialog }, // "Player Handicaps" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(25), 0x00000000, (void *)&g_MpSimulantsMenuDialog }, // "Simulants" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(22), 0x00000000, (void *)&g_MpTeamsMenuDialog }, // "Teams" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU_019, (u32)&mpMenuTextScenarioShortName, (void *)&g_MpScenarioMenuDialog }, // "Scenario" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_021, 0x00000000, menuhandlerMpOpenOptions }, // "Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_020, (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_023, 0x00000000, (void *)&g_MpWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_024, 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPWEAPONS_184, 0x00000000, (void *)&g_MpHandicapsMenuDialog }, // "Player Handicaps" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_025, 0x00000000, (void *)&g_MpSimulantsMenuDialog }, // "Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_022, 0x00000000, (void *)&g_MpTeamsMenuDialog }, // "Teams" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU(18), 0x00000000, (void *)&g_MpLoadSettingsMenuDialog }, // "Load Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(26), 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060004, L_MPMENU_018, 0x00000000, (void *)&g_MpLoadSettingsMenuDialog }, // "Load Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU_026, 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpAdvancedSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(17), // "Game Setup" + L_MPMENU_017, // "Game Setup" g_MpAdvancedSetupMenuItems, menudialogMpGameSetup, 0x00000810, @@ -5614,7 +5614,7 @@ struct menudialog g_MpAdvancedSetupMenuDialog = { struct menudialog g_MpAdvancedSetupViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(17), // "Game Setup" + L_MPMENU_017, // "Game Setup" g_MpAdvancedSetupMenuItems, menudialogMpGameSetup, 0x00000810, @@ -5622,16 +5622,16 @@ struct menudialog g_MpAdvancedSetupViaAdvChallengeMenuDialog = { }; struct menuitem g_MpQuickGoMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(456), 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(29), 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(458), 0x00000000, (void *)&g_MpPlayerSetupViaQuickGoMenuDialog }, // "Player Settings" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC(457), 0x00000000, (void *)&g_MpDropOutMenuDialog }, // "Drop Out" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_456, 0x00000000, (void *)&g_MpReadyMenuDialog }, // "Start Game" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_029, 0x00000000, (void *)&g_MpLoadPlayerMenuDialog }, // "Load Player" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_458, 0x00000000, (void *)&g_MpPlayerSetupViaQuickGoMenuDialog }, // "Player Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MISC_457, 0x00000000, (void *)&g_MpDropOutMenuDialog }, // "Drop Out" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MISC(460), // "Quick Go" + L_MISC_460, // "Quick Go" g_MpQuickGoMenuItems, menudialogMpQuickGo, 0x00000000, @@ -5639,29 +5639,29 @@ struct menudialog g_MpQuickGoMenuDialog = { }; struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU(19), (u32)&mpMenuTextScenarioShortName, (void *)&g_MpQuickTeamScenarioMenuDialog }, // "Scenario" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(21), 0x00000000, menuhandlerMpOpenOptions }, // "Options" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(20), (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(23), (u32)&mpMenuTextWeaponSetName, (void *)&g_MpQuickTeamWeaponsMenuDialog }, // "Weapons" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU(24), 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" + { MENUITEMTYPE_SELECTABLE, 0, 0x00020004, L_MPMENU_019, (u32)&mpMenuTextScenarioShortName, (void *)&g_MpQuickTeamScenarioMenuDialog }, // "Scenario" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU_021, 0x00000000, menuhandlerMpOpenOptions }, // "Options" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_020, (u32)&mpMenuTextArenaName, (void *)&g_MpArenaMenuDialog }, // "Arena" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_023, (u32)&mpMenuTextWeaponSetName, (void *)&g_MpQuickTeamWeaponsMenuDialog }, // "Weapons" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_MPMENU_024, 0x00000000, (void *)&g_MpLimitsMenuDialog }, // "Limits" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, menuhandlerQuickTeamSeparator }, - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC(449), 0x00000000, menuhandlerPlayerTeam }, // "Player 1 Team" - { MENUITEMTYPE_DROPDOWN, 1, 0x00000000, L_MISC(450), 0x00000000, menuhandlerPlayerTeam }, // "Player 2 Team" - { MENUITEMTYPE_DROPDOWN, 2, 0x00000000, L_MISC(451), 0x00000000, menuhandlerPlayerTeam }, // "Player 3 Team" - { MENUITEMTYPE_DROPDOWN, 3, 0x00000000, L_MISC(452), 0x00000000, menuhandlerPlayerTeam }, // "Player 4 Team" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC(453), 0x00000000, menuhandlerMpNumberOfSimulants }, // "Number Of Simulants" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC(454), 0x00000000, menuhandlerMpSimulantsPerTeam }, // "Simulants Per Team" - { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC(455), 0x00000000, mpQuickTeamSimulantDifficultyHandler }, // "Simulant Difficulty" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC_449, 0x00000000, menuhandlerPlayerTeam }, // "Player 1 Team" + { MENUITEMTYPE_DROPDOWN, 1, 0x00000000, L_MISC_450, 0x00000000, menuhandlerPlayerTeam }, // "Player 2 Team" + { MENUITEMTYPE_DROPDOWN, 2, 0x00000000, L_MISC_451, 0x00000000, menuhandlerPlayerTeam }, // "Player 3 Team" + { MENUITEMTYPE_DROPDOWN, 3, 0x00000000, L_MISC_452, 0x00000000, menuhandlerPlayerTeam }, // "Player 4 Team" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC_453, 0x00000000, menuhandlerMpNumberOfSimulants }, // "Number Of Simulants" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC_454, 0x00000000, menuhandlerMpSimulantsPerTeam }, // "Simulants Per Team" + { MENUITEMTYPE_DROPDOWN, 0, 0x00000000, L_MISC_455, 0x00000000, mpQuickTeamSimulantDifficultyHandler }, // "Simulant Difficulty" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MISC(448), 0x00000000, menuhandlerMpFinishedSetup }, // "Finished Setup" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MISC_448, 0x00000000, menuhandlerMpFinishedSetup }, // "Finished Setup" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU(26), 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" + { MENUITEMTYPE_SELECTABLE, 0, 0x00060000, L_MPMENU_026, 0x00000000, menuhandlerMpSaveSettings }, // "Save Settings" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpQuickTeamGameSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(17), // "Game Setup" + L_MPMENU_017, // "Game Setup" g_MpQuickTeamGameSetupMenuItems, NULL, 0x00000000, @@ -5669,18 +5669,18 @@ struct menudialog g_MpQuickTeamGameSetupMenuDialog = { }; struct menuitem g_MpQuickTeamMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(463), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players Only" - { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, L_MISC(464), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players and Simulants" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC_463, 0x00000000, menuhandlerMpQuickTeamOption }, // "Players Only" + { MENUITEMTYPE_SELECTABLE, 1, 0x00400000, L_MISC_464, 0x00000000, menuhandlerMpQuickTeamOption }, // "Players and Simulants" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000082, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, L_MISC(465), 0x00000000, menuhandlerMpQuickTeamOption }, // "Player Teams" - { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, L_MISC(466), 0x00000000, menuhandlerMpQuickTeamOption }, // "Players vs. Simulants" - { MENUITEMTYPE_SELECTABLE, 4, 0x00400000, L_MISC(467), 0x00000000, menuhandlerMpQuickTeamOption }, // "Player-Simulant Teams" + { MENUITEMTYPE_SELECTABLE, 2, 0x00400000, L_MISC_465, 0x00000000, menuhandlerMpQuickTeamOption }, // "Player Teams" + { MENUITEMTYPE_SELECTABLE, 3, 0x00400000, L_MISC_466, 0x00000000, menuhandlerMpQuickTeamOption }, // "Players vs. Simulants" + { MENUITEMTYPE_SELECTABLE, 4, 0x00400000, L_MISC_467, 0x00000000, menuhandlerMpQuickTeamOption }, // "Player-Simulant Teams" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_MpQuickTeamMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MISC(462), // "Quick Team" + L_MISC_462, // "Quick Team" g_MpQuickTeamMenuItems, NULL, 0x00000004, @@ -5688,16 +5688,16 @@ struct menudialog g_MpQuickTeamMenuDialog = { }; struct menuitem g_CombatSimulatorMenuItems[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(441), 0x00000000, (void *)&g_MpChallengesMenuDialog }, // "Challenges" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(442), 0x00000001, (void *)&g_MpLoadPresetMenuDialog }, // "Load/Preset Games" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC(443), 0x00000002, (void *)&g_MpQuickTeamMenuDialog }, // "Quick Start" - { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC(444), 0x00000003, menuhandlerMpAdvancedSetup }, // "Advanced Setup" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC_441, 0x00000000, (void *)&g_MpChallengesMenuDialog }, // "Challenges" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC_442, 0x00000001, (void *)&g_MpLoadPresetMenuDialog }, // "Load/Preset Games" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400004, L_MISC_443, 0x00000002, (void *)&g_MpQuickTeamMenuDialog }, // "Quick Start" + { MENUITEMTYPE_SELECTABLE, 0, 0x00400000, L_MISC_444, 0x00000003, menuhandlerMpAdvancedSetup }, // "Advanced Setup" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_CombatSimulatorMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MISC(445), // "Combat Simulator" + L_MISC_445, // "Combat Simulator" g_CombatSimulatorMenuItems, menudialogCombatSimulator, 0x00000004, diff --git a/src/game/mpstats.c b/src/game/mpstats.c index fc327ba05..d4f7ddbd5 100644 --- a/src/game/mpstats.c +++ b/src/game/mpstats.c @@ -93,7 +93,7 @@ void mpstatsRecordPlayerKill(void) // Show HUD message // "Kill count: %d" - sprintf(text, "%s: %d\n", langGet(L_GUN(1)), g_Vars.currentplayerstats->killcount); + sprintf(text, "%s: %d\n", langGet(L_GUN_001), g_Vars.currentplayerstats->killcount); hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT); // Update slowest/fastest two kills @@ -153,12 +153,12 @@ void mpstatsRecordPlayerDeath(void) if (g_Vars.normmplayerisrunning) { if (g_Vars.currentplayer->deathcount == 1) { - sprintf(buffer, langGet(L_GUN(2))); // "Died once" + sprintf(buffer, langGet(L_GUN_002)); // "Died once" } else { sprintf(buffer, "%s %d %s\n", - langGet(L_GUN(3)), // "Died" + langGet(L_GUN_003), // "Died" g_Vars.currentplayer->deathcount, - langGet(L_GUN(4))); // "times" + langGet(L_GUN_004)); // "times" } hudmsgCreateViaPreset(buffer, HUDMSGTYPE_DEFAULT); @@ -186,7 +186,7 @@ void mpstatsRecordPlayerSuicide(void) // Show HUD message // "Suicide count: %d" - sprintf(text, "%s: %d\n", langGet(L_GUN(5)), mpchr->killcounts[mpindex]); + sprintf(text, "%s: %d\n", langGet(L_GUN_005), mpchr->killcounts[mpindex]); hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT); // Update slowest/fastest two kills @@ -293,7 +293,7 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) if (g_Vars.normmplayerisrunning && aplayernum >= 0) { // "Killed by %s" - sprintf(text, "%s %s", langGet(L_MISC(183)), var800ac500[aplayernum]->name); + sprintf(text, "%s %s", langGet(L_MISC_183), var800ac500[aplayernum]->name); hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT); } @@ -313,7 +313,7 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) if (g_Vars.normmplayerisrunning && vplayernum >= 0) { // "Killed %s" - sprintf(text, "%s %s", langGet(L_MISC(184)), var800ac500[vplayernum]->name); + sprintf(text, "%s %s", langGet(L_MISC_184), var800ac500[vplayernum]->name); hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT); } diff --git a/src/game/objectives/objectives.c b/src/game/objectives/objectives.c index 69ba8779a..46b2505fa 100644 --- a/src/game/objectives/objectives.c +++ b/src/game/objectives/objectives.c @@ -414,16 +414,16 @@ void objectivesCheckAll(void) g_ObjectiveStatuses[i] = status; if (objectiveGetDifficultyBits(i) & (1 << coreGetDifficulty())) { - sprintf(buffer, "%s %d: ", langGet(L_MISC(44)), availableindex + 1); // "Objective" + sprintf(buffer, "%s %d: ", langGet(L_MISC_044), availableindex + 1); // "Objective" if (status == OBJECTIVE_COMPLETE) { - strcat(buffer, langGet(L_MISC(45))); // "Completed" + strcat(buffer, langGet(L_MISC_045)); // "Completed" objectivesShowHudmsg(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE); } else if (status == OBJECTIVE_INCOMPLETE) { - strcat(buffer, langGet(L_MISC(46))); // "Incomplete" + strcat(buffer, langGet(L_MISC_046)); // "Incomplete" objectivesShowHudmsg(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE); } else if (status == OBJECTIVE_FAILED) { - strcat(buffer, langGet(L_MISC(47))); // "Failed" + strcat(buffer, langGet(L_MISC_047)); // "Failed" objectivesShowHudmsg(buffer, HUDMSGTYPE_OBJECTIVEFAILED); } } diff --git a/src/game/propobj.c b/src/game/propobj.c index 651ad0a03..d9049fc16 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -49887,7 +49887,7 @@ glabel func0f087888pf #if VERSION < VERSION_PAL_FINAL void ammotypeGetPickedUpText(char *dst) { - strcat(dst, langGet(L_PROPOBJ(0))); // "Picked up" + strcat(dst, langGet(L_PROPOBJ_000)); // "Picked up" } #endif @@ -50270,33 +50270,33 @@ void ammotypeGetDeterminer(char *dst, s32 ammotype, s32 qty) if (determiner_a) { if (full) { - strcat(dst, langGet(L_PROPOBJ(4))); // "a" + strcat(dst, langGet(L_PROPOBJ_004)); // "a" } else { - strcat(dst, langGet(L_PROPOBJ(5))); // "A" + strcat(dst, langGet(L_PROPOBJ_005)); // "A" } } if (determiner_an) { if (full) { - strcat(dst, langGet(L_PROPOBJ(6))); // "an" + strcat(dst, langGet(L_PROPOBJ_006)); // "an" } else { - strcat(dst, langGet(L_PROPOBJ(7))); // "An" + strcat(dst, langGet(L_PROPOBJ_007)); // "An" } } if (determiner_some) { if (full) { - strcat(dst, langGet(L_PROPOBJ(2))); // "some" + strcat(dst, langGet(L_PROPOBJ_002)); // "some" } else { - strcat(dst, langGet(L_PROPOBJ(3))); // "Some" + strcat(dst, langGet(L_PROPOBJ_003)); // "Some" } } if (determiner_the) { if (full) { - strcat(dst, langGet(L_PROPOBJ(8))); // "the" + strcat(dst, langGet(L_PROPOBJ_008)); // "the" } else { - strcat(dst, langGet(L_PROPOBJ(9))); // "The" + strcat(dst, langGet(L_PROPOBJ_009)); // "The" } } } @@ -50506,17 +50506,17 @@ glabel var7f1aac40 // case AMMOTYPE_PISTOL: // case AMMOTYPE_SMG: // case AMMOTYPE_RIFLE: -// strcat(dst, langGet(L_PROPOBJ(10))); // "ammo" +// strcat(dst, langGet(L_PROPOBJ_010)); // "ammo" // return; // } // // if (ammotype == AMMOTYPE_KNIFE) { -// strcat(dst, langGet(L_PROPOBJ(21))); // "combat" +// strcat(dst, langGet(L_PROPOBJ_021)); // "combat" // // if (qty == 1) { -// strcat(dst, langGet(L_PROPOBJ(22))); // "knife" +// strcat(dst, langGet(L_PROPOBJ_022)); // "knife" // } else { -// strcat(dst, langGet(L_PROPOBJ(23))); // "knives" +// strcat(dst, langGet(L_PROPOBJ_023)); // "knives" // } // // return; @@ -50525,28 +50525,28 @@ glabel var7f1aac40 // text_id = -1; // // switch (ammotype) { -// case AMMOTYPE_CROSSBOW: text_id = L_PROPOBJ(45); break; // "bolt" -// case AMMOTYPE_SHOTGUN: text_id = L_PROPOBJ(11); break; // "cartridge" -// case AMMOTYPE_FARSIGHT: text_id = L_PROPOBJ(46); break; // "orb" -// case AMMOTYPE_GRENADE: text_id = L_PROPOBJ(14); break; // "grenade" -// case AMMOTYPE_ROCKET: text_id = L_PROPOBJ(16); break; // "rocket" -// case AMMOTYPE_MAGNUM: text_id = L_PROPOBJ(12); break; // "magnum bullet" -// case AMMOTYPE_DEVASTATOR: text_id = L_PROPOBJ(15); break; // "grenade round" -// case AMMOTYPE_REMOTE_MINE: text_id = L_PROPOBJ(18); break; // "remote mine" -// case AMMOTYPE_PROXY_MINE: text_id = L_PROPOBJ(19); break; // "proximity mine" -// case AMMOTYPE_TIMED_MINE: text_id = L_PROPOBJ(20); break; // "timed mine" -// case AMMOTYPE_REAPER: text_id = L_PROPOBJ(47); break; // "Reaper ammo" -// case AMMOTYPE_HOMINGROCKET: text_id = L_PROPOBJ(17); break; // "homing rocket" -// case AMMOTYPE_DART: text_id = L_PROPOBJ(25); break; // "dart" -// case AMMOTYPE_NBOMB: text_id = L_PROPOBJ(26); break; // "N-Bomb" -// case AMMOTYPE_SEDATIVE: text_id = L_PROPOBJ(27); break; // "sedatives" -// case AMMOTYPE_PSYCHOSIS: text_id = L_PROPOBJ(27); break; // "sedatives" -// case AMMOTYPE_BUG: text_id = L_PROPOBJ(35); break; // "bug" -// case AMMOTYPE_MICROCAMERA: text_id = L_PROPOBJ(36); break; // "micro camera" -// case AMMOTYPE_TOKEN: text_id = L_PROPOBJ(38); break; // "token" -// case AMMOTYPE_PLASTIQUE: text_id = L_PROPOBJ(39); break; // "plastique" -// case AMMOTYPE_CLOAK: text_id = L_PROPOBJ(48); break; // "cloaking device" -// case AMMOTYPE_BOOST: text_id = L_PROPOBJ(49); break; // "boost pill" +// case AMMOTYPE_CROSSBOW: text_id = L_PROPOBJ_045; break; // "bolt" +// case AMMOTYPE_SHOTGUN: text_id = L_PROPOBJ_011; break; // "cartridge" +// case AMMOTYPE_FARSIGHT: text_id = L_PROPOBJ_046; break; // "orb" +// case AMMOTYPE_GRENADE: text_id = L_PROPOBJ_014; break; // "grenade" +// case AMMOTYPE_ROCKET: text_id = L_PROPOBJ_016; break; // "rocket" +// case AMMOTYPE_MAGNUM: text_id = L_PROPOBJ_012; break; // "magnum bullet" +// case AMMOTYPE_DEVASTATOR: text_id = L_PROPOBJ_015; break; // "grenade round" +// case AMMOTYPE_REMOTE_MINE: text_id = L_PROPOBJ_018; break; // "remote mine" +// case AMMOTYPE_PROXY_MINE: text_id = L_PROPOBJ_019; break; // "proximity mine" +// case AMMOTYPE_TIMED_MINE: text_id = L_PROPOBJ_020; break; // "timed mine" +// case AMMOTYPE_REAPER: text_id = L_PROPOBJ_047; break; // "Reaper ammo" +// case AMMOTYPE_HOMINGROCKET: text_id = L_PROPOBJ_017; break; // "homing rocket" +// case AMMOTYPE_DART: text_id = L_PROPOBJ_025; break; // "dart" +// case AMMOTYPE_NBOMB: text_id = L_PROPOBJ_026; break; // "N-Bomb" +// case AMMOTYPE_SEDATIVE: text_id = L_PROPOBJ_027; break; // "sedatives" +// case AMMOTYPE_PSYCHOSIS: text_id = L_PROPOBJ_027; break; // "sedatives" +// case AMMOTYPE_BUG: text_id = L_PROPOBJ_035; break; // "bug" +// case AMMOTYPE_MICROCAMERA: text_id = L_PROPOBJ_036; break; // "micro camera" +// case AMMOTYPE_TOKEN: text_id = L_PROPOBJ_038; break; // "token" +// case AMMOTYPE_PLASTIQUE: text_id = L_PROPOBJ_039; break; // "plastique" +// case AMMOTYPE_CLOAK: text_id = L_PROPOBJ_048; break; // "cloaking device" +// case AMMOTYPE_BOOST: text_id = L_PROPOBJ_049; break; // "boost pill" // } // // if (text_id >= 0) { @@ -50557,7 +50557,7 @@ glabel var7f1aac40 // && ammotype != AMMOTYPE_REAPER // && ammotype != AMMOTYPE_SEDATIVE // && ammotype != AMMOTYPE_CLOAK) { -// strcat(dst, langGet(L_PROPOBJ(24))); // "s" +// strcat(dst, langGet(L_PROPOBJ_024)); // "s" // } //} #endif @@ -51024,36 +51024,36 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual) bool plural = false; if (dual) { - strcat(buffer, langGet(L_PROPOBJ(1))); // "Double" + strcat(buffer, langGet(L_PROPOBJ_001)); // "Double" } else { if (g_LanguageId == LANGUAGE_ENGLISH) { if (full) { - strcat(buffer, langGet(L_PROPOBJ(0))); // "Picked up" + strcat(buffer, langGet(L_PROPOBJ_000)); // "Picked up" if (weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) { - textid = L_PROPOBJ(50); // "your" + textid = L_PROPOBJ_050; // "your" } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME)) { - textid = L_PROPOBJ(2); // "some" + textid = L_PROPOBJ_002; // "some" } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_AN)) { - textid = L_PROPOBJ(6); // "an" + textid = L_PROPOBJ_006; // "an" } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_THE)) { - textid = L_PROPOBJ(8); // "the" + textid = L_PROPOBJ_008; // "the" } else { - textid = L_PROPOBJ(4); // "a" + textid = L_PROPOBJ_004; // "a" } strcat(buffer, langGet(textid)); } else { if (weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) { - textid = L_PROPOBJ(51); // "Your" + textid = L_PROPOBJ_051; // "Your" } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME)) { - textid = L_PROPOBJ(3); // "Some" + textid = L_PROPOBJ_003; // "Some" } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_AN)) { - textid = L_PROPOBJ(7); // "An" + textid = L_PROPOBJ_007; // "An" } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_THE)) { - textid = L_PROPOBJ(9); // "The" + textid = L_PROPOBJ_009; // "The" } else { - textid = L_PROPOBJ(5); // "A" + textid = L_PROPOBJ_005; // "A" } strcat(buffer, langGet(textid)); @@ -51087,7 +51087,7 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual) buffer[strlen(buffer) - 1] = '\0'; } - strcat(buffer, langGet(L_PROPOBJ(0))); // "Picked up" + strcat(buffer, langGet(L_PROPOBJ_000)); // "Picked up" strcat(buffer, "\n"); // This just gets removed immediately below } @@ -51791,7 +51791,7 @@ glabel var7f1aae70 // char *text = invGetActivatedTextByObj(obj); // // if (text == NULL) { -// text = langGet(L_PROPOBJ(40)); // "Picked up a key." +// text = langGet(L_PROPOBJ_040); // "Picked up a key." // } // // func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 9); @@ -51985,9 +51985,9 @@ glabel var7f1aae70 // // if (playercount < 3 && // (playercount != 2 || (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && g_Is4Mb != true))) { -// text = langGet(L_PROPOBJ(41)); // "Picked up a shield." +// text = langGet(L_PROPOBJ_041); // "Picked up a shield." // } else { -// text = langGet(L_PROPOBJ(42)); // "A shield." +// text = langGet(L_PROPOBJ_042); // "A shield." // } // } // @@ -52047,7 +52047,7 @@ glabel var7f1aae70 // char *text = invGetActivatedTextByObj(obj); // // if (text == NULL) { -// text = langGet(L_PROPOBJ(43)); // "Picked up something." +// text = langGet(L_PROPOBJ_043); // "Picked up something." // } // // func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 9); @@ -59796,9 +59796,9 @@ bool propdoorInteract(struct prop *doorprop) if (override && override->activatetextid) { func0f0ddfa4(langGet(override->activatetextid), 0, 1); } else if (intraining) { - func0f0ddfa4(langGet(L_DISH(80)), 0, 1); // "Cannot exit while training is in progress." + func0f0ddfa4(langGet(L_DISH_080), 0, 1); // "Cannot exit while training is in progress." } else { - func0f0ddfa4(langGet(L_PROPOBJ(44)), 0, 1); // "This door is locked." + func0f0ddfa4(langGet(L_PROPOBJ_044), 0, 1); // "This door is locked." } } diff --git a/src/game/sight.c b/src/game/sight.c index b11de63af..b757acf63 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -2930,7 +2930,7 @@ glabel var7f1ade50 // // if (var80070f98 & 0x80) { // // "Identify" -// gdl = textRender(gdl, &textx, &texty, langGet(L_MISC(439)), +// gdl = textRender(gdl, &textx, &texty, langGet(L_MISC_439), // g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0x00ff00a0, 0x000000a0, // viGetWidth(), viGetHeight(), 0, 0); // } @@ -2984,7 +2984,7 @@ glabel var7f1ade50 // // probably OK. // if (obj && obj->type == OBJTYPE_AUTOGUN // && (obj->flags2 & (OBJFLAG2_AICANNOTUSE | OBJFLAG2_80000000)) == 0) { -// textid = L_GUN(215); // "AUTOGUN" +// textid = L_GUN_215; // "AUTOGUN" // } // // weapon = prop->weapon; @@ -2993,30 +2993,30 @@ glabel var7f1ade50 // switch (weapon->weaponnum) { // case WEAPON_GRENADE: // if (weapon->gunfunc == FUNC_SECONDARY) { -// textid = L_GUN(212); // "PROXY" +// textid = L_GUN_212; // "PROXY" // } else { -// textid = L_GUN(213); // "TIMED" +// textid = L_GUN_213; // "TIMED" // } // break; // case WEAPON_NBOMB: // if (weapon->gunfunc == FUNC_SECONDARY) { -// textid = L_GUN(212); // "PROXY" +// textid = L_GUN_212; // "PROXY" // } else { -// textid = L_GUN(216); // "IMPACT" +// textid = L_GUN_216; // "IMPACT" // } // break; // case WEAPON_TIMEDMINE: -// textid = L_GUN(213); // "TIMED" +// textid = L_GUN_213; // "TIMED" // break; // case WEAPON_PROXIMITYMINE: -// textid = L_GUN(212); // "PROXY" +// textid = L_GUN_212; // "PROXY" // break; // case WEAPON_REMOTEMINE: -// textid = L_GUN(214); // "REMOTE" +// textid = L_GUN_214; // "REMOTE" // break; // case WEAPON_DRAGON: // if (weapon->gunfunc == FUNC_SECONDARY) { -// textid = L_GUN(212); // "PROXY" +// textid = L_GUN_212; // "PROXY" // } // break; // } diff --git a/src/game/title.c b/src/game/title.c index 32228b960..97858a1a1 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -5275,15 +5275,15 @@ Gfx *titleRenderRarePresents(Gfx *gdl) var80062868 = 0; if (g_TitleMode == TITLEMODE_RAREPRESENTS1) { - gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(5), g_TitleTimer, &sp76); // "earth:" + gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS_005, g_TitleTimer, &sp76); // "earth:" if (g_TitleTimer > 70) { sp84 = viGetViewLeft() + 50; sp80 = viGetViewTop() + viGetViewHeight() - 60; - gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(6), g_TitleTimer - 100, &sp76); // " prehistory" + gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS_006, g_TitleTimer - 100, &sp76); // " prehistory" } } else { - gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(7), g_TitleTimer - 35, &sp76); // "rare presents" + gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS_007, g_TitleTimer - 35, &sp76); // "rare presents" } gdl = func0f153780(gdl); @@ -6515,7 +6515,7 @@ glabel titleRenderNoController // gdl = func0f153628(gdl); // // // First line -// text = langGet(L_OPTIONS(71)); // "- no controller in controller socket 1 -" +// text = langGet(L_OPTIONS_071); // "- no controller in controller socket 1 -" // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2, 0); // // x = 288 - (textwidth >> 1); @@ -6530,7 +6530,7 @@ glabel titleRenderNoController // } // // // Second line -// text = langGet(L_OPTIONS(72)); // "please power off and attach a controller" +// text = langGet(L_OPTIONS_072); // "please power off and attach a controller" // textMeasure(&textheight, &textwidth, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2, 0); // // x = 288 - (textwidth >> 1); diff --git a/src/game/training/menus.c b/src/game/training/menus.c index f9dde440c..5061e6c97 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -519,9 +519,9 @@ s32 frTrainingStatsMenuDialog(s32 operation, struct menudialog *dialog, union ha s32 frDifficultyDropdownMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { u16 names[] = { - L_MPMENU(439), // "Bronze" - L_MPMENU(440), // "Silver" - L_MPMENU(441), // "Gold" + L_MPMENU_439, // "Bronze" + L_MPMENU_440, // "Silver" + L_MPMENU_441, // "Gold" }; switch (operation) { @@ -593,11 +593,11 @@ char *frSecondaryFunctionMenuText(struct menuitem *item) char *frMenuTextFailReason(struct menuitem *item) { u16 reasons[] = { - L_MPMENU(456), // "Not Failed" - L_MPMENU(457), // "Out of Ammo" - L_MPMENU(458), // "Time Over" - L_MPMENU(459), // "Score Unattainable" - L_MPMENU(460), // "Too Inaccurate" + L_MPMENU_456, // "Not Failed" + L_MPMENU_457, // "Out of Ammo" + L_MPMENU_458, // "Time Over" + L_MPMENU_459, // "Score Unattainable" + L_MPMENU_460, // "Too Inaccurate" }; struct frdata *frdata = frGetData(); @@ -608,9 +608,9 @@ char *frMenuTextFailReason(struct menuitem *item) char *frMenuTextDifficultyName(struct menuitem *item) { u16 names[] = { - L_MPMENU(439), // "Bronze" - L_MPMENU(440), // "Silver" - L_MPMENU(441), // "Gold" + L_MPMENU_439, // "Bronze" + L_MPMENU_440, // "Silver" + L_MPMENU_441, // "Gold" }; struct frdata *frdata = frGetData(); @@ -695,7 +695,7 @@ char *frMenuTextGoalScoreLabel(struct menuitem *item) struct frdata *frdata = frGetData(); if (frdata->goalscore > 0) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU(475))); // "Goal Score:" + sprintf(g_StringPointer, "%s", langGet(L_MPMENU_475)); // "Goal Score:" return g_StringPointer; } @@ -719,9 +719,9 @@ char *frMenuTextMinAccuracyOrTargetsLabel(struct menuitem *item) struct frdata *frdata = frGetData(); if (frdata->goalaccuracy > 0) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU(473))); // "Min Accuracy:" + sprintf(g_StringPointer, "%s", langGet(L_MPMENU_473)); // "Min Accuracy:" } else if (frdata->goaltargets != 255) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU(474))); // "Goal Targets:" + sprintf(g_StringPointer, "%s", langGet(L_MPMENU_474)); // "Goal Targets:" } else { return NULL; } @@ -749,7 +749,7 @@ char *frMenuTextTimeLimitLabel(struct menuitem *item) struct frdata *frdata = frGetData(); if (frdata->timelimit != 255) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU(472))); // "Time Limit:" + sprintf(g_StringPointer, "%s", langGet(L_MPMENU_472)); // "Time Limit:" } else { return NULL; } @@ -787,7 +787,7 @@ char *frMenuTextAmmoLimitLabel(struct menuitem *item) struct frdata *frdata = frGetData(); if (frdata->ammolimit != 255) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU(471))); // "Ammo Limit:" + sprintf(g_StringPointer, "%s", langGet(L_MPMENU_471)); // "Ammo Limit:" } else { return NULL; } @@ -2448,18 +2448,18 @@ s32 menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union hand } struct menuitem g_FrDifficultyMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPMENU(444), L_MPMENU(445), NULL }, // "Select Difficulty:" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPMENU(439), L_OPTIONS(3), frDifficultyMenuHandler }, // "Bronze" - { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, L_MPMENU(440), L_OPTIONS(3), frDifficultyMenuHandler }, // "Silver" - { MENUITEMTYPE_SELECTABLE, 2, 0x00000020, L_MPMENU(441), L_OPTIONS(3), frDifficultyMenuHandler }, // "Gold" + { MENUITEMTYPE_LABEL, 0, 0x00000012, L_MPMENU_444, L_MPMENU_445, NULL }, // "Select Difficulty:" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPMENU_439, L_OPTIONS_003, frDifficultyMenuHandler }, // "Bronze" + { MENUITEMTYPE_SELECTABLE, 1, 0x00000020, L_MPMENU_440, L_OPTIONS_003, frDifficultyMenuHandler }, // "Silver" + { MENUITEMTYPE_SELECTABLE, 2, 0x00000020, L_MPMENU_441, L_OPTIONS_003, frDifficultyMenuHandler }, // "Gold" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU(429), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_MPMENU_429, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FrDifficultyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(442), // "Difficulty" + L_MPMENU_442, // "Difficulty" g_FrDifficultyMenuItems, NULL, 0x00000200, @@ -2473,7 +2473,7 @@ struct menuitem g_FrWeaponListMenuItems[] = { struct menudialog g_FrWeaponListMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(446), // "Weapon" + L_MPMENU_446, // "Weapon" g_FrWeaponListMenuItems, NULL, 0x00000200, @@ -2481,7 +2481,7 @@ struct menudialog g_FrWeaponListMenuDialog = { }; struct menuitem g_FrTrainingInfoInGameMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(443), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_443, (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty" { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextGoalScoreLabel, (u32)&frMenuTextGoalScoreValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextMinAccuracyOrTargetsLabel, (u32)&frMenuTextMinAccuracyOrTargetsValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextTimeLimitLabel, (u32)&frMenuTextTimeLimitValue, NULL }, @@ -2489,14 +2489,14 @@ struct menuitem g_FrTrainingInfoInGameMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_FRWEAPON, 0x00004000, 0x0000010e, 0x0000005f, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(3), L_MPMENU(428), frDetailsOkMenuHandler }, // "", "Resume" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(3), L_MPMENU(430), frAbortMenuHandler }, // "", "Abort" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_003, L_MPMENU_428, frDetailsOkMenuHandler }, // "", "Resume" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_003, L_MPMENU_430, frAbortMenuHandler }, // "", "Abort" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FrTrainingInfoInGameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(447), // "Training Info" + L_MPMENU_447, // "Training Info" g_FrTrainingInfoInGameMenuItems, frTrainingInfoMenuDialog, 0x00000602, @@ -2504,7 +2504,7 @@ struct menudialog g_FrTrainingInfoInGameMenuDialog = { }; struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(443), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_443, (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextGoalScoreLabel, (u32)&frMenuTextGoalScoreValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextMinAccuracyOrTargetsLabel, (u32)&frMenuTextMinAccuracyOrTargetsValue, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000002, (u32)&frMenuTextTimeLimitLabel, (u32)&frMenuTextTimeLimitValue, NULL }, @@ -2512,14 +2512,14 @@ struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_FRWEAPON, 0x00004000, 0x0000010e, 0x0000005f, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(3), L_MPMENU(427), frDetailsOkMenuHandler }, // "", "Ok" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS(3), L_MPMENU(429), frAbortMenuHandler }, // "", "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_003, L_MPMENU_427, frDetailsOkMenuHandler }, // "", "Ok" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, L_OPTIONS_003, L_MPMENU_429, frAbortMenuHandler }, // "", "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FrTrainingInfoPreGameMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(447), // "Training Info" + L_MPMENU_447, // "Training Info" g_FrTrainingInfoPreGameMenuItems, frTrainingInfoMenuDialog, 0x00000602, @@ -2527,24 +2527,24 @@ struct menudialog g_FrTrainingInfoPreGameMenuDialog = { }; struct menuitem g_FrCompletedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(449), 0x00000000, NULL }, // "Completed!" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" + { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU_449, 0x00000000, NULL }, // "Completed!" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_450, (u32)&frMenuTextScoreValue, NULL }, // "Score:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_451, (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(453), (u32)&frMenuTextTimeTakenValue, NULL }, // "Time Taken:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_452, (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_453, (u32)&frMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(454), (u32)&frMenuTextWeaponName, NULL }, // "Weapon:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(455), (u32)&frMenuTextAccuracyValue, NULL }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_454, (u32)&frMenuTextWeaponName, NULL }, // "Weapon:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_455, (u32)&frMenuTextAccuracyValue, NULL }, // "Accuracy:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00200002, 0x000000d2, 0x00000050, menuhandler001a44c0 }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(252), 0x00000000, menuhandlerFrFailedContinue }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS_252, 0x00000000, menuhandlerFrFailedContinue }, // "Continue" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FrCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPMENU(448), // "Training Stats" + L_MPMENU_448, // "Training Stats" g_FrCompletedMenuItems, frTrainingStatsMenuDialog, 0x00000004, @@ -2553,23 +2553,23 @@ struct menudialog g_FrCompletedMenuDialog = { struct menuitem g_FrFailedMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&frMenuTextFailReason, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(450), (u32)&frMenuTextScoreValue, NULL }, // "Score:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(451), (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_450, (u32)&frMenuTextScoreValue, NULL }, // "Score:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_451, (u32)&frMenuTextTargetsDestroyedValue, NULL }, // "Targets Destroyed:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(452), (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(453), (u32)&frMenuTextTimeTakenValue, NULL }, // "Time Taken:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_452, (u32)&frMenuTextDifficultyName, NULL }, // "Difficulty:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_453, (u32)&frMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(454), (u32)&frMenuTextWeaponName, NULL }, // "Weapon:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(455), (u32)&frMenuTextAccuracyValue, NULL }, // "Accuracy:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_454, (u32)&frMenuTextWeaponName, NULL }, // "Weapon:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_455, (u32)&frMenuTextAccuracyValue, NULL }, // "Accuracy:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_MODEL, 0, 0x00200002, 0x000000d2, 0x00000050, menuhandler001a44c0 }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS(252), 0x00000000, menuhandlerFrFailedContinue }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, L_MPWEAPONS_252, 0x00000000, menuhandlerFrFailedContinue }, // "Continue" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_FrFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(448), // "Training Stats" + L_MPMENU_448, // "Training Stats" g_FrFailedMenuItems, frTrainingStatsMenuDialog, 0x00000004, @@ -2579,8 +2579,8 @@ struct menudialog g_FrFailedMenuDialog = { s32 ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { - { 0, L_MPMENU(421) }, // "Character Profiles" - { 0, L_MPMENU(422) }, // "Other Information" + { 0, L_MPMENU_421 }, // "Character Profiles" + { 0, L_MPMENU_422 }, // "Other Information" }; s32 numunlockedchrbios = ciGetNumUnlockedChrBios(); @@ -2634,7 +2634,7 @@ struct menuitem g_BioListMenuItems[] = { struct menudialog g_BioListMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(418), // "Information" + L_MPMENU_418, // "Information" g_BioListMenuItems, NULL, 0x00000000, @@ -2642,15 +2642,15 @@ struct menudialog g_BioListMenuDialog = { }; struct menuitem g_NowSafeMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU(437), 0x00000000, NULL }, // "It is now safe to turn off your computer" + { MENUITEMTYPE_LABEL, 0, 0x00000020, L_MPMENU_437, 0x00000000, NULL }, // "It is now safe to turn off your computer" { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU(438), 0x00000000, NULL }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, L_MPMENU_438, 0x00000000, NULL }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_NowSafeMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(436), // "Cheats" + L_MPMENU_436, // "Cheats" g_NowSafeMenuItems, NULL, 0x00000200, @@ -2883,19 +2883,19 @@ s32 menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata struct menuitem g_BioProfileMenuItems[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000046, 0x00000096, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000003, L_MPMENU(432), (u32)&ciMenuTextChrBioName, NULL }, // "Name:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(433), (u32)&ciMenuTextChrBioAge, NULL }, // "Age:" - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(434), (u32)&ciMenuTextChrBioRace, NULL }, // "Race:" + { MENUITEMTYPE_LABEL, 0, 0x00000003, L_MPMENU_432, (u32)&ciMenuTextChrBioName, NULL }, // "Name:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_433, (u32)&ciMenuTextChrBioAge, NULL }, // "Age:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_434, (u32)&ciMenuTextChrBioRace, NULL }, // "Race:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_CHRBIO, 0x00000000, 0x000000b4, 0x00000064, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(435), 0x00000000, NULL }, // "Press the B Button to go back." + { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU_435, 0x00000000, NULL }, // "Press the B Button to go back." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_BioProfileMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(431), // "Character Profile" + L_MPMENU_431, // "Character Profile" g_BioProfileMenuItems, ciCharacterProfileMenuDialog, 0x00000002, @@ -2905,7 +2905,7 @@ struct menudialog g_BioProfileMenuDialog = { struct menuitem g_BioTextMenuItems[] = { { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_MISCBIO, 0x00000000, 0x000000c8, 0x00000096, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." + { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU_414, 0x00000000, NULL }, // "Press the B Button to go back." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -2925,7 +2925,7 @@ struct menuitem g_DtListMenuItems[] = { struct menudialog g_DtListMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(417), // "Device List" + L_MPMENU_417, // "Device List" g_DtListMenuItems, NULL, 0x00000000, @@ -3002,10 +3002,10 @@ char *dtMenuTextOkOrResume(struct menuitem *item) struct trainingdata *data = dtGetData(); if (data->intraining) { - return langGet(L_MPMENU(428)); // "Resume" + return langGet(L_MPMENU_428); // "Resume" } - return langGet(L_MPMENU(427)); // "Ok" + return langGet(L_MPMENU_427); // "Ok" } char *dtMenuTextCancelOrAbort(struct menuitem *item) @@ -3013,10 +3013,10 @@ char *dtMenuTextCancelOrAbort(struct menuitem *item) struct trainingdata *data = dtGetData(); if (data->intraining) { - return langGet(L_MPMENU(430)); // "Abort" + return langGet(L_MPMENU_430); // "Abort" } - return langGet(L_MPMENU(429)); // "Cancel" + return langGet(L_MPMENU_429); // "Cancel" } char *dtMenuTextTimeTakenValue(struct menuitem *item) @@ -3120,10 +3120,10 @@ char *htMenuTextOkOrResume(struct menuitem *item) struct trainingdata *data = getHoloTrainingData(); if (data->intraining) { - return langGet(L_MPMENU(428)); // "Resume" + return langGet(L_MPMENU_428); // "Resume" } - return langGet(L_MPMENU(427)); // "Ok" + return langGet(L_MPMENU_427); // "Ok" } char *htMenuTextCancelOrAbort(struct menuitem *item) @@ -3131,10 +3131,10 @@ char *htMenuTextCancelOrAbort(struct menuitem *item) struct trainingdata *data = getHoloTrainingData(); if (data->intraining) { - return langGet(L_MPMENU(430)); // "Abort" + return langGet(L_MPMENU_430); // "Abort" } - return langGet(L_MPMENU(429)); // "Cancel" + return langGet(L_MPMENU_429); // "Cancel" } char *htMenuTextTimeTakenValue(struct menuitem *item) @@ -3213,9 +3213,9 @@ struct menudialog g_DtDetailsMenuDialog = { }; struct menuitem g_DtFailedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(426), 0x00000000, NULL }, // "Failed!" + { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU_426, 0x00000000, NULL }, // "Failed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_424, (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_DEVICETIP1, 0x00000000, 0x00000082, 0x00000064, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3223,7 +3223,7 @@ struct menuitem g_DtFailedMenuItems[] = { struct menudialog g_DtFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(423), // "Training Stats" + L_MPMENU_423, // "Training Stats" g_DtFailedMenuItems, menudialogDeviceTrainingResults, 0x00000200, @@ -3231,9 +3231,9 @@ struct menudialog g_DtFailedMenuDialog = { }; struct menuitem g_DtCompletedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(425), 0x00000000, NULL }, // "Completed!" + { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU_425, 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_424, (u32)&dtMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_DEVICETIP2, 0x00000000, 0x00000082, 0x00000064, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3241,7 +3241,7 @@ struct menuitem g_DtCompletedMenuItems[] = { struct menudialog g_DtCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPMENU(423), // "Training Stats" + L_MPMENU_423, // "Training Stats" g_DtCompletedMenuItems, menudialogDeviceTrainingResults, 0x00000200, @@ -3255,7 +3255,7 @@ struct menuitem g_HtListMenuItems[] = { struct menudialog g_HtListMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(416), // "Holotraining" + L_MPMENU_416, // "Holotraining" g_HtListMenuItems, NULL, 0x00000000, @@ -3281,9 +3281,9 @@ struct menudialog g_HtDetailsMenuDialog = { }; struct menuitem g_HtFailedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(426), 0x00000000, NULL }, // "Failed!" + { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU_426, 0x00000000, NULL }, // "Failed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_424, (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HOLOTIP1, 0x00000000, 0x00000082, 0x00000064, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3291,7 +3291,7 @@ struct menuitem g_HtFailedMenuItems[] = { struct menudialog g_HtFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - L_MPMENU(423), // "Training Stats" + L_MPMENU_423, // "Training Stats" g_HtFailedMenuItems, menudialogFiringRangeResults, 0x00000200, @@ -3299,9 +3299,9 @@ struct menudialog g_HtFailedMenuDialog = { }; struct menuitem g_HtCompletedMenuItems[] = { - { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU(425), 0x00000000, NULL }, // "Completed!" + { MENUITEMTYPE_LABEL, 0, 0x00000032, L_MPMENU_425, 0x00000000, NULL }, // "Completed!" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU(424), (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" + { MENUITEMTYPE_LABEL, 0, 0x00000002, L_MPMENU_424, (u32)&htMenuTextTimeTakenValue, NULL }, // "Time Taken:" { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HOLOTIP2, 0x00000000, 0x00000082, 0x00000064, NULL }, { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -3309,7 +3309,7 @@ struct menuitem g_HtCompletedMenuItems[] = { struct menudialog g_HtCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - L_MPMENU(423), // "Training Stats" + L_MPMENU_423, // "Training Stats" g_HtCompletedMenuItems, menudialogFiringRangeResults, 0x00000200, @@ -3319,8 +3319,8 @@ struct menudialog g_HtCompletedMenuDialog = { s32 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { - { 0, L_MPMENU(419) }, // "Locations" - { 0, L_MPMENU(420) }, // "Vehicles" + { 0, L_MPMENU_419 }, // "Locations" + { 0, L_MPMENU_420 }, // "Vehicles" }; s32 bioindex; @@ -3893,20 +3893,20 @@ struct menuitem g_HangarDetailsMenuItems[] = { { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, { MENUITEMTYPE_SCROLLABLE, DESCRIPTION_HANGARBIO, 0x00000000, 0x00000104, 0x0000005a, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." + { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU_414, 0x00000000, NULL }, // "Press the B Button to go back." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menuitem g_HangarVehicleHolographMenuItems[] = { { MENUITEMTYPE_MODEL, 0, 0x00000002, 0x00000104, 0x0000006e, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000002, 0x00000000, 0x00000000, NULL }, - { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU(414), 0x00000000, NULL }, // "Press the B Button to go back." + { MENUITEMTYPE_LABEL, 0, 0x00000022, L_MPMENU_414, 0x00000000, NULL }, // "Press the B Button to go back." { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; struct menudialog g_HangarVehicleHolographMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MISC(471), // "Holograph" + L_MISC_471, // "Holograph" g_HangarVehicleHolographMenuItems, ciHangarHolographMenuDialog, 0x00000202, @@ -3938,7 +3938,7 @@ struct menuitem g_HangarListMenuItems[] = { struct menudialog g_HangarListMenuDialog = { MENUDIALOGTYPE_DEFAULT, - L_MPMENU(415), // "Hangar Information" + L_MPMENU_415, // "Hangar Information" g_HangarListMenuItems, NULL, 0x00000000, diff --git a/src/game/training/training.c b/src/game/training/training.c index 675e5bb5c..2bdc84d01 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -2093,39 +2093,39 @@ char *frGetWeaponDescription(void) u32 weapon = frGetWeaponBySlot(g_FrData.slot); switch (weapon) { - case WEAPON_FALCON2: return langGet(L_MISC(377)); - case WEAPON_FALCON2_SCOPE: return langGet(L_MISC(378)); - case WEAPON_FALCON2_SILENCER: return langGet(L_MISC(379)); - case WEAPON_MAGSEC4: return langGet(L_MISC(380)); - case WEAPON_MAULER: return langGet(L_MISC(381)); - case WEAPON_PHOENIX: return langGet(L_MISC(382)); - case WEAPON_DY357MAGNUM: return langGet(L_MISC(383)); - case WEAPON_DY357LX: return langGet(L_MISC(384)); - case WEAPON_CMP150: return langGet(L_MISC(385)); - case WEAPON_CYCLONE: return langGet(L_MISC(386)); - case WEAPON_CALLISTONTG: return langGet(L_MISC(387)); - case WEAPON_RCP120: return langGet(L_MISC(388)); - case WEAPON_LAPTOPGUN: return langGet(L_MISC(389)); - case WEAPON_DRAGON: return langGet(L_MISC(390)); - case WEAPON_K7AVENGER: return langGet(L_MISC(391)); - case WEAPON_AR34: return langGet(L_MISC(392)); - case WEAPON_SUPERDRAGON: return langGet(L_MISC(393)); - case WEAPON_SHOTGUN: return langGet(L_MISC(394)); - case WEAPON_SNIPERRIFLE: return langGet(L_MISC(395)); - case WEAPON_FARSIGHTXR20: return langGet(L_MISC(396)); - case WEAPON_CROSSBOW: return langGet(L_MISC(397)); - case WEAPON_TRANQUILIZER: return langGet(L_MISC(398)); - case WEAPON_REAPER: return langGet(L_MISC(399)); - case WEAPON_DEVASTATOR: return langGet(L_MISC(400)); - case WEAPON_ROCKETLAUNCHER: return langGet(L_MISC(401)); - case WEAPON_SLAYER: return langGet(L_MISC(402)); - case WEAPON_COMBATKNIFE: return langGet(L_MISC(403)); - case WEAPON_LASER: return langGet(L_MISC(404)); - case WEAPON_GRENADE: return langGet(L_MISC(405)); - case WEAPON_NBOMB: return langGet(L_MISC(406)); - case WEAPON_TIMEDMINE: return langGet(L_MISC(407)); - case WEAPON_PROXIMITYMINE: return langGet(L_MISC(408)); - case WEAPON_REMOTEMINE: return langGet(L_MISC(409)); + case WEAPON_FALCON2: return langGet(L_MISC_377); + case WEAPON_FALCON2_SCOPE: return langGet(L_MISC_378); + case WEAPON_FALCON2_SILENCER: return langGet(L_MISC_379); + case WEAPON_MAGSEC4: return langGet(L_MISC_380); + case WEAPON_MAULER: return langGet(L_MISC_381); + case WEAPON_PHOENIX: return langGet(L_MISC_382); + case WEAPON_DY357MAGNUM: return langGet(L_MISC_383); + case WEAPON_DY357LX: return langGet(L_MISC_384); + case WEAPON_CMP150: return langGet(L_MISC_385); + case WEAPON_CYCLONE: return langGet(L_MISC_386); + case WEAPON_CALLISTONTG: return langGet(L_MISC_387); + case WEAPON_RCP120: return langGet(L_MISC_388); + case WEAPON_LAPTOPGUN: return langGet(L_MISC_389); + case WEAPON_DRAGON: return langGet(L_MISC_390); + case WEAPON_K7AVENGER: return langGet(L_MISC_391); + case WEAPON_AR34: return langGet(L_MISC_392); + case WEAPON_SUPERDRAGON: return langGet(L_MISC_393); + case WEAPON_SHOTGUN: return langGet(L_MISC_394); + case WEAPON_SNIPERRIFLE: return langGet(L_MISC_395); + case WEAPON_FARSIGHTXR20: return langGet(L_MISC_396); + case WEAPON_CROSSBOW: return langGet(L_MISC_397); + case WEAPON_TRANQUILIZER: return langGet(L_MISC_398); + case WEAPON_REAPER: return langGet(L_MISC_399); + case WEAPON_DEVASTATOR: return langGet(L_MISC_400); + case WEAPON_ROCKETLAUNCHER: return langGet(L_MISC_401); + case WEAPON_SLAYER: return langGet(L_MISC_402); + case WEAPON_COMBATKNIFE: return langGet(L_MISC_403); + case WEAPON_LASER: return langGet(L_MISC_404); + case WEAPON_GRENADE: return langGet(L_MISC_405); + case WEAPON_NBOMB: return langGet(L_MISC_406); + case WEAPON_TIMEDMINE: return langGet(L_MISC_407); + case WEAPON_PROXIMITYMINE: return langGet(L_MISC_408); + case WEAPON_REMOTEMINE: return langGet(L_MISC_409); } return NULL; @@ -5566,16 +5566,16 @@ struct chrbio *ciGetChrBioByBodynum(u32 bodynum) { struct chrbio bios[] = { // name, race, age, profile - /*0*/ { L_MISC(219), L_MISC(220), L_MISC(221), L_MISC(222) }, // Joanna Dark - /*1*/ { L_MISC(223), L_MISC(224), L_MISC(225), L_MISC(226) }, // Jonathan - /*2*/ { L_MISC(227), L_MISC(228), L_MISC(229), L_MISC(230) }, // Daniel Carrington - /*3*/ { L_MISC(231), L_MISC(232), L_MISC(233), L_MISC(234) }, // Cassandra De Vries - /*4*/ { L_MISC(235), L_MISC(236), L_MISC(237), L_MISC(238) }, // Trent Easton - /*5*/ { L_MISC(239), L_MISC(240), L_MISC(241), L_MISC(242) }, // Dr. Caroll - /*6*/ { L_MISC(243), L_MISC(244), L_MISC(245), L_MISC(246) }, // Elvis - /*7*/ { L_MISC(247), L_MISC(248), L_MISC(249), L_MISC(250) }, // Mr. Blonde - /*8*/ { L_MISC(251), L_MISC(252), L_MISC(253), L_MISC(254) }, // Mr. Blonde (repeat) - /*9*/ { L_MISC(255), L_MISC(256), L_MISC(257), L_MISC(258) }, // The U.S. President + /*0*/ { L_MISC_219, L_MISC_220, L_MISC_221, L_MISC_222 }, // Joanna Dark + /*1*/ { L_MISC_223, L_MISC_224, L_MISC_225, L_MISC_226 }, // Jonathan + /*2*/ { L_MISC_227, L_MISC_228, L_MISC_229, L_MISC_230 }, // Daniel Carrington + /*3*/ { L_MISC_231, L_MISC_232, L_MISC_233, L_MISC_234 }, // Cassandra De Vries + /*4*/ { L_MISC_235, L_MISC_236, L_MISC_237, L_MISC_238 }, // Trent Easton + /*5*/ { L_MISC_239, L_MISC_240, L_MISC_241, L_MISC_242 }, // Dr. Caroll + /*6*/ { L_MISC_243, L_MISC_244, L_MISC_245, L_MISC_246 }, // Elvis + /*7*/ { L_MISC_247, L_MISC_248, L_MISC_249, L_MISC_250 }, // Mr. Blonde + /*8*/ { L_MISC_251, L_MISC_252, L_MISC_253, L_MISC_254 }, // Mr. Blonde (repeat) + /*9*/ { L_MISC_255, L_MISC_256, L_MISC_257, L_MISC_258 }, // The U.S. President }; switch (bodynum) { @@ -5647,10 +5647,10 @@ struct miscbio *ciGetMiscBio(s32 index) { struct miscbio bios[] = { // name, description - { L_MISC(259), L_MISC(260) }, - { L_MISC(261), L_MISC(262) }, - { L_MISC(263), L_MISC(264) }, - { L_MISC(265), L_MISC(266) }, + { L_MISC_259, L_MISC_260 }, + { L_MISC_261, L_MISC_262 }, + { L_MISC_263, L_MISC_264 }, + { L_MISC_265, L_MISC_266 }, }; switch (index) { @@ -5729,29 +5729,29 @@ struct hangarbio *ciGetHangarBio(s32 index) { struct hangarbio bios[] = { // name, description - { L_MISC(290), L_MISC(313) }, // Carrington Institute - { L_MISC(291), L_MISC(314) }, // Lucerne Tower - { L_MISC(292), L_MISC(315) }, // Laboratory Basement - { L_MISC(293), L_MISC(316) }, // Carrington Villa - { L_MISC(294), L_MISC(317) }, // Chicago - { L_MISC(295), L_MISC(318) }, // G5 Building - { L_MISC(296), L_MISC(319) }, // Area 51 - { L_MISC(297), L_MISC(320) }, // Alaskan Air Base - { L_MISC(298), L_MISC(321) }, // Air Force One - { L_MISC(299), L_MISC(322) }, // Crash Site - { L_MISC(300), L_MISC(323) }, // Pelagic II - { L_MISC(301), L_MISC(324) }, // Cetan Ship - { L_MISC(302), L_MISC(325) }, // Skedar Assault Ship - { L_MISC(303), L_MISC(326) }, // Skedar Homeworld - { L_MISC(304), L_MISC(327) }, // Jumpship - { L_MISC(305), L_MISC(328) }, // HoverCrate - { L_MISC(306), L_MISC(329) }, // HoverBike - { L_MISC(307), L_MISC(330) }, // Cleaning Hovbot - { L_MISC(308), L_MISC(331) }, // Hovercopter - { L_MISC(309), L_MISC(332) }, // G5 Robot - { L_MISC(310), L_MISC(333) }, // A51 Interceptor - { L_MISC(311), L_MISC(334) }, // Maian Vessel - { L_MISC(312), L_MISC(335) }, // Skedar Shuttle + { L_MISC_290, L_MISC_313 }, // Carrington Institute + { L_MISC_291, L_MISC_314 }, // Lucerne Tower + { L_MISC_292, L_MISC_315 }, // Laboratory Basement + { L_MISC_293, L_MISC_316 }, // Carrington Villa + { L_MISC_294, L_MISC_317 }, // Chicago + { L_MISC_295, L_MISC_318 }, // G5 Building + { L_MISC_296, L_MISC_319 }, // Area 51 + { L_MISC_297, L_MISC_320 }, // Alaskan Air Base + { L_MISC_298, L_MISC_321 }, // Air Force One + { L_MISC_299, L_MISC_322 }, // Crash Site + { L_MISC_300, L_MISC_323 }, // Pelagic II + { L_MISC_301, L_MISC_324 }, // Cetan Ship + { L_MISC_302, L_MISC_325 }, // Skedar Assault Ship + { L_MISC_303, L_MISC_326 }, // Skedar Homeworld + { L_MISC_304, L_MISC_327 }, // Jumpship + { L_MISC_305, L_MISC_328 }, // HoverCrate + { L_MISC_306, L_MISC_329 }, // HoverBike + { L_MISC_307, L_MISC_330 }, // Cleaning Hovbot + { L_MISC_308, L_MISC_331 }, // Hovercopter + { L_MISC_309, L_MISC_332 }, // G5 Robot + { L_MISC_310, L_MISC_333 }, // A51 Interceptor + { L_MISC_311, L_MISC_334 }, // Maian Vessel + { L_MISC_312, L_MISC_335 }, // Skedar Shuttle }; switch (index) { @@ -6129,16 +6129,16 @@ u32 ciGetStageFlagByDeviceIndex(u32 deviceindex) char *dtGetDescription(void) { u32 texts[] = { - /*0*/ L_MISC(280), // Data uplink - /*1*/ L_MISC(279), // ECM mine - /*2*/ L_MISC(271), // CamSpy - /*3*/ L_MISC(272), // Night vision - /*4*/ L_MISC(273), // Door decoder - /*5*/ L_MISC(277), // R-tracker - /*6*/ L_MISC(276), // IR scanner - /*7*/ L_MISC(274), // X-ray scanner - /*8*/ L_MISC(275), // Disguise - /*9*/ L_MISC(278), // Cloak + /*0*/ L_MISC_280, // Data uplink + /*1*/ L_MISC_279, // ECM mine + /*2*/ L_MISC_271, // CamSpy + /*3*/ L_MISC_272, // Night vision + /*4*/ L_MISC_273, // Door decoder + /*5*/ L_MISC_277, // R-tracker + /*6*/ L_MISC_276, // IR scanner + /*7*/ L_MISC_274, // X-ray scanner + /*8*/ L_MISC_275, // Disguise + /*9*/ L_MISC_278, // Cloak }; return langGet(texts[dtGetIndexBySlot(g_DtSlot)]); @@ -6147,16 +6147,16 @@ char *dtGetDescription(void) char *dtGetTip1(void) { u32 texts[] = { - /*0*/ L_MISC(357), - /*1*/ L_MISC(358), - /*2*/ L_MISC(359), - /*3*/ L_MISC(360), - /*4*/ L_MISC(361), - /*5*/ L_MISC(362), - /*6*/ L_MISC(363), - /*7*/ L_MISC(364), - /*8*/ L_MISC(365), - /*9*/ L_MISC(366), + /*0*/ L_MISC_357, + /*1*/ L_MISC_358, + /*2*/ L_MISC_359, + /*3*/ L_MISC_360, + /*4*/ L_MISC_361, + /*5*/ L_MISC_362, + /*6*/ L_MISC_363, + /*7*/ L_MISC_364, + /*8*/ L_MISC_365, + /*9*/ L_MISC_366, }; return langGet(texts[dtGetIndexBySlot(g_DtSlot)]); @@ -6165,16 +6165,16 @@ char *dtGetTip1(void) char *dtGetTip2(void) { u32 texts[] = { - /*0*/ L_MISC(367), - /*1*/ L_MISC(368), - /*2*/ L_MISC(369), - /*3*/ L_MISC(370), - /*4*/ L_MISC(371), - /*5*/ L_MISC(372), - /*6*/ L_MISC(373), - /*7*/ L_MISC(374), - /*8*/ L_MISC(375), - /*9*/ L_MISC(376), + /*0*/ L_MISC_367, + /*1*/ L_MISC_368, + /*2*/ L_MISC_369, + /*3*/ L_MISC_370, + /*4*/ L_MISC_371, + /*5*/ L_MISC_372, + /*6*/ L_MISC_373, + /*7*/ L_MISC_374, + /*8*/ L_MISC_375, + /*9*/ L_MISC_376, }; return langGet(texts[dtGetIndexBySlot(g_DtSlot)]); @@ -6360,13 +6360,13 @@ s32 htGetIndexBySlot(s32 slot) char *htGetName(s32 index) { u32 texts[] = { - L_MISC(410), // "Holo 1 - Looking Around" - L_MISC(411), // "Holo 2 - Movement 1" - L_MISC(412), // "Holo 3 - Movement 2" - L_MISC(413), // "Holo 4 - Unarmed Combat 1" - L_MISC(414), // "Holo 5 - Unarmed Combat 2" - L_MISC(415), // "Holo 6 - Live Combat 1" - L_MISC(416), // "Holo 7 - Live Combat 2" + L_MISC_410, // "Holo 1 - Looking Around" + L_MISC_411, // "Holo 2 - Movement 1" + L_MISC_412, // "Holo 3 - Movement 2" + L_MISC_413, // "Holo 4 - Unarmed Combat 1" + L_MISC_414, // "Holo 5 - Unarmed Combat 2" + L_MISC_415, // "Holo 6 - Live Combat 1" + L_MISC_416, // "Holo 7 - Live Combat 2" }; return langGet(texts[index]); @@ -6391,13 +6391,13 @@ u32 func0f1a25c0(s32 index) char *htGetDescription(void) { u32 texts[] = { - L_MISC(336), - L_MISC(337), - L_MISC(338), - L_MISC(339), - L_MISC(340), - L_MISC(341), - L_MISC(342), + L_MISC_336, + L_MISC_337, + L_MISC_338, + L_MISC_339, + L_MISC_340, + L_MISC_341, + L_MISC_342, }; return langGet(texts[htGetIndexBySlot(var80088bb4)]); @@ -6406,13 +6406,13 @@ char *htGetDescription(void) char *htGetTip1(void) { u32 texts[] = { - L_MISC(343), // "For greater precision..." - L_MISC(344), // "Think about where you want to go..." - L_MISC(345), // "Ducking enables you to..." - L_MISC(346), // "Attacking opponents from behind..." - L_MISC(347), // "Only stay close long enough..." - L_MISC(348), // "Don't hang around and wait..." - L_MISC(349), // "Go for the armed opponents..." + L_MISC_343, // "For greater precision..." + L_MISC_344, // "Think about where you want to go..." + L_MISC_345, // "Ducking enables you to..." + L_MISC_346, // "Attacking opponents from behind..." + L_MISC_347, // "Only stay close long enough..." + L_MISC_348, // "Don't hang around and wait..." + L_MISC_349, // "Go for the armed opponents..." }; return langGet(texts[htGetIndexBySlot(var80088bb4)]); @@ -6421,13 +6421,13 @@ char *htGetTip1(void) char *htGetTip2(void) { u32 texts[] = { - L_MISC(350), // "For greater precision..." - L_MISC(351), // "Sidestepping and strafing..." - L_MISC(352), // "Ducking enables you to..." - L_MISC(353), // "Attacking opponents from behind..." - L_MISC(354), // "Only stay close long enough..." - L_MISC(355), // "Don't hang around and wait..." - L_MISC(356), // "Go for the armed opponents..." + L_MISC_350, // "For greater precision..." + L_MISC_351, // "Sidestepping and strafing..." + L_MISC_352, // "Ducking enables you to..." + L_MISC_353, // "Attacking opponents from behind..." + L_MISC_354, // "Only stay close long enough..." + L_MISC_355, // "Don't hang around and wait..." + L_MISC_356, // "Go for the armed opponents..." }; return langGet(texts[htGetIndexBySlot(var80088bb4)]); @@ -6436,7 +6436,7 @@ char *htGetTip2(void) void frGetGoalTargetsText(char *buffer) { // "GOAL TARGETS:" - sprintf(buffer, "%s %d\n", langGet(L_MISC(417)), g_FrData.goaltargets); + sprintf(buffer, "%s %d\n", langGet(L_MISC_417), g_FrData.goaltargets); } void frGetTargetsDestroyedValue(char *buffer) @@ -6453,7 +6453,7 @@ void frGetGoalScoreText(char *buffer) { if (g_FrData.goalscore) { // "GOAL SCORE:" - sprintf(buffer, "%s %d\n", langGet(L_MISC(418)), g_FrData.goalscore); + sprintf(buffer, "%s %d\n", langGet(L_MISC_418), g_FrData.goalscore); } else { sprintf(buffer, ""); } @@ -6483,7 +6483,7 @@ f32 frGetAccuracy(char *buffer) bool frGetMinAccuracy(char *buffer, f32 accuracy) { // "MIN ACCURACY:" - sprintf(buffer, "%s %d%%\n", langGet(L_MISC(419)), g_FrData.goalaccuracy); + sprintf(buffer, "%s %d%%\n", langGet(L_MISC_419), g_FrData.goalaccuracy); return accuracy < g_FrData.goalaccuracy; } @@ -6535,12 +6535,12 @@ bool frGetHudMiddleSubtext(char *buffer) s32 mins; if (g_FrData.timetaken < -180) { - sprintf(buffer, "%s", langGet(L_MISC(420))); // "FIRE TO START" + sprintf(buffer, "%s", langGet(L_MISC_420)); // "FIRE TO START" return false; } if (g_FrData.timetaken < 0) { - sprintf(buffer, "%s", langGet(L_MISC(421))); // "GET READY!" + sprintf(buffer, "%s", langGet(L_MISC_421)); // "GET READY!" return true; } @@ -6558,18 +6558,18 @@ bool frGetHudMiddleSubtext(char *buffer) } } - sprintf(buffer, "%s %02d:%02d\n", langGet(L_MISC(422)), mins, secs); // "LIMIT:" + sprintf(buffer, "%s %02d:%02d\n", langGet(L_MISC_422), mins, secs); // "LIMIT:" return true; } bool frGetFeedback(char *scorebuffer, char *zonebuffer) { u32 texts[] = { - L_MISC(423), // "ZONE 3" - L_MISC(424), // "ZONE 2" - L_MISC(425), // "ZONE 1" - L_MISC(426), // "BULL'S-EYE" - L_MISC(427), // "EXPLODED" + L_MISC_423, // "ZONE 3" + L_MISC_424, // "ZONE 2" + L_MISC_425, // "ZONE 1" + L_MISC_426, // "BULL'S-EYE" + L_MISC_427, // "EXPLODED" }; if (g_FrData.feedbackzone) { diff --git a/src/include/constants.h b/src/include/constants.h index 745f3ec93..1f9992c1b 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -25,7 +25,6 @@ #define PLAYERCOUNT3012() ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0)) #define SECSTOTIME240(secs) (secs * 240) #define SECSTOTIME60(secs) (secs * 60) -#define TEXT(bankid, index) ((bankid << 9) | index) #define VOLUME(volume) (volume > 0x5000 ? 0x5000 : volume) #define EYESPYINACTIVE() (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active)) @@ -1021,144 +1020,6 @@ #define LA_1 1 // either waiting for lift or in lift #define LA_3 3 // either waiting for lift or in lift -#define LANGBANK_AME 0x01 -#define LANGBANK_ARCH 0x02 -#define LANGBANK_ARK 0x03 -#define LANGBANK_ASH 0x04 -#define LANGBANK_AZT 0x05 -#define LANGBANK_CAT 0x06 -#define LANGBANK_CAVE 0x07 -#define LANGBANK_AREC 0x08 -#define LANGBANK_CRAD 0x09 -#define LANGBANK_CRYP 0x0a -#define LANGBANK_DAM 0x0b -#define LANGBANK_DEPO 0x0c -#define LANGBANK_DEST 0x0d -#define LANGBANK_DISH 0x0e -#define LANGBANK_EAR 0x0f -#define LANGBANK_ELD 0x10 -#define LANGBANK_IMP 0x11 -#define LANGBANK_JUN 0x12 -#define LANGBANK_LEE 0x13 -#define LANGBANK_LEN 0x14 -#define LANGBANK_LIP 0x15 -#define LANGBANK_LUE 0x16 -#define LANGBANK_OAT 0x17 -#define LANGBANK_PAM 0x18 -#define LANGBANK_PETE 0x19 -#define LANGBANK_REF 0x1a -#define LANGBANK_RIT 0x1b -#define LANGBANK_RUN 0x1c -#define LANGBANK_SEVB 0x1d -#define LANGBANK_SEV 0x1e -#define LANGBANK_SEVX 0x1f -#define LANGBANK_SEVXB 0x20 -#define LANGBANK_SHO 0x21 -#define LANGBANK_SILO 0x22 -#define LANGBANK_STAT 0x23 -#define LANGBANK_TRA 0x24 -#define LANGBANK_WAX 0x25 -#define LANGBANK_GUN 0x26 -#define LANGBANK_TITLE 0x27 -#define LANGBANK_MPMENU 0x28 -#define LANGBANK_PROPOBJ 0x29 -#define LANGBANK_MPWEAPONS 0x2a -#define LANGBANK_OPTIONS 0x2b -#define LANGBANK_MISC 0x2c -#define LANGBANK_UFF 0x2d -#define LANGBANK_OLD 0x2e -#define LANGBANK_ATE 0x2f -#define LANGBANK_LAM 0x30 -#define LANGBANK_MP1 0x31 -#define LANGBANK_MP2 0x32 -#define LANGBANK_MP3 0x33 -#define LANGBANK_MP4 0x34 -#define LANGBANK_MP5 0x35 -#define LANGBANK_MP6 0x36 -#define LANGBANK_MP7 0x37 -#define LANGBANK_MP8 0x38 -#define LANGBANK_MP9 0x39 -#define LANGBANK_MP10 0x3a -#define LANGBANK_MP11 0x3b -#define LANGBANK_MP12 0x3c -#define LANGBANK_MP13 0x3d -#define LANGBANK_MP14 0x3e -#define LANGBANK_MP15 0x3f -#define LANGBANK_MP16 0x40 -#define LANGBANK_MP17 0x41 -#define LANGBANK_MP18 0x42 -#define LANGBANK_MP19 0x43 -#define LANGBANK_MP20 0x44 - -#define L_AME(index) TEXT(LANGBANK_AME, index) -#define L_ARCH(index) TEXT(LANGBANK_ARCH, index) -#define L_ARK(index) TEXT(LANGBANK_ARK, index) -#define L_ASH(index) TEXT(LANGBANK_ASH, index) -#define L_AZT(index) TEXT(LANGBANK_AZT, index) -#define L_CAT(index) TEXT(LANGBANK_CAT, index) -#define L_CAVE(index) TEXT(LANGBANK_CAVE, index) -#define L_AREC(index) TEXT(LANGBANK_AREC, index) -#define L_CRAD(index) TEXT(LANGBANK_CRAD, index) -#define L_CRYP(index) TEXT(LANGBANK_CRYP, index) -#define L_DAM(index) TEXT(LANGBANK_DAM, index) -#define L_DEPO(index) TEXT(LANGBANK_DEPO, index) -#define L_DEST(index) TEXT(LANGBANK_DEST, index) -#define L_DISH(index) TEXT(LANGBANK_DISH, index) -#define L_EAR(index) TEXT(LANGBANK_EAR, index) -#define L_ELD(index) TEXT(LANGBANK_ELD, index) -#define L_IMP(index) TEXT(LANGBANK_IMP, index) -#define L_JUN(index) TEXT(LANGBANK_JUN, index) -#define L_LEE(index) TEXT(LANGBANK_LEE, index) -#define L_LEN(index) TEXT(LANGBANK_LEN, index) -#define L_LIP(index) TEXT(LANGBANK_LIP, index) -#define L_LUE(index) TEXT(LANGBANK_LUE, index) -#define L_OAT(index) TEXT(LANGBANK_OAT, index) -#define L_PAM(index) TEXT(LANGBANK_PAM, index) -#define L_PETE(index) TEXT(LANGBANK_PETE, index) -#define L_REF(index) TEXT(LANGBANK_REF, index) -#define L_RIT(index) TEXT(LANGBANK_RIT, index) -#define L_RUN(index) TEXT(LANGBANK_RUN, index) -#define L_SEVB(index) TEXT(LANGBANK_SEVB, index) -#define L_SEV(index) TEXT(LANGBANK_SEV, index) -#define L_SEVX(index) TEXT(LANGBANK_SEVX, index) -#define L_SEVXB(index) TEXT(LANGBANK_SEVXB, index) -#define L_SHO(index) TEXT(LANGBANK_SHO, index) -#define L_SILO(index) TEXT(LANGBANK_SILO, index) -#define L_STAT(index) TEXT(LANGBANK_STAT, index) -#define L_TRA(index) TEXT(LANGBANK_TRA, index) -#define L_WAX(index) TEXT(LANGBANK_WAX, index) -#define L_GUN(index) TEXT(LANGBANK_GUN, index) -#define L_TITLE(index) TEXT(LANGBANK_TITLE, index) -#define L_MPMENU(index) TEXT(LANGBANK_MPMENU, index) -#define L_PROPOBJ(index) TEXT(LANGBANK_PROPOBJ, index) -#define L_MPWEAPONS(index) TEXT(LANGBANK_MPWEAPONS, index) -#define L_OPTIONS(index) TEXT(LANGBANK_OPTIONS, index) -#define L_MISC(index) TEXT(LANGBANK_MISC, index) -#define L_UFF(index) TEXT(LANGBANK_UFF, index) -#define L_OLD(index) TEXT(LANGBANK_OLD, index) -#define L_ATE(index) TEXT(LANGBANK_ATE, index) -#define L_LAM(index) TEXT(LANGBANK_LAM, index) -#define L_MP1(index) TEXT(LANGBANK_MP1, index) -#define L_MP2(index) TEXT(LANGBANK_MP2, index) -#define L_MP3(index) TEXT(LANGBANK_MP3, index) -#define L_MP4(index) TEXT(LANGBANK_MP4, index) -#define L_MP5(index) TEXT(LANGBANK_MP5, index) -#define L_MP6(index) TEXT(LANGBANK_MP6, index) -#define L_MP7(index) TEXT(LANGBANK_MP7, index) -#define L_MP8(index) TEXT(LANGBANK_MP8, index) -#define L_MP9(index) TEXT(LANGBANK_MP9, index) -#define L_MP10(index) TEXT(LANGBANK_MP10, index) -#define L_MP11(index) TEXT(LANGBANK_MP11, index) -#define L_MP12(index) TEXT(LANGBANK_MP12, index) -#define L_MP13(index) TEXT(LANGBANK_MP13, index) -#define L_MP14(index) TEXT(LANGBANK_MP14, index) -#define L_MP15(index) TEXT(LANGBANK_MP15, index) -#define L_MP16(index) TEXT(LANGBANK_MP16, index) -#define L_MP17(index) TEXT(LANGBANK_MP17, index) -#define L_MP18(index) TEXT(LANGBANK_MP18, index) -#define L_MP19(index) TEXT(LANGBANK_MP19, index) -#define L_MP20(index) TEXT(LANGBANK_MP20, index) - #define LANGUAGE_ENGLISH 0 #define LANGUAGE_JAPANESE 1 diff --git a/src/include/lang.h b/src/include/lang.h new file mode 100644 index 000000000..4d3ec5fd7 --- /dev/null +++ b/src/include/lang.h @@ -0,0 +1,162 @@ +#ifndef _IN_LANG_H +#define _IN_LANG_H + +/** + * Text is referenced throughout the code using 16-bit integers. + * The first 7 bits are the bank/file number, and the remaining + * 9 bits are the string index within that file. + * + * There is one bank/file per stage, as well as common banks for + * menus, weapons and so on. + */ + +#define LANGBANK_AME 0x01 +#define LANGBANK_ARCH 0x02 +#define LANGBANK_ARK 0x03 +#define LANGBANK_ASH 0x04 +#define LANGBANK_AZT 0x05 +#define LANGBANK_CAT 0x06 +#define LANGBANK_CAVE 0x07 +#define LANGBANK_AREC 0x08 +#define LANGBANK_CRAD 0x09 +#define LANGBANK_CRYP 0x0a +#define LANGBANK_DAM 0x0b +#define LANGBANK_DEPO 0x0c +#define LANGBANK_DEST 0x0d +#define LANGBANK_DISH 0x0e +#define LANGBANK_EAR 0x0f +#define LANGBANK_ELD 0x10 +#define LANGBANK_IMP 0x11 +#define LANGBANK_JUN 0x12 +#define LANGBANK_LEE 0x13 +#define LANGBANK_LEN 0x14 +#define LANGBANK_LIP 0x15 +#define LANGBANK_LUE 0x16 +#define LANGBANK_OAT 0x17 +#define LANGBANK_PAM 0x18 +#define LANGBANK_PETE 0x19 +#define LANGBANK_REF 0x1a +#define LANGBANK_RIT 0x1b +#define LANGBANK_RUN 0x1c +#define LANGBANK_SEVB 0x1d +#define LANGBANK_SEV 0x1e +#define LANGBANK_SEVX 0x1f +#define LANGBANK_SEVXB 0x20 +#define LANGBANK_SHO 0x21 +#define LANGBANK_SILO 0x22 +#define LANGBANK_STAT 0x23 +#define LANGBANK_TRA 0x24 +#define LANGBANK_WAX 0x25 +#define LANGBANK_GUN 0x26 +#define LANGBANK_TITLE 0x27 +#define LANGBANK_MPMENU 0x28 +#define LANGBANK_PROPOBJ 0x29 +#define LANGBANK_MPWEAPONS 0x2a +#define LANGBANK_OPTIONS 0x2b +#define LANGBANK_MISC 0x2c +#define LANGBANK_UFF 0x2d +#define LANGBANK_OLD 0x2e +#define LANGBANK_ATE 0x2f +#define LANGBANK_LAM 0x30 +#define LANGBANK_MP1 0x31 +#define LANGBANK_MP2 0x32 +#define LANGBANK_MP3 0x33 +#define LANGBANK_MP4 0x34 +#define LANGBANK_MP5 0x35 +#define LANGBANK_MP6 0x36 +#define LANGBANK_MP7 0x37 +#define LANGBANK_MP8 0x38 +#define LANGBANK_MP9 0x39 +#define LANGBANK_MP10 0x3a +#define LANGBANK_MP11 0x3b +#define LANGBANK_MP12 0x3c +#define LANGBANK_MP13 0x3d +#define LANGBANK_MP14 0x3e +#define LANGBANK_MP15 0x3f +#define LANGBANK_MP16 0x40 +#define LANGBANK_MP17 0x41 +#define LANGBANK_MP18 0x42 +#define LANGBANK_MP19 0x43 +#define LANGBANK_MP20 0x44 + +/** + * This macro moves the bank number to the upper 7 bits. + * + * This is used by the enum lists in each bank's header file to start the enum + * from the correct value. + */ +#define LANG_FIRST(bankid) (bankid << 9) + +/** + * Include each lang header, which defines their enums. + */ +#include "lang/ame.h" +#include "lang/arch.h" +#include "lang/ark.h" +#include "lang/ash.h" +#include "lang/azt.h" +#include "lang/cat.h" +#include "lang/cave.h" +#include "lang/arec.h" +#include "lang/crad.h" +#include "lang/cryp.h" +#include "lang/dam.h" +#include "lang/depo.h" +#include "lang/dest.h" +#include "lang/dish.h" +#include "lang/ear.h" +#include "lang/eld.h" +#include "lang/imp.h" +#include "lang/jun.h" +#include "lang/lee.h" +#include "lang/len.h" +#include "lang/lip.h" +#include "lang/lue.h" +#include "lang/oat.h" +#include "lang/pam.h" +#include "lang/pete.h" +#include "lang/ref.h" +#include "lang/rit.h" +#include "lang/run.h" +#include "lang/sevb.h" +#include "lang/sev.h" +#include "lang/sevx.h" +#include "lang/sevxb.h" +#include "lang/sho.h" +#include "lang/silo.h" +#include "lang/stat.h" +#include "lang/tra.h" +#include "lang/wax.h" +#include "lang/gun.h" +#include "lang/title.h" +#include "lang/mpmenu.h" +#include "lang/propobj.h" +#include "lang/mpweapons.h" +#include "lang/options.h" +#include "lang/misc.h" +#include "lang/uff.h" +#include "lang/old.h" +#include "lang/ate.h" +#include "lang/lam.h" +#include "lang/mp1.h" +#include "lang/mp2.h" +#include "lang/mp3.h" +#include "lang/mp4.h" +#include "lang/mp5.h" +#include "lang/mp6.h" +#include "lang/mp7.h" +#include "lang/mp8.h" +#include "lang/mp9.h" +#include "lang/mp10.h" +#include "lang/mp11.h" +#include "lang/mp12.h" +#include "lang/mp13.h" +#include "lang/mp14.h" +#include "lang/mp15.h" +#include "lang/mp16.h" +#include "lang/mp17.h" +#include "lang/mp18.h" +#include "lang/mp19.h" +#include "lang/mp20.h" + +#endif diff --git a/src/include/lang/ame.h b/src/include/lang/ame.h new file mode 100644 index 000000000..70071a40a --- /dev/null +++ b/src/include/lang/ame.h @@ -0,0 +1,116 @@ +#include "lang.h" + +enum l_ame { + L_AME_000 = LANG_FIRST(LANGBANK_AME), + L_AME_001, + L_AME_002, + L_AME_003, + L_AME_004, + L_AME_005, + L_AME_006, + L_AME_007, + L_AME_008, + L_AME_009, + L_AME_010, + L_AME_011, + L_AME_012, + L_AME_013, + L_AME_014, + L_AME_015, + L_AME_016, + L_AME_017, + L_AME_018, + L_AME_019, + L_AME_020, + L_AME_021, + L_AME_022, + L_AME_023, + L_AME_024, + L_AME_025, + L_AME_026, + L_AME_027, + L_AME_028, + L_AME_029, + L_AME_030, + L_AME_031, + L_AME_032, + L_AME_033, + L_AME_034, + L_AME_035, + L_AME_036, + L_AME_037, + L_AME_038, + L_AME_039, + L_AME_040, + L_AME_041, + L_AME_042, + L_AME_043, + L_AME_044, + L_AME_045, + L_AME_046, + L_AME_047, + L_AME_048, + L_AME_049, + L_AME_050, + L_AME_051, + L_AME_052, + L_AME_053, + L_AME_054, + L_AME_055, + L_AME_056, + L_AME_057, + L_AME_058, + L_AME_059, + L_AME_060, + L_AME_061, + L_AME_062, + L_AME_063, + L_AME_064, + L_AME_065, + L_AME_066, + L_AME_067, + L_AME_068, + L_AME_069, + L_AME_070, + L_AME_071, + L_AME_072, + L_AME_073, + L_AME_074, + L_AME_075, + L_AME_076, + L_AME_077, + L_AME_078, + L_AME_079, + L_AME_080, + L_AME_081, + L_AME_082, + L_AME_083, + L_AME_084, + L_AME_085, + L_AME_086, + L_AME_087, + L_AME_088, + L_AME_089, + L_AME_090, + L_AME_091, + L_AME_092, + L_AME_093, + L_AME_094, + L_AME_095, + L_AME_096, + L_AME_097, + L_AME_098, + L_AME_099, + L_AME_100, + L_AME_101, + L_AME_102, + L_AME_103, + L_AME_104, + L_AME_105, + L_AME_106, + L_AME_107, + L_AME_108, + L_AME_109, + L_AME_110, + L_AME_111 +}; diff --git a/src/include/lang/arch.h b/src/include/lang/arch.h new file mode 100644 index 000000000..d7aec6ef8 --- /dev/null +++ b/src/include/lang/arch.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_arch { + L_ARCH_000 = LANG_FIRST(LANGBANK_ARCH) +}; diff --git a/src/include/lang/arec.h b/src/include/lang/arec.h new file mode 100644 index 000000000..5f490993d --- /dev/null +++ b/src/include/lang/arec.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_arec { + L_AREC_000 = LANG_FIRST(LANGBANK_AREC) +}; diff --git a/src/include/lang/ark.h b/src/include/lang/ark.h new file mode 100644 index 000000000..fd5b975c3 --- /dev/null +++ b/src/include/lang/ark.h @@ -0,0 +1,80 @@ +#include "lang.h" + +enum l_ark { + L_ARK_000 = LANG_FIRST(LANGBANK_ARK), + L_ARK_001, + L_ARK_002, + L_ARK_003, + L_ARK_004, + L_ARK_005, + L_ARK_006, + L_ARK_007, + L_ARK_008, + L_ARK_009, + L_ARK_010, + L_ARK_011, + L_ARK_012, + L_ARK_013, + L_ARK_014, + L_ARK_015, + L_ARK_016, + L_ARK_017, + L_ARK_018, + L_ARK_019, + L_ARK_020, + L_ARK_021, + L_ARK_022, + L_ARK_023, + L_ARK_024, + L_ARK_025, + L_ARK_026, + L_ARK_027, + L_ARK_028, + L_ARK_029, + L_ARK_030, + L_ARK_031, + L_ARK_032, + L_ARK_033, + L_ARK_034, + L_ARK_035, + L_ARK_036, + L_ARK_037, + L_ARK_038, + L_ARK_039, + L_ARK_040, + L_ARK_041, + L_ARK_042, + L_ARK_043, + L_ARK_044, + L_ARK_045, + L_ARK_046, + L_ARK_047, + L_ARK_048, + L_ARK_049, + L_ARK_050, + L_ARK_051, + L_ARK_052, + L_ARK_053, + L_ARK_054, + L_ARK_055, + L_ARK_056, + L_ARK_057, + L_ARK_058, + L_ARK_059, + L_ARK_060, + L_ARK_061, + L_ARK_062, + L_ARK_063, + L_ARK_064, + L_ARK_065, + L_ARK_066, + L_ARK_067, + L_ARK_068, + L_ARK_069, + L_ARK_070, + L_ARK_071, + L_ARK_072, + L_ARK_073, + L_ARK_074, + L_ARK_075 +}; diff --git a/src/include/lang/ash.h b/src/include/lang/ash.h new file mode 100644 index 000000000..6a59c9c5c --- /dev/null +++ b/src/include/lang/ash.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_ash { + L_ASH_000 = LANG_FIRST(LANGBANK_ASH) +}; diff --git a/src/include/lang/ate.h b/src/include/lang/ate.h new file mode 100644 index 000000000..861889b68 --- /dev/null +++ b/src/include/lang/ate.h @@ -0,0 +1,20 @@ +#include "lang.h" + +enum l_ate { + L_ATE_000 = LANG_FIRST(LANGBANK_ATE), + L_ATE_001, + L_ATE_002, + L_ATE_003, + L_ATE_004, + L_ATE_005, + L_ATE_006, + L_ATE_007, + L_ATE_008, + L_ATE_009, + L_ATE_010, + L_ATE_011, + L_ATE_012, + L_ATE_013, + L_ATE_014, + L_ATE_015 +}; diff --git a/src/include/lang/azt.h b/src/include/lang/azt.h new file mode 100644 index 000000000..b9e5cf010 --- /dev/null +++ b/src/include/lang/azt.h @@ -0,0 +1,52 @@ +#include "lang.h" + +enum l_azt { + L_AZT_000 = LANG_FIRST(LANGBANK_AZT), + L_AZT_001, + L_AZT_002, + L_AZT_003, + L_AZT_004, + L_AZT_005, + L_AZT_006, + L_AZT_007, + L_AZT_008, + L_AZT_009, + L_AZT_010, + L_AZT_011, + L_AZT_012, + L_AZT_013, + L_AZT_014, + L_AZT_015, + L_AZT_016, + L_AZT_017, + L_AZT_018, + L_AZT_019, + L_AZT_020, + L_AZT_021, + L_AZT_022, + L_AZT_023, + L_AZT_024, + L_AZT_025, + L_AZT_026, + L_AZT_027, + L_AZT_028, + L_AZT_029, + L_AZT_030, + L_AZT_031, + L_AZT_032, + L_AZT_033, + L_AZT_034, + L_AZT_035, + L_AZT_036, + L_AZT_037, + L_AZT_038, + L_AZT_039, + L_AZT_040, + L_AZT_041, + L_AZT_042, + L_AZT_043, + L_AZT_044, + L_AZT_045, + L_AZT_046, + L_AZT_047 +}; diff --git a/src/include/lang/cat.h b/src/include/lang/cat.h new file mode 100644 index 000000000..6bd976a30 --- /dev/null +++ b/src/include/lang/cat.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_cat { + L_CAT_000 = LANG_FIRST(LANGBANK_CAT) +}; diff --git a/src/include/lang/cave.h b/src/include/lang/cave.h new file mode 100644 index 000000000..5a280b636 --- /dev/null +++ b/src/include/lang/cave.h @@ -0,0 +1,72 @@ +#include "lang.h" + +enum l_cave { + L_CAVE_000 = LANG_FIRST(LANGBANK_CAVE), + L_CAVE_001, + L_CAVE_002, + L_CAVE_003, + L_CAVE_004, + L_CAVE_005, + L_CAVE_006, + L_CAVE_007, + L_CAVE_008, + L_CAVE_009, + L_CAVE_010, + L_CAVE_011, + L_CAVE_012, + L_CAVE_013, + L_CAVE_014, + L_CAVE_015, + L_CAVE_016, + L_CAVE_017, + L_CAVE_018, + L_CAVE_019, + L_CAVE_020, + L_CAVE_021, + L_CAVE_022, + L_CAVE_023, + L_CAVE_024, + L_CAVE_025, + L_CAVE_026, + L_CAVE_027, + L_CAVE_028, + L_CAVE_029, + L_CAVE_030, + L_CAVE_031, + L_CAVE_032, + L_CAVE_033, + L_CAVE_034, + L_CAVE_035, + L_CAVE_036, + L_CAVE_037, + L_CAVE_038, + L_CAVE_039, + L_CAVE_040, + L_CAVE_041, + L_CAVE_042, + L_CAVE_043, + L_CAVE_044, + L_CAVE_045, + L_CAVE_046, + L_CAVE_047, + L_CAVE_048, + L_CAVE_049, + L_CAVE_050, + L_CAVE_051, + L_CAVE_052, + L_CAVE_053, + L_CAVE_054, + L_CAVE_055, + L_CAVE_056, + L_CAVE_057, + L_CAVE_058, + L_CAVE_059, + L_CAVE_060, + L_CAVE_061, + L_CAVE_062, + L_CAVE_063, + L_CAVE_064, + L_CAVE_065, + L_CAVE_066, + L_CAVE_067 +}; diff --git a/src/include/lang/crad.h b/src/include/lang/crad.h new file mode 100644 index 000000000..c9e7c646f --- /dev/null +++ b/src/include/lang/crad.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_crad { + L_CRAD_000 = LANG_FIRST(LANGBANK_CRAD) +}; diff --git a/src/include/lang/cryp.h b/src/include/lang/cryp.h new file mode 100644 index 000000000..25ec68266 --- /dev/null +++ b/src/include/lang/cryp.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_cryp { + L_CRYP_000 = LANG_FIRST(LANGBANK_CRYP) +}; diff --git a/src/include/lang/dam.h b/src/include/lang/dam.h new file mode 100644 index 000000000..0f999a737 --- /dev/null +++ b/src/include/lang/dam.h @@ -0,0 +1,52 @@ +#include "lang.h" + +enum l_dam { + L_DAM_000 = LANG_FIRST(LANGBANK_DAM), + L_DAM_001, + L_DAM_002, + L_DAM_003, + L_DAM_004, + L_DAM_005, + L_DAM_006, + L_DAM_007, + L_DAM_008, + L_DAM_009, + L_DAM_010, + L_DAM_011, + L_DAM_012, + L_DAM_013, + L_DAM_014, + L_DAM_015, + L_DAM_016, + L_DAM_017, + L_DAM_018, + L_DAM_019, + L_DAM_020, + L_DAM_021, + L_DAM_022, + L_DAM_023, + L_DAM_024, + L_DAM_025, + L_DAM_026, + L_DAM_027, + L_DAM_028, + L_DAM_029, + L_DAM_030, + L_DAM_031, + L_DAM_032, + L_DAM_033, + L_DAM_034, + L_DAM_035, + L_DAM_036, + L_DAM_037, + L_DAM_038, + L_DAM_039, + L_DAM_040, + L_DAM_041, + L_DAM_042, + L_DAM_043, + L_DAM_044, + L_DAM_045, + L_DAM_046, + L_DAM_047 +}; diff --git a/src/include/lang/depo.h b/src/include/lang/depo.h new file mode 100644 index 000000000..eebe99708 --- /dev/null +++ b/src/include/lang/depo.h @@ -0,0 +1,88 @@ +#include "lang.h" + +enum l_depo { + L_DEPO_000 = LANG_FIRST(LANGBANK_DEPO), + L_DEPO_001, + L_DEPO_002, + L_DEPO_003, + L_DEPO_004, + L_DEPO_005, + L_DEPO_006, + L_DEPO_007, + L_DEPO_008, + L_DEPO_009, + L_DEPO_010, + L_DEPO_011, + L_DEPO_012, + L_DEPO_013, + L_DEPO_014, + L_DEPO_015, + L_DEPO_016, + L_DEPO_017, + L_DEPO_018, + L_DEPO_019, + L_DEPO_020, + L_DEPO_021, + L_DEPO_022, + L_DEPO_023, + L_DEPO_024, + L_DEPO_025, + L_DEPO_026, + L_DEPO_027, + L_DEPO_028, + L_DEPO_029, + L_DEPO_030, + L_DEPO_031, + L_DEPO_032, + L_DEPO_033, + L_DEPO_034, + L_DEPO_035, + L_DEPO_036, + L_DEPO_037, + L_DEPO_038, + L_DEPO_039, + L_DEPO_040, + L_DEPO_041, + L_DEPO_042, + L_DEPO_043, + L_DEPO_044, + L_DEPO_045, + L_DEPO_046, + L_DEPO_047, + L_DEPO_048, + L_DEPO_049, + L_DEPO_050, + L_DEPO_051, + L_DEPO_052, + L_DEPO_053, + L_DEPO_054, + L_DEPO_055, + L_DEPO_056, + L_DEPO_057, + L_DEPO_058, + L_DEPO_059, + L_DEPO_060, + L_DEPO_061, + L_DEPO_062, + L_DEPO_063, + L_DEPO_064, + L_DEPO_065, + L_DEPO_066, + L_DEPO_067, + L_DEPO_068, + L_DEPO_069, + L_DEPO_070, + L_DEPO_071, + L_DEPO_072, + L_DEPO_073, + L_DEPO_074, + L_DEPO_075, + L_DEPO_076, + L_DEPO_077, + L_DEPO_078, + L_DEPO_079, + L_DEPO_080, + L_DEPO_081, + L_DEPO_082, + L_DEPO_083 +}; diff --git a/src/include/lang/dest.h b/src/include/lang/dest.h new file mode 100644 index 000000000..5e7567227 --- /dev/null +++ b/src/include/lang/dest.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_dest { + L_DEST_000 = LANG_FIRST(LANGBANK_DEST) +}; diff --git a/src/include/lang/dish.h b/src/include/lang/dish.h new file mode 100644 index 000000000..d0c71558f --- /dev/null +++ b/src/include/lang/dish.h @@ -0,0 +1,132 @@ +#include "lang.h" + +enum l_dish { + L_DISH_000 = LANG_FIRST(LANGBANK_DISH), + L_DISH_001, + L_DISH_002, + L_DISH_003, + L_DISH_004, + L_DISH_005, + L_DISH_006, + L_DISH_007, + L_DISH_008, + L_DISH_009, + L_DISH_010, + L_DISH_011, + L_DISH_012, + L_DISH_013, + L_DISH_014, + L_DISH_015, + L_DISH_016, + L_DISH_017, + L_DISH_018, + L_DISH_019, + L_DISH_020, + L_DISH_021, + L_DISH_022, + L_DISH_023, + L_DISH_024, + L_DISH_025, + L_DISH_026, + L_DISH_027, + L_DISH_028, + L_DISH_029, + L_DISH_030, + L_DISH_031, + L_DISH_032, + L_DISH_033, + L_DISH_034, + L_DISH_035, + L_DISH_036, + L_DISH_037, + L_DISH_038, + L_DISH_039, + L_DISH_040, + L_DISH_041, + L_DISH_042, + L_DISH_043, + L_DISH_044, + L_DISH_045, + L_DISH_046, + L_DISH_047, + L_DISH_048, + L_DISH_049, + L_DISH_050, + L_DISH_051, + L_DISH_052, + L_DISH_053, + L_DISH_054, + L_DISH_055, + L_DISH_056, + L_DISH_057, + L_DISH_058, + L_DISH_059, + L_DISH_060, + L_DISH_061, + L_DISH_062, + L_DISH_063, + L_DISH_064, + L_DISH_065, + L_DISH_066, + L_DISH_067, + L_DISH_068, + L_DISH_069, + L_DISH_070, + L_DISH_071, + L_DISH_072, + L_DISH_073, + L_DISH_074, + L_DISH_075, + L_DISH_076, + L_DISH_077, + L_DISH_078, + L_DISH_079, + L_DISH_080, + L_DISH_081, + L_DISH_082, + L_DISH_083, + L_DISH_084, + L_DISH_085, + L_DISH_086, + L_DISH_087, + L_DISH_088, + L_DISH_089, + L_DISH_090, + L_DISH_091, + L_DISH_092, + L_DISH_093, + L_DISH_094, + L_DISH_095, + L_DISH_096, + L_DISH_097, + L_DISH_098, + L_DISH_099, + L_DISH_100, + L_DISH_101, + L_DISH_102, + L_DISH_103, + L_DISH_104, + L_DISH_105, + L_DISH_106, + L_DISH_107, + L_DISH_108, + L_DISH_109, + L_DISH_110, + L_DISH_111, + L_DISH_112, + L_DISH_113, + L_DISH_114, + L_DISH_115, + L_DISH_116, + L_DISH_117, + L_DISH_118, + L_DISH_119, + L_DISH_120, + L_DISH_121, + L_DISH_122, + L_DISH_123, + L_DISH_124, + L_DISH_125, + L_DISH_126, + L_DISH_127 +}; diff --git a/src/include/lang/ear.h b/src/include/lang/ear.h new file mode 100644 index 000000000..2e52222d7 --- /dev/null +++ b/src/include/lang/ear.h @@ -0,0 +1,112 @@ +#include "lang.h" + +enum l_ear { + L_EAR_000 = LANG_FIRST(LANGBANK_EAR), + L_EAR_001, + L_EAR_002, + L_EAR_003, + L_EAR_004, + L_EAR_005, + L_EAR_006, + L_EAR_007, + L_EAR_008, + L_EAR_009, + L_EAR_010, + L_EAR_011, + L_EAR_012, + L_EAR_013, + L_EAR_014, + L_EAR_015, + L_EAR_016, + L_EAR_017, + L_EAR_018, + L_EAR_019, + L_EAR_020, + L_EAR_021, + L_EAR_022, + L_EAR_023, + L_EAR_024, + L_EAR_025, + L_EAR_026, + L_EAR_027, + L_EAR_028, + L_EAR_029, + L_EAR_030, + L_EAR_031, + L_EAR_032, + L_EAR_033, + L_EAR_034, + L_EAR_035, + L_EAR_036, + L_EAR_037, + L_EAR_038, + L_EAR_039, + L_EAR_040, + L_EAR_041, + L_EAR_042, + L_EAR_043, + L_EAR_044, + L_EAR_045, + L_EAR_046, + L_EAR_047, + L_EAR_048, + L_EAR_049, + L_EAR_050, + L_EAR_051, + L_EAR_052, + L_EAR_053, + L_EAR_054, + L_EAR_055, + L_EAR_056, + L_EAR_057, + L_EAR_058, + L_EAR_059, + L_EAR_060, + L_EAR_061, + L_EAR_062, + L_EAR_063, + L_EAR_064, + L_EAR_065, + L_EAR_066, + L_EAR_067, + L_EAR_068, + L_EAR_069, + L_EAR_070, + L_EAR_071, + L_EAR_072, + L_EAR_073, + L_EAR_074, + L_EAR_075, + L_EAR_076, + L_EAR_077, + L_EAR_078, + L_EAR_079, + L_EAR_080, + L_EAR_081, + L_EAR_082, + L_EAR_083, + L_EAR_084, + L_EAR_085, + L_EAR_086, + L_EAR_087, + L_EAR_088, + L_EAR_089, + L_EAR_090, + L_EAR_091, + L_EAR_092, + L_EAR_093, + L_EAR_094, + L_EAR_095, + L_EAR_096, + L_EAR_097, + L_EAR_098, + L_EAR_099, + L_EAR_100, + L_EAR_101, + L_EAR_102, + L_EAR_103, + L_EAR_104, + L_EAR_105, + L_EAR_106, + L_EAR_107 +}; diff --git a/src/include/lang/eld.h b/src/include/lang/eld.h new file mode 100644 index 000000000..d8804d8b1 --- /dev/null +++ b/src/include/lang/eld.h @@ -0,0 +1,56 @@ +#include "lang.h" + +enum l_eld { + L_ELD_000 = LANG_FIRST(LANGBANK_ELD), + L_ELD_001, + L_ELD_002, + L_ELD_003, + L_ELD_004, + L_ELD_005, + L_ELD_006, + L_ELD_007, + L_ELD_008, + L_ELD_009, + L_ELD_010, + L_ELD_011, + L_ELD_012, + L_ELD_013, + L_ELD_014, + L_ELD_015, + L_ELD_016, + L_ELD_017, + L_ELD_018, + L_ELD_019, + L_ELD_020, + L_ELD_021, + L_ELD_022, + L_ELD_023, + L_ELD_024, + L_ELD_025, + L_ELD_026, + L_ELD_027, + L_ELD_028, + L_ELD_029, + L_ELD_030, + L_ELD_031, + L_ELD_032, + L_ELD_033, + L_ELD_034, + L_ELD_035, + L_ELD_036, + L_ELD_037, + L_ELD_038, + L_ELD_039, + L_ELD_040, + L_ELD_041, + L_ELD_042, + L_ELD_043, + L_ELD_044, + L_ELD_045, + L_ELD_046, + L_ELD_047, + L_ELD_048, + L_ELD_049, + L_ELD_050, + L_ELD_051 +}; diff --git a/src/include/lang/gun.h b/src/include/lang/gun.h new file mode 100644 index 000000000..fca45232a --- /dev/null +++ b/src/include/lang/gun.h @@ -0,0 +1,248 @@ +#include "lang.h" + +enum l_gun { + L_GUN_000 = LANG_FIRST(LANGBANK_GUN), + L_GUN_001, + L_GUN_002, + L_GUN_003, + L_GUN_004, + L_GUN_005, + L_GUN_006, + L_GUN_007, + L_GUN_008, + L_GUN_009, + L_GUN_010, + L_GUN_011, + L_GUN_012, + L_GUN_013, + L_GUN_014, + L_GUN_015, + L_GUN_016, + L_GUN_017, + L_GUN_018, + L_GUN_019, + L_GUN_020, + L_GUN_021, + L_GUN_022, + L_GUN_023, + L_GUN_024, + L_GUN_025, + L_GUN_026, + L_GUN_027, + L_GUN_028, + L_GUN_029, + L_GUN_030, + L_GUN_031, + L_GUN_032, + L_GUN_033, + L_GUN_034, + L_GUN_035, + L_GUN_036, + L_GUN_037, + L_GUN_038, + L_GUN_039, + L_GUN_040, + L_GUN_041, + L_GUN_042, + L_GUN_043, + L_GUN_044, + L_GUN_045, + L_GUN_046, + L_GUN_047, + L_GUN_048, + L_GUN_049, + L_GUN_050, + L_GUN_051, + L_GUN_052, + L_GUN_053, + L_GUN_054, + L_GUN_055, + L_GUN_056, + L_GUN_057, + L_GUN_058, + L_GUN_059, + L_GUN_060, + L_GUN_061, + L_GUN_062, + L_GUN_063, + L_GUN_064, + L_GUN_065, + L_GUN_066, + L_GUN_067, + L_GUN_068, + L_GUN_069, + L_GUN_070, + L_GUN_071, + L_GUN_072, + L_GUN_073, + L_GUN_074, + L_GUN_075, + L_GUN_076, + L_GUN_077, + L_GUN_078, + L_GUN_079, + L_GUN_080, + L_GUN_081, + L_GUN_082, + L_GUN_083, + L_GUN_084, + L_GUN_085, + L_GUN_086, + L_GUN_087, + L_GUN_088, + L_GUN_089, + L_GUN_090, + L_GUN_091, + L_GUN_092, + L_GUN_093, + L_GUN_094, + L_GUN_095, + L_GUN_096, + L_GUN_097, + L_GUN_098, + L_GUN_099, + L_GUN_100, + L_GUN_101, + L_GUN_102, + L_GUN_103, + L_GUN_104, + L_GUN_105, + L_GUN_106, + L_GUN_107, + L_GUN_108, + L_GUN_109, + L_GUN_110, + L_GUN_111, + L_GUN_112, + L_GUN_113, + L_GUN_114, + L_GUN_115, + L_GUN_116, + L_GUN_117, + L_GUN_118, + L_GUN_119, + L_GUN_120, + L_GUN_121, + L_GUN_122, + L_GUN_123, + L_GUN_124, + L_GUN_125, + L_GUN_126, + L_GUN_127, + L_GUN_128, + L_GUN_129, + L_GUN_130, + L_GUN_131, + L_GUN_132, + L_GUN_133, + L_GUN_134, + L_GUN_135, + L_GUN_136, + L_GUN_137, + L_GUN_138, + L_GUN_139, + L_GUN_140, + L_GUN_141, + L_GUN_142, + L_GUN_143, + L_GUN_144, + L_GUN_145, + L_GUN_146, + L_GUN_147, + L_GUN_148, + L_GUN_149, + L_GUN_150, + L_GUN_151, + L_GUN_152, + L_GUN_153, + L_GUN_154, + L_GUN_155, + L_GUN_156, + L_GUN_157, + L_GUN_158, + L_GUN_159, + L_GUN_160, + L_GUN_161, + L_GUN_162, + L_GUN_163, + L_GUN_164, + L_GUN_165, + L_GUN_166, + L_GUN_167, + L_GUN_168, + L_GUN_169, + L_GUN_170, + L_GUN_171, + L_GUN_172, + L_GUN_173, + L_GUN_174, + L_GUN_175, + L_GUN_176, + L_GUN_177, + L_GUN_178, + L_GUN_179, + L_GUN_180, + L_GUN_181, + L_GUN_182, + L_GUN_183, + L_GUN_184, + L_GUN_185, + L_GUN_186, + L_GUN_187, + L_GUN_188, + L_GUN_189, + L_GUN_190, + L_GUN_191, + L_GUN_192, + L_GUN_193, + L_GUN_194, + L_GUN_195, + L_GUN_196, + L_GUN_197, + L_GUN_198, + L_GUN_199, + L_GUN_200, + L_GUN_201, + L_GUN_202, + L_GUN_203, + L_GUN_204, + L_GUN_205, + L_GUN_206, + L_GUN_207, + L_GUN_208, + L_GUN_209, + L_GUN_210, + L_GUN_211, + L_GUN_212, + L_GUN_213, + L_GUN_214, + L_GUN_215, + L_GUN_216, + L_GUN_217, + L_GUN_218, + L_GUN_219, + L_GUN_220, + L_GUN_221, + L_GUN_222, + L_GUN_223, + L_GUN_224, + L_GUN_225, + L_GUN_226, + L_GUN_227, + L_GUN_228, + L_GUN_229, + L_GUN_230, + L_GUN_231, + L_GUN_232, + L_GUN_233, + L_GUN_234, + L_GUN_235, + L_GUN_236, + L_GUN_237, + L_GUN_238, + L_GUN_239, + L_GUN_240, + L_GUN_241, + L_GUN_242, + L_GUN_243 +}; diff --git a/src/include/lang/imp.h b/src/include/lang/imp.h new file mode 100644 index 000000000..7a3d1b92c --- /dev/null +++ b/src/include/lang/imp.h @@ -0,0 +1,68 @@ +#include "lang.h" + +enum l_imp { + L_IMP_000 = LANG_FIRST(LANGBANK_IMP), + L_IMP_001, + L_IMP_002, + L_IMP_003, + L_IMP_004, + L_IMP_005, + L_IMP_006, + L_IMP_007, + L_IMP_008, + L_IMP_009, + L_IMP_010, + L_IMP_011, + L_IMP_012, + L_IMP_013, + L_IMP_014, + L_IMP_015, + L_IMP_016, + L_IMP_017, + L_IMP_018, + L_IMP_019, + L_IMP_020, + L_IMP_021, + L_IMP_022, + L_IMP_023, + L_IMP_024, + L_IMP_025, + L_IMP_026, + L_IMP_027, + L_IMP_028, + L_IMP_029, + L_IMP_030, + L_IMP_031, + L_IMP_032, + L_IMP_033, + L_IMP_034, + L_IMP_035, + L_IMP_036, + L_IMP_037, + L_IMP_038, + L_IMP_039, + L_IMP_040, + L_IMP_041, + L_IMP_042, + L_IMP_043, + L_IMP_044, + L_IMP_045, + L_IMP_046, + L_IMP_047, + L_IMP_048, + L_IMP_049, + L_IMP_050, + L_IMP_051, + L_IMP_052, + L_IMP_053, + L_IMP_054, + L_IMP_055, + L_IMP_056, + L_IMP_057, + L_IMP_058, + L_IMP_059, + L_IMP_060, + L_IMP_061, + L_IMP_062, + L_IMP_063 +}; diff --git a/src/include/lang/jun.h b/src/include/lang/jun.h new file mode 100644 index 000000000..14b58ec5c --- /dev/null +++ b/src/include/lang/jun.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_jun { + L_JUN_000 = LANG_FIRST(LANGBANK_JUN) +}; diff --git a/src/include/lang/lam.h b/src/include/lang/lam.h new file mode 100644 index 000000000..7827ff478 --- /dev/null +++ b/src/include/lang/lam.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_lam { + L_LAM_000 = LANG_FIRST(LANGBANK_LAM) +}; diff --git a/src/include/lang/lee.h b/src/include/lang/lee.h new file mode 100644 index 000000000..51fbf5238 --- /dev/null +++ b/src/include/lang/lee.h @@ -0,0 +1,60 @@ +#include "lang.h" + +enum l_lee { + L_LEE_000 = LANG_FIRST(LANGBANK_LEE), + L_LEE_001, + L_LEE_002, + L_LEE_003, + L_LEE_004, + L_LEE_005, + L_LEE_006, + L_LEE_007, + L_LEE_008, + L_LEE_009, + L_LEE_010, + L_LEE_011, + L_LEE_012, + L_LEE_013, + L_LEE_014, + L_LEE_015, + L_LEE_016, + L_LEE_017, + L_LEE_018, + L_LEE_019, + L_LEE_020, + L_LEE_021, + L_LEE_022, + L_LEE_023, + L_LEE_024, + L_LEE_025, + L_LEE_026, + L_LEE_027, + L_LEE_028, + L_LEE_029, + L_LEE_030, + L_LEE_031, + L_LEE_032, + L_LEE_033, + L_LEE_034, + L_LEE_035, + L_LEE_036, + L_LEE_037, + L_LEE_038, + L_LEE_039, + L_LEE_040, + L_LEE_041, + L_LEE_042, + L_LEE_043, + L_LEE_044, + L_LEE_045, + L_LEE_046, + L_LEE_047, + L_LEE_048, + L_LEE_049, + L_LEE_050, + L_LEE_051, + L_LEE_052, + L_LEE_053, + L_LEE_054, + L_LEE_055 +}; diff --git a/src/include/lang/len.h b/src/include/lang/len.h new file mode 100644 index 000000000..807e0d420 --- /dev/null +++ b/src/include/lang/len.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_len { + L_LEN_000 = LANG_FIRST(LANGBANK_LEN) +}; diff --git a/src/include/lang/lip.h b/src/include/lang/lip.h new file mode 100644 index 000000000..60c3f9c60 --- /dev/null +++ b/src/include/lang/lip.h @@ -0,0 +1,112 @@ +#include "lang.h" + +enum l_lip { + L_LIP_000 = LANG_FIRST(LANGBANK_LIP), + L_LIP_001, + L_LIP_002, + L_LIP_003, + L_LIP_004, + L_LIP_005, + L_LIP_006, + L_LIP_007, + L_LIP_008, + L_LIP_009, + L_LIP_010, + L_LIP_011, + L_LIP_012, + L_LIP_013, + L_LIP_014, + L_LIP_015, + L_LIP_016, + L_LIP_017, + L_LIP_018, + L_LIP_019, + L_LIP_020, + L_LIP_021, + L_LIP_022, + L_LIP_023, + L_LIP_024, + L_LIP_025, + L_LIP_026, + L_LIP_027, + L_LIP_028, + L_LIP_029, + L_LIP_030, + L_LIP_031, + L_LIP_032, + L_LIP_033, + L_LIP_034, + L_LIP_035, + L_LIP_036, + L_LIP_037, + L_LIP_038, + L_LIP_039, + L_LIP_040, + L_LIP_041, + L_LIP_042, + L_LIP_043, + L_LIP_044, + L_LIP_045, + L_LIP_046, + L_LIP_047, + L_LIP_048, + L_LIP_049, + L_LIP_050, + L_LIP_051, + L_LIP_052, + L_LIP_053, + L_LIP_054, + L_LIP_055, + L_LIP_056, + L_LIP_057, + L_LIP_058, + L_LIP_059, + L_LIP_060, + L_LIP_061, + L_LIP_062, + L_LIP_063, + L_LIP_064, + L_LIP_065, + L_LIP_066, + L_LIP_067, + L_LIP_068, + L_LIP_069, + L_LIP_070, + L_LIP_071, + L_LIP_072, + L_LIP_073, + L_LIP_074, + L_LIP_075, + L_LIP_076, + L_LIP_077, + L_LIP_078, + L_LIP_079, + L_LIP_080, + L_LIP_081, + L_LIP_082, + L_LIP_083, + L_LIP_084, + L_LIP_085, + L_LIP_086, + L_LIP_087, + L_LIP_088, + L_LIP_089, + L_LIP_090, + L_LIP_091, + L_LIP_092, + L_LIP_093, + L_LIP_094, + L_LIP_095, + L_LIP_096, + L_LIP_097, + L_LIP_098, + L_LIP_099, + L_LIP_100, + L_LIP_101, + L_LIP_102, + L_LIP_103, + L_LIP_104, + L_LIP_105, + L_LIP_106, + L_LIP_107 +}; diff --git a/src/include/lang/lue.h b/src/include/lang/lue.h new file mode 100644 index 000000000..482e25a1a --- /dev/null +++ b/src/include/lang/lue.h @@ -0,0 +1,80 @@ +#include "lang.h" + +enum l_lue { + L_LUE_000 = LANG_FIRST(LANGBANK_LUE), + L_LUE_001, + L_LUE_002, + L_LUE_003, + L_LUE_004, + L_LUE_005, + L_LUE_006, + L_LUE_007, + L_LUE_008, + L_LUE_009, + L_LUE_010, + L_LUE_011, + L_LUE_012, + L_LUE_013, + L_LUE_014, + L_LUE_015, + L_LUE_016, + L_LUE_017, + L_LUE_018, + L_LUE_019, + L_LUE_020, + L_LUE_021, + L_LUE_022, + L_LUE_023, + L_LUE_024, + L_LUE_025, + L_LUE_026, + L_LUE_027, + L_LUE_028, + L_LUE_029, + L_LUE_030, + L_LUE_031, + L_LUE_032, + L_LUE_033, + L_LUE_034, + L_LUE_035, + L_LUE_036, + L_LUE_037, + L_LUE_038, + L_LUE_039, + L_LUE_040, + L_LUE_041, + L_LUE_042, + L_LUE_043, + L_LUE_044, + L_LUE_045, + L_LUE_046, + L_LUE_047, + L_LUE_048, + L_LUE_049, + L_LUE_050, + L_LUE_051, + L_LUE_052, + L_LUE_053, + L_LUE_054, + L_LUE_055, + L_LUE_056, + L_LUE_057, + L_LUE_058, + L_LUE_059, + L_LUE_060, + L_LUE_061, + L_LUE_062, + L_LUE_063, + L_LUE_064, + L_LUE_065, + L_LUE_066, + L_LUE_067, + L_LUE_068, + L_LUE_069, + L_LUE_070, + L_LUE_071, + L_LUE_072, + L_LUE_073, + L_LUE_074, + L_LUE_075 +}; diff --git a/src/include/lang/misc.h b/src/include/lang/misc.h new file mode 100644 index 000000000..789e1f826 --- /dev/null +++ b/src/include/lang/misc.h @@ -0,0 +1,480 @@ +#include "lang.h" + +enum l_misc { + L_MISC_000 = LANG_FIRST(LANGBANK_MISC), + L_MISC_001, + L_MISC_002, + L_MISC_003, + L_MISC_004, + L_MISC_005, + L_MISC_006, + L_MISC_007, + L_MISC_008, + L_MISC_009, + L_MISC_010, + L_MISC_011, + L_MISC_012, + L_MISC_013, + L_MISC_014, + L_MISC_015, + L_MISC_016, + L_MISC_017, + L_MISC_018, + L_MISC_019, + L_MISC_020, + L_MISC_021, + L_MISC_022, + L_MISC_023, + L_MISC_024, + L_MISC_025, + L_MISC_026, + L_MISC_027, + L_MISC_028, + L_MISC_029, + L_MISC_030, + L_MISC_031, + L_MISC_032, + L_MISC_033, + L_MISC_034, + L_MISC_035, + L_MISC_036, + L_MISC_037, + L_MISC_038, + L_MISC_039, + L_MISC_040, + L_MISC_041, + L_MISC_042, + L_MISC_043, + L_MISC_044, + L_MISC_045, + L_MISC_046, + L_MISC_047, + L_MISC_048, + L_MISC_049, + L_MISC_050, + L_MISC_051, + L_MISC_052, + L_MISC_053, + L_MISC_054, + L_MISC_055, + L_MISC_056, + L_MISC_057, + L_MISC_058, + L_MISC_059, + L_MISC_060, + L_MISC_061, + L_MISC_062, + L_MISC_063, + L_MISC_064, + L_MISC_065, + L_MISC_066, + L_MISC_067, + L_MISC_068, + L_MISC_069, + L_MISC_070, + L_MISC_071, + L_MISC_072, + L_MISC_073, + L_MISC_074, + L_MISC_075, + L_MISC_076, + L_MISC_077, + L_MISC_078, + L_MISC_079, + L_MISC_080, + L_MISC_081, + L_MISC_082, + L_MISC_083, + L_MISC_084, + L_MISC_085, + L_MISC_086, + L_MISC_087, + L_MISC_088, + L_MISC_089, + L_MISC_090, + L_MISC_091, + L_MISC_092, + L_MISC_093, + L_MISC_094, + L_MISC_095, + L_MISC_096, + L_MISC_097, + L_MISC_098, + L_MISC_099, + L_MISC_100, + L_MISC_101, + L_MISC_102, + L_MISC_103, + L_MISC_104, + L_MISC_105, + L_MISC_106, + L_MISC_107, + L_MISC_108, + L_MISC_109, + L_MISC_110, + L_MISC_111, + L_MISC_112, + L_MISC_113, + L_MISC_114, + L_MISC_115, + L_MISC_116, + L_MISC_117, + L_MISC_118, + L_MISC_119, + L_MISC_120, + L_MISC_121, + L_MISC_122, + L_MISC_123, + L_MISC_124, + L_MISC_125, + L_MISC_126, + L_MISC_127, + L_MISC_128, + L_MISC_129, + L_MISC_130, + L_MISC_131, + L_MISC_132, + L_MISC_133, + L_MISC_134, + L_MISC_135, + L_MISC_136, + L_MISC_137, + L_MISC_138, + L_MISC_139, + L_MISC_140, + L_MISC_141, + L_MISC_142, + L_MISC_143, + L_MISC_144, + L_MISC_145, + L_MISC_146, + L_MISC_147, + L_MISC_148, + L_MISC_149, + L_MISC_150, + L_MISC_151, + L_MISC_152, + L_MISC_153, + L_MISC_154, + L_MISC_155, + L_MISC_156, + L_MISC_157, + L_MISC_158, + L_MISC_159, + L_MISC_160, + L_MISC_161, + L_MISC_162, + L_MISC_163, + L_MISC_164, + L_MISC_165, + L_MISC_166, + L_MISC_167, + L_MISC_168, + L_MISC_169, + L_MISC_170, + L_MISC_171, + L_MISC_172, + L_MISC_173, + L_MISC_174, + L_MISC_175, + L_MISC_176, + L_MISC_177, + L_MISC_178, + L_MISC_179, + L_MISC_180, + L_MISC_181, + L_MISC_182, + L_MISC_183, + L_MISC_184, + L_MISC_185, + L_MISC_186, + L_MISC_187, + L_MISC_188, + L_MISC_189, + L_MISC_190, + L_MISC_191, + L_MISC_192, + L_MISC_193, + L_MISC_194, + L_MISC_195, + L_MISC_196, + L_MISC_197, + L_MISC_198, + L_MISC_199, + L_MISC_200, + L_MISC_201, + L_MISC_202, + L_MISC_203, + L_MISC_204, + L_MISC_205, + L_MISC_206, + L_MISC_207, + L_MISC_208, + L_MISC_209, + L_MISC_210, + L_MISC_211, + L_MISC_212, + L_MISC_213, + L_MISC_214, + L_MISC_215, + L_MISC_216, + L_MISC_217, + L_MISC_218, + L_MISC_219, + L_MISC_220, + L_MISC_221, + L_MISC_222, + L_MISC_223, + L_MISC_224, + L_MISC_225, + L_MISC_226, + L_MISC_227, + L_MISC_228, + L_MISC_229, + L_MISC_230, + L_MISC_231, + L_MISC_232, + L_MISC_233, + L_MISC_234, + L_MISC_235, + L_MISC_236, + L_MISC_237, + L_MISC_238, + L_MISC_239, + L_MISC_240, + L_MISC_241, + L_MISC_242, + L_MISC_243, + L_MISC_244, + L_MISC_245, + L_MISC_246, + L_MISC_247, + L_MISC_248, + L_MISC_249, + L_MISC_250, + L_MISC_251, + L_MISC_252, + L_MISC_253, + L_MISC_254, + L_MISC_255, + L_MISC_256, + L_MISC_257, + L_MISC_258, + L_MISC_259, + L_MISC_260, + L_MISC_261, + L_MISC_262, + L_MISC_263, + L_MISC_264, + L_MISC_265, + L_MISC_266, + L_MISC_267, + L_MISC_268, + L_MISC_269, + L_MISC_270, + L_MISC_271, + L_MISC_272, + L_MISC_273, + L_MISC_274, + L_MISC_275, + L_MISC_276, + L_MISC_277, + L_MISC_278, + L_MISC_279, + L_MISC_280, + L_MISC_281, + L_MISC_282, + L_MISC_283, + L_MISC_284, + L_MISC_285, + L_MISC_286, + L_MISC_287, + L_MISC_288, + L_MISC_289, + L_MISC_290, + L_MISC_291, + L_MISC_292, + L_MISC_293, + L_MISC_294, + L_MISC_295, + L_MISC_296, + L_MISC_297, + L_MISC_298, + L_MISC_299, + L_MISC_300, + L_MISC_301, + L_MISC_302, + L_MISC_303, + L_MISC_304, + L_MISC_305, + L_MISC_306, + L_MISC_307, + L_MISC_308, + L_MISC_309, + L_MISC_310, + L_MISC_311, + L_MISC_312, + L_MISC_313, + L_MISC_314, + L_MISC_315, + L_MISC_316, + L_MISC_317, + L_MISC_318, + L_MISC_319, + L_MISC_320, + L_MISC_321, + L_MISC_322, + L_MISC_323, + L_MISC_324, + L_MISC_325, + L_MISC_326, + L_MISC_327, + L_MISC_328, + L_MISC_329, + L_MISC_330, + L_MISC_331, + L_MISC_332, + L_MISC_333, + L_MISC_334, + L_MISC_335, + L_MISC_336, + L_MISC_337, + L_MISC_338, + L_MISC_339, + L_MISC_340, + L_MISC_341, + L_MISC_342, + L_MISC_343, + L_MISC_344, + L_MISC_345, + L_MISC_346, + L_MISC_347, + L_MISC_348, + L_MISC_349, + L_MISC_350, + L_MISC_351, + L_MISC_352, + L_MISC_353, + L_MISC_354, + L_MISC_355, + L_MISC_356, + L_MISC_357, + L_MISC_358, + L_MISC_359, + L_MISC_360, + L_MISC_361, + L_MISC_362, + L_MISC_363, + L_MISC_364, + L_MISC_365, + L_MISC_366, + L_MISC_367, + L_MISC_368, + L_MISC_369, + L_MISC_370, + L_MISC_371, + L_MISC_372, + L_MISC_373, + L_MISC_374, + L_MISC_375, + L_MISC_376, + L_MISC_377, + L_MISC_378, + L_MISC_379, + L_MISC_380, + L_MISC_381, + L_MISC_382, + L_MISC_383, + L_MISC_384, + L_MISC_385, + L_MISC_386, + L_MISC_387, + L_MISC_388, + L_MISC_389, + L_MISC_390, + L_MISC_391, + L_MISC_392, + L_MISC_393, + L_MISC_394, + L_MISC_395, + L_MISC_396, + L_MISC_397, + L_MISC_398, + L_MISC_399, + L_MISC_400, + L_MISC_401, + L_MISC_402, + L_MISC_403, + L_MISC_404, + L_MISC_405, + L_MISC_406, + L_MISC_407, + L_MISC_408, + L_MISC_409, + L_MISC_410, + L_MISC_411, + L_MISC_412, + L_MISC_413, + L_MISC_414, + L_MISC_415, + L_MISC_416, + L_MISC_417, + L_MISC_418, + L_MISC_419, + L_MISC_420, + L_MISC_421, + L_MISC_422, + L_MISC_423, + L_MISC_424, + L_MISC_425, + L_MISC_426, + L_MISC_427, + L_MISC_428, + L_MISC_429, + L_MISC_430, + L_MISC_431, + L_MISC_432, + L_MISC_433, + L_MISC_434, + L_MISC_435, + L_MISC_436, + L_MISC_437, + L_MISC_438, + L_MISC_439, + L_MISC_440, + L_MISC_441, + L_MISC_442, + L_MISC_443, + L_MISC_444, + L_MISC_445, + L_MISC_446, + L_MISC_447, + L_MISC_448, + L_MISC_449, + L_MISC_450, + L_MISC_451, + L_MISC_452, + L_MISC_453, + L_MISC_454, + L_MISC_455, + L_MISC_456, + L_MISC_457, + L_MISC_458, + L_MISC_459, + L_MISC_460, + L_MISC_461, + L_MISC_462, + L_MISC_463, + L_MISC_464, + L_MISC_465, + L_MISC_466, + L_MISC_467, + L_MISC_468, + L_MISC_469, + L_MISC_470, + L_MISC_471, + L_MISC_472, + L_MISC_473, + L_MISC_474, + L_MISC_475 +}; diff --git a/src/include/lang/mp1.h b/src/include/lang/mp1.h new file mode 100644 index 000000000..da4e5adcb --- /dev/null +++ b/src/include/lang/mp1.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp1 { + L_MP1_000 = LANG_FIRST(LANGBANK_MP1) +}; diff --git a/src/include/lang/mp10.h b/src/include/lang/mp10.h new file mode 100644 index 000000000..4f448333f --- /dev/null +++ b/src/include/lang/mp10.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp10 { + L_MP10_000 = LANG_FIRST(LANGBANK_MP10) +}; diff --git a/src/include/lang/mp11.h b/src/include/lang/mp11.h new file mode 100644 index 000000000..3a4b63e3f --- /dev/null +++ b/src/include/lang/mp11.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp11 { + L_MP11_000 = LANG_FIRST(LANGBANK_MP11) +}; diff --git a/src/include/lang/mp12.h b/src/include/lang/mp12.h new file mode 100644 index 000000000..7294b2cf0 --- /dev/null +++ b/src/include/lang/mp12.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp12 { + L_MP12_000 = LANG_FIRST(LANGBANK_MP12) +}; diff --git a/src/include/lang/mp13.h b/src/include/lang/mp13.h new file mode 100644 index 000000000..2f6bfa301 --- /dev/null +++ b/src/include/lang/mp13.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp13 { + L_MP13_000 = LANG_FIRST(LANGBANK_MP13) +}; diff --git a/src/include/lang/mp14.h b/src/include/lang/mp14.h new file mode 100644 index 000000000..720aa4e97 --- /dev/null +++ b/src/include/lang/mp14.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp14 { + L_MP14_000 = LANG_FIRST(LANGBANK_MP14) +}; diff --git a/src/include/lang/mp15.h b/src/include/lang/mp15.h new file mode 100644 index 000000000..8d107f21f --- /dev/null +++ b/src/include/lang/mp15.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp15 { + L_MP15_000 = LANG_FIRST(LANGBANK_MP15) +}; diff --git a/src/include/lang/mp16.h b/src/include/lang/mp16.h new file mode 100644 index 000000000..dc336a195 --- /dev/null +++ b/src/include/lang/mp16.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp16 { + L_MP16_000 = LANG_FIRST(LANGBANK_MP16) +}; diff --git a/src/include/lang/mp17.h b/src/include/lang/mp17.h new file mode 100644 index 000000000..00da3f00a --- /dev/null +++ b/src/include/lang/mp17.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp17 { + L_MP17_000 = LANG_FIRST(LANGBANK_MP17) +}; diff --git a/src/include/lang/mp18.h b/src/include/lang/mp18.h new file mode 100644 index 000000000..7dd9fca14 --- /dev/null +++ b/src/include/lang/mp18.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp18 { + L_MP18_000 = LANG_FIRST(LANGBANK_MP18) +}; diff --git a/src/include/lang/mp19.h b/src/include/lang/mp19.h new file mode 100644 index 000000000..4d645e2ba --- /dev/null +++ b/src/include/lang/mp19.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp19 { + L_MP19_000 = LANG_FIRST(LANGBANK_MP19) +}; diff --git a/src/include/lang/mp2.h b/src/include/lang/mp2.h new file mode 100644 index 000000000..b262444ef --- /dev/null +++ b/src/include/lang/mp2.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp2 { + L_MP2_000 = LANG_FIRST(LANGBANK_MP2) +}; diff --git a/src/include/lang/mp20.h b/src/include/lang/mp20.h new file mode 100644 index 000000000..fa1267159 --- /dev/null +++ b/src/include/lang/mp20.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp20 { + L_MP20_000 = LANG_FIRST(LANGBANK_MP20) +}; diff --git a/src/include/lang/mp3.h b/src/include/lang/mp3.h new file mode 100644 index 000000000..f96fa41a3 --- /dev/null +++ b/src/include/lang/mp3.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp3 { + L_MP3_000 = LANG_FIRST(LANGBANK_MP3) +}; diff --git a/src/include/lang/mp4.h b/src/include/lang/mp4.h new file mode 100644 index 000000000..08a713b5e --- /dev/null +++ b/src/include/lang/mp4.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp4 { + L_MP4_000 = LANG_FIRST(LANGBANK_MP4) +}; diff --git a/src/include/lang/mp5.h b/src/include/lang/mp5.h new file mode 100644 index 000000000..9277fc50a --- /dev/null +++ b/src/include/lang/mp5.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp5 { + L_MP5_000 = LANG_FIRST(LANGBANK_MP5) +}; diff --git a/src/include/lang/mp6.h b/src/include/lang/mp6.h new file mode 100644 index 000000000..e1aaefb81 --- /dev/null +++ b/src/include/lang/mp6.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp6 { + L_MP6_000 = LANG_FIRST(LANGBANK_MP6) +}; diff --git a/src/include/lang/mp7.h b/src/include/lang/mp7.h new file mode 100644 index 000000000..14db3a46d --- /dev/null +++ b/src/include/lang/mp7.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp7 { + L_MP7_000 = LANG_FIRST(LANGBANK_MP7) +}; diff --git a/src/include/lang/mp8.h b/src/include/lang/mp8.h new file mode 100644 index 000000000..fb9cdf7db --- /dev/null +++ b/src/include/lang/mp8.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp8 { + L_MP8_000 = LANG_FIRST(LANGBANK_MP8) +}; diff --git a/src/include/lang/mp9.h b/src/include/lang/mp9.h new file mode 100644 index 000000000..01ffb62f0 --- /dev/null +++ b/src/include/lang/mp9.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_mp9 { + L_MP9_000 = LANG_FIRST(LANGBANK_MP9) +}; diff --git a/src/include/lang/mpmenu.h b/src/include/lang/mpmenu.h new file mode 100644 index 000000000..b967167e9 --- /dev/null +++ b/src/include/lang/mpmenu.h @@ -0,0 +1,500 @@ +#include "lang.h" + +enum l_mpmenu { + L_MPMENU_000 = LANG_FIRST(LANGBANK_MPMENU), + L_MPMENU_001, + L_MPMENU_002, + L_MPMENU_003, + L_MPMENU_004, + L_MPMENU_005, + L_MPMENU_006, + L_MPMENU_007, + L_MPMENU_008, + L_MPMENU_009, + L_MPMENU_010, + L_MPMENU_011, + L_MPMENU_012, + L_MPMENU_013, + L_MPMENU_014, + L_MPMENU_015, + L_MPMENU_016, + L_MPMENU_017, + L_MPMENU_018, + L_MPMENU_019, + L_MPMENU_020, + L_MPMENU_021, + L_MPMENU_022, + L_MPMENU_023, + L_MPMENU_024, + L_MPMENU_025, + L_MPMENU_026, + L_MPMENU_027, + L_MPMENU_028, + L_MPMENU_029, + L_MPMENU_030, + L_MPMENU_031, + L_MPMENU_032, + L_MPMENU_033, + L_MPMENU_034, + L_MPMENU_035, + L_MPMENU_036, + L_MPMENU_037, + L_MPMENU_038, + L_MPMENU_039, + L_MPMENU_040, + L_MPMENU_041, + L_MPMENU_042, + L_MPMENU_043, + L_MPMENU_044, + L_MPMENU_045, + L_MPMENU_046, + L_MPMENU_047, + L_MPMENU_048, + L_MPMENU_049, + L_MPMENU_050, + L_MPMENU_051, + L_MPMENU_052, + L_MPMENU_053, + L_MPMENU_054, + L_MPMENU_055, + L_MPMENU_056, + L_MPMENU_057, + L_MPMENU_058, + L_MPMENU_059, + L_MPMENU_060, + L_MPMENU_061, + L_MPMENU_062, + L_MPMENU_063, + L_MPMENU_064, + L_MPMENU_065, + L_MPMENU_066, + L_MPMENU_067, + L_MPMENU_068, + L_MPMENU_069, + L_MPMENU_070, + L_MPMENU_071, + L_MPMENU_072, + L_MPMENU_073, + L_MPMENU_074, + L_MPMENU_075, + L_MPMENU_076, + L_MPMENU_077, + L_MPMENU_078, + L_MPMENU_079, + L_MPMENU_080, + L_MPMENU_081, + L_MPMENU_082, + L_MPMENU_083, + L_MPMENU_084, + L_MPMENU_085, + L_MPMENU_086, + L_MPMENU_087, + L_MPMENU_088, + L_MPMENU_089, + L_MPMENU_090, + L_MPMENU_091, + L_MPMENU_092, + L_MPMENU_093, + L_MPMENU_094, + L_MPMENU_095, + L_MPMENU_096, + L_MPMENU_097, + L_MPMENU_098, + L_MPMENU_099, + L_MPMENU_100, + L_MPMENU_101, + L_MPMENU_102, + L_MPMENU_103, + L_MPMENU_104, + L_MPMENU_105, + L_MPMENU_106, + L_MPMENU_107, + L_MPMENU_108, + L_MPMENU_109, + L_MPMENU_110, + L_MPMENU_111, + L_MPMENU_112, + L_MPMENU_113, + L_MPMENU_114, + L_MPMENU_115, + L_MPMENU_116, + L_MPMENU_117, + L_MPMENU_118, + L_MPMENU_119, + L_MPMENU_120, + L_MPMENU_121, + L_MPMENU_122, + L_MPMENU_123, + L_MPMENU_124, + L_MPMENU_125, + L_MPMENU_126, + L_MPMENU_127, + L_MPMENU_128, + L_MPMENU_129, + L_MPMENU_130, + L_MPMENU_131, + L_MPMENU_132, + L_MPMENU_133, + L_MPMENU_134, + L_MPMENU_135, + L_MPMENU_136, + L_MPMENU_137, + L_MPMENU_138, + L_MPMENU_139, + L_MPMENU_140, + L_MPMENU_141, + L_MPMENU_142, + L_MPMENU_143, + L_MPMENU_144, + L_MPMENU_145, + L_MPMENU_146, + L_MPMENU_147, + L_MPMENU_148, + L_MPMENU_149, + L_MPMENU_150, + L_MPMENU_151, + L_MPMENU_152, + L_MPMENU_153, + L_MPMENU_154, + L_MPMENU_155, + L_MPMENU_156, + L_MPMENU_157, + L_MPMENU_158, + L_MPMENU_159, + L_MPMENU_160, + L_MPMENU_161, + L_MPMENU_162, + L_MPMENU_163, + L_MPMENU_164, + L_MPMENU_165, + L_MPMENU_166, + L_MPMENU_167, + L_MPMENU_168, + L_MPMENU_169, + L_MPMENU_170, + L_MPMENU_171, + L_MPMENU_172, + L_MPMENU_173, + L_MPMENU_174, + L_MPMENU_175, + L_MPMENU_176, + L_MPMENU_177, + L_MPMENU_178, + L_MPMENU_179, + L_MPMENU_180, + L_MPMENU_181, + L_MPMENU_182, + L_MPMENU_183, + L_MPMENU_184, + L_MPMENU_185, + L_MPMENU_186, + L_MPMENU_187, + L_MPMENU_188, + L_MPMENU_189, + L_MPMENU_190, + L_MPMENU_191, + L_MPMENU_192, + L_MPMENU_193, + L_MPMENU_194, + L_MPMENU_195, + L_MPMENU_196, + L_MPMENU_197, + L_MPMENU_198, + L_MPMENU_199, + L_MPMENU_200, + L_MPMENU_201, + L_MPMENU_202, + L_MPMENU_203, + L_MPMENU_204, + L_MPMENU_205, + L_MPMENU_206, + L_MPMENU_207, + L_MPMENU_208, + L_MPMENU_209, + L_MPMENU_210, + L_MPMENU_211, + L_MPMENU_212, + L_MPMENU_213, + L_MPMENU_214, + L_MPMENU_215, + L_MPMENU_216, + L_MPMENU_217, + L_MPMENU_218, + L_MPMENU_219, + L_MPMENU_220, + L_MPMENU_221, + L_MPMENU_222, + L_MPMENU_223, + L_MPMENU_224, + L_MPMENU_225, + L_MPMENU_226, + L_MPMENU_227, + L_MPMENU_228, + L_MPMENU_229, + L_MPMENU_230, + L_MPMENU_231, + L_MPMENU_232, + L_MPMENU_233, + L_MPMENU_234, + L_MPMENU_235, + L_MPMENU_236, + L_MPMENU_237, + L_MPMENU_238, + L_MPMENU_239, + L_MPMENU_240, + L_MPMENU_241, + L_MPMENU_242, + L_MPMENU_243, + L_MPMENU_244, + L_MPMENU_245, + L_MPMENU_246, + L_MPMENU_247, + L_MPMENU_248, + L_MPMENU_249, + L_MPMENU_250, + L_MPMENU_251, + L_MPMENU_252, + L_MPMENU_253, + L_MPMENU_254, + L_MPMENU_255, + L_MPMENU_256, + L_MPMENU_257, + L_MPMENU_258, + L_MPMENU_259, + L_MPMENU_260, + L_MPMENU_261, + L_MPMENU_262, + L_MPMENU_263, + L_MPMENU_264, + L_MPMENU_265, + L_MPMENU_266, + L_MPMENU_267, + L_MPMENU_268, + L_MPMENU_269, + L_MPMENU_270, + L_MPMENU_271, + L_MPMENU_272, + L_MPMENU_273, + L_MPMENU_274, + L_MPMENU_275, + L_MPMENU_276, + L_MPMENU_277, + L_MPMENU_278, + L_MPMENU_279, + L_MPMENU_280, + L_MPMENU_281, + L_MPMENU_282, + L_MPMENU_283, + L_MPMENU_284, + L_MPMENU_285, + L_MPMENU_286, + L_MPMENU_287, + L_MPMENU_288, + L_MPMENU_289, + L_MPMENU_290, + L_MPMENU_291, + L_MPMENU_292, + L_MPMENU_293, + L_MPMENU_294, + L_MPMENU_295, + L_MPMENU_296, + L_MPMENU_297, + L_MPMENU_298, + L_MPMENU_299, + L_MPMENU_300, + L_MPMENU_301, + L_MPMENU_302, + L_MPMENU_303, + L_MPMENU_304, + L_MPMENU_305, + L_MPMENU_306, + L_MPMENU_307, + L_MPMENU_308, + L_MPMENU_309, + L_MPMENU_310, + L_MPMENU_311, + L_MPMENU_312, + L_MPMENU_313, + L_MPMENU_314, + L_MPMENU_315, + L_MPMENU_316, + L_MPMENU_317, + L_MPMENU_318, + L_MPMENU_319, + L_MPMENU_320, + L_MPMENU_321, + L_MPMENU_322, + L_MPMENU_323, + L_MPMENU_324, + L_MPMENU_325, + L_MPMENU_326, + L_MPMENU_327, + L_MPMENU_328, + L_MPMENU_329, + L_MPMENU_330, + L_MPMENU_331, + L_MPMENU_332, + L_MPMENU_333, + L_MPMENU_334, + L_MPMENU_335, + L_MPMENU_336, + L_MPMENU_337, + L_MPMENU_338, + L_MPMENU_339, + L_MPMENU_340, + L_MPMENU_341, + L_MPMENU_342, + L_MPMENU_343, + L_MPMENU_344, + L_MPMENU_345, + L_MPMENU_346, + L_MPMENU_347, + L_MPMENU_348, + L_MPMENU_349, + L_MPMENU_350, + L_MPMENU_351, + L_MPMENU_352, + L_MPMENU_353, + L_MPMENU_354, + L_MPMENU_355, + L_MPMENU_356, + L_MPMENU_357, + L_MPMENU_358, + L_MPMENU_359, + L_MPMENU_360, + L_MPMENU_361, + L_MPMENU_362, + L_MPMENU_363, + L_MPMENU_364, + L_MPMENU_365, + L_MPMENU_366, + L_MPMENU_367, + L_MPMENU_368, + L_MPMENU_369, + L_MPMENU_370, + L_MPMENU_371, + L_MPMENU_372, + L_MPMENU_373, + L_MPMENU_374, + L_MPMENU_375, + L_MPMENU_376, + L_MPMENU_377, + L_MPMENU_378, + L_MPMENU_379, + L_MPMENU_380, + L_MPMENU_381, + L_MPMENU_382, + L_MPMENU_383, + L_MPMENU_384, + L_MPMENU_385, + L_MPMENU_386, + L_MPMENU_387, + L_MPMENU_388, + L_MPMENU_389, + L_MPMENU_390, + L_MPMENU_391, + L_MPMENU_392, + L_MPMENU_393, + L_MPMENU_394, + L_MPMENU_395, + L_MPMENU_396, + L_MPMENU_397, + L_MPMENU_398, + L_MPMENU_399, + L_MPMENU_400, + L_MPMENU_401, + L_MPMENU_402, + L_MPMENU_403, + L_MPMENU_404, + L_MPMENU_405, + L_MPMENU_406, + L_MPMENU_407, + L_MPMENU_408, + L_MPMENU_409, + L_MPMENU_410, + L_MPMENU_411, + L_MPMENU_412, + L_MPMENU_413, + L_MPMENU_414, + L_MPMENU_415, + L_MPMENU_416, + L_MPMENU_417, + L_MPMENU_418, + L_MPMENU_419, + L_MPMENU_420, + L_MPMENU_421, + L_MPMENU_422, + L_MPMENU_423, + L_MPMENU_424, + L_MPMENU_425, + L_MPMENU_426, + L_MPMENU_427, + L_MPMENU_428, + L_MPMENU_429, + L_MPMENU_430, + L_MPMENU_431, + L_MPMENU_432, + L_MPMENU_433, + L_MPMENU_434, + L_MPMENU_435, + L_MPMENU_436, + L_MPMENU_437, + L_MPMENU_438, + L_MPMENU_439, + L_MPMENU_440, + L_MPMENU_441, + L_MPMENU_442, + L_MPMENU_443, + L_MPMENU_444, + L_MPMENU_445, + L_MPMENU_446, + L_MPMENU_447, + L_MPMENU_448, + L_MPMENU_449, + L_MPMENU_450, + L_MPMENU_451, + L_MPMENU_452, + L_MPMENU_453, + L_MPMENU_454, + L_MPMENU_455, + L_MPMENU_456, + L_MPMENU_457, + L_MPMENU_458, + L_MPMENU_459, + L_MPMENU_460, + L_MPMENU_461, + L_MPMENU_462, + L_MPMENU_463, + L_MPMENU_464, + L_MPMENU_465, + L_MPMENU_466, + L_MPMENU_467, + L_MPMENU_468, + L_MPMENU_469, + L_MPMENU_470, + L_MPMENU_471, + L_MPMENU_472, + L_MPMENU_473, + L_MPMENU_474, + L_MPMENU_475, + L_MPMENU_476, + L_MPMENU_477, + L_MPMENU_478, + L_MPMENU_479, + L_MPMENU_480, + L_MPMENU_481, + L_MPMENU_482, + L_MPMENU_483, + L_MPMENU_484, + L_MPMENU_485, + L_MPMENU_486, + L_MPMENU_487, + L_MPMENU_488, + L_MPMENU_489, + L_MPMENU_490, + L_MPMENU_491, + L_MPMENU_492, + L_MPMENU_493, + L_MPMENU_494, + L_MPMENU_495 +}; diff --git a/src/include/lang/mpweapons.h b/src/include/lang/mpweapons.h new file mode 100644 index 000000000..5c3e09f98 --- /dev/null +++ b/src/include/lang/mpweapons.h @@ -0,0 +1,268 @@ +#include "lang.h" + +enum l_mpweapons { + L_MPWEAPONS_000 = LANG_FIRST(LANGBANK_MPWEAPONS), + L_MPWEAPONS_001, + L_MPWEAPONS_002, + L_MPWEAPONS_003, + L_MPWEAPONS_004, + L_MPWEAPONS_005, + L_MPWEAPONS_006, + L_MPWEAPONS_007, + L_MPWEAPONS_008, + L_MPWEAPONS_009, + L_MPWEAPONS_010, + L_MPWEAPONS_011, + L_MPWEAPONS_012, + L_MPWEAPONS_013, + L_MPWEAPONS_014, + L_MPWEAPONS_015, + L_MPWEAPONS_016, + L_MPWEAPONS_017, + L_MPWEAPONS_018, + L_MPWEAPONS_019, + L_MPWEAPONS_020, + L_MPWEAPONS_021, + L_MPWEAPONS_022, + L_MPWEAPONS_023, + L_MPWEAPONS_024, + L_MPWEAPONS_025, + L_MPWEAPONS_026, + L_MPWEAPONS_027, + L_MPWEAPONS_028, + L_MPWEAPONS_029, + L_MPWEAPONS_030, + L_MPWEAPONS_031, + L_MPWEAPONS_032, + L_MPWEAPONS_033, + L_MPWEAPONS_034, + L_MPWEAPONS_035, + L_MPWEAPONS_036, + L_MPWEAPONS_037, + L_MPWEAPONS_038, + L_MPWEAPONS_039, + L_MPWEAPONS_040, + L_MPWEAPONS_041, + L_MPWEAPONS_042, + L_MPWEAPONS_043, + L_MPWEAPONS_044, + L_MPWEAPONS_045, + L_MPWEAPONS_046, + L_MPWEAPONS_047, + L_MPWEAPONS_048, + L_MPWEAPONS_049, + L_MPWEAPONS_050, + L_MPWEAPONS_051, + L_MPWEAPONS_052, + L_MPWEAPONS_053, + L_MPWEAPONS_054, + L_MPWEAPONS_055, + L_MPWEAPONS_056, + L_MPWEAPONS_057, + L_MPWEAPONS_058, + L_MPWEAPONS_059, + L_MPWEAPONS_060, + L_MPWEAPONS_061, + L_MPWEAPONS_062, + L_MPWEAPONS_063, + L_MPWEAPONS_064, + L_MPWEAPONS_065, + L_MPWEAPONS_066, + L_MPWEAPONS_067, + L_MPWEAPONS_068, + L_MPWEAPONS_069, + L_MPWEAPONS_070, + L_MPWEAPONS_071, + L_MPWEAPONS_072, + L_MPWEAPONS_073, + L_MPWEAPONS_074, + L_MPWEAPONS_075, + L_MPWEAPONS_076, + L_MPWEAPONS_077, + L_MPWEAPONS_078, + L_MPWEAPONS_079, + L_MPWEAPONS_080, + L_MPWEAPONS_081, + L_MPWEAPONS_082, + L_MPWEAPONS_083, + L_MPWEAPONS_084, + L_MPWEAPONS_085, + L_MPWEAPONS_086, + L_MPWEAPONS_087, + L_MPWEAPONS_088, + L_MPWEAPONS_089, + L_MPWEAPONS_090, + L_MPWEAPONS_091, + L_MPWEAPONS_092, + L_MPWEAPONS_093, + L_MPWEAPONS_094, + L_MPWEAPONS_095, + L_MPWEAPONS_096, + L_MPWEAPONS_097, + L_MPWEAPONS_098, + L_MPWEAPONS_099, + L_MPWEAPONS_100, + L_MPWEAPONS_101, + L_MPWEAPONS_102, + L_MPWEAPONS_103, + L_MPWEAPONS_104, + L_MPWEAPONS_105, + L_MPWEAPONS_106, + L_MPWEAPONS_107, + L_MPWEAPONS_108, + L_MPWEAPONS_109, + L_MPWEAPONS_110, + L_MPWEAPONS_111, + L_MPWEAPONS_112, + L_MPWEAPONS_113, + L_MPWEAPONS_114, + L_MPWEAPONS_115, + L_MPWEAPONS_116, + L_MPWEAPONS_117, + L_MPWEAPONS_118, + L_MPWEAPONS_119, + L_MPWEAPONS_120, + L_MPWEAPONS_121, + L_MPWEAPONS_122, + L_MPWEAPONS_123, + L_MPWEAPONS_124, + L_MPWEAPONS_125, + L_MPWEAPONS_126, + L_MPWEAPONS_127, + L_MPWEAPONS_128, + L_MPWEAPONS_129, + L_MPWEAPONS_130, + L_MPWEAPONS_131, + L_MPWEAPONS_132, + L_MPWEAPONS_133, + L_MPWEAPONS_134, + L_MPWEAPONS_135, + L_MPWEAPONS_136, + L_MPWEAPONS_137, + L_MPWEAPONS_138, + L_MPWEAPONS_139, + L_MPWEAPONS_140, + L_MPWEAPONS_141, + L_MPWEAPONS_142, + L_MPWEAPONS_143, + L_MPWEAPONS_144, + L_MPWEAPONS_145, + L_MPWEAPONS_146, + L_MPWEAPONS_147, + L_MPWEAPONS_148, + L_MPWEAPONS_149, + L_MPWEAPONS_150, + L_MPWEAPONS_151, + L_MPWEAPONS_152, + L_MPWEAPONS_153, + L_MPWEAPONS_154, + L_MPWEAPONS_155, + L_MPWEAPONS_156, + L_MPWEAPONS_157, + L_MPWEAPONS_158, + L_MPWEAPONS_159, + L_MPWEAPONS_160, + L_MPWEAPONS_161, + L_MPWEAPONS_162, + L_MPWEAPONS_163, + L_MPWEAPONS_164, + L_MPWEAPONS_165, + L_MPWEAPONS_166, + L_MPWEAPONS_167, + L_MPWEAPONS_168, + L_MPWEAPONS_169, + L_MPWEAPONS_170, + L_MPWEAPONS_171, + L_MPWEAPONS_172, + L_MPWEAPONS_173, + L_MPWEAPONS_174, + L_MPWEAPONS_175, + L_MPWEAPONS_176, + L_MPWEAPONS_177, + L_MPWEAPONS_178, + L_MPWEAPONS_179, + L_MPWEAPONS_180, + L_MPWEAPONS_181, + L_MPWEAPONS_182, + L_MPWEAPONS_183, + L_MPWEAPONS_184, + L_MPWEAPONS_185, + L_MPWEAPONS_186, + L_MPWEAPONS_187, + L_MPWEAPONS_188, + L_MPWEAPONS_189, + L_MPWEAPONS_190, + L_MPWEAPONS_191, + L_MPWEAPONS_192, + L_MPWEAPONS_193, + L_MPWEAPONS_194, + L_MPWEAPONS_195, + L_MPWEAPONS_196, + L_MPWEAPONS_197, + L_MPWEAPONS_198, + L_MPWEAPONS_199, + L_MPWEAPONS_200, + L_MPWEAPONS_201, + L_MPWEAPONS_202, + L_MPWEAPONS_203, + L_MPWEAPONS_204, + L_MPWEAPONS_205, + L_MPWEAPONS_206, + L_MPWEAPONS_207, + L_MPWEAPONS_208, + L_MPWEAPONS_209, + L_MPWEAPONS_210, + L_MPWEAPONS_211, + L_MPWEAPONS_212, + L_MPWEAPONS_213, + L_MPWEAPONS_214, + L_MPWEAPONS_215, + L_MPWEAPONS_216, + L_MPWEAPONS_217, + L_MPWEAPONS_218, + L_MPWEAPONS_219, + L_MPWEAPONS_220, + L_MPWEAPONS_221, + L_MPWEAPONS_222, + L_MPWEAPONS_223, + L_MPWEAPONS_224, + L_MPWEAPONS_225, + L_MPWEAPONS_226, + L_MPWEAPONS_227, + L_MPWEAPONS_228, + L_MPWEAPONS_229, + L_MPWEAPONS_230, + L_MPWEAPONS_231, + L_MPWEAPONS_232, + L_MPWEAPONS_233, + L_MPWEAPONS_234, + L_MPWEAPONS_235, + L_MPWEAPONS_236, + L_MPWEAPONS_237, + L_MPWEAPONS_238, + L_MPWEAPONS_239, + L_MPWEAPONS_240, + L_MPWEAPONS_241, + L_MPWEAPONS_242, + L_MPWEAPONS_243, + L_MPWEAPONS_244, + L_MPWEAPONS_245, + L_MPWEAPONS_246, + L_MPWEAPONS_247, + L_MPWEAPONS_248, + L_MPWEAPONS_249, + L_MPWEAPONS_250, + L_MPWEAPONS_251, + L_MPWEAPONS_252, + L_MPWEAPONS_253, + L_MPWEAPONS_254, + L_MPWEAPONS_255, + L_MPWEAPONS_256, + L_MPWEAPONS_257, + L_MPWEAPONS_258, + L_MPWEAPONS_259, + L_MPWEAPONS_260, + L_MPWEAPONS_261, + L_MPWEAPONS_262, + L_MPWEAPONS_263 +}; diff --git a/src/include/lang/oat.h b/src/include/lang/oat.h new file mode 100644 index 000000000..4947c1f93 --- /dev/null +++ b/src/include/lang/oat.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_oat { + L_OAT_000 = LANG_FIRST(LANGBANK_OAT) +}; diff --git a/src/include/lang/old.h b/src/include/lang/old.h new file mode 100644 index 000000000..4fe6d3d82 --- /dev/null +++ b/src/include/lang/old.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_old { + L_OLD_000 = LANG_FIRST(LANGBANK_OLD) +}; diff --git a/src/include/lang/options.h b/src/include/lang/options.h new file mode 100644 index 000000000..7693b3187 --- /dev/null +++ b/src/include/lang/options.h @@ -0,0 +1,500 @@ +#include "lang.h" + +enum l_options { + L_OPTIONS_000 = LANG_FIRST(LANGBANK_OPTIONS), + L_OPTIONS_001, + L_OPTIONS_002, + L_OPTIONS_003, + L_OPTIONS_004, + L_OPTIONS_005, + L_OPTIONS_006, + L_OPTIONS_007, + L_OPTIONS_008, + L_OPTIONS_009, + L_OPTIONS_010, + L_OPTIONS_011, + L_OPTIONS_012, + L_OPTIONS_013, + L_OPTIONS_014, + L_OPTIONS_015, + L_OPTIONS_016, + L_OPTIONS_017, + L_OPTIONS_018, + L_OPTIONS_019, + L_OPTIONS_020, + L_OPTIONS_021, + L_OPTIONS_022, + L_OPTIONS_023, + L_OPTIONS_024, + L_OPTIONS_025, + L_OPTIONS_026, + L_OPTIONS_027, + L_OPTIONS_028, + L_OPTIONS_029, + L_OPTIONS_030, + L_OPTIONS_031, + L_OPTIONS_032, + L_OPTIONS_033, + L_OPTIONS_034, + L_OPTIONS_035, + L_OPTIONS_036, + L_OPTIONS_037, + L_OPTIONS_038, + L_OPTIONS_039, + L_OPTIONS_040, + L_OPTIONS_041, + L_OPTIONS_042, + L_OPTIONS_043, + L_OPTIONS_044, + L_OPTIONS_045, + L_OPTIONS_046, + L_OPTIONS_047, + L_OPTIONS_048, + L_OPTIONS_049, + L_OPTIONS_050, + L_OPTIONS_051, + L_OPTIONS_052, + L_OPTIONS_053, + L_OPTIONS_054, + L_OPTIONS_055, + L_OPTIONS_056, + L_OPTIONS_057, + L_OPTIONS_058, + L_OPTIONS_059, + L_OPTIONS_060, + L_OPTIONS_061, + L_OPTIONS_062, + L_OPTIONS_063, + L_OPTIONS_064, + L_OPTIONS_065, + L_OPTIONS_066, + L_OPTIONS_067, + L_OPTIONS_068, + L_OPTIONS_069, + L_OPTIONS_070, + L_OPTIONS_071, + L_OPTIONS_072, + L_OPTIONS_073, + L_OPTIONS_074, + L_OPTIONS_075, + L_OPTIONS_076, + L_OPTIONS_077, + L_OPTIONS_078, + L_OPTIONS_079, + L_OPTIONS_080, + L_OPTIONS_081, + L_OPTIONS_082, + L_OPTIONS_083, + L_OPTIONS_084, + L_OPTIONS_085, + L_OPTIONS_086, + L_OPTIONS_087, + L_OPTIONS_088, + L_OPTIONS_089, + L_OPTIONS_090, + L_OPTIONS_091, + L_OPTIONS_092, + L_OPTIONS_093, + L_OPTIONS_094, + L_OPTIONS_095, + L_OPTIONS_096, + L_OPTIONS_097, + L_OPTIONS_098, + L_OPTIONS_099, + L_OPTIONS_100, + L_OPTIONS_101, + L_OPTIONS_102, + L_OPTIONS_103, + L_OPTIONS_104, + L_OPTIONS_105, + L_OPTIONS_106, + L_OPTIONS_107, + L_OPTIONS_108, + L_OPTIONS_109, + L_OPTIONS_110, + L_OPTIONS_111, + L_OPTIONS_112, + L_OPTIONS_113, + L_OPTIONS_114, + L_OPTIONS_115, + L_OPTIONS_116, + L_OPTIONS_117, + L_OPTIONS_118, + L_OPTIONS_119, + L_OPTIONS_120, + L_OPTIONS_121, + L_OPTIONS_122, + L_OPTIONS_123, + L_OPTIONS_124, + L_OPTIONS_125, + L_OPTIONS_126, + L_OPTIONS_127, + L_OPTIONS_128, + L_OPTIONS_129, + L_OPTIONS_130, + L_OPTIONS_131, + L_OPTIONS_132, + L_OPTIONS_133, + L_OPTIONS_134, + L_OPTIONS_135, + L_OPTIONS_136, + L_OPTIONS_137, + L_OPTIONS_138, + L_OPTIONS_139, + L_OPTIONS_140, + L_OPTIONS_141, + L_OPTIONS_142, + L_OPTIONS_143, + L_OPTIONS_144, + L_OPTIONS_145, + L_OPTIONS_146, + L_OPTIONS_147, + L_OPTIONS_148, + L_OPTIONS_149, + L_OPTIONS_150, + L_OPTIONS_151, + L_OPTIONS_152, + L_OPTIONS_153, + L_OPTIONS_154, + L_OPTIONS_155, + L_OPTIONS_156, + L_OPTIONS_157, + L_OPTIONS_158, + L_OPTIONS_159, + L_OPTIONS_160, + L_OPTIONS_161, + L_OPTIONS_162, + L_OPTIONS_163, + L_OPTIONS_164, + L_OPTIONS_165, + L_OPTIONS_166, + L_OPTIONS_167, + L_OPTIONS_168, + L_OPTIONS_169, + L_OPTIONS_170, + L_OPTIONS_171, + L_OPTIONS_172, + L_OPTIONS_173, + L_OPTIONS_174, + L_OPTIONS_175, + L_OPTIONS_176, + L_OPTIONS_177, + L_OPTIONS_178, + L_OPTIONS_179, + L_OPTIONS_180, + L_OPTIONS_181, + L_OPTIONS_182, + L_OPTIONS_183, + L_OPTIONS_184, + L_OPTIONS_185, + L_OPTIONS_186, + L_OPTIONS_187, + L_OPTIONS_188, + L_OPTIONS_189, + L_OPTIONS_190, + L_OPTIONS_191, + L_OPTIONS_192, + L_OPTIONS_193, + L_OPTIONS_194, + L_OPTIONS_195, + L_OPTIONS_196, + L_OPTIONS_197, + L_OPTIONS_198, + L_OPTIONS_199, + L_OPTIONS_200, + L_OPTIONS_201, + L_OPTIONS_202, + L_OPTIONS_203, + L_OPTIONS_204, + L_OPTIONS_205, + L_OPTIONS_206, + L_OPTIONS_207, + L_OPTIONS_208, + L_OPTIONS_209, + L_OPTIONS_210, + L_OPTIONS_211, + L_OPTIONS_212, + L_OPTIONS_213, + L_OPTIONS_214, + L_OPTIONS_215, + L_OPTIONS_216, + L_OPTIONS_217, + L_OPTIONS_218, + L_OPTIONS_219, + L_OPTIONS_220, + L_OPTIONS_221, + L_OPTIONS_222, + L_OPTIONS_223, + L_OPTIONS_224, + L_OPTIONS_225, + L_OPTIONS_226, + L_OPTIONS_227, + L_OPTIONS_228, + L_OPTIONS_229, + L_OPTIONS_230, + L_OPTIONS_231, + L_OPTIONS_232, + L_OPTIONS_233, + L_OPTIONS_234, + L_OPTIONS_235, + L_OPTIONS_236, + L_OPTIONS_237, + L_OPTIONS_238, + L_OPTIONS_239, + L_OPTIONS_240, + L_OPTIONS_241, + L_OPTIONS_242, + L_OPTIONS_243, + L_OPTIONS_244, + L_OPTIONS_245, + L_OPTIONS_246, + L_OPTIONS_247, + L_OPTIONS_248, + L_OPTIONS_249, + L_OPTIONS_250, + L_OPTIONS_251, + L_OPTIONS_252, + L_OPTIONS_253, + L_OPTIONS_254, + L_OPTIONS_255, + L_OPTIONS_256, + L_OPTIONS_257, + L_OPTIONS_258, + L_OPTIONS_259, + L_OPTIONS_260, + L_OPTIONS_261, + L_OPTIONS_262, + L_OPTIONS_263, + L_OPTIONS_264, + L_OPTIONS_265, + L_OPTIONS_266, + L_OPTIONS_267, + L_OPTIONS_268, + L_OPTIONS_269, + L_OPTIONS_270, + L_OPTIONS_271, + L_OPTIONS_272, + L_OPTIONS_273, + L_OPTIONS_274, + L_OPTIONS_275, + L_OPTIONS_276, + L_OPTIONS_277, + L_OPTIONS_278, + L_OPTIONS_279, + L_OPTIONS_280, + L_OPTIONS_281, + L_OPTIONS_282, + L_OPTIONS_283, + L_OPTIONS_284, + L_OPTIONS_285, + L_OPTIONS_286, + L_OPTIONS_287, + L_OPTIONS_288, + L_OPTIONS_289, + L_OPTIONS_290, + L_OPTIONS_291, + L_OPTIONS_292, + L_OPTIONS_293, + L_OPTIONS_294, + L_OPTIONS_295, + L_OPTIONS_296, + L_OPTIONS_297, + L_OPTIONS_298, + L_OPTIONS_299, + L_OPTIONS_300, + L_OPTIONS_301, + L_OPTIONS_302, + L_OPTIONS_303, + L_OPTIONS_304, + L_OPTIONS_305, + L_OPTIONS_306, + L_OPTIONS_307, + L_OPTIONS_308, + L_OPTIONS_309, + L_OPTIONS_310, + L_OPTIONS_311, + L_OPTIONS_312, + L_OPTIONS_313, + L_OPTIONS_314, + L_OPTIONS_315, + L_OPTIONS_316, + L_OPTIONS_317, + L_OPTIONS_318, + L_OPTIONS_319, + L_OPTIONS_320, + L_OPTIONS_321, + L_OPTIONS_322, + L_OPTIONS_323, + L_OPTIONS_324, + L_OPTIONS_325, + L_OPTIONS_326, + L_OPTIONS_327, + L_OPTIONS_328, + L_OPTIONS_329, + L_OPTIONS_330, + L_OPTIONS_331, + L_OPTIONS_332, + L_OPTIONS_333, + L_OPTIONS_334, + L_OPTIONS_335, + L_OPTIONS_336, + L_OPTIONS_337, + L_OPTIONS_338, + L_OPTIONS_339, + L_OPTIONS_340, + L_OPTIONS_341, + L_OPTIONS_342, + L_OPTIONS_343, + L_OPTIONS_344, + L_OPTIONS_345, + L_OPTIONS_346, + L_OPTIONS_347, + L_OPTIONS_348, + L_OPTIONS_349, + L_OPTIONS_350, + L_OPTIONS_351, + L_OPTIONS_352, + L_OPTIONS_353, + L_OPTIONS_354, + L_OPTIONS_355, + L_OPTIONS_356, + L_OPTIONS_357, + L_OPTIONS_358, + L_OPTIONS_359, + L_OPTIONS_360, + L_OPTIONS_361, + L_OPTIONS_362, + L_OPTIONS_363, + L_OPTIONS_364, + L_OPTIONS_365, + L_OPTIONS_366, + L_OPTIONS_367, + L_OPTIONS_368, + L_OPTIONS_369, + L_OPTIONS_370, + L_OPTIONS_371, + L_OPTIONS_372, + L_OPTIONS_373, + L_OPTIONS_374, + L_OPTIONS_375, + L_OPTIONS_376, + L_OPTIONS_377, + L_OPTIONS_378, + L_OPTIONS_379, + L_OPTIONS_380, + L_OPTIONS_381, + L_OPTIONS_382, + L_OPTIONS_383, + L_OPTIONS_384, + L_OPTIONS_385, + L_OPTIONS_386, + L_OPTIONS_387, + L_OPTIONS_388, + L_OPTIONS_389, + L_OPTIONS_390, + L_OPTIONS_391, + L_OPTIONS_392, + L_OPTIONS_393, + L_OPTIONS_394, + L_OPTIONS_395, + L_OPTIONS_396, + L_OPTIONS_397, + L_OPTIONS_398, + L_OPTIONS_399, + L_OPTIONS_400, + L_OPTIONS_401, + L_OPTIONS_402, + L_OPTIONS_403, + L_OPTIONS_404, + L_OPTIONS_405, + L_OPTIONS_406, + L_OPTIONS_407, + L_OPTIONS_408, + L_OPTIONS_409, + L_OPTIONS_410, + L_OPTIONS_411, + L_OPTIONS_412, + L_OPTIONS_413, + L_OPTIONS_414, + L_OPTIONS_415, + L_OPTIONS_416, + L_OPTIONS_417, + L_OPTIONS_418, + L_OPTIONS_419, + L_OPTIONS_420, + L_OPTIONS_421, + L_OPTIONS_422, + L_OPTIONS_423, + L_OPTIONS_424, + L_OPTIONS_425, + L_OPTIONS_426, + L_OPTIONS_427, + L_OPTIONS_428, + L_OPTIONS_429, + L_OPTIONS_430, + L_OPTIONS_431, + L_OPTIONS_432, + L_OPTIONS_433, + L_OPTIONS_434, + L_OPTIONS_435, + L_OPTIONS_436, + L_OPTIONS_437, + L_OPTIONS_438, + L_OPTIONS_439, + L_OPTIONS_440, + L_OPTIONS_441, + L_OPTIONS_442, + L_OPTIONS_443, + L_OPTIONS_444, + L_OPTIONS_445, + L_OPTIONS_446, + L_OPTIONS_447, + L_OPTIONS_448, + L_OPTIONS_449, + L_OPTIONS_450, + L_OPTIONS_451, + L_OPTIONS_452, + L_OPTIONS_453, + L_OPTIONS_454, + L_OPTIONS_455, + L_OPTIONS_456, + L_OPTIONS_457, + L_OPTIONS_458, + L_OPTIONS_459, + L_OPTIONS_460, + L_OPTIONS_461, + L_OPTIONS_462, + L_OPTIONS_463, + L_OPTIONS_464, + L_OPTIONS_465, + L_OPTIONS_466, + L_OPTIONS_467, + L_OPTIONS_468, + L_OPTIONS_469, + L_OPTIONS_470, + L_OPTIONS_471, + L_OPTIONS_472, + L_OPTIONS_473, + L_OPTIONS_474, + L_OPTIONS_475, + L_OPTIONS_476, + L_OPTIONS_477, + L_OPTIONS_478, + L_OPTIONS_479, + L_OPTIONS_480, + L_OPTIONS_481, + L_OPTIONS_482, + L_OPTIONS_483, + L_OPTIONS_484, + L_OPTIONS_485, + L_OPTIONS_486, + L_OPTIONS_487, + L_OPTIONS_488, + L_OPTIONS_489, + L_OPTIONS_490, + L_OPTIONS_491, + L_OPTIONS_492, + L_OPTIONS_493, + L_OPTIONS_494, + L_OPTIONS_495 +}; diff --git a/src/include/lang/pam.h b/src/include/lang/pam.h new file mode 100644 index 000000000..cbcdf3292 --- /dev/null +++ b/src/include/lang/pam.h @@ -0,0 +1,52 @@ +#include "lang.h" + +enum l_pam { + L_PAM_000 = LANG_FIRST(LANGBANK_PAM), + L_PAM_001, + L_PAM_002, + L_PAM_003, + L_PAM_004, + L_PAM_005, + L_PAM_006, + L_PAM_007, + L_PAM_008, + L_PAM_009, + L_PAM_010, + L_PAM_011, + L_PAM_012, + L_PAM_013, + L_PAM_014, + L_PAM_015, + L_PAM_016, + L_PAM_017, + L_PAM_018, + L_PAM_019, + L_PAM_020, + L_PAM_021, + L_PAM_022, + L_PAM_023, + L_PAM_024, + L_PAM_025, + L_PAM_026, + L_PAM_027, + L_PAM_028, + L_PAM_029, + L_PAM_030, + L_PAM_031, + L_PAM_032, + L_PAM_033, + L_PAM_034, + L_PAM_035, + L_PAM_036, + L_PAM_037, + L_PAM_038, + L_PAM_039, + L_PAM_040, + L_PAM_041, + L_PAM_042, + L_PAM_043, + L_PAM_044, + L_PAM_045, + L_PAM_046, + L_PAM_047 +}; diff --git a/src/include/lang/pete.h b/src/include/lang/pete.h new file mode 100644 index 000000000..6a303594b --- /dev/null +++ b/src/include/lang/pete.h @@ -0,0 +1,80 @@ +#include "lang.h" + +enum l_pete { + L_PETE_000 = LANG_FIRST(LANGBANK_PETE), + L_PETE_001, + L_PETE_002, + L_PETE_003, + L_PETE_004, + L_PETE_005, + L_PETE_006, + L_PETE_007, + L_PETE_008, + L_PETE_009, + L_PETE_010, + L_PETE_011, + L_PETE_012, + L_PETE_013, + L_PETE_014, + L_PETE_015, + L_PETE_016, + L_PETE_017, + L_PETE_018, + L_PETE_019, + L_PETE_020, + L_PETE_021, + L_PETE_022, + L_PETE_023, + L_PETE_024, + L_PETE_025, + L_PETE_026, + L_PETE_027, + L_PETE_028, + L_PETE_029, + L_PETE_030, + L_PETE_031, + L_PETE_032, + L_PETE_033, + L_PETE_034, + L_PETE_035, + L_PETE_036, + L_PETE_037, + L_PETE_038, + L_PETE_039, + L_PETE_040, + L_PETE_041, + L_PETE_042, + L_PETE_043, + L_PETE_044, + L_PETE_045, + L_PETE_046, + L_PETE_047, + L_PETE_048, + L_PETE_049, + L_PETE_050, + L_PETE_051, + L_PETE_052, + L_PETE_053, + L_PETE_054, + L_PETE_055, + L_PETE_056, + L_PETE_057, + L_PETE_058, + L_PETE_059, + L_PETE_060, + L_PETE_061, + L_PETE_062, + L_PETE_063, + L_PETE_064, + L_PETE_065, + L_PETE_066, + L_PETE_067, + L_PETE_068, + L_PETE_069, + L_PETE_070, + L_PETE_071, + L_PETE_072, + L_PETE_073, + L_PETE_074, + L_PETE_075 +}; diff --git a/src/include/lang/propobj.h b/src/include/lang/propobj.h new file mode 100644 index 000000000..680eba537 --- /dev/null +++ b/src/include/lang/propobj.h @@ -0,0 +1,56 @@ +#include "lang.h" + +enum l_propobj { + L_PROPOBJ_000 = LANG_FIRST(LANGBANK_PROPOBJ), + L_PROPOBJ_001, + L_PROPOBJ_002, + L_PROPOBJ_003, + L_PROPOBJ_004, + L_PROPOBJ_005, + L_PROPOBJ_006, + L_PROPOBJ_007, + L_PROPOBJ_008, + L_PROPOBJ_009, + L_PROPOBJ_010, + L_PROPOBJ_011, + L_PROPOBJ_012, + L_PROPOBJ_013, + L_PROPOBJ_014, + L_PROPOBJ_015, + L_PROPOBJ_016, + L_PROPOBJ_017, + L_PROPOBJ_018, + L_PROPOBJ_019, + L_PROPOBJ_020, + L_PROPOBJ_021, + L_PROPOBJ_022, + L_PROPOBJ_023, + L_PROPOBJ_024, + L_PROPOBJ_025, + L_PROPOBJ_026, + L_PROPOBJ_027, + L_PROPOBJ_028, + L_PROPOBJ_029, + L_PROPOBJ_030, + L_PROPOBJ_031, + L_PROPOBJ_032, + L_PROPOBJ_033, + L_PROPOBJ_034, + L_PROPOBJ_035, + L_PROPOBJ_036, + L_PROPOBJ_037, + L_PROPOBJ_038, + L_PROPOBJ_039, + L_PROPOBJ_040, + L_PROPOBJ_041, + L_PROPOBJ_042, + L_PROPOBJ_043, + L_PROPOBJ_044, + L_PROPOBJ_045, + L_PROPOBJ_046, + L_PROPOBJ_047, + L_PROPOBJ_048, + L_PROPOBJ_049, + L_PROPOBJ_050, + L_PROPOBJ_051 +}; diff --git a/src/include/lang/ref.h b/src/include/lang/ref.h new file mode 100644 index 000000000..a56c3ee17 --- /dev/null +++ b/src/include/lang/ref.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_ref { + L_REF_000 = LANG_FIRST(LANGBANK_REF) +}; diff --git a/src/include/lang/rit.h b/src/include/lang/rit.h new file mode 100644 index 000000000..37b04bed9 --- /dev/null +++ b/src/include/lang/rit.h @@ -0,0 +1,92 @@ +#include "lang.h" + +enum l_rit { + L_RIT_000 = LANG_FIRST(LANGBANK_RIT), + L_RIT_001, + L_RIT_002, + L_RIT_003, + L_RIT_004, + L_RIT_005, + L_RIT_006, + L_RIT_007, + L_RIT_008, + L_RIT_009, + L_RIT_010, + L_RIT_011, + L_RIT_012, + L_RIT_013, + L_RIT_014, + L_RIT_015, + L_RIT_016, + L_RIT_017, + L_RIT_018, + L_RIT_019, + L_RIT_020, + L_RIT_021, + L_RIT_022, + L_RIT_023, + L_RIT_024, + L_RIT_025, + L_RIT_026, + L_RIT_027, + L_RIT_028, + L_RIT_029, + L_RIT_030, + L_RIT_031, + L_RIT_032, + L_RIT_033, + L_RIT_034, + L_RIT_035, + L_RIT_036, + L_RIT_037, + L_RIT_038, + L_RIT_039, + L_RIT_040, + L_RIT_041, + L_RIT_042, + L_RIT_043, + L_RIT_044, + L_RIT_045, + L_RIT_046, + L_RIT_047, + L_RIT_048, + L_RIT_049, + L_RIT_050, + L_RIT_051, + L_RIT_052, + L_RIT_053, + L_RIT_054, + L_RIT_055, + L_RIT_056, + L_RIT_057, + L_RIT_058, + L_RIT_059, + L_RIT_060, + L_RIT_061, + L_RIT_062, + L_RIT_063, + L_RIT_064, + L_RIT_065, + L_RIT_066, + L_RIT_067, + L_RIT_068, + L_RIT_069, + L_RIT_070, + L_RIT_071, + L_RIT_072, + L_RIT_073, + L_RIT_074, + L_RIT_075, + L_RIT_076, + L_RIT_077, + L_RIT_078, + L_RIT_079, + L_RIT_080, + L_RIT_081, + L_RIT_082, + L_RIT_083, + L_RIT_084, + L_RIT_085, + L_RIT_086, + L_RIT_087 +}; diff --git a/src/include/lang/run.h b/src/include/lang/run.h new file mode 100644 index 000000000..530ea88d5 --- /dev/null +++ b/src/include/lang/run.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_run { + L_RUN_000 = LANG_FIRST(LANGBANK_RUN) +}; diff --git a/src/include/lang/sev.h b/src/include/lang/sev.h new file mode 100644 index 000000000..bd171ed06 --- /dev/null +++ b/src/include/lang/sev.h @@ -0,0 +1,20 @@ +#include "lang.h" + +enum l_sev { + L_SEV_000 = LANG_FIRST(LANGBANK_SEV), + L_SEV_001, + L_SEV_002, + L_SEV_003, + L_SEV_004, + L_SEV_005, + L_SEV_006, + L_SEV_007, + L_SEV_008, + L_SEV_009, + L_SEV_010, + L_SEV_011, + L_SEV_012, + L_SEV_013, + L_SEV_014, + L_SEV_015 +}; diff --git a/src/include/lang/sevb.h b/src/include/lang/sevb.h new file mode 100644 index 000000000..36c0dee70 --- /dev/null +++ b/src/include/lang/sevb.h @@ -0,0 +1,12 @@ +#include "lang.h" + +enum l_sevb { + L_SEVB_000 = LANG_FIRST(LANGBANK_SEVB), + L_SEVB_001, + L_SEVB_002, + L_SEVB_003, + L_SEVB_004, + L_SEVB_005, + L_SEVB_006, + L_SEVB_007 +}; diff --git a/src/include/lang/sevx.h b/src/include/lang/sevx.h new file mode 100644 index 000000000..fe47bcf5a --- /dev/null +++ b/src/include/lang/sevx.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_sevx { + L_SEVX_000 = LANG_FIRST(LANGBANK_SEVX) +}; diff --git a/src/include/lang/sevxb.h b/src/include/lang/sevxb.h new file mode 100644 index 000000000..5ba7560d2 --- /dev/null +++ b/src/include/lang/sevxb.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_sevxb { + L_SEVXB_000 = LANG_FIRST(LANGBANK_SEVXB) +}; diff --git a/src/include/lang/sho.h b/src/include/lang/sho.h new file mode 100644 index 000000000..f7d58a4de --- /dev/null +++ b/src/include/lang/sho.h @@ -0,0 +1,60 @@ +#include "lang.h" + +enum l_sho { + L_SHO_000 = LANG_FIRST(LANGBANK_SHO), + L_SHO_001, + L_SHO_002, + L_SHO_003, + L_SHO_004, + L_SHO_005, + L_SHO_006, + L_SHO_007, + L_SHO_008, + L_SHO_009, + L_SHO_010, + L_SHO_011, + L_SHO_012, + L_SHO_013, + L_SHO_014, + L_SHO_015, + L_SHO_016, + L_SHO_017, + L_SHO_018, + L_SHO_019, + L_SHO_020, + L_SHO_021, + L_SHO_022, + L_SHO_023, + L_SHO_024, + L_SHO_025, + L_SHO_026, + L_SHO_027, + L_SHO_028, + L_SHO_029, + L_SHO_030, + L_SHO_031, + L_SHO_032, + L_SHO_033, + L_SHO_034, + L_SHO_035, + L_SHO_036, + L_SHO_037, + L_SHO_038, + L_SHO_039, + L_SHO_040, + L_SHO_041, + L_SHO_042, + L_SHO_043, + L_SHO_044, + L_SHO_045, + L_SHO_046, + L_SHO_047, + L_SHO_048, + L_SHO_049, + L_SHO_050, + L_SHO_051, + L_SHO_052, + L_SHO_053, + L_SHO_054, + L_SHO_055 +}; diff --git a/src/include/lang/silo.h b/src/include/lang/silo.h new file mode 100644 index 000000000..9a49fc29c --- /dev/null +++ b/src/include/lang/silo.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_silo { + L_SILO_000 = LANG_FIRST(LANGBANK_SILO) +}; diff --git a/src/include/lang/stat.h b/src/include/lang/stat.h new file mode 100644 index 000000000..b3fc50b35 --- /dev/null +++ b/src/include/lang/stat.h @@ -0,0 +1,16 @@ +#include "lang.h" + +enum l_stat { + L_STAT_000 = LANG_FIRST(LANGBANK_STAT), + L_STAT_001, + L_STAT_002, + L_STAT_003, + L_STAT_004, + L_STAT_005, + L_STAT_006, + L_STAT_007, + L_STAT_008, + L_STAT_009, + L_STAT_010, + L_STAT_011 +}; diff --git a/src/include/lang/title.h b/src/include/lang/title.h new file mode 100644 index 000000000..323b2c917 --- /dev/null +++ b/src/include/lang/title.h @@ -0,0 +1,156 @@ +#include "lang.h" + +enum l_title { + L_TITLE_000 = LANG_FIRST(LANGBANK_TITLE), + L_TITLE_001, + L_TITLE_002, + L_TITLE_003, + L_TITLE_004, + L_TITLE_005, + L_TITLE_006, + L_TITLE_007, + L_TITLE_008, + L_TITLE_009, + L_TITLE_010, + L_TITLE_011, + L_TITLE_012, + L_TITLE_013, + L_TITLE_014, + L_TITLE_015, + L_TITLE_016, + L_TITLE_017, + L_TITLE_018, + L_TITLE_019, + L_TITLE_020, + L_TITLE_021, + L_TITLE_022, + L_TITLE_023, + L_TITLE_024, + L_TITLE_025, + L_TITLE_026, + L_TITLE_027, + L_TITLE_028, + L_TITLE_029, + L_TITLE_030, + L_TITLE_031, + L_TITLE_032, + L_TITLE_033, + L_TITLE_034, + L_TITLE_035, + L_TITLE_036, + L_TITLE_037, + L_TITLE_038, + L_TITLE_039, + L_TITLE_040, + L_TITLE_041, + L_TITLE_042, + L_TITLE_043, + L_TITLE_044, + L_TITLE_045, + L_TITLE_046, + L_TITLE_047, + L_TITLE_048, + L_TITLE_049, + L_TITLE_050, + L_TITLE_051, + L_TITLE_052, + L_TITLE_053, + L_TITLE_054, + L_TITLE_055, + L_TITLE_056, + L_TITLE_057, + L_TITLE_058, + L_TITLE_059, + L_TITLE_060, + L_TITLE_061, + L_TITLE_062, + L_TITLE_063, + L_TITLE_064, + L_TITLE_065, + L_TITLE_066, + L_TITLE_067, + L_TITLE_068, + L_TITLE_069, + L_TITLE_070, + L_TITLE_071, + L_TITLE_072, + L_TITLE_073, + L_TITLE_074, + L_TITLE_075, + L_TITLE_076, + L_TITLE_077, + L_TITLE_078, + L_TITLE_079, + L_TITLE_080, + L_TITLE_081, + L_TITLE_082, + L_TITLE_083, + L_TITLE_084, + L_TITLE_085, + L_TITLE_086, + L_TITLE_087, + L_TITLE_088, + L_TITLE_089, + L_TITLE_090, + L_TITLE_091, + L_TITLE_092, + L_TITLE_093, + L_TITLE_094, + L_TITLE_095, + L_TITLE_096, + L_TITLE_097, + L_TITLE_098, + L_TITLE_099, + L_TITLE_100, + L_TITLE_101, + L_TITLE_102, + L_TITLE_103, + L_TITLE_104, + L_TITLE_105, + L_TITLE_106, + L_TITLE_107, + L_TITLE_108, + L_TITLE_109, + L_TITLE_110, + L_TITLE_111, + L_TITLE_112, + L_TITLE_113, + L_TITLE_114, + L_TITLE_115, + L_TITLE_116, + L_TITLE_117, + L_TITLE_118, + L_TITLE_119, + L_TITLE_120, + L_TITLE_121, + L_TITLE_122, + L_TITLE_123, + L_TITLE_124, + L_TITLE_125, + L_TITLE_126, + L_TITLE_127, + L_TITLE_128, + L_TITLE_129, + L_TITLE_130, + L_TITLE_131, + L_TITLE_132, + L_TITLE_133, + L_TITLE_134, + L_TITLE_135, + L_TITLE_136, + L_TITLE_137, + L_TITLE_138, + L_TITLE_139, + L_TITLE_140, + L_TITLE_141, + L_TITLE_142, + L_TITLE_143, + L_TITLE_144, + L_TITLE_145, + L_TITLE_146, + L_TITLE_147, + L_TITLE_148, + L_TITLE_149, + L_TITLE_150, + L_TITLE_151 +}; diff --git a/src/include/lang/tra.h b/src/include/lang/tra.h new file mode 100644 index 000000000..11eecc6b2 --- /dev/null +++ b/src/include/lang/tra.h @@ -0,0 +1,92 @@ +#include "lang.h" + +enum l_tra { + L_TRA_000 = LANG_FIRST(LANGBANK_TRA), + L_TRA_001, + L_TRA_002, + L_TRA_003, + L_TRA_004, + L_TRA_005, + L_TRA_006, + L_TRA_007, + L_TRA_008, + L_TRA_009, + L_TRA_010, + L_TRA_011, + L_TRA_012, + L_TRA_013, + L_TRA_014, + L_TRA_015, + L_TRA_016, + L_TRA_017, + L_TRA_018, + L_TRA_019, + L_TRA_020, + L_TRA_021, + L_TRA_022, + L_TRA_023, + L_TRA_024, + L_TRA_025, + L_TRA_026, + L_TRA_027, + L_TRA_028, + L_TRA_029, + L_TRA_030, + L_TRA_031, + L_TRA_032, + L_TRA_033, + L_TRA_034, + L_TRA_035, + L_TRA_036, + L_TRA_037, + L_TRA_038, + L_TRA_039, + L_TRA_040, + L_TRA_041, + L_TRA_042, + L_TRA_043, + L_TRA_044, + L_TRA_045, + L_TRA_046, + L_TRA_047, + L_TRA_048, + L_TRA_049, + L_TRA_050, + L_TRA_051, + L_TRA_052, + L_TRA_053, + L_TRA_054, + L_TRA_055, + L_TRA_056, + L_TRA_057, + L_TRA_058, + L_TRA_059, + L_TRA_060, + L_TRA_061, + L_TRA_062, + L_TRA_063, + L_TRA_064, + L_TRA_065, + L_TRA_066, + L_TRA_067, + L_TRA_068, + L_TRA_069, + L_TRA_070, + L_TRA_071, + L_TRA_072, + L_TRA_073, + L_TRA_074, + L_TRA_075, + L_TRA_076, + L_TRA_077, + L_TRA_078, + L_TRA_079, + L_TRA_080, + L_TRA_081, + L_TRA_082, + L_TRA_083, + L_TRA_084, + L_TRA_085, + L_TRA_086, + L_TRA_087 +}; diff --git a/src/include/lang/uff.h b/src/include/lang/uff.h new file mode 100644 index 000000000..44c94d7ee --- /dev/null +++ b/src/include/lang/uff.h @@ -0,0 +1,5 @@ +#include "lang.h" + +enum l_uff { + L_UFF_000 = LANG_FIRST(LANGBANK_UFF) +}; diff --git a/src/include/lang/wax.h b/src/include/lang/wax.h new file mode 100644 index 000000000..de9fffb5b --- /dev/null +++ b/src/include/lang/wax.h @@ -0,0 +1,32 @@ +#include "lang.h" + +enum l_wax { + L_WAX_000 = LANG_FIRST(LANGBANK_WAX), + L_WAX_001, + L_WAX_002, + L_WAX_003, + L_WAX_004, + L_WAX_005, + L_WAX_006, + L_WAX_007, + L_WAX_008, + L_WAX_009, + L_WAX_010, + L_WAX_011, + L_WAX_012, + L_WAX_013, + L_WAX_014, + L_WAX_015, + L_WAX_016, + L_WAX_017, + L_WAX_018, + L_WAX_019, + L_WAX_020, + L_WAX_021, + L_WAX_022, + L_WAX_023, + L_WAX_024, + L_WAX_025, + L_WAX_026, + L_WAX_027 +}; diff --git a/src/include/types.h b/src/include/types.h index 53b9887af..fc0e8a525 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -3,6 +3,7 @@ #include #include "constants.h" #include "gbiex.h" +#include "lang.h" #define bool s32 #define ubool u32