Annotate all data with DUSK_GAME_DATA (#2214)

The hope of auto-importing data via lld MinGW
+ pseudo_reloc is now dead thanks to ARM64,
so I just wrote a script to go annotate every
exported data symbol in the game instead.
This commit is contained in:
Luke Street
2026-07-14 13:49:21 -06:00
committed by GitHub
parent f5d30a886d
commit eed14acdc6
843 changed files with 4817 additions and 4821 deletions
+2 -2
View File
@@ -19,8 +19,8 @@
#include "Z2AudioCS/Z2AudioCS.h"
#endif
Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
u8 gMuffleOutOfRangeMic = false;
DUSK_GAME_DATA Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
DUSK_GAME_DATA u8 gMuffleOutOfRangeMic = false;
Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
mAudioMgrPtr = this;
+2 -2
View File
@@ -19,9 +19,9 @@ f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 o
}
}
const f32 Z2Calc::cEqualCSlope = 1.0f;
DUSK_GAME_DATA const f32 Z2Calc::cEqualCSlope = 1.0f;
const f32 Z2Calc::cEqualPSlope = 0.5f;
DUSK_GAME_DATA const f32 Z2Calc::cEqualPSlope = 0.5f;
f32 Z2Calc::getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 outMin, f32 outMax, Z2Calc::CurveSign curveSign) {
if (curveSign == Z2Calc::CURVE_POSITIVE) {
+2 -2
View File
@@ -10,8 +10,8 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32);
static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32);
static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32);
s8 data_80451358;
s8 data_80451359;
DUSK_GAME_DATA s8 data_80451358;
DUSK_GAME_DATA s8 data_80451359;
static Z2EnemyArea const sAreaDefault = {true, 700, 1100, 1500};
+1 -1
View File
@@ -121,7 +121,7 @@ JAISeqDataMgr* Z2DebugSys::initSeSeqDataMgr(const void* param_1) {
u8 gMicOn = true;
u8 gMicOffWhenOutOfSight = true;
extern u8 gMuffleOutOfRangeMic;
DUSK_GAME_EXTERN u8 gMuffleOutOfRangeMic;
void Z2ParamNode::message(JAHControl& ctrl) {
ctrl.makeComment("**** 各種パラメータ編集用ノード ****", 0, 5, 0);
+1 -1
View File
@@ -47,7 +47,7 @@ void Z2CreatureLink::setLinkBootsType(s32 bootsType) {
}
}
Z2CreatureLink* Z2CreatureLink::mLinkPtr;
DUSK_GAME_DATA Z2CreatureLink* Z2CreatureLink::mLinkPtr;
Z2CreatureLink::Z2CreatureLink() {
mLinkState = 0;
+52 -52
View File
@@ -5,81 +5,81 @@
#include "Z2AudioLib/Z2Param.h"
f32 Z2Param::DISTANCE_MAX = 2000.0f;
DUSK_GAME_DATA f32 Z2Param::DISTANCE_MAX = 2000.0f;
f32 Z2Param::MAX_VOLUME_DISTANCE = 300.0f;
DUSK_GAME_DATA f32 Z2Param::MAX_VOLUME_DISTANCE = 300.0f;
f32 Z2Param::DOLBY_CENTER_VALUE = 0.3f;
DUSK_GAME_DATA f32 Z2Param::DOLBY_CENTER_VALUE = 0.3f;
f32 Z2Param::DOLBY_FLONT_DISTANCE_MAX = -300.0f;
DUSK_GAME_DATA f32 Z2Param::DOLBY_FLONT_DISTANCE_MAX = -300.0f;
f32 Z2Param::DOLBY_BEHIND_DISTANCE_MAX = 600.0f;
DUSK_GAME_DATA f32 Z2Param::DOLBY_BEHIND_DISTANCE_MAX = 600.0f;
f32 Z2Param::DISTANCE_FX_PARAM = 10.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::DISTANCE_FX_PARAM = 10.0f / 127.0f;
f32 Z2Param::SONIC_SPEED = 360.0f;
DUSK_GAME_DATA f32 Z2Param::SONIC_SPEED = 360.0f;
f32 Z2Param::VOL_BGM_DEFAULT = 1.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_BGM_DEFAULT = 1.0f;
f32 Z2Param::VOL_SE_SYSTEM_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_SYSTEM_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_VOICE_DEFAULT = 1.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_VOICE_DEFAULT = 1.0f;
f32 Z2Param::VOL_SE_LINK_MOTION_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_MOTION_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_CHAR_VOICE_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_CHAR_VOICE_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_CHAR_MOVE_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_CHAR_MOVE_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_OBJECT_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_OBJECT_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_ATMOSPHERE_DEFAULT = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_ATMOSPHERE_DEFAULT = 120.0f / 127.0f;
f32 Z2Param::VOL_BGM_TALKING = 0.5f;
DUSK_GAME_DATA f32 Z2Param::VOL_BGM_TALKING = 0.5f;
f32 Z2Param::VOL_SE_SYSTEM_TALKING = 112.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_SYSTEM_TALKING = 112.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_VOICE_TALKING = 104.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_VOICE_TALKING = 104.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_MOTION_TALKING = 96.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_MOTION_TALKING = 96.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING = 96.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING = 96.0f / 127.0f;
f32 Z2Param::VOL_SE_CHAR_VOICE_TALKING = 120.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_CHAR_VOICE_TALKING = 120.0f / 127.0f;
f32 Z2Param::VOL_SE_CHAR_MOVE_TALKING = 119.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_CHAR_MOVE_TALKING = 119.0f / 127.0f;
f32 Z2Param::VOL_SE_OBJECT_TALKING = 96.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_OBJECT_TALKING = 96.0f / 127.0f;
f32 Z2Param::VOL_SE_ATMOSPHERE_TALKING = 96.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_ATMOSPHERE_TALKING = 96.0f / 127.0f;
f32 Z2Param::VOL_BGM_PAUSING = 0.3f;
DUSK_GAME_DATA f32 Z2Param::VOL_BGM_PAUSING = 0.3f;
f32 Z2Param::VOL_SE_SYSTEM_PAUSING = 112.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_SYSTEM_PAUSING = 112.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_VOICE_PAUSING = 80.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_VOICE_PAUSING = 80.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_MOTION_PAUSING = 72.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_MOTION_PAUSING = 72.0f / 127.0f;
f32 Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING = 72.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING = 72.0f / 127.0f;
f32 Z2Param::VOL_SE_CHAR_VOICE_PAUSING = 72.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_CHAR_VOICE_PAUSING = 72.0f / 127.0f;
f32 Z2Param::VOL_SE_CHAR_MOVE_PAUSING = 72.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_CHAR_MOVE_PAUSING = 72.0f / 127.0f;
f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f;
f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f;
DUSK_GAME_DATA f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f;
u8 Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME = 33;
DUSK_GAME_DATA u8 Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME = 33;
u8 Z2Param::BGM_CROSS_FADEIN_TIME = 60;
DUSK_GAME_DATA u8 Z2Param::BGM_CROSS_FADEIN_TIME = 60;
u8 Z2Param::BGM_CROSS_FADEOUT_TIME = 60;
DUSK_GAME_DATA u8 Z2Param::BGM_CROSS_FADEOUT_TIME = 60;
u8 Z2Param::BATTLE_BGM_WAIT_TIME = 30;
DUSK_GAME_DATA u8 Z2Param::BATTLE_BGM_WAIT_TIME = 30;
#if DEBUG
f32 Z2Param::ENEMY_NEARBY_DIST = 700.0f;
@@ -87,23 +87,23 @@ f32 Z2Param::BATTLE_FADEIN_DIST = 1100.0f;
f32 Z2Param::BATTLE_FADEOUT_DIST = 1500.0f;
#endif
u8 Z2Param::FOUND_TRACK_FI_TIME = 20;
DUSK_GAME_DATA u8 Z2Param::FOUND_TRACK_FI_TIME = 20;
u8 Z2Param::FOUND_TRACK_FO_TIME = 30;
DUSK_GAME_DATA u8 Z2Param::FOUND_TRACK_FO_TIME = 30;
u8 Z2Param::CLOSE_BATTLE_TRACK_FI_TIME = 10;
DUSK_GAME_DATA u8 Z2Param::CLOSE_BATTLE_TRACK_FI_TIME = 10;
u8 Z2Param::CLOSE_BATTLE_TRACK_FO_TIME = 30;
DUSK_GAME_DATA u8 Z2Param::CLOSE_BATTLE_TRACK_FO_TIME = 30;
u8 Z2Param::ENDING_BLOW_VOL_DOWN_TIME = 1;
DUSK_GAME_DATA u8 Z2Param::ENDING_BLOW_VOL_DOWN_TIME = 1;
u8 Z2Param::ENDING_BLOW_VOL_LOWER_TIME = 10;
DUSK_GAME_DATA u8 Z2Param::ENDING_BLOW_VOL_LOWER_TIME = 10;
u8 Z2Param::ENDING_BLOW_VOL_LOWER_RECOVER_TIME = 30;
DUSK_GAME_DATA u8 Z2Param::ENDING_BLOW_VOL_LOWER_RECOVER_TIME = 30;
u8 Z2Param::ENDING_BLOW_MIN_FINISH_TIME = 20;
DUSK_GAME_DATA u8 Z2Param::ENDING_BLOW_MIN_FINISH_TIME = 20;
u8 data_8045086C = 1;
DUSK_GAME_DATA u8 data_8045086C = 1;
#if DEBUG
f32 Z2Param::AUDIBLE_DELTA_RANGE_VOLUME = 0.25f;
@@ -111,12 +111,12 @@ f32 Z2Param::AUDIBLE_DELTA_RANGE_PAN = 0.15f;
f32 Z2Param::AUDIBLE_DELTA_RANGE_DOLBY = 0.15f;
#endif
f32 Z2Param::MIN_DISTANCE_VOLUME;
DUSK_GAME_DATA f32 Z2Param::MIN_DISTANCE_VOLUME;
f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME;
DUSK_GAME_DATA f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME;
u8 Z2Param::DARK_SE_FILTER_ON;
DUSK_GAME_DATA u8 Z2Param::DARK_SE_FILTER_ON;
u8 Z2Param::DARK_SE_LOW_PASS_FILTER_SETTING;
DUSK_GAME_DATA u8 Z2Param::DARK_SE_LOW_PASS_FILTER_SETTING;
u8 Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING;
DUSK_GAME_DATA u8 Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING;
+2 -2
View File
@@ -8,7 +8,7 @@
#include "Z2AudioLib/Z2Calc.h"
struct JAUStdSoundTableType {
static const u32 STRM_CH_SHIFT;
static DUSK_GAME_DATA const u32 STRM_CH_SHIFT;
struct StringOffset {
static inline const char* getString(const void* addr, u32 offset) {
return (const char*)addr + offset;
@@ -230,7 +230,7 @@ void Z2SoundInfo::getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const {
getSoundInfo_(soundID, seqPtr);
}
const u32 JAUStdSoundTableType::STRM_CH_SHIFT = 2;
DUSK_GAME_DATA const u32 JAUStdSoundTableType::STRM_CH_SHIFT = 2;
void Z2SoundInfo::getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const {
int numChild;
+70 -70
View File
@@ -19,61 +19,61 @@ struct Z2MdnPrm {
u8 tailNum2;
};
static Unit const sReply[50];
static u8 const sReplyTail[10];
static DUSK_GAME_DATA Unit const sReply[50];
static DUSK_GAME_DATA u8 const sReplyTail[10];
static Unit const sJoke[50];
static u8 const sJokeTail[10];
static DUSK_GAME_DATA Unit const sJoke[50];
static DUSK_GAME_DATA u8 const sJokeTail[10];
static Unit const sSexy[50];
static u8 const sSexyTail[10];
static DUSK_GAME_DATA Unit const sSexy[50];
static DUSK_GAME_DATA u8 const sSexyTail[10];
static Unit const sRidicule[50];
static u8 const sRidiculeTail[10];
static DUSK_GAME_DATA Unit const sRidicule[50];
static DUSK_GAME_DATA u8 const sRidiculeTail[10];
static Unit const sBoring[54];
static u8 const sBoringTail[6];
static DUSK_GAME_DATA Unit const sBoring[54];
static DUSK_GAME_DATA u8 const sBoringTail[6];
static Unit const sIrritated[47];
static u8 const sIrritatedTail[10];
static DUSK_GAME_DATA Unit const sIrritated[47];
static DUSK_GAME_DATA u8 const sIrritatedTail[10];
static Unit const sOrder[57];
static u8 const sOrderTail[6];
static DUSK_GAME_DATA Unit const sOrder[57];
static DUSK_GAME_DATA u8 const sOrderTail[6];
static Unit const sResent[53];
static u8 const sResentTail[5];
static DUSK_GAME_DATA Unit const sResent[53];
static DUSK_GAME_DATA u8 const sResentTail[5];
static Unit const sCheerful[53];
static u8 const sCheerfulTail[8];
static DUSK_GAME_DATA Unit const sCheerful[53];
static DUSK_GAME_DATA u8 const sCheerfulTail[8];
static Unit const sConfused[53];
static u8 const sConfusedTail[5];
static DUSK_GAME_DATA Unit const sConfused[53];
static DUSK_GAME_DATA u8 const sConfusedTail[5];
static Unit const sHostility[52];
static u8 const sHostilityTail[7];
static DUSK_GAME_DATA Unit const sHostility[52];
static DUSK_GAME_DATA u8 const sHostilityTail[7];
static Unit const sTired[53];
static u8 const sTiredTail[8];
static DUSK_GAME_DATA Unit const sTired[53];
static DUSK_GAME_DATA u8 const sTiredTail[8];
static Unit const sSerious[53];
static u8 const sSeriousTail[7];
static DUSK_GAME_DATA Unit const sSerious[53];
static DUSK_GAME_DATA u8 const sSeriousTail[7];
static Unit const sReplyb[42];
static u8 const sReplybTail[7];
static DUSK_GAME_DATA Unit const sReplyb[42];
static DUSK_GAME_DATA u8 const sReplybTail[7];
static Unit const sApologize[50];
static u8 const sApologizeTail[9];
static DUSK_GAME_DATA Unit const sApologize[50];
static DUSK_GAME_DATA u8 const sApologizeTail[9];
static Unit const sDeside[50];
static u8 const sDesideTail[8];
static DUSK_GAME_DATA Unit const sDeside[50];
static DUSK_GAME_DATA u8 const sDesideTail[8];
static Unit const sAfford[52];
static u8 const sAffordTail[12];
static DUSK_GAME_DATA Unit const sAfford[52];
static DUSK_GAME_DATA u8 const sAffordTail[12];
static Prm const sPrm[17];
static DUSK_GAME_DATA Prm const sPrm[17];
};
Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
0x6A, 0x8A, 0x50, 0x5F, 0x53, 0x37, 0x37, 0x4F, 0x4F, 0x5E, 0xAA, 0x46, 0x52, 0x5A, 0x5A,
0x4F, 0x4F, 0x45, 0x45, 0x56, 0x64, 0x79, 0x79, 0x79, 0x87, 0x95, 0x95, 0x89, 0x89, 0x4C,
0x4C, 0x4B, 0x52, 0x41, 0x41, 0x5B, 0x5F, 0x71, 0x53, 0x47, 0x89, 0x7D, 0x77, 0x88, 0x88,
@@ -83,11 +83,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
0x71, 0x85, 0x85, 0xA2, 0xA2, 0x52, 0x52, 0x5C, 0x5C, 0x75,
};
u8 const Z2MdnPrm::sReplyTail[10] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sReplyTail[10] = {
0x5E, 0x7F, 0x68, 0x39, 0x56, 0x75, 0x47, 0x71, 0x7D, 0x33,
};
Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
0x68, 0x57, 0x57, 0x55, 0x55, 0x51, 0x5B, 0x64, 0x6B, 0x7B, 0x7B, 0x5C, 0x77, 0x97, 0x8D,
0x97, 0x97, 0x8D, 0x66, 0x69, 0xA2, 0x5C, 0x87, 0x4F, 0x69, 0x5F, 0x5F, 0x83, 0x83, 0x82,
0x7F, 0x96, 0x96, 0xB0, 0x70, 0xA1, 0x6D, 0x6D, 0x6D, 0x59, 0x4C, 0x4B, 0x5A, 0x40, 0x4A,
@@ -97,11 +97,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
0x45, 0x45, 0x29, 0x4C, 0x4B, 0x64, 0x64, 0x60, 0x5C, 0xB1,
};
u8 const Z2MdnPrm::sJokeTail[10] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sJokeTail[10] = {
0x51, 0x97, 0x60, 0xB0, 0x6F, 0x5E, 0x5A, 0xA6, 0x4F, 0x4F,
};
Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
0x5E, 0x60, 0x5F, 0x63, 0x63, 0x72, 0x72, 0x78, 0x4D, 0x7A, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E,
0x59, 0x59, 0x7A, 0x7A, 0xA5, 0x90, 0x8D, 0x86, 0x62, 0x72, 0x79, 0x79, 0x86, 0x7F, 0x8B,
0x85, 0x7B, 0x7B, 0x5E, 0x5E, 0x6D, 0x6D, 0x88, 0x5F, 0xA3, 0xA3, 0x95, 0x95, 0x7F, 0x79,
@@ -111,11 +111,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
0x79, 0x65, 0x65, 0x4A, 0x5C, 0x78, 0x78, 0x8B, 0x8D, 0x7C,
};
u8 const Z2MdnPrm::sSexyTail[10] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sSexyTail[10] = {
0x52, 0x79, 0x82, 0xA5, 0x62, 0x86, 0x3F, 0x7D, 0x57, 0x7C,
};
Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
0xA7, 0x5A, 0x5A, 0x52, 0x52, 0x85, 0x85, 0x8C, 0x63, 0x73, 0x73, 0x90, 0x50, 0x46, 0x74,
0x74, 0xA3, 0xA7, 0x41, 0x51, 0x58, 0x34, 0x34, 0x2A, 0x5A, 0x81, 0x5D, 0x42, 0x4B, 0x70,
0x70, 0xB1, 0xB1, 0xB1, 0xB1, 0x65, 0x6A, 0xB1, 0x54, 0xA8, 0xA8, 0x6B, 0x6C, 0x55, 0x55,
@@ -125,11 +125,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
0x2D, 0x2D, 0x2D, 0x8C, 0x8C, 0x8B, 0x8B, 0x93, 0x93, 0x6E,
};
u8 const Z2MdnPrm::sRidiculeTail[10] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sRidiculeTail[10] = {
0x81, 0x67, 0x6D, 0x8C, 0x90, 0x85, 0xB1, 0x4D, 0x4F, 0x6E,
};
Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
0x8E, 0x9C, 0x9C, 0x5A, 0x5A, 0x52, 0x52, 0x5B, 0x5C, 0x56, 0x5C, 0x52, 0x52, 0x2D, 0x2D, 0x5B,
0x59, 0x56, 0x56, 0x56, 0x56, 0x6B, 0x6B, 0x58, 0x4C, 0x8E, 0x8E, 0x59, 0x61, 0x54, 0xA0, 0x4D,
0x5D, 0x59, 0x48, 0x30, 0x30, 0x5B, 0x5B, 0x5B, 0x4A, 0x64, 0x64, 0x7A, 0x7A, 0x92, 0x62, 0x62,
@@ -139,11 +139,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
0x5B, 0x5E, 0x70, 0x56, 0x56, 0x4C, 0x4C, 0x59, 0x59, 0x5B, 0x5B, 0x71,
};
u8 const Z2MdnPrm::sBoringTail[6] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sBoringTail[6] = {
0x92, 0x58, 0x59, 0x5B, 0x70, 0x71,
};
Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
0x6C, 0x91, 0x67, 0x8B, 0x8B, 0xA2, 0xA2, 0xAB, 0x48, 0x64, 0x73, 0x61, 0x61, 0x64, 0x64, 0x6D,
0x60, 0x7E, 0x4A, 0x55, 0x6A, 0x63, 0x66, 0x78, 0x5C, 0x5A, 0x6E, 0x79, 0x75, 0x62, 0x62, 0x57,
0x85, 0x3F, 0x3C, 0x83, 0x83, 0x9B, 0x78, 0x65, 0x65, 0x67, 0x65, 0x65, 0x87, 0x88, 0x88, 0x3D,
@@ -152,11 +152,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
0xAD, 0x6E, 0x72, 0x82, 0x83, 0x87, 0x85, 0x85, 0x85, 0x8E, 0x60, 0x6D, 0x80, 0x80,
};
u8 const Z2MdnPrm::sIrritatedTail[10] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sIrritatedTail[10] = {
0x64, 0x61, 0x4E, 0x91, 0xA0, 0x85, 0x9B, 0x67, 0x6F, 0x64,
};
Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
0x77, 0x5F, 0x5F, 0x73, 0x73, 0x66, 0x66, 0x6B, 0x6B, 0x7A, 0x7A, 0x60, 0x54, 0x5F, 0x5F,
0x69, 0x69, 0x5A, 0x86, 0x84, 0x84, 0x96, 0x96, 0x94, 0x94, 0x8A, 0x87, 0x84, 0x5A, 0x2C,
0x4E, 0x52, 0x52, 0x52, 0x52, 0x51, 0x51, 0x6E, 0x62, 0x5E, 0x6C, 0xA3, 0xA3, 0x5B, 0x62,
@@ -167,11 +167,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
0x48, 0x48, 0x69, 0x69, 0x6D, 0x6D, 0x94, 0x94, 0x97,
};
u8 const Z2MdnPrm::sOrderTail[6] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sOrderTail[6] = {
0x60, 0xA8, 0x5B, 0x4E, 0x5D, 0x87,
};
Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
0x6F, 0x5F, 0x5F, 0x66, 0x66, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x4B, 0x4B, 0x6B, 0x6B, 0x86,
0x86, 0x4A, 0x4A, 0x6D, 0x6D, 0x6D, 0x6D, 0x8C, 0x8C, 0x84, 0x84, 0x64, 0x64, 0x6C, 0x6C, 0x92,
0x92, 0x6A, 0x5F, 0x6F, 0x6F, 0x62, 0x62, 0x62, 0x75, 0x5A, 0x5A, 0x5A, 0x5A, 0x60, 0x60, 0x6A,
@@ -181,11 +181,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
0x5E, 0xAA, 0xAA, 0x9E, 0x9E, 0x5A, 0x5A, 0x57, 0x57, 0x57,
};
u8 const Z2MdnPrm::sResentTail[5] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sResentTail[5] = {
0x4A, 0x98, 0x8A, 0x7E, 0x57,
};
Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
0x64, 0x6D, 0x6D, 0x6D, 0x99, 0x6D, 0x40, 0x51, 0x51, 0x6F, 0x6F, 0x66, 0x66, 0x60, 0xA7, 0xAF,
0xB3, 0x61, 0x61, 0xA7, 0xA7, 0x5E, 0x8B, 0x75, 0x77, 0x72, 0x72, 0x93, 0x93, 0x8B, 0x8B, 0x88,
0x88, 0x77, 0x77, 0x80, 0x80, 0x80, 0x80, 0x67, 0x67, 0x4D, 0x4A, 0x69, 0x44, 0xA1, 0x64, 0xA8,
@@ -195,11 +195,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
0x65, 0x70, 0x6B, 0x6B, 0x6B, 0x6D, 0x6D, 0x57, 0x57, 0x7B,
};
u8 const Z2MdnPrm::sCheerfulTail[8] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sCheerfulTail[8] = {
0x60, 0x6D, 0x4D, 0x44, 0x9C, 0x54, 0x70, 0x7B,
};
Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
0x83, 0x80, 0x80, 0x82, 0x82, 0x82, 0x82, 0x5B, 0x75, 0x84, 0x84, 0x84, 0x84, 0x75, 0x75, 0x62,
0x62, 0x62, 0x4D, 0x56, 0x56, 0x59, 0x59, 0x59, 0x59, 0x74, 0x74, 0x85, 0x7D, 0x8D, 0x8D, 0x70,
0x70, 0x5A, 0x5A, 0x6B, 0x6B, 0x6B, 0x6B, 0x70, 0x79, 0x73, 0x73, 0x71, 0x71, 0x75, 0x75, 0x7B,
@@ -209,11 +209,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
0x38, 0x38, 0x38, 0x83, 0x83, 0x8E, 0x8E, 0x4C, 0x56, 0x56,
};
u8 const Z2MdnPrm::sConfusedTail[5] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sConfusedTail[5] = {
0x2C, 0x42, 0x4C, 0x7C, 0x49,
};
Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
0x85, 0x71, 0x71, 0x73, 0x73, 0x3B, 0x62, 0x84, 0x94, 0x94, 0x94, 0xAF, 0x98, 0xAD, 0xAD,
0x5A, 0x5A, 0x63, 0x63, 0x97, 0x90, 0x90, 0x7B, 0x73, 0x73, 0x63, 0x63, 0x55, 0x55, 0x65,
0x66, 0x7F, 0x7F, 0x87, 0x87, 0x8A, 0x8A, 0x94, 0x5D, 0x5C, 0x5A, 0x67, 0x67, 0x68, 0x68,
@@ -223,11 +223,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
0x62, 0x6A, 0x5F, 0x72, 0x72, 0x62, 0x62, 0x65, 0x5E, 0x69, 0x69, 0x63, 0x63, 0x7F,
};
u8 const Z2MdnPrm::sHostilityTail[7] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sHostilityTail[7] = {
0x97, 0x67, 0x94, 0x6A, 0x66, 0x4F, 0x6A,
};
Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
0x70, 0x70, 0x70, 0x5C, 0x5C, 0x5C, 0x6F, 0x6F, 0x6F, 0x93, 0x8C, 0x9A, 0x9D, 0x89, 0x99, 0x7A,
0x91, 0x8D, 0x8D, 0x8D, 0x8D, 0x69, 0x69, 0x72, 0x72, 0x65, 0x65, 0x65, 0x9E, 0x98, 0x98, 0x2A,
0x50, 0x54, 0x54, 0x49, 0x64, 0x59, 0x59, 0x62, 0x62, 0x62, 0x44, 0x5E, 0x9F, 0x91, 0x63, 0x63,
@@ -237,11 +237,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
0x84, 0x6D, 0x6D, 0x6A, 0x6A, 0x8D, 0x8D, 0x8D, 0x8D, 0x3B,
};
u8 const Z2MdnPrm::sTiredTail[8] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sTiredTail[8] = {
0x66, 0x6F, 0x3B, 0x7A, 0x49, 0x91, 0x5C, 0x6A,
};
Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
0x52, 0x65, 0x65, 0x72, 0x5A, 0x61, 0x61, 0x7B, 0x80, 0x92, 0x93, 0x9D, 0x9D, 0x70, 0x79, 0x76,
0x62, 0x57, 0x5A, 0x53, 0x53, 0x59, 0x59, 0x65, 0x63, 0x60, 0x60, 0x6A, 0x83, 0x80, 0x7F, 0x5D,
0x5C, 0x45, 0x5D, 0x71, 0x72, 0x65, 0x65, 0x65, 0x66, 0x4B, 0xB2, 0x60, 0x5C, 0x5C, 0x5C, 0x5B,
@@ -251,11 +251,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
0x70, 0x60, 0x3C, 0x81, 0x81, 0x92, 0x92, 0x8E, 0x98, 0x87,
};
u8 const Z2MdnPrm::sSeriousTail[7] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sSeriousTail[7] = {
0x7B, 0x69, 0x4B, 0x61, 0x52, 0x59, 0x87,
};
Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
0x5C, 0x45, 0x45, 0x71, 0x9F, 0x57, 0xB4, 0xB4, 0x56, 0x62, 0x8E, 0x61, 0x61, 0xB0,
0xB0, 0x3C, 0x59, 0x4A, 0x64, 0xA4, 0xA4, 0x5A, 0x5A, 0x5A, 0x5A, 0x72, 0x72, 0x4B,
0x6B, 0x97, 0x97, 0x59, 0x60, 0x60, 0x60, 0x69, 0x3E, 0x3E, 0x57, 0x42, 0x5E, 0x76,
@@ -264,11 +264,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
0x44, 0x4F, 0x52, 0x58, 0x5A, 0x6F, 0x6E, 0x8A, 0x8E, 0x8E, 0x8E, 0x8C, 0x8C, 0x9B,
};
u8 const Z2MdnPrm::sReplybTail[7] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sReplybTail[7] = {
0x4F, 0x4A, 0xA2, 0x4F, 0x65, 0x98, 0x5C,
};
Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
0x6A, 0x6A, 0x6A, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x57, 0x57, 0x57, 0x63, 0x61,
0x54, 0x54, 0x54, 0x54, 0x58, 0x58, 0x58, 0x58, 0x45, 0x45, 0x56, 0x56, 0x5B, 0x5B, 0x37,
0x53, 0x53, 0x53, 0x59, 0x59, 0x59, 0x49, 0x58, 0x58, 0x55, 0x56, 0x56, 0x83, 0x7F, 0x7F,
@@ -278,11 +278,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
0x64, 0x60, 0x61, 0x63, 0x6A, 0x62, 0x62, 0x64, 0x65, 0x71,
};
u8 const Z2MdnPrm::sApologizeTail[9] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sApologizeTail[9] = {
0x7C, 0x6E, 0x63, 0x71, 0x51, 0x37, 0x75, 0x58, 0x5C,
};
Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
0x77, 0x77, 0x77, 0x58, 0x58, 0x6F, 0x78, 0x5F, 0x66, 0x5E, 0x6E, 0x62, 0x62, 0x2E, 0x5A,
0x58, 0x54, 0x52, 0x52, 0x5C, 0x59, 0x56, 0x56, 0x4B, 0x4B, 0x63, 0x63, 0x4D, 0x4E, 0x4A,
0x69, 0x71, 0x71, 0x76, 0x80, 0x80, 0x80, 0x73, 0x73, 0x5C, 0x7C, 0x64, 0x83, 0x89, 0x89,
@@ -292,11 +292,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
0x75, 0x6A, 0x66, 0x76, 0x69, 0x69, 0x69, 0x60, 0x60, 0x5F,
};
u8 const Z2MdnPrm::sDesideTail[8] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sDesideTail[8] = {
0x64, 0x2E, 0x4A, 0x57, 0x80, 0x48, 0x7C, 0x5F,
};
Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
DUSK_GAME_DATA Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
0x4E, 0x45, 0x52, 0x5B, 0x56, 0x5B, 0x59, 0x52, 0x52, 0x57, 0x5C, 0x50, 0x50, 0x49, 0x80,
0x6E, 0x6E, 0x5A, 0x5C, 0x60, 0x6A, 0x62, 0x62, 0x6A, 0x71, 0x48, 0x4C, 0x5B, 0x5A, 0x40,
0x40, 0x49, 0x49, 0x50, 0x51, 0x51, 0x51, 0x3A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x57, 0x57,
@@ -306,11 +306,11 @@ Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
0x63, 0x5D, 0x69, 0x70, 0x56, 0x50, 0x4B, 0x92, 0x86, 0x8F, 0x4B, 0x4F, 0x57, 0x56,
};
u8 const Z2MdnPrm::sAffordTail[12] = {
DUSK_GAME_DATA u8 const Z2MdnPrm::sAffordTail[12] = {
0x63, 0x8E, 0x5B, 0x59, 0x4C, 0x3A, 0x69, 0x47, 0x41, 0x59, 0x50, 0x55,
};
const Z2MdnPrm::Prm Z2MdnPrm::sPrm[17] = {
DUSK_GAME_DATA const Z2MdnPrm::Prm Z2MdnPrm::sPrm[17] = {
{Z2MdnPrm::sReply, Z2MdnPrm::sReplyTail, ARRAY_SIZE(Z2MdnPrm::sReply), 6, 4},
{Z2MdnPrm::sJoke, Z2MdnPrm::sJokeTail, ARRAY_SIZE(Z2MdnPrm::sJoke), 3, 7},
{Z2MdnPrm::sSexy, Z2MdnPrm::sSexyTail, ARRAY_SIZE(Z2MdnPrm::sSexy), 3, 7},